diff --git a/Dockerfile b/Dockerfile index 9785b4c80291fdb22453cfa2c4aee825d9df7568..02562f42a001d14ad0aa5cd5702dd62f2fdfdbe9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # java8基础镜像 -FROM registry.cn-beijing.aliyuncs.com/xxm1995/java8 +FROM openjdk:8-jre # 作者信息 MAINTAINER xxm1995@outlook.com diff --git a/README.md b/README.md index 2b8a1e09475a3f47d9824e93e83bd6e5f36f78d7..5041a09efdedeb71956e6e4de4ea9743430fe5c0 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,47 @@ -# Bootx-Platform (v1.2.3) +# Bootx-Platform (v1.3.0-园博园)

star - Build Status + Build Status Build Status - Downloads + Downloads

## 🙏🙏🙏 求star呀，走过路过留个star吧，非常非常感谢。🙏🙏🙏 ## 🍈项目介绍 +> 目前Bootx-Platform的开发重点是，将核心中的业务代码剥离出子项目，作为单独系统使用， +保持脚手架核心的精简，同时对不同的业务模块也可以专门优化和适配，使其加易用和强大。 基于Spring Boot框架打造，针对单体式应用进行专门设计，提供整套服务模块，努力为打造全方位企业级开发解决方案， 致力将开源版打造成超越商业版后台管理框架的项目。 - 单体版本使用Spring Boot相关技术栈 -- 分布式版本使用Spring Cloud Alibaba技术栈 - vue2使用 [ANTD PRO VUE](https://pro.antdv.com/) 作为脚手架 - vue3使用 [Vben-Admin](https://vvbin.cn/doc-next/) 作为脚手架 - 可视化大屏使用 [Go-VIew](https://gitee.com/dromara/go-view) 作为基础框架 - 移动端使用 [Taro](https://taro.jd.com/)、[NutUI](https://nutui.jd.com/) vue3+TS为技术栈。 -## 🍒文档 +## 🍁子项目 +- dax-pay：开源支付系统 [Gitee地址](https://gitee.com/bootx/dax-pay) +- bpm-plus：工作流办公平台[Gitee地址](https://gitee.com/bootx/bpm-plus) +- mybatis-table-modify：数据表结构管理 [Gitee地址](https://gitee.com/bootx/mybatis-table-modify) +- 待命名：可视化大屏 + +## 项目Maven坐标 +> 项目各模块都已经发布到maven中央仓库中，进行二开时可以对不进行更改的模块，使用Maven方式进行引入，方便后续进行版本升级 + +例子： +```xml + + cn.bootx。 + mybatis-table-modify + ${latest.version} + +``` + +## 📚文档 - 系统演示地址：[管理平台(vue2)](http://web.platform.bootx.cn/)、[管理平台(vue3)](http://v3.platform.bootx.cn/)、[可视化大屏](http://visualization.platform.bootx.cn/) - 前端项目地址：[前端项目(vue2)](https://gitee.com/bootx/bootx-platform-ui)、[前端项目(vue3)](https://gitee.com/bootx/bootx-platform-vue3)、[可视化大屏](https://gitee.com/bootx/bootx-platform-visualization) @@ -30,12 +49,13 @@ - 日志收集：[ELK](http://elk.dev.bootx.cn:5601/app/discove)、[PlumeLog](http://platform.dev.bootx.cn:8080/plumelog/#/) - 项目文档：[项目文档(GITEE)](https://bootx.gitee.io/)、[项目文档(备用)](https://doc.bootx.cn/) - 更新日志：[更新日志](./_doc/ChangeLog.md) + ## 🛠️功能亮点 低代码可视化平台，基于`GoView`开发，可以通过托拉拽来生成常用的大屏，可以适用于需要快速开发各种数据看板的场景。 ![](https://oscimg.oschina.net/oscnet/up-43cd6c0ac952c938863db303d0c2e644827.png) -集成最新版本的Flowable 6.7.2 工作流，并基于Bpmn.js定制流程设计器，相较于自带modeler更贴近业务和易用，通过关联动态表单可通过托拉拽实现业务审批流的业务 +集成最新版本的Flowable 6.8 工作流，并基于Bpmn.js定制流程设计器，相较于自带modeler更贴近业务和易用，通过关联动态表单可通过托拉拽实现业务审批流的业务 ![](https://oscimg.oschina.net/oscnet/up-22b8de0f4951ee6165e2ae604ad77b0af44.png) 支持支付宝、微信、聚合支付、现金支付、储值卡支付、钱包，对各种支付方式抽象成策略类，通过模板模式进行串通，方便扩展新的支付方式或业务 @@ -48,44 +68,23 @@ - 支持单通道支付、聚合支付、组合支付、部分和全部退款等支付功能 - 支持支付宝、微信、云闪付、现金、钱包、储值卡等多种支付方式 - 基于Sa-Token定制，支持对多终端、多登录方式进行分别的管理 -- 针对各类敏感信息，可以通过添加注解实现返回时自动脱敏 -- 针对重要信息，可以通过添加注解，实现在数据库中保密存储，配合数据脱敏使用可以更好的保护系统数据的安全 -- 支持多种范围的数据权限控制，如只能查看自己、只能查询指定部门、用户、可以查询全部的数据等等 -- 支持嵌套查询的超级查询构造器，自动生成对应条件SQL语句，也支持普通查询器，免去大量重复代码的编写 -- 提供移动端开发脚手架，方便开发H5与各种小程序 -- 支持通过ELK和轻量级PlumeLog来管理项目日志,以适应不同的场景 - 支持通过微信、钉钉、企业微信等第三方开放平台进行扫码登录 - 支持站内信、微信、钉钉、企业微信、微信公众号的消息推送 - 支持微信自定义菜单、素材、消息模板等资源的管理 - 集成Flowable+Bpmn.js工作流全家桶，方便OA相关功能的开发 - 基于GoView打造低代码可视化大屏平台，快速生成各种数据展板和大屏 -## 🚅 路线图 -- 功能 - - [x] 基于`GoView`的低代码可视化大屏平台 (90%) - - [ ] Vue3工作流功能移植除流程设计器 - - [ ] 短信通知 ## 🥂 Quick Start -[后端](https://bootx.gitee.io/doc/overview/config/项目启动.html#后端启动) +Spring Boot后端: [后端启动流程](https://bootx.gitee.io/doc/overview/config/项目启动.html#后端启动) Vue2前端: [Vue2前端启动流程](https://bootx.gitee.io/doc/overview/config/%E9%A1%B9%E7%9B%AE%E5%90%AF%E5%8A%A8.html#环境准备) Vue3后端: [Vue3前端启动流程](https://bootx.gitee.io/doc/overview/config/%E9%A1%B9%E7%9B%AE%E5%90%AF%E5%8A%A8.html#环境准备-1) -可视化大屏: [可视化大屏启动流程](http://) - -**中间件配置** - -| 组件 | 是否必须配置 | 备注 | -|----------|--------|---------------------------------------------| -| MySQL | 是 | 不设置无法启动 | -| Redis | 是 | 不设置启动后无法正常使用 | -| RabbitMQ | 否 | 支付消息通知在使用 | -| MongoDB | 否 | 默认审计日志和文件管理使用持久化方式为Mono，可在配置文件中配置切换成其他持久化方式 | -| plumelog | 是 | 默认项目自带lite版plumelog，不需要额外配置中间件，直接就可以使用 | +可视化大屏: [可视化大屏启动流程](https://bootx.gitee.io/doc/overview/) -## 🥞项目整体结构 +## 🥞项目模块结构 ```lua bootx-platform ├── _config -- 项目相关配置 @@ -110,10 +109,8 @@ bootx-platform ├── common-header-holder -- 请求头获取工具 ├── common-idempotency -- 幂等控制组件 ├── common-jackson -- Json序列化配置 - ├── common-lock -- 分布式锁 ├── common-log -- 日志配置 ├── common-mongo -- MongoDB配置 - ├── common-mqtt -- mqtt配置（停用） ├── common-mybatis-plus -- Mybatis Plus扩展 ├── common-rabbitmq -- rabbitmq消息队列 ├── common-redis-client -- Redis客户端封装和配置 @@ -128,94 +125,19 @@ bootx-platform ├── service-baseapi -- 基础api功能服务 ├── service-iam -- 身份识别与访问管理 ├── service-notice -- 消息通知服务 - ├── service-office -- 办公服务 ├── service-visualization -- 可视化大屏管理 - ├── service-payment -- 支付服务 ├── bootx-start -- 启动模块 ``` -## 🍇模块结构说明 - -**模块分包设计** - -以`service-iam`举例 -```lua -service-iam - ├── code -- 常量包 - ├── controller -- 控制器 - ├── core -- 功能核心 - ├── exception -- 异常 - ├── dto -- 业务对象 - ├── mq -- 消息通知处理 - ├── task -- 定时任务 - ├── param -- 请求参数包 - ├── util -- 内部工具包 - ├── IamApplication -- 启动类 -``` -**core核心包业务代码分包** - -```lua -├───core - ├── business -- 业务模块 - ├── convert -- 实体类转换 - ├── dao -- 持久化类 - ├── entity -- 数据库实体 - ├── service -- 服务类 -``` - -## 🍌项目展示 - -Vue3版本管理端 -![输入图片说明](https://oscimg.oschina.net/oscnet/up-f073982714da2b2151090f0c1cbf3680159.png) - -支付结算台 - -![简单支付](https://oscimg.oschina.net/oscnet/up-2afe305355141ae9398e3b056052596e1f8.png) - -工作流 - -![工作流](https://oscimg.oschina.net/oscnet/up-6a021b64002a32c69c9f4c12b1c047f6b5c.png) - -微信自定义菜单 - -![微信自定义菜单](https://oscimg.oschina.net/oscnet/up-09e7cf13093c4b77065829582caeb6647cd.png) - -动态表单 - -![输入图片说明](https://oscimg.oschina.net/oscnet/up-8384daeef614b3beae7641a46880273d10e.png) - -邮件发送 - -![输入图片说明](https://oscimg.oschina.net/oscnet/up-650a65461bb5123f9055e75fcdf92c83356.png) - -超级查询器 - -![输入图片说明](https://oscimg.oschina.net/oscnet/up-b888976cccac630663bf55cb7689ab39333.png) - -富文本编辑器 - -![输入图片说明](https://oscimg.oschina.net/oscnet/up-1e771f954859081e4151c8333245536b64c.png) - -PlumeLog 轻量级日志管理 - -![输入图片说明](https://oscimg.oschina.net/oscnet/up-198d0b0c09c2087e7d22506e58ae75cc536.png) - -ELK日志 - -![输入图片说明](https://oscimg.oschina.net/oscnet/up-31d6dbbccdaf8dcfc1cad8e24c7b7f80602.png) - -菜单管理 - -![输入图片说明](https://oscimg.oschina.net/oscnet/up-97b10943138e572258ac1cb1f31365f72db.png) +## 🥂 Bootx 项目合集 +- Bootx-Platform：单体版脚手架 [Gitee地址](https://gitee.com/bootx/bootx-platform) +- Bootx-Cloud：微服务版脚手架 [Gitee地址](https://gitee.com/bootx/bootx-cloud) +- dax-pay：开源支付系统 [Gitee地址](https://gitee.com/bootx/dax-pay) +- bpm-plus：开源支付系统 [Gitee地址](https://gitee.com/bootx/bpm-plus) +- mybatis-table-modify：数据表结构管理 [Gitee地址](https://gitee.com/bootx/mybatis-table-modify) ## 🥪 关于我们 -微信扫码加入交流群，或添加微信号：`xxxx` 邀请进群 - - -钉钉扫码加入钉钉交流群 - - QQ扫码加入QQ交流群

diff --git a/_config/elk/es/docker-compose.yml b/_config/elk/es/docker-compose.yml deleted file mode 100644 index b2ac9e0179a21a77c644174580e06828e493a1e5..0000000000000000000000000000000000000000 --- a/_config/elk/es/docker-compose.yml +++ /dev/null @@ -1,41 +0,0 @@ -version: '3.0' -services: - es: - image: docker.elastic.co/elasticsearch/elasticsearch:7.13.2 - container_name: es - environment: - - node.name=es - - discovery.type=single-node - - "ES_JAVA_OPTS=-Xms2048m -Xmx4096m" - ulimits: - memlock: - soft: -1 - hard: -1 - volumes: - - data01:/usr/share/elasticsearch/data - - /home/ubuntu/docker/elasticsearch/plugins:/usr/share/elasticsearch/plugins - ports: - - 9200:9200 - networks: - - elastic - - kibana: - image: kibana:7.13.2 - container_name: kibana - environment: - - ELASTICSEARCH_HOSTS=http://es:9200 - # 需要将Kibana配置文件中的小写转换成大写，然后这个才能用于变量，才能被设置到 - - I18N_LOCALE=zh-CN - - xpack.monitoring.ui.container.elasticsearch.enabled=false - ports: - - "5601:5601" - networks: - - elastic - -volumes: - data01: - driver: local - -networks: - elastic: - driver: bridge \ No newline at end of file diff --git a/_config/elk/filebeat/README.md b/_config/elk/filebeat/README.md deleted file mode 100644 index e8cc4b6809bd152ab558aa40829ca83ed37a2f2d..0000000000000000000000000000000000000000 --- a/_config/elk/filebeat/README.md +++ /dev/null @@ -1,51 +0,0 @@ -filebeat输出到ES配置 -```yaml -filebeat.inputs: -- type: log - enabled: true - paths: - - /data/logs/bootx-platform/*.json -# 输出到es -output.elasticsearch: - hosts: localhost:9200 - # 索引名 - index: "bootx-platform-logs" -# 设置 -setup: -# 自定义索引的话必须设置 - template: - name: "filebeat" - pattern: "filebeat-*" - ilm.enabled: false - -processors: - - decode_json_fields: - fields: ['message'] #要进行解析的字段 - target: "" #json内容解析到指定的字段，如果为空（“”），则解析到顶级结构下 - - drop_fields: - fields: ["log","ecs","agent","input","@metadata","message"] #删除无用的字段 -``` - -日志索引格式 -```json -{ - "mappings": { - "properties":{ - "@timestamp":{"type":"date"}, - "log_time":{"type":"date"}, - "severity":{"type":"keyword"}, - "service":{"type":"keyword"}, - "trace":{"type":"keyword"}, - "class":{"type":"keyword"}, - "rest":{"type":"text"}, - "stack_trace":{"type":"text"}, - "thread_name":{"type":"keyword"}, - "host":{ - "properties": { - "name": {"type": "keyword"} - } - } - } - } -} -``` \ No newline at end of file diff --git a/_config/elk/filebeat/docker-compose.yml b/_config/elk/filebeat/docker-compose.yml deleted file mode 100644 index 8c8e8fd3bc54b5ade1790ca6a2ae5bf619dbaf19..0000000000000000000000000000000000000000 --- a/_config/elk/filebeat/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -version: '3' -services: - # 日志收集 - filebeat: - image: docker.elastic.co/beats/filebeat:7.13.2 - restart: always - volumes: - # 挂载日志目录到容器中 - - /data/logs:/data/logs - # 启动命令 - command: filebeat /usr/share/filebeat/filebeat.yml \ No newline at end of file diff --git a/_config/elk/filebeat/filebeat.yml b/_config/elk/filebeat/filebeat.yml deleted file mode 100644 index 86a60e86caa635625485894e3a4d0ae2c2a7a36b..0000000000000000000000000000000000000000 --- a/_config/elk/filebeat/filebeat.yml +++ /dev/null @@ -1,23 +0,0 @@ -filebeat.inputs: -- type: log - enabled: true - paths: - - /data/logs/platform/*.json -# 输出到es -output.elasticsearch: - hosts: http://localhost:9200 - # index: "%{[fields.log_type]}-%{[agent.version]}-%{+yyyy.MM.dd}" - index: "bootx-platform-logs" -# 设置 -setup: -# 自定义索引的话必须设置 - template: - name: "filebeat" - pattern: "filebeat-*" - ilm.enabled: false -processors: - - decode_json_fields: - fields: ['message'] #要进行解析的字段 - target: "" #json内容解析到指定的字段，如果为空（“”），则解析到顶级结构下 - - drop_fields: - fields: ["log","ecs","agent","input","@metadata","message"] #删除无用的字段 diff --git a/_config/sql/1.1.x/1.1.0-bate/V1.1.0_220604__init.sql b/_config/sql/1.1.x/1.1.0-bate/V1.1.0_220604__init.sql deleted file mode 100644 index 6a4916d17a4bdb760221296d3e86327f9f4a944e..0000000000000000000000000000000000000000 --- a/_config/sql/1.1.x/1.1.0-bate/V1.1.0_220604__init.sql +++ /dev/null @@ -1,3442 +0,0 @@ -/* - Navicat Premium Data Transfer - Source Schema : bootx-platform - Target Server Type : MySQL -*/ - -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - --- ---------------------------- --- Table structure for iam_role_path --- ---------------------------- -CREATE TABLE `iam_role_path` ( - `id` bigint(20) NOT NULL, - `role_id` bigint(20) NOT NULL COMMENT '角色id', - `permission_id` bigint(20) NOT NULL COMMENT '请求权限id', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '角色请求权限表' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of iam_role_path --- ---------------------------- -INSERT INTO `iam_role_path` VALUES (1533038257611128832, 1405414804771971072, 1533037132564578304); -INSERT INTO `iam_role_path` VALUES (1533038257611128840, 1405414804771971072, 1533037132585549824); -INSERT INTO `iam_role_path` VALUES (1533038257611128843, 1405414804771971072, 1533037132593938432); -INSERT INTO `iam_role_path` VALUES (1533038257611128850, 1405414804771971072, 1533037132598132736); -INSERT INTO `iam_role_path` VALUES (1533038257611128861, 1405414804771971072, 1533037132602327040); -INSERT INTO `iam_role_path` VALUES (1533038257611128869, 1405414804771971072, 1533037132606521344); -INSERT INTO `iam_role_path` VALUES (1533038257611128875, 1405414804771971072, 1533037132610715648); -INSERT INTO `iam_role_path` VALUES (1533038257611128881, 1405414804771971072, 1533037132614909952); -INSERT INTO `iam_role_path` VALUES (1533038257611128876, 1405414804771971072, 1533037132614909953); -INSERT INTO `iam_role_path` VALUES (1533038257611128890, 1405414804771971072, 1533037132619104256); -INSERT INTO `iam_role_path` VALUES (1533038257611128891, 1405414804771971072, 1533037132623298560); -INSERT INTO `iam_role_path` VALUES (1533038257611128903, 1405414804771971072, 1533037132623298561); -INSERT INTO `iam_role_path` VALUES (1533038257611128907, 1405414804771971072, 1533037132627492864); -INSERT INTO `iam_role_path` VALUES (1533038257611128915, 1405414804771971072, 1533037132627492865); -INSERT INTO `iam_role_path` VALUES (1533038257611128930, 1405414804771971072, 1533037132631687168); -INSERT INTO `iam_role_path` VALUES (1533038257611128938, 1405414804771971072, 1533037132631687169); -INSERT INTO `iam_role_path` VALUES (1533038257611128948, 1405414804771971072, 1533037132640075776); -INSERT INTO `iam_role_path` VALUES (1533038257611128959, 1405414804771971072, 1533037132640075777); -INSERT INTO `iam_role_path` VALUES (1533038257611128908, 1405414804771971072, 1533037132644270080); -INSERT INTO `iam_role_path` VALUES (1533038257611128844, 1405414804771971072, 1533037132648464384); -INSERT INTO `iam_role_path` VALUES (1533038257611128970, 1405414804771971072, 1533037132656852992); -INSERT INTO `iam_role_path` VALUES (1533038257611128892, 1405414804771971072, 1533037132661047296); -INSERT INTO `iam_role_path` VALUES (1533038257611128893, 1405414804771971072, 1533037132661047297); -INSERT INTO `iam_role_path` VALUES (1533038257611128980, 1405414804771971072, 1533037132661047298); -INSERT INTO `iam_role_path` VALUES (1533038257611128949, 1405414804771971072, 1533037132665241600); -INSERT INTO `iam_role_path` VALUES (1533038257611128845, 1405414804771971072, 1533037132665241601); -INSERT INTO `iam_role_path` VALUES (1533038257611128916, 1405414804771971072, 1533037132669435904); -INSERT INTO `iam_role_path` VALUES (1533038257611128950, 1405414804771971072, 1533037132669435905); -INSERT INTO `iam_role_path` VALUES (1533038257611128877, 1405414804771971072, 1533037132669435906); -INSERT INTO `iam_role_path` VALUES (1533038257611128931, 1405414804771971072, 1533037132673630208); -INSERT INTO `iam_role_path` VALUES (1533038257611128986, 1405414804771971072, 1533037132673630209); -INSERT INTO `iam_role_path` VALUES (1533038257611128994, 1405414804771971072, 1533037132677824512); -INSERT INTO `iam_role_path` VALUES (1533038257611129004, 1405414804771971072, 1533037132677824513); -INSERT INTO `iam_role_path` VALUES (1533038257611129005, 1405414804771971072, 1533037132682018816); -INSERT INTO `iam_role_path` VALUES (1533038257611128833, 1405414804771971072, 1533037132682018817); -INSERT INTO `iam_role_path` VALUES (1533038257611129009, 1405414804771971072, 1533037132682018818); -INSERT INTO `iam_role_path` VALUES (1533038257611128939, 1405414804771971072, 1533037132686213120); -INSERT INTO `iam_role_path` VALUES (1533038257611128851, 1405414804771971072, 1533037132686213121); -INSERT INTO `iam_role_path` VALUES (1533038257611129018, 1405414804771971072, 1533037132690407424); -INSERT INTO `iam_role_path` VALUES (1533038257611129027, 1405414804771971072, 1533037132690407425); -INSERT INTO `iam_role_path` VALUES (1533038257611129032, 1405414804771971072, 1533037132690407426); -INSERT INTO `iam_role_path` VALUES (1533038257611129035, 1405414804771971072, 1533037132694601728); -INSERT INTO `iam_role_path` VALUES (1533038257611128995, 1405414804771971072, 1533037132694601729); -INSERT INTO `iam_role_path` VALUES (1533038257611128951, 1405414804771971072, 1533037132698796032); -INSERT INTO `iam_role_path` VALUES (1533038257611129019, 1405414804771971072, 1533037132698796033); -INSERT INTO `iam_role_path` VALUES (1533038257611129038, 1405414804771971072, 1533037132702990336); -INSERT INTO `iam_role_path` VALUES (1533038257611129042, 1405414804771971072, 1533037132702990337); -INSERT INTO `iam_role_path` VALUES (1533038257611129049, 1405414804771971072, 1533037132707184640); -INSERT INTO `iam_role_path` VALUES (1533038257611128981, 1405414804771971072, 1533037132707184641); -INSERT INTO `iam_role_path` VALUES (1533038257611128852, 1405414804771971072, 1533037132707184642); -INSERT INTO `iam_role_path` VALUES (1533038257611128971, 1405414804771971072, 1533037132711378944); -INSERT INTO `iam_role_path` VALUES (1533038257611128917, 1405414804771971072, 1533037132711378945); -INSERT INTO `iam_role_path` VALUES (1533038257611128894, 1405414804771971072, 1533037132719767552); -INSERT INTO `iam_role_path` VALUES (1533038257611129050, 1405414804771971072, 1533037132723961856); -INSERT INTO `iam_role_path` VALUES (1533038257611129058, 1405414804771971072, 1533037132723961857); -INSERT INTO `iam_role_path` VALUES (1533038257611129064, 1405414804771971072, 1533037132728156160); -INSERT INTO `iam_role_path` VALUES (1533038257611128882, 1405414804771971072, 1533037132728156161); -INSERT INTO `iam_role_path` VALUES (1533038257611129043, 1405414804771971072, 1533037132732350464); -INSERT INTO `iam_role_path` VALUES (1533038257611129071, 1405414804771971072, 1533037132732350465); -INSERT INTO `iam_role_path` VALUES (1533038257611129073, 1405414804771971072, 1533037132732350466); -INSERT INTO `iam_role_path` VALUES (1533038257611129076, 1405414804771971072, 1533037132736544768); -INSERT INTO `iam_role_path` VALUES (1533038257611129080, 1405414804771971072, 1533037132736544769); -INSERT INTO `iam_role_path` VALUES (1533038257611128996, 1405414804771971072, 1533037132740739072); -INSERT INTO `iam_role_path` VALUES (1533038257611129082, 1405414804771971072, 1533037132740739073); -INSERT INTO `iam_role_path` VALUES (1533038257611129085, 1405414804771971072, 1533037132740739074); -INSERT INTO `iam_role_path` VALUES (1533038257611129059, 1405414804771971072, 1533037132744933376); -INSERT INTO `iam_role_path` VALUES (1533038257611129092, 1405414804771971072, 1533037132744933377); -INSERT INTO `iam_role_path` VALUES (1533038257611129044, 1405414804771971072, 1533037132749127680); -INSERT INTO `iam_role_path` VALUES (1533038257611129093, 1405414804771971072, 1533037132749127681); -INSERT INTO `iam_role_path` VALUES (1533038257611128878, 1405414804771971072, 1533037132753321984); -INSERT INTO `iam_role_path` VALUES (1533038257611129051, 1405414804771971072, 1533037132753321985); -INSERT INTO `iam_role_path` VALUES (1533038257611129010, 1405414804771971072, 1533037132753321986); -INSERT INTO `iam_role_path` VALUES (1533038257611129101, 1405414804771971072, 1533037132757516288); -INSERT INTO `iam_role_path` VALUES (1533038257611129107, 1405414804771971072, 1533037132757516289); -INSERT INTO `iam_role_path` VALUES (1533038257611129111, 1405414804771971072, 1533037132761710592); -INSERT INTO `iam_role_path` VALUES (1533038257611129114, 1405414804771971072, 1533037132761710593); -INSERT INTO `iam_role_path` VALUES (1533038257611128972, 1405414804771971072, 1533037132761710594); -INSERT INTO `iam_role_path` VALUES (1533038257611129118, 1405414804771971072, 1533037132765904896); -INSERT INTO `iam_role_path` VALUES (1533038257611129020, 1405414804771971072, 1533037132765904897); -INSERT INTO `iam_role_path` VALUES (1533038257611129120, 1405414804771971072, 1533037132770099200); -INSERT INTO `iam_role_path` VALUES (1533038257611129125, 1405414804771971072, 1533037132770099201); -INSERT INTO `iam_role_path` VALUES (1533038257611129028, 1405414804771971072, 1533037132770099202); -INSERT INTO `iam_role_path` VALUES (1533038257611128862, 1405414804771971072, 1533037132774293504); -INSERT INTO `iam_role_path` VALUES (1533038257611128918, 1405414804771971072, 1533037132774293505); -INSERT INTO `iam_role_path` VALUES (1533038257611129011, 1405414804771971072, 1533037132778487808); -INSERT INTO `iam_role_path` VALUES (1533038257611129086, 1405414804771971072, 1533037132778487809); -INSERT INTO `iam_role_path` VALUES (1533038257611129130, 1405414804771971072, 1533037132778487810); -INSERT INTO `iam_role_path` VALUES (1533038257611129045, 1405414804771971072, 1533037132786876416); -INSERT INTO `iam_role_path` VALUES (1533038257611128960, 1405414804771971072, 1533037132786876417); -INSERT INTO `iam_role_path` VALUES (1533038257611128982, 1405414804771971072, 1533037132791070720); -INSERT INTO `iam_role_path` VALUES (1533038257611129012, 1405414804771971072, 1533037132791070721); -INSERT INTO `iam_role_path` VALUES (1533038257611129029, 1405414804771971072, 1533037132795265024); -INSERT INTO `iam_role_path` VALUES (1533038257611128932, 1405414804771971072, 1533037132795265025); -INSERT INTO `iam_role_path` VALUES (1533038257611128961, 1405414804771971072, 1533037132799459328); -INSERT INTO `iam_role_path` VALUES (1533038257611129136, 1405414804771971072, 1533037132799459329); -INSERT INTO `iam_role_path` VALUES (1533038257611128870, 1405414804771971072, 1533037132799459330); -INSERT INTO `iam_role_path` VALUES (1533038257611128987, 1405414804771971072, 1533037132803653632); -INSERT INTO `iam_role_path` VALUES (1533038257611128962, 1405414804771971072, 1533037132803653633); -INSERT INTO `iam_role_path` VALUES (1533038257611129139, 1405414804771971072, 1533037132807847936); -INSERT INTO `iam_role_path` VALUES (1533038257611128952, 1405414804771971072, 1533037132807847937); -INSERT INTO `iam_role_path` VALUES (1533038257611128895, 1405414804771971072, 1533037132807847938); -INSERT INTO `iam_role_path` VALUES (1533038257611128909, 1405414804771971072, 1533037132812042240); -INSERT INTO `iam_role_path` VALUES (1533038257611129131, 1405414804771971072, 1533037132812042241); -INSERT INTO `iam_role_path` VALUES (1533038257611129144, 1405414804771971072, 1533037132812042242); -INSERT INTO `iam_role_path` VALUES (1533038257611129126, 1405414804771971072, 1533037132816236544); -INSERT INTO `iam_role_path` VALUES (1533038257611129147, 1405414804771971072, 1533037132816236545); -INSERT INTO `iam_role_path` VALUES (1533038257611129021, 1405414804771971072, 1533037132820430848); -INSERT INTO `iam_role_path` VALUES (1533038257611128896, 1405414804771971072, 1533037132820430849); -INSERT INTO `iam_role_path` VALUES (1533038257611128988, 1405414804771971072, 1533037132820430850); -INSERT INTO `iam_role_path` VALUES (1533038257611128910, 1405414804771971072, 1533037132824625152); -INSERT INTO `iam_role_path` VALUES (1533038257611129132, 1405414804771971072, 1533037132824625153); -INSERT INTO `iam_role_path` VALUES (1533038257611129149, 1405414804771971072, 1533037132824625154); -INSERT INTO `iam_role_path` VALUES (1533038257611129155, 1405414804771971072, 1533037132828819456); -INSERT INTO `iam_role_path` VALUES (1533038257611128933, 1405414804771971072, 1533037132828819457); -INSERT INTO `iam_role_path` VALUES (1533038257611129158, 1405414804771971072, 1533037132828819458); -INSERT INTO `iam_role_path` VALUES (1533038257611128919, 1405414804771971072, 1533037132833013760); -INSERT INTO `iam_role_path` VALUES (1533038257611129160, 1405414804771971072, 1533037132833013761); -INSERT INTO `iam_role_path` VALUES (1533038257611129083, 1405414804771971072, 1533037132833013762); -INSERT INTO `iam_role_path` VALUES (1533038257611128904, 1405414804771971072, 1533037132837208064); -INSERT INTO `iam_role_path` VALUES (1533038257611129052, 1405414804771971072, 1533037132837208065); -INSERT INTO `iam_role_path` VALUES (1533038257611129162, 1405414804771971072, 1533037132841402368); -INSERT INTO `iam_role_path` VALUES (1533038257611129036, 1405414804771971072, 1533037132841402369); -INSERT INTO `iam_role_path` VALUES (1533038257611129022, 1405414804771971072, 1533037132841402370); -INSERT INTO `iam_role_path` VALUES (1533038257611128863, 1405414804771971072, 1533037132845596672); -INSERT INTO `iam_role_path` VALUES (1533038257611128897, 1405414804771971072, 1533037132845596673); -INSERT INTO `iam_role_path` VALUES (1533038257611128963, 1405414804771971072, 1533037132849790976); -INSERT INTO `iam_role_path` VALUES (1533038257611129163, 1405414804771971072, 1533037132853985280); -INSERT INTO `iam_role_path` VALUES (1533038257611128920, 1405414804771971072, 1533037132853985281); -INSERT INTO `iam_role_path` VALUES (1533038257611128883, 1405414804771971072, 1533037132858179584); -INSERT INTO `iam_role_path` VALUES (1533038257611129094, 1405414804771971072, 1533037132858179585); -INSERT INTO `iam_role_path` VALUES (1533038257611129150, 1405414804771971072, 1533037132862373888); -INSERT INTO `iam_role_path` VALUES (1533038257611129170, 1405414804771971072, 1533037132862373889); -INSERT INTO `iam_role_path` VALUES (1533038257611128864, 1405414804771971072, 1533037132862373890); -INSERT INTO `iam_role_path` VALUES (1533038257611128997, 1405414804771971072, 1533037132866568192); -INSERT INTO `iam_role_path` VALUES (1533038257611128865, 1405414804771971072, 1533037132866568193); -INSERT INTO `iam_role_path` VALUES (1533038257611128846, 1405414804771971072, 1533037132870762496); -INSERT INTO `iam_role_path` VALUES (1533038257611129013, 1405414804771971072, 1533037132870762497); -INSERT INTO `iam_role_path` VALUES (1533038257611128921, 1405414804771971072, 1533037132870762498); -INSERT INTO `iam_role_path` VALUES (1533038257611129171, 1405414804771971072, 1533037132874956800); -INSERT INTO `iam_role_path` VALUES (1533038257611129077, 1405414804771971072, 1533037132874956801); -INSERT INTO `iam_role_path` VALUES (1533038257611128834, 1405414804771971072, 1533037132874956802); -INSERT INTO `iam_role_path` VALUES (1533038257611129053, 1405414804771971072, 1533037132874956803); -INSERT INTO `iam_role_path` VALUES (1533038257611129173, 1405414804771971072, 1533037132879151104); -INSERT INTO `iam_role_path` VALUES (1533038257611129102, 1405414804771971072, 1533037132879151105); -INSERT INTO `iam_role_path` VALUES (1533038257611129115, 1405414804771971072, 1533037132879151106); -INSERT INTO `iam_role_path` VALUES (1533038257611129151, 1405414804771971072, 1533037132883345408); -INSERT INTO `iam_role_path` VALUES (1533038257611129175, 1405414804771971072, 1533037132883345409); -INSERT INTO `iam_role_path` VALUES (1533038257611128922, 1405414804771971072, 1533037132883345410); -INSERT INTO `iam_role_path` VALUES (1533038257611129178, 1405414804771971072, 1533037132883345411); -INSERT INTO `iam_role_path` VALUES (1533038257611129014, 1405414804771971072, 1533037132887539712); -INSERT INTO `iam_role_path` VALUES (1533038257611129137, 1405414804771971072, 1533037132887539713); -INSERT INTO `iam_role_path` VALUES (1533038257611129095, 1405414804771971072, 1533037132887539714); -INSERT INTO `iam_role_path` VALUES (1533038257611129065, 1405414804771971072, 1533037132891734016); -INSERT INTO `iam_role_path` VALUES (1533038257611129184, 1405414804771971072, 1533037132891734017); -INSERT INTO `iam_role_path` VALUES (1533038257611129186, 1405414804771971072, 1533037132891734018); -INSERT INTO `iam_role_path` VALUES (1533038257611129037, 1405414804771971072, 1533037132891734019); -INSERT INTO `iam_role_path` VALUES (1533038257611129193, 1405414804771971072, 1533037132895928320); -INSERT INTO `iam_role_path` VALUES (1533038257611128871, 1405414804771971072, 1533037132895928321); -INSERT INTO `iam_role_path` VALUES (1533038257611128953, 1405414804771971072, 1533037132895928322); -INSERT INTO `iam_role_path` VALUES (1533038257611129087, 1405414804771971072, 1533037132900122624); -INSERT INTO `iam_role_path` VALUES (1533038257611128879, 1405414804771971072, 1533037132900122625); -INSERT INTO `iam_role_path` VALUES (1533038257611128853, 1405414804771971072, 1533037132900122626); -INSERT INTO `iam_role_path` VALUES (1533038257611129127, 1405414804771971072, 1533037132900122627); -INSERT INTO `iam_role_path` VALUES (1533038257611129103, 1405414804771971072, 1533037132904316928); -INSERT INTO `iam_role_path` VALUES (1533038257611129054, 1405414804771971072, 1533037132904316929); -INSERT INTO `iam_role_path` VALUES (1533038257611129104, 1405414804771971072, 1533037132904316930); -INSERT INTO `iam_role_path` VALUES (1533038257611128964, 1405414804771971072, 1533037132908511232); -INSERT INTO `iam_role_path` VALUES (1533038257611129030, 1405414804771971072, 1533037132908511233); -INSERT INTO `iam_role_path` VALUES (1533038257611129195, 1405414804771971072, 1533037132908511234); -INSERT INTO `iam_role_path` VALUES (1533038257611128954, 1405414804771971072, 1533037132908511235); -INSERT INTO `iam_role_path` VALUES (1533038257611129066, 1405414804771971072, 1533037132912705536); -INSERT INTO `iam_role_path` VALUES (1533038257611129096, 1405414804771971072, 1533037132912705537); -INSERT INTO `iam_role_path` VALUES (1533038257611128973, 1405414804771971072, 1533037132916899840); -INSERT INTO `iam_role_path` VALUES (1533038257611129196, 1405414804771971072, 1533037132916899841); -INSERT INTO `iam_role_path` VALUES (1533038257611128965, 1405414804771971072, 1533037132916899842); -INSERT INTO `iam_role_path` VALUES (1533038257611128911, 1405414804771971072, 1533037132916899843); -INSERT INTO `iam_role_path` VALUES (1533038257611128835, 1405414804771971072, 1533037132921094144); -INSERT INTO `iam_role_path` VALUES (1533038257611129179, 1405414804771971072, 1533037132921094145); -INSERT INTO `iam_role_path` VALUES (1533038257611129023, 1405414804771971072, 1533037132921094146); -INSERT INTO `iam_role_path` VALUES (1533038257611128866, 1405414804771971072, 1533037132925288448); -INSERT INTO `iam_role_path` VALUES (1533038257611129006, 1405414804771971072, 1533037132925288449); -INSERT INTO `iam_role_path` VALUES (1533038257611128847, 1405414804771971072, 1533037132925288450); -INSERT INTO `iam_role_path` VALUES (1533038257611128923, 1405414804771971072, 1533037132929482752); -INSERT INTO `iam_role_path` VALUES (1533038257611128966, 1405414804771971072, 1533037132929482753); -INSERT INTO `iam_role_path` VALUES (1533038257611129031, 1405414804771971072, 1533037132929482754); -INSERT INTO `iam_role_path` VALUES (1533038257611129112, 1405414804771971072, 1533037132933677056); -INSERT INTO `iam_role_path` VALUES (1533038257611129072, 1405414804771971072, 1533037132933677057); -INSERT INTO `iam_role_path` VALUES (1533038257611129156, 1405414804771971072, 1533037132933677058); -INSERT INTO `iam_role_path` VALUES (1533038257611128940, 1405414804771971072, 1533037132937871360); -INSERT INTO `iam_role_path` VALUES (1533038257611128841, 1405414804771971072, 1533037132937871361); -INSERT INTO `iam_role_path` VALUES (1533038257611128848, 1405414804771971072, 1533037132937871362); -INSERT INTO `iam_role_path` VALUES (1533038257611128983, 1405414804771971072, 1533037132942065664); -INSERT INTO `iam_role_path` VALUES (1533038257611129074, 1405414804771971072, 1533037132942065665); -INSERT INTO `iam_role_path` VALUES (1533038257611128984, 1405414804771971072, 1533037132942065666); -INSERT INTO `iam_role_path` VALUES (1533038257611128854, 1405414804771971072, 1533037132946259968); -INSERT INTO `iam_role_path` VALUES (1533038257611129113, 1405414804771971072, 1533037132946259969); -INSERT INTO `iam_role_path` VALUES (1533038257611128941, 1405414804771971072, 1533037132946259970); -INSERT INTO `iam_role_path` VALUES (1533038257611128934, 1405414804771971072, 1533037132950454272); -INSERT INTO `iam_role_path` VALUES (1533038257611129198, 1405414804771971072, 1533037132950454273); -INSERT INTO `iam_role_path` VALUES (1533038257611128924, 1405414804771971072, 1533037132950454274); -INSERT INTO `iam_role_path` VALUES (1533038257611129200, 1405414804771971072, 1533037132950454275); -INSERT INTO `iam_role_path` VALUES (1533038257611129075, 1405414804771971072, 1533037132954648576); -INSERT INTO `iam_role_path` VALUES (1533038257611129133, 1405414804771971072, 1533037132954648577); -INSERT INTO `iam_role_path` VALUES (1533038257611128942, 1405414804771971072, 1533037132954648578); -INSERT INTO `iam_role_path` VALUES (1533038257611128989, 1405414804771971072, 1533037132958842880); -INSERT INTO `iam_role_path` VALUES (1533038257611129055, 1405414804771971072, 1533037132958842881); -INSERT INTO `iam_role_path` VALUES (1533038257611128905, 1405414804771971072, 1533037132958842882); -INSERT INTO `iam_role_path` VALUES (1533038257611129164, 1405414804771971072, 1533037132963037184); -INSERT INTO `iam_role_path` VALUES (1533038257611128836, 1405414804771971072, 1533037132963037185); -INSERT INTO `iam_role_path` VALUES (1533038257611128974, 1405414804771971072, 1533037132963037186); -INSERT INTO `iam_role_path` VALUES (1533038257611129172, 1405414804771971072, 1533037132967231488); -INSERT INTO `iam_role_path` VALUES (1533038257611128837, 1405414804771971072, 1533037132967231489); -INSERT INTO `iam_role_path` VALUES (1533038257611129202, 1405414804771971072, 1533037132967231490); -INSERT INTO `iam_role_path` VALUES (1533038257611128935, 1405414804771971072, 1533037132967231491); -INSERT INTO `iam_role_path` VALUES (1533038257611129024, 1405414804771971072, 1533037132971425792); -INSERT INTO `iam_role_path` VALUES (1533038257611128998, 1405414804771971072, 1533037132971425793); -INSERT INTO `iam_role_path` VALUES (1533038257611128999, 1405414804771971072, 1533037132971425794); -INSERT INTO `iam_role_path` VALUES (1533038257611128975, 1405414804771971072, 1533037132975620096); -INSERT INTO `iam_role_path` VALUES (1533038257611129088, 1405414804771971072, 1533037132975620097); -INSERT INTO `iam_role_path` VALUES (1533038257611128880, 1405414804771971072, 1533037132975620098); -INSERT INTO `iam_role_path` VALUES (1533038257611129187, 1405414804771971072, 1533037132979814400); -INSERT INTO `iam_role_path` VALUES (1533038257611129089, 1405414804771971072, 1533037132979814401); -INSERT INTO `iam_role_path` VALUES (1533038257611129015, 1405414804771971072, 1533037132979814402); -INSERT INTO `iam_role_path` VALUES (1533038257611129188, 1405414804771971072, 1533037132979814403); -INSERT INTO `iam_role_path` VALUES (1533038257611129046, 1405414804771971072, 1533037132984008704); -INSERT INTO `iam_role_path` VALUES (1533038257611129205, 1405414804771971072, 1533037132984008705); -INSERT INTO `iam_role_path` VALUES (1533038257611129039, 1405414804771971072, 1533037132984008706); -INSERT INTO `iam_role_path` VALUES (1533038257611129097, 1405414804771971072, 1533037132988203008); -INSERT INTO `iam_role_path` VALUES (1533038257611129025, 1405414804771971072, 1533037132988203009); -INSERT INTO `iam_role_path` VALUES (1533038257611128936, 1405414804771971072, 1533037132988203010); -INSERT INTO `iam_role_path` VALUES (1533038257611129000, 1405414804771971072, 1533037132992397312); -INSERT INTO `iam_role_path` VALUES (1533038257611129152, 1405414804771971072, 1533037132992397313); -INSERT INTO `iam_role_path` VALUES (1533038257611129180, 1405414804771971072, 1533037132992397314); -INSERT INTO `iam_role_path` VALUES (1533038257611129056, 1405414804771971072, 1533037132992397315); -INSERT INTO `iam_role_path` VALUES (1533038257611128955, 1405414804771971072, 1533037132996591616); -INSERT INTO `iam_role_path` VALUES (1533038257611128925, 1405414804771971072, 1533037132996591617); -INSERT INTO `iam_role_path` VALUES (1533038257611129033, 1405414804771971072, 1533037132996591618); -INSERT INTO `iam_role_path` VALUES (1533038257611128985, 1405414804771971072, 1533037133000785920); -INSERT INTO `iam_role_path` VALUES (1533038257611128912, 1405414804771971072, 1533037133000785921); -INSERT INTO `iam_role_path` VALUES (1533038257611129203, 1405414804771971072, 1533037133000785922); -INSERT INTO `iam_role_path` VALUES (1533038257611129001, 1405414804771971072, 1533037133000785923); -INSERT INTO `iam_role_path` VALUES (1533038257611129026, 1405414804771971072, 1533037133004980224); -INSERT INTO `iam_role_path` VALUES (1533038257611129161, 1405414804771971072, 1533037133004980225); -INSERT INTO `iam_role_path` VALUES (1533038257611129007, 1405414804771971072, 1533037133004980226); -INSERT INTO `iam_role_path` VALUES (1533038257611128943, 1405414804771971072, 1533037133009174528); -INSERT INTO `iam_role_path` VALUES (1533038257611129140, 1405414804771971072, 1533037133009174529); -INSERT INTO `iam_role_path` VALUES (1533038257611129067, 1405414804771971072, 1533037133009174530); -INSERT INTO `iam_role_path` VALUES (1533038257611129141, 1405414804771971072, 1533037133009174531); -INSERT INTO `iam_role_path` VALUES (1533038257611128872, 1405414804771971072, 1533037133013368832); -INSERT INTO `iam_role_path` VALUES (1533038257611129153, 1405414804771971072, 1533037133013368833); -INSERT INTO `iam_role_path` VALUES (1533038257611128967, 1405414804771971072, 1533037133013368834); -INSERT INTO `iam_role_path` VALUES (1533038257611129197, 1405414804771971072, 1533037133017563136); -INSERT INTO `iam_role_path` VALUES (1533038257611129060, 1405414804771971072, 1533037133017563137); -INSERT INTO `iam_role_path` VALUES (1533038257611129116, 1405414804771971072, 1533037133021757440); -INSERT INTO `iam_role_path` VALUES (1533038257611129207, 1405414804771971072, 1533037133021757441); -INSERT INTO `iam_role_path` VALUES (1533038257611129098, 1405414804771971072, 1533037133021757442); -INSERT INTO `iam_role_path` VALUES (1533038257611128956, 1405414804771971072, 1533037133025951744); -INSERT INTO `iam_role_path` VALUES (1533038257611128926, 1405414804771971072, 1533037133025951745); -INSERT INTO `iam_role_path` VALUES (1533038257611129117, 1405414804771971072, 1533037133025951746); -INSERT INTO `iam_role_path` VALUES (1533038257611129061, 1405414804771971072, 1533037133030146048); -INSERT INTO `iam_role_path` VALUES (1533038257611129078, 1405414804771971072, 1533037133030146049); -INSERT INTO `iam_role_path` VALUES (1533038257611128855, 1405414804771971072, 1533037133030146050); -INSERT INTO `iam_role_path` VALUES (1533038257611129209, 1405414804771971072, 1533037133030146051); -INSERT INTO `iam_role_path` VALUES (1533038257611128913, 1405414804771971072, 1533037133034340352); -INSERT INTO `iam_role_path` VALUES (1533038257611129185, 1405414804771971072, 1533037133034340353); -INSERT INTO `iam_role_path` VALUES (1533038257611128976, 1405414804771971072, 1533037133034340354); -INSERT INTO `iam_role_path` VALUES (1533038257611129154, 1405414804771971072, 1533037133034340355); -INSERT INTO `iam_role_path` VALUES (1533038257611129119, 1405414804771971072, 1533037133038534656); -INSERT INTO `iam_role_path` VALUES (1533038257611128990, 1405414804771971072, 1533037133038534657); -INSERT INTO `iam_role_path` VALUES (1533038257611129057, 1405414804771971072, 1533037133042728960); -INSERT INTO `iam_role_path` VALUES (1533038257611129081, 1405414804771971072, 1533037133042728961); -INSERT INTO `iam_role_path` VALUES (1533038257611128898, 1405414804771971072, 1533037133042728962); -INSERT INTO `iam_role_path` VALUES (1533038257611128899, 1405414804771971072, 1533037133046923264); -INSERT INTO `iam_role_path` VALUES (1533038257611129206, 1405414804771971072, 1533037133046923265); -INSERT INTO `iam_role_path` VALUES (1533038257611128856, 1405414804771971072, 1533037133046923266); -INSERT INTO `iam_role_path` VALUES (1533038257611129062, 1405414804771971072, 1533037133051117568); -INSERT INTO `iam_role_path` VALUES (1533038257611129079, 1405414804771971072, 1533037133051117569); -INSERT INTO `iam_role_path` VALUES (1533038257611129142, 1405414804771971072, 1533037133051117570); -INSERT INTO `iam_role_path` VALUES (1533038257611129090, 1405414804771971072, 1533037133055311872); -INSERT INTO `iam_role_path` VALUES (1533038257611128867, 1405414804771971072, 1533037133055311873); -INSERT INTO `iam_role_path` VALUES (1533038257611129128, 1405414804771971072, 1533037133055311874); -INSERT INTO `iam_role_path` VALUES (1533038257611129181, 1405414804771971072, 1533037133055311875); -INSERT INTO `iam_role_path` VALUES (1533038257611129174, 1405414804771971072, 1533037133059506176); -INSERT INTO `iam_role_path` VALUES (1533038257611129129, 1405414804771971072, 1533037133059506177); -INSERT INTO `iam_role_path` VALUES (1533038257611129105, 1405414804771971072, 1533037133059506178); -INSERT INTO `iam_role_path` VALUES (1533038257611128906, 1405414804771971072, 1533037133063700480); -INSERT INTO `iam_role_path` VALUES (1533038257611129121, 1405414804771971072, 1533037133063700481); -INSERT INTO `iam_role_path` VALUES (1533038257611128900, 1405414804771971072, 1533037133063700482); -INSERT INTO `iam_role_path` VALUES (1533038257611129068, 1405414804771971072, 1533037133067894784); -INSERT INTO `iam_role_path` VALUES (1533038257611129040, 1405414804771971072, 1533037133067894785); -INSERT INTO `iam_role_path` VALUES (1533038257611129208, 1405414804771971072, 1533037133067894786); -INSERT INTO `iam_role_path` VALUES (1533038257611128901, 1405414804771971072, 1533037133067894787); -INSERT INTO `iam_role_path` VALUES (1533038257611129145, 1405414804771971072, 1533037133072089088); -INSERT INTO `iam_role_path` VALUES (1533038257611129099, 1405414804771971072, 1533037133072089089); -INSERT INTO `iam_role_path` VALUES (1533038257611128857, 1405414804771971072, 1533037133072089090); -INSERT INTO `iam_role_path` VALUES (1533038257611129189, 1405414804771971072, 1533037133072089091); -INSERT INTO `iam_role_path` VALUES (1533038257611129159, 1405414804771971072, 1533037133076283392); -INSERT INTO `iam_role_path` VALUES (1533038257611128884, 1405414804771971072, 1533037133076283393); -INSERT INTO `iam_role_path` VALUES (1533038257611128914, 1405414804771971072, 1533037133076283394); -INSERT INTO `iam_role_path` VALUES (1533038257611129108, 1405414804771971072, 1533037133076283395); -INSERT INTO `iam_role_path` VALUES (1533038257611129002, 1405414804771971072, 1533037133080477696); -INSERT INTO `iam_role_path` VALUES (1533038257611129165, 1405414804771971072, 1533037133080477697); -INSERT INTO `iam_role_path` VALUES (1533038257611128977, 1405414804771971072, 1533037133080477698); -INSERT INTO `iam_role_path` VALUES (1533038257611128838, 1405414804771971072, 1533037133080477699); -INSERT INTO `iam_role_path` VALUES (1533038257611129166, 1405414804771971072, 1533037133084672000); -INSERT INTO `iam_role_path` VALUES (1533038257611129122, 1405414804771971072, 1533037133084672001); -INSERT INTO `iam_role_path` VALUES (1533038257611128978, 1405414804771971072, 1533037133084672002); -INSERT INTO `iam_role_path` VALUES (1533038257611129109, 1405414804771971072, 1533037133088866304); -INSERT INTO `iam_role_path` VALUES (1533038257611128885, 1405414804771971072, 1533037133088866305); -INSERT INTO `iam_role_path` VALUES (1533038257611129063, 1405414804771971072, 1533037133088866306); -INSERT INTO `iam_role_path` VALUES (1533038257611129190, 1405414804771971072, 1533037133088866307); -INSERT INTO `iam_role_path` VALUES (1533038257611128927, 1405414804771971072, 1533037133093060608); -INSERT INTO `iam_role_path` VALUES (1533038257611129176, 1405414804771971072, 1533037133093060609); -INSERT INTO `iam_role_path` VALUES (1533038257611128944, 1405414804771971072, 1533037133093060610); -INSERT INTO `iam_role_path` VALUES (1533038257611129194, 1405414804771971072, 1533037133093060611); -INSERT INTO `iam_role_path` VALUES (1533038257611128886, 1405414804771971072, 1533037133097254912); -INSERT INTO `iam_role_path` VALUES (1533038257611129069, 1405414804771971072, 1533037133097254913); -INSERT INTO `iam_role_path` VALUES (1533038257611128887, 1405414804771971072, 1533037133097254914); -INSERT INTO `iam_role_path` VALUES (1533038257611128957, 1405414804771971072, 1533037133097254915); -INSERT INTO `iam_role_path` VALUES (1533038257611128888, 1405414804771971072, 1533037133101449216); -INSERT INTO `iam_role_path` VALUES (1533038257611129016, 1405414804771971072, 1533037133101449217); -INSERT INTO `iam_role_path` VALUES (1533038257611129041, 1405414804771971072, 1533037133101449218); -INSERT INTO `iam_role_path` VALUES (1533038257611128991, 1405414804771971072, 1533037133101449219); -INSERT INTO `iam_role_path` VALUES (1533038257611129003, 1405414804771971072, 1533037133105643520); -INSERT INTO `iam_role_path` VALUES (1533038257611128945, 1405414804771971072, 1533037133109837824); -INSERT INTO `iam_role_path` VALUES (1533038257611128928, 1405414804771971072, 1533037133109837825); -INSERT INTO `iam_role_path` VALUES (1533038257611128929, 1405414804771971072, 1533037133109837826); -INSERT INTO `iam_role_path` VALUES (1533038257611129182, 1405414804771971072, 1533037133109837827); -INSERT INTO `iam_role_path` VALUES (1533038257611129138, 1405414804771971072, 1533037133114032128); -INSERT INTO `iam_role_path` VALUES (1533038257611128902, 1405414804771971072, 1533037133114032129); -INSERT INTO `iam_role_path` VALUES (1533038257611129091, 1405414804771971072, 1533037133114032130); -INSERT INTO `iam_role_path` VALUES (1533038257611129167, 1405414804771971072, 1533037133118226432); -INSERT INTO `iam_role_path` VALUES (1533038257611129100, 1405414804771971072, 1533037133118226433); -INSERT INTO `iam_role_path` VALUES (1533038257611129199, 1405414804771971072, 1533037133118226434); -INSERT INTO `iam_role_path` VALUES (1533038257611128889, 1405414804771971072, 1533037133118226435); -INSERT INTO `iam_role_path` VALUES (1533038257611129123, 1405414804771971072, 1533037133122420736); -INSERT INTO `iam_role_path` VALUES (1533038257611128979, 1405414804771971072, 1533037133122420737); -INSERT INTO `iam_role_path` VALUES (1533038257611128992, 1405414804771971072, 1533037133122420738); -INSERT INTO `iam_role_path` VALUES (1533038257611128873, 1405414804771971072, 1533037133122420739); -INSERT INTO `iam_role_path` VALUES (1533038257611129168, 1405414804771971072, 1533037133126615040); -INSERT INTO `iam_role_path` VALUES (1533038257611129034, 1405414804771971072, 1533037133126615041); -INSERT INTO `iam_role_path` VALUES (1533038257611129169, 1405414804771971072, 1533037133126615042); -INSERT INTO `iam_role_path` VALUES (1533038257611128849, 1405414804771971072, 1533037133130809344); -INSERT INTO `iam_role_path` VALUES (1533038257611129047, 1405414804771971072, 1533037133130809345); -INSERT INTO `iam_role_path` VALUES (1533038257611128993, 1405414804771971072, 1533037133130809346); -INSERT INTO `iam_role_path` VALUES (1533038257611128946, 1405414804771971072, 1533037133135003648); -INSERT INTO `iam_role_path` VALUES (1533038257611129210, 1405414804771971072, 1533037133135003649); -INSERT INTO `iam_role_path` VALUES (1533038257611129157, 1405414804771971072, 1533037133135003650); -INSERT INTO `iam_role_path` VALUES (1533038257611128958, 1405414804771971072, 1533037133135003651); -INSERT INTO `iam_role_path` VALUES (1533038257611129110, 1405414804771971072, 1533037133139197952); -INSERT INTO `iam_role_path` VALUES (1533038257611129148, 1405414804771971072, 1533037133139197953); -INSERT INTO `iam_role_path` VALUES (1533038257611129146, 1405414804771971072, 1533037133139197954); -INSERT INTO `iam_role_path` VALUES (1533038257611129017, 1405414804771971072, 1533037133143392256); -INSERT INTO `iam_role_path` VALUES (1533038257611128868, 1405414804771971072, 1533037133143392257); -INSERT INTO `iam_role_path` VALUES (1533038257611129048, 1405414804771971072, 1533037133143392258); -INSERT INTO `iam_role_path` VALUES (1533038257611129134, 1405414804771971072, 1533037133147586560); -INSERT INTO `iam_role_path` VALUES (1533038257611128839, 1405414804771971072, 1533037133147586561); -INSERT INTO `iam_role_path` VALUES (1533038257611129124, 1405414804771971072, 1533037133147586562); -INSERT INTO `iam_role_path` VALUES (1533038257611128937, 1405414804771971072, 1533037133147586563); -INSERT INTO `iam_role_path` VALUES (1533038257611129177, 1405414804771971072, 1533037133151780864); -INSERT INTO `iam_role_path` VALUES (1533038257611128858, 1405414804771971072, 1533037133151780865); -INSERT INTO `iam_role_path` VALUES (1533038257611128968, 1405414804771971072, 1533037133151780866); -INSERT INTO `iam_role_path` VALUES (1533038257611128859, 1405414804771971072, 1533037133151780867); -INSERT INTO `iam_role_path` VALUES (1533038257611128860, 1405414804771971072, 1533037133155975168); -INSERT INTO `iam_role_path` VALUES (1533038257611129143, 1405414804771971072, 1533037133155975169); -INSERT INTO `iam_role_path` VALUES (1533038257611129201, 1405414804771971072, 1533037133155975170); -INSERT INTO `iam_role_path` VALUES (1533038257611128947, 1405414804771971072, 1533037133155975171); -INSERT INTO `iam_role_path` VALUES (1533038257611129204, 1405414804771971072, 1533037133155975172); -INSERT INTO `iam_role_path` VALUES (1533038257611129191, 1405414804771971072, 1533037133160169472); -INSERT INTO `iam_role_path` VALUES (1533038257611128842, 1405414804771971072, 1533037133160169473); -INSERT INTO `iam_role_path` VALUES (1533038257611128874, 1405414804771971072, 1533037133160169474); -INSERT INTO `iam_role_path` VALUES (1533038257611129070, 1405414804771971072, 1533037133160169475); -INSERT INTO `iam_role_path` VALUES (1533038257611129008, 1405414804771971072, 1533037133160169476); -INSERT INTO `iam_role_path` VALUES (1533038257611129106, 1405414804771971072, 1533037133164363776); -INSERT INTO `iam_role_path` VALUES (1533038257611128969, 1405414804771971072, 1533037133164363777); -INSERT INTO `iam_role_path` VALUES (1533038257611129135, 1405414804771971072, 1533037133164363778); -INSERT INTO `iam_role_path` VALUES (1533038257611129192, 1405414804771971072, 1533037133164363779); -INSERT INTO `iam_role_path` VALUES (1533038257611129084, 1405414804771971072, 1533037133168558080); -INSERT INTO `iam_role_path` VALUES (1533038257611129183, 1405414804771971072, 1533037133168558081); - --- ---------------------------- --- Table structure for iam_perm_path --- ---------------------------- -CREATE TABLE `iam_perm_path` ( - `id` bigint(20) NOT NULL, - `code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '权限标识', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '权限名称', - `request_type` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '请求类型', - `path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '请求路径', - `group_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '分组名称', - `enable` bit(1) NOT NULL COMMENT '启用状态', - `generate` bit(1) NOT NULL COMMENT '是否通过系统生成的权限', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `creator` bigint(20) NULL DEFAULT NULL, - `create_time` datetime(6) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `deleted` bit(1) NOT NULL, - `version` int(11) NOT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '权限_请求' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of iam_perm_path --- ---------------------------- -INSERT INTO `iam_perm_path` VALUES (1533037132564578304, 'DingTalkConfigController#delete', '删除', 'DELETE', '/ding/config/delete', '钉钉配置', b'1', b'1', '钉钉配置 删除', 1399985191002447872, '2022-06-04 18:45:09.514000', 1399985191002447872, '2022-06-04 18:45:09.514000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132585549824, 'TokenEndpoint#login', '普通登录', 'POST', '/token/login', '认证相关', b'1', b'1', '认证相关 普通登录', 1399985191002447872, '2022-06-04 18:45:09.517000', 1399985191002447872, '2022-06-04 18:45:09.517000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132593938432, 'AlipayConfigController#add', '添加', 'POST', '/alipay/add', '支付宝配置', b'1', b'1', '支付宝配置 添加', 1399985191002447872, '2022-06-04 18:45:09.519000', 1399985191002447872, '2022-06-04 18:45:09.519000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132598132736, 'RoleController#add', '添加角色（返回角色对象）', 'POST', '/role/add', '角色管理', b'1', b'1', '角色管理 添加角色（返回角色对象）', 1399985191002447872, '2022-06-04 18:45:09.520000', 1399985191002447872, '2022-06-04 18:45:09.520000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132602327040, 'CategoryParameterController#findAll', '查询所有', 'GET', '/categoryParameter/findAll', '类目参数', b'1', b'1', '类目参数 查询所有', 1399985191002447872, '2022-06-04 18:45:09.521000', 1399985191002447872, '2022-06-04 18:45:09.521000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132606521344, 'DeptController#delete', '普通删除', 'DELETE', '/dept/delete', '部门管理', b'1', b'1', '部门管理 普通删除', 1399985191002447872, '2022-06-04 18:45:09.522000', 1399985191002447872, '2022-06-04 18:45:09.522000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132610715648, 'PayController#cancelByBusinessId', '取消支付(业务id)', 'POST', '/uni_pay/cancelByBusinessId', '统一支付', b'1', b'1', '统一支付 取消支付(业务id)', 1399985191002447872, '2022-06-04 18:45:09.523000', 1399985191002447872, '2022-06-04 18:45:09.523000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132614909952, 'DictionaryItemController#existsByCode', '编码是否被使用', 'GET', '/translate/item/existsByCode', '字典项', b'1', b'1', '字典项 编码是否被使用', 1399985191002447872, '2022-06-04 18:45:09.524000', 1399985191002447872, '2022-06-04 18:45:09.524000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132614909953, 'PayController#refundByBusinessId', '全额退款(业务id)', 'POST', '/uni_pay/refundByBusinessId', '统一支付', b'1', b'1', '统一支付 全额退款(业务id)', 1399985191002447872, '2022-06-04 18:45:09.524000', 1399985191002447872, '2022-06-04 18:45:09.524000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132619104256, 'SwaggerWelcomeWebMvc#redirectToUi', 'redirectToUi', 'GET', '/swagger-ui.html', 'SwaggerWelcomeWebMvc', b'1', b'1', 'SwaggerWelcomeWebMvc redirectToUi', 1399985191002447872, '2022-06-04 18:45:09.525000', 1399985191002447872, '2022-06-04 18:45:09.525000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132623298560, 'CategoryController#findBindBrandIds', '根据类目id查询关联的绑定品牌id集合', 'GET', '/category/findBindBrandIds', '类目管理', b'1', b'1', '类目管理 根据类目id查询关联的绑定品牌id集合', 1399985191002447872, '2022-06-04 18:45:09.526000', 1399985191002447872, '2022-06-04 18:45:09.526000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132623298561, 'RoleMenuController#findMenuIds', '获取权限菜单id列表,不包含资源权限', 'GET', '/role/menu/findMenuIds', '角色菜单权限关系', b'1', b'1', '角色菜单权限关系 获取权限菜单id列表,不包含资源权限', 1399985191002447872, '2022-06-04 18:45:09.526000', 1399985191002447872, '2022-06-04 18:45:09.526000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132627492864, 'PaymentController#findByUser', '根据userId获取列表', 'GET', '/payment/findByUser', '支付记录', b'1', b'1', '支付记录 根据userId获取列表', 1399985191002447872, '2022-06-04 18:45:09.527000', 1399985191002447872, '2022-06-04 18:45:09.527000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132627492865, 'DataScopeController#existsByCode', '编码是否被使用(不包含自己)', 'GET', '/data/scope/existsByCodeNotId', '数据范围权限配置', b'1', b'1', '数据范围权限配置 编码是否被使用(不包含自己)', 1399985191002447872, '2022-06-04 18:45:09.527000', 1399985191002447872, '2022-06-04 18:45:09.527000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132631687168, 'SystemParamController#add', '添加', 'POST', '/system/param/add', '系统参数', b'1', b'1', '系统参数 添加', 1399985191002447872, '2022-06-04 18:45:09.528000', 1399985191002447872, '2022-06-04 18:45:09.528000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132631687169, 'QuartzJobController#delete', '删除', 'DELETE', '/quartz/delete', '定时任务', b'1', b'1', '定时任务 删除', 1399985191002447872, '2022-06-04 18:45:09.528000', 1399985191002447872, '2022-06-04 18:45:09.528000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132640075776, 'UserInfoController#existsUsername', '账号是否被使用', 'GET', '/user/existsUsername', '用户管理', b'1', b'1', '用户管理 账号是否被使用', 1399985191002447872, '2022-06-04 18:45:09.530000', 1399985191002447872, '2022-06-04 18:45:09.530000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132640075777, 'ClientController#existsByCode', '编码是否被使用(不包含自己)', 'GET', '/client/existsByCodeNotId', '终端管理', b'1', b'1', '终端管理 编码是否被使用(不包含自己)', 1399985191002447872, '2022-06-04 18:45:09.530000', 1399985191002447872, '2022-06-04 18:45:09.531000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132644270080, 'PaymentController#findPayTypeInfoById', '根据id获取订单支付方式', 'GET', '/payment/findPayTypeInfoById', '支付记录', b'1', b'1', '支付记录 根据id获取订单支付方式', 1399985191002447872, '2022-06-04 18:45:09.531000', 1399985191002447872, '2022-06-04 18:45:09.531000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132648464384, 'AlipayConfigController#update', '更新', 'POST', '/alipay/update', '支付宝配置', b'1', b'1', '支付宝配置 更新', 1399985191002447872, '2022-06-04 18:45:09.532000', 1399985191002447872, '2022-06-04 18:45:09.532000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132656852992, 'UserAdminController#getByEmail', '根据邮箱查询用户', 'GET', '/user/admin/getByEmail', '管理用户(管理员级别)', b'1', b'1', '管理用户(管理员级别) 根据邮箱查询用户', 1399985191002447872, '2022-06-04 18:45:09.534000', 1399985191002447872, '2022-06-04 18:45:09.534000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132661047296, 'CategoryController#bindSpec', '绑定规格', 'POST', '/category/bindSpec', '类目管理', b'1', b'1', '类目管理 绑定规格', 1399985191002447872, '2022-06-04 18:45:09.535000', 1399985191002447872, '2022-06-04 18:45:09.535000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132661047297, 'CategoryController#existsByName', '判断类目是否已经存在', 'GET', '/category/existsByName', '类目管理', b'1', b'1', '类目管理 判断类目是否已经存在', 1399985191002447872, '2022-06-04 18:45:09.535000', 1399985191002447872, '2022-06-04 18:45:09.535000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132661047298, 'StrategyController#add', '添加策略', 'POST', '/strategy/add', '策略定义', b'1', b'1', '策略定义 添加策略', 1399985191002447872, '2022-06-04 18:45:09.535000', 1399985191002447872, '2022-06-04 18:45:09.536000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132665241600, 'UserInfoController#existsEmail', '邮箱是否被使用(不包含自己)', 'GET', '/user/existsEmailNotId', '用户管理', b'1', b'1', '用户管理 邮箱是否被使用(不包含自己)', 1399985191002447872, '2022-06-04 18:45:09.536000', 1399985191002447872, '2022-06-04 18:45:09.536000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132665241601, 'AlipayConfigController#findPayWayList', '支付宝支持支付方式', 'GET', '/alipay/findPayWayList', '支付宝配置', b'1', b'1', '支付宝配置 支付宝支持支付方式', 1399985191002447872, '2022-06-04 18:45:09.536000', 1399985191002447872, '2022-06-04 18:45:09.536000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132669435904, 'DataScopeController#add', '添加', 'POST', '/data/scope/add', '数据范围权限配置', b'1', b'1', '数据范围权限配置 添加', 1399985191002447872, '2022-06-04 18:45:09.537000', 1399985191002447872, '2022-06-04 18:45:09.537000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132669435905, 'UserInfoController#existsEmail', '邮箱是否被使用', 'GET', '/user/existsEmail', '用户管理', b'1', b'1', '用户管理 邮箱是否被使用', 1399985191002447872, '2022-06-04 18:45:09.537000', 1399985191002447872, '2022-06-04 18:45:09.537000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132669435906, 'PayController#cancelByPaymentId', '取消支付(支付id)', 'POST', '/uni_pay/cancelByPaymentId', '统一支付', b'1', b'1', '统一支付 取消支付(支付id)', 1399985191002447872, '2022-06-04 18:45:09.537000', 1399985191002447872, '2022-06-04 18:45:09.538000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132673630208, 'SystemParamController#findByParamKey', '根据键名获取键值', 'GET', '/system/param/findByParamKey', '系统参数', b'1', b'1', '系统参数 根据键名获取键值', 1399985191002447872, '2022-06-04 18:45:09.538000', 1399985191002447872, '2022-06-04 18:45:09.538000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132673630209, 'DictionaryController#delete', '根据id删除', 'DELETE', '/translate/delete', '字典', b'1', b'1', '字典 根据id删除', 1399985191002447872, '2022-06-04 18:45:09.538000', 1399985191002447872, '2022-06-04 18:45:09.538000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132677824512, 'WalletController#createWalletBatch', '批量开通用户钱包操作', 'POST', '/wallet/createWalletBatch', '钱包相关的接口', b'1', b'1', '钱包相关的接口 批量开通用户钱包操作', 1399985191002447872, '2022-06-04 18:45:09.539000', 1399985191002447872, '2022-06-04 18:45:09.539000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132677824513, 'DataEncryptDemoController#findById', '通过ID查询', 'GET', '/demo/data/encrypt/findById', '数据加密解密演示', b'1', b'1', '数据加密解密演示 通过ID查询', 1399985191002447872, '2022-06-04 18:45:09.539000', 1399985191002447872, '2022-06-04 18:45:09.539000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132682018816, 'DataEncryptDemoController#add', '添加', 'POST', '/demo/data/encrypt/add', '数据加密解密演示', b'1', b'1', '数据加密解密演示 添加', 1399985191002447872, '2022-06-04 18:45:09.540000', 1399985191002447872, '2022-06-04 18:45:09.540000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132682018817, 'DingTalkConfigController#setEnable', '设置启用的配置', 'POST', '/ding/config/setEnable', '钉钉配置', b'1', b'1', '钉钉配置 设置启用的配置', 1399985191002447872, '2022-06-04 18:45:09.540000', 1399985191002447872, '2022-06-04 18:45:09.540000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132682018818, 'PermMenuController#existsByPermCode', '编码是否被使用', 'GET', '/perm/menu/existsByPermCode', '菜单权限资源', b'1', b'1', '菜单权限资源 编码是否被使用', 1399985191002447872, '2022-06-04 18:45:09.540000', 1399985191002447872, '2022-06-04 18:45:09.540000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132686213120, 'QuartzJobController#syncJobStatus', '同步定时任务状态', 'POST', '/quartz/syncJobStatus', '定时任务', b'1', b'1', '定时任务 同步定时任务状态', 1399985191002447872, '2022-06-04 18:45:09.541000', 1399985191002447872, '2022-06-04 18:45:09.541000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132686213121, 'RoleController#findAll', '查询所有的角色', 'GET', '/role/findAll', '角色管理', b'1', b'1', '角色管理 查询所有的角色', 1399985191002447872, '2022-06-04 18:45:09.541000', 1399985191002447872, '2022-06-04 18:45:09.541000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132690407424, 'InventoryController#lockInventory', '锁定库存', 'POST', '/inventory/lockInventory', '库存操作', b'1', b'1', '库存操作 锁定库存', 1399985191002447872, '2022-06-04 18:45:09.542000', 1399985191002447872, '2022-06-04 18:45:09.542000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132690407425, 'DataPermDemoController#add', '添加', 'POST', '/demo/data/perm/add', '数据权限演示', b'1', b'1', '数据权限演示 添加', 1399985191002447872, '2022-06-04 18:45:09.542000', 1399985191002447872, '2022-06-04 18:45:09.542000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132690407426, 'UserDataScopeController#saveAssign', '给用户分配权限', 'POST', '/user/data/scope/saveAssign', '用户数据权限配置', b'1', b'1', '用户数据权限配置 给用户分配权限', 1399985191002447872, '2022-06-04 18:45:09.542000', 1399985191002447872, '2022-06-04 18:45:09.542000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132694601728, 'RolePathController#save', '保存角色权限关联关系', 'POST', '/role/path/save', '角色请求权限消息关系', b'1', b'1', '角色请求权限消息关系 保存角色权限关联关系', 1399985191002447872, '2022-06-04 18:45:09.543000', 1399985191002447872, '2022-06-04 18:45:09.543000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132694601729, 'WalletController#changerBalance', '充值操作(增减余额)', 'POST', '/wallet/changerBalance', '钱包相关的接口', b'1', b'1', '钱包相关的接口 充值操作(增减余额)', 1399985191002447872, '2022-06-04 18:45:09.543000', 1399985191002447872, '2022-06-04 18:45:09.543000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132698796032, 'UserInfoController#existsPhone', '手机号是否被使用(不包含自己)', 'GET', '/user/existsPhoneNotId', '用户管理', b'1', b'1', '用户管理 手机号是否被使用(不包含自己)', 1399985191002447872, '2022-06-04 18:45:09.544000', 1399985191002447872, '2022-06-04 18:45:09.544000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132698796033, 'InventoryController#reduceLockedAndCapacity', '扣减指定的 SKU 的库存', 'POST', '/inventory/reduceLockedAndCapacity', '库存操作', b'1', b'1', '库存操作 扣减指定的 SKU 的库存', 1399985191002447872, '2022-06-04 18:45:09.544000', 1399985191002447872, '2022-06-04 18:45:09.544000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132702990336, 'DatabaseTableController#findByTableName', '获取表信息', 'GET', '/gen/table/findByTableName', '数据库表信息', b'1', b'1', '数据库表信息 获取表信息', 1399985191002447872, '2022-06-04 18:45:09.545000', 1399985191002447872, '2022-06-04 18:45:09.545000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132702990337, 'PermPathController#syncSystem', '同步系统请求资源', 'POST', '/perm/path/syncSystem', '请求权限资源', b'1', b'1', '请求权限资源 同步系统请求资源', 1399985191002447872, '2022-06-04 18:45:09.545000', 1399985191002447872, '2022-06-04 18:45:09.545000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132707184640, 'AuthAssistController#sendSmsCaptcha', '发送短信验证码', 'POST', '/auth/sendSmsCaptcha', '认证支撑接口', b'1', b'1', '认证支撑接口 发送短信验证码', 1399985191002447872, '2022-06-04 18:45:09.546000', 1399985191002447872, '2022-06-04 18:45:09.546000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132707184641, 'StrategyController#findById', '获取策略及其配置项', 'GET', '/strategy/findById', '策略定义', b'1', b'1', '策略定义 获取策略及其配置项', 1399985191002447872, '2022-06-04 18:45:09.546000', 1399985191002447872, '2022-06-04 18:45:09.546000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132707184642, 'RoleController#update', '修改角色（返回角色对象）', 'POST', '/role/update', '角色管理', b'1', b'1', '角色管理 修改角色（返回角色对象）', 1399985191002447872, '2022-06-04 18:45:09.546000', 1399985191002447872, '2022-06-04 18:45:09.546000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132711378944, 'UserAdminController#getByPhone', '根据手机号查询用户', 'GET', '/user/admin/getByPhone', '管理用户(管理员级别)', b'1', b'1', '管理用户(管理员级别) 根据手机号查询用户', 1399985191002447872, '2022-06-04 18:45:09.547000', 1399985191002447872, '2022-06-04 18:45:09.547000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132711378945, 'DataScopeController#saveUserAssign', '保存关联用户权限', 'POST', '/data/scope/saveUserAssign', '数据范围权限配置', b'1', b'1', '数据范围权限配置 保存关联用户权限', 1399985191002447872, '2022-06-04 18:45:09.547000', 1399985191002447872, '2022-06-04 18:45:09.547000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132719767552, 'CategoryController#existsByName', '判断类目是否已经存在(不包含自身)', 'GET', '/category/existsByNameNotId', '类目管理', b'1', b'1', '类目管理 判断类目是否已经存在(不包含自身)', 1399985191002447872, '2022-06-04 18:45:09.549000', 1399985191002447872, '2022-06-04 18:45:09.549000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132723961856, 'DingRobotConfigController#add', '新增机器人配置', 'POST', '/ding/robot/config/add', '钉钉机器人配置', b'1', b'1', '钉钉机器人配置 新增机器人配置', 1399985191002447872, '2022-06-04 18:45:09.550000', 1399985191002447872, '2022-06-04 18:45:09.550000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132723961857, 'GoodsController#getDetails', '查询包含sku的详情', 'GET', '/goods/getDetails', '商品管理', b'1', b'1', '商品管理 查询包含sku的详情', 1399985191002447872, '2022-06-04 18:45:09.550000', 1399985191002447872, '2022-06-04 18:45:09.550000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132728156160, 'FIleUpLoadController#getFilePreviewUrl', '获取文件预览地址', 'GET', '/file/getFilePreviewUrl', '文件上传', b'0', b'0', '文件上传 获取文件预览地址', 1399985191002447872, '2022-06-04 18:45:09.551000', 1399985191002447872, '2022-06-04 18:45:56.898000', b'0', 1); -INSERT INTO `iam_perm_path` VALUES (1533037132728156161, 'DictionaryItemController#findAll', '获取全部字典项', 'GET', '/translate/item/findAll', '字典项', b'1', b'1', '字典项 获取全部字典项', 1399985191002447872, '2022-06-04 18:45:09.551000', 1399985191002447872, '2022-06-04 18:45:09.551000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132732350464, 'PermPathController#add', '添加权限', 'POST', '/perm/path/add', '请求权限资源', b'1', b'1', '请求权限资源 添加权限', 1399985191002447872, '2022-06-04 18:45:09.552000', 1399985191002447872, '2022-06-04 18:45:09.552000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132732350465, 'OrderRecommendController#findCoupon', '查询适用的优惠券', 'POST', '/order/recommend/findCoupon', '订单优惠选择与推荐', b'1', b'1', '订单优惠选择与推荐 查询适用的优惠券', 1399985191002447872, '2022-06-04 18:45:09.552000', 1399985191002447872, '2022-06-04 18:45:09.552000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132732350466, 'UserDeptController#findIdsByUser', '根据用户ID获取到部门id集合', 'GET', '/user/dept/findIdsByUser', '用户部门关联关系', b'1', b'1', '用户部门关联关系 根据用户ID获取到部门id集合', 1399985191002447872, '2022-06-04 18:45:09.552000', 1399985191002447872, '2022-06-04 18:45:09.552000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132736544768, 'IdempotencyDemoController#lock20', '分布式锁(暂停20秒)', 'GET', '/demo/lock/lock20', '幂等控制演示', b'1', b'1', '幂等控制演示 分布式锁(暂停20秒)', 1399985191002447872, '2022-06-04 18:45:09.553000', 1399985191002447872, '2022-06-04 18:45:09.553000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132736544769, 'StrategyRegisterController#delete', '删除', 'DELETE', '/strategy/register/del/{id}', '策略注册', b'1', b'1', '策略注册 删除', 1399985191002447872, '2022-06-04 18:45:09.553000', 1399985191002447872, '2022-06-04 18:45:09.553000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132740739072, 'WalletController#findById', '根据钱包ID查询钱包', 'GET', '/wallet/findById', '钱包相关的接口', b'1', b'1', '钱包相关的接口 根据钱包ID查询钱包', 1399985191002447872, '2022-06-04 18:45:09.554000', 1399985191002447872, '2022-06-04 18:45:09.554000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132740739073, 'UserRoleController#saveAndUpdate', '给用户分配角色', 'POST', '/user/role/saveAndUpdate', '用户角色管理', b'1', b'1', '用户角色管理 给用户分配角色', 1399985191002447872, '2022-06-04 18:45:09.554000', 1399985191002447872, '2022-06-04 18:45:09.554000', b'1', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132740739074, 'TestController#redisPub', 'redis消息队列发布', 'GET', '/test/redisPub', '测试控制器', b'1', b'1', '测试控制器 redis消息队列发布', 1399985191002447872, '2022-06-04 18:45:09.554000', 1399985191002447872, '2022-06-04 18:45:09.555000', b'1', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132744933376, 'GoodsController#page', '分页', 'GET', '/goods/page', '商品管理', b'1', b'1', '商品管理 分页', 1399985191002447872, '2022-06-04 18:45:09.555000', 1399985191002447872, '2022-06-04 18:45:09.555000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132744933377, 'SwaggerConfigResource#openapiJson', 'openapiJson', 'GET', '/v3/api-docs/swagger-config', 'SwaggerConfigResource', b'0', b'0', 'SwaggerConfigResource openapiJson', 1399985191002447872, '2022-06-04 18:45:09.555000', 1399985191002447872, '2022-06-04 18:47:08.619000', b'0', 1); -INSERT INTO `iam_perm_path` VALUES (1533037132749127680, 'PermPathController#findAll', '权限列表', 'GET', '/perm/path/findAll', '请求权限资源', b'1', b'1', '请求权限资源 权限列表', 1399985191002447872, '2022-06-04 18:45:09.556000', 1399985191002447872, '2022-06-04 18:45:09.556000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132749127681, 'CategoryParameterGroupController#findById', '通过ID查询', 'GET', '/categoryParameterGroup/findById', '类目参数组', b'1', b'1', '类目参数组 通过ID查询', 1399985191002447872, '2022-06-04 18:45:09.556000', 1399985191002447872, '2022-06-04 18:45:09.556000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132753321984, 'PayController#syncByBusinessId', '刷新指定业务id的支付单状态', 'POST', '/uni_pay/syncByBusinessId', '统一支付', b'1', b'1', '统一支付 刷新指定业务id的支付单状态', 1399985191002447872, '2022-06-04 18:45:09.557000', 1399985191002447872, '2022-06-04 18:45:09.557000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132753321985, 'DingRobotConfigController#existsByCode', '编码是否被使用(不包含自己)', 'GET', '/ding/robot/config/existsByCodeNotId', '钉钉机器人配置', b'1', b'1', '钉钉机器人配置 编码是否被使用(不包含自己)', 1399985191002447872, '2022-06-04 18:45:09.557000', 1399985191002447872, '2022-06-04 18:45:09.557000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132753321986, 'PermMenuController#add', '添加菜单权限', 'POST', '/perm/menu/add', '菜单权限资源', b'1', b'1', '菜单权限资源 添加菜单权限', 1399985191002447872, '2022-06-04 18:45:09.557000', 1399985191002447872, '2022-06-04 18:45:09.557000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132757516288, 'CouponController#obtainCoupon', '领取优惠券', 'POST', '/coupon/obtainCoupon', '优惠券', b'1', b'1', '优惠券 领取优惠券', 1399985191002447872, '2022-06-04 18:45:09.558000', 1399985191002447872, '2022-06-04 18:45:09.558000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132757516289, 'MessageQueueDemoController#sendRabbitMsg', '发送RabbitMQ消息', 'POST', '/demo/mq/sendRabbitMsg', '测试消息队列', b'1', b'1', '测试消息队列 发送RabbitMQ消息', 1399985191002447872, '2022-06-04 18:45:09.558000', 1399985191002447872, '2022-06-04 18:45:09.558000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132761710592, 'DingRobotSendController#sendLink', '测试发送link', 'POST', '/ding/robot/send/link', '钉钉机器人发送', b'1', b'1', '钉钉机器人发送 测试发送link', 1399985191002447872, '2022-06-04 18:45:09.559000', 1399985191002447872, '2022-06-04 18:45:09.559000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132761710593, 'GoodsSkuController#findByGoodsId', '根据goodsId查询', 'GET', '/sku/findByGoodsId', 'sku操作', b'1', b'1', 'sku操作 根据goodsId查询', 1399985191002447872, '2022-06-04 18:45:09.559000', 1399985191002447872, '2022-06-04 18:45:09.559000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132761710594, 'UserAdminController#getUserInfoWhole', '查询用户详情', 'GET', '/user/admin/getUserInfoWhole', '管理用户(管理员级别)', b'1', b'1', '管理用户(管理员级别) 查询用户详情', 1399985191002447872, '2022-06-04 18:45:09.559000', 1399985191002447872, '2022-06-04 18:45:09.559000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132765904896, 'OperateLogController#findById', '获取', 'GET', '/log/operate/findById', '操作日志', b'1', b'1', '操作日志 获取', 1399985191002447872, '2022-06-04 18:45:09.560000', 1399985191002447872, '2022-06-04 18:45:09.560000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132765904897, 'InventoryController#increaseInventory', '增补指定 SKU 的可售库存， 扣减对应售出', 'POST', '/inventory/increaseInventory', '库存操作', b'1', b'1', '库存操作 增补指定 SKU 的可售库存， 扣减对应售出', 1399985191002447872, '2022-06-04 18:45:09.560000', 1399985191002447872, '2022-06-04 18:45:09.560000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132770099200, 'OrderFindController#findByUser', '根据用户获取订单', 'GET', '/order/findByUser', '订单查询', b'1', b'1', '订单查询 根据用户获取订单', 1399985191002447872, '2022-06-04 18:45:09.561000', 1399985191002447872, '2022-06-04 18:45:09.561000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132770099201, 'DataSensitiveDemoController#delete', '删除', 'DELETE', '/demo/data/sensitive/delete', '数据脱敏演示', b'1', b'1', '数据脱敏演示 删除', 1399985191002447872, '2022-06-04 18:45:09.561000', 1399985191002447872, '2022-06-04 18:45:09.561000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132770099202, 'DataPermDemoController#update', '修改', 'POST', '/demo/data/perm/update', '数据权限演示', b'1', b'1', '数据权限演示 修改', 1399985191002447872, '2022-06-04 18:45:09.561000', 1399985191002447872, '2022-06-04 18:45:09.561000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132774293504, 'CategoryParameterController#update', '修改', 'POST', '/categoryParameter/update', '类目参数', b'1', b'1', '类目参数 修改', 1399985191002447872, '2022-06-04 18:45:09.562000', 1399985191002447872, '2022-06-04 18:45:09.562000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132774293505, 'DataScopeController#existsByCode', '编码是否被使用', 'GET', '/data/scope/existsByCode', '数据范围权限配置', b'1', b'1', '数据范围权限配置 编码是否被使用', 1399985191002447872, '2022-06-04 18:45:09.562000', 1399985191002447872, '2022-06-04 18:45:09.562000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132778487808, 'PermMenuController#allTree', '获取全部树', 'GET', '/perm/menu/allTree', '菜单权限资源', b'1', b'1', '菜单权限资源 获取全部树', 1399985191002447872, '2022-06-04 18:45:09.563000', 1399985191002447872, '2022-06-04 18:45:09.563000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132778487809, 'TestController#sendWsByUserId', '发送ws消息(全部用户)', 'POST', '/test/sendWsByAll', '测试控制器', b'1', b'1', '测试控制器 发送ws消息(全部用户)', 1399985191002447872, '2022-06-04 18:45:09.563000', 1399985191002447872, '2022-06-04 18:45:09.563000', b'1', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132778487810, 'BrandController#findAll', '查询所有', 'GET', '/brand/findAll', '品牌', b'1', b'1', '品牌 查询所有', 1399985191002447872, '2022-06-04 18:45:09.563000', 1399985191002447872, '2022-06-04 18:45:09.563000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132786876416, 'PermPathController#delete', '删除权限', 'DELETE', '/perm/path/delete', '请求权限资源', b'1', b'1', '请求权限资源 删除权限', 1399985191002447872, '2022-06-04 18:45:09.565000', 1399985191002447872, '2022-06-04 18:45:09.565000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132786876417, 'ClientController#findAll', '查询所有的终端', 'GET', '/client/findAll', '终端管理', b'1', b'1', '终端管理 查询所有的终端', 1399985191002447872, '2022-06-04 18:45:09.565000', 1399985191002447872, '2022-06-04 18:45:09.565000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132791070720, 'StrategyController#findByType', '根据类型查询', 'GET', '/strategy/findByType', '策略定义', b'1', b'1', '策略定义 根据类型查询', 1399985191002447872, '2022-06-04 18:45:09.566000', 1399985191002447872, '2022-06-04 18:45:09.566000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132791070721, 'PermMenuController#update', '修改菜单权限', 'POST', '/perm/menu/update', '菜单权限资源', b'1', b'1', '菜单权限资源 修改菜单权限', 1399985191002447872, '2022-06-04 18:45:09.566000', 1399985191002447872, '2022-06-04 18:45:09.566000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132795265024, 'DataPermDemoController#findById', '通过ID查询', 'GET', '/demo/data/perm/findById', '数据权限演示', b'1', b'1', '数据权限演示 通过ID查询', 1399985191002447872, '2022-06-04 18:45:09.567000', 1399985191002447872, '2022-06-04 18:45:09.567000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132795265025, 'SystemParamController#existsByKey', '判断编码是否存在', 'GET', '/system/param/existsByKey', '系统参数', b'1', b'1', '系统参数 判断编码是否存在', 1399985191002447872, '2022-06-04 18:45:09.567000', 1399985191002447872, '2022-06-04 18:45:09.567000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132799459328, 'ClientController#findById', '通过ID查询终端', 'GET', '/client/findById', '终端管理', b'1', b'1', '终端管理 通过ID查询终端', 1399985191002447872, '2022-06-04 18:45:09.568000', 1399985191002447872, '2022-06-04 18:45:09.568000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132799459329, 'OnlineUserController#page', '分页', 'GET', '/user/online/page', '在线用户', b'1', b'1', '在线用户 分页', 1399985191002447872, '2022-06-04 18:45:09.568000', 1399985191002447872, '2022-06-04 18:45:09.568000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132799459330, 'DeptController#add', '添加', 'POST', '/dept/add', '部门管理', b'1', b'1', '部门管理 添加', 1399985191002447872, '2022-06-04 18:45:09.568000', 1399985191002447872, '2022-06-04 18:45:09.568000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132803653632, 'DictionaryController#update', '更新', 'POST', '/translate/update', '字典', b'1', b'1', '字典 更新', 1399985191002447872, '2022-06-04 18:45:09.569000', 1399985191002447872, '2022-06-04 18:45:09.569000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132803653633, 'ClientController#page', '分页查询终端', 'GET', '/client/page', '终端管理', b'1', b'1', '终端管理 分页查询终端', 1399985191002447872, '2022-06-04 18:45:09.569000', 1399985191002447872, '2022-06-04 18:45:09.569000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132807847936, 'AppVersionController#check', '检查更新', 'POST', '/app/version/check', 'app版本管理', b'1', b'1', 'app版本管理 检查更新', 1399985191002447872, '2022-06-04 18:45:09.570000', 1399985191002447872, '2022-06-04 18:45:09.570000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132807847937, 'UserInfoController#existsUsername', '账号是否被使用(不包含自己)', 'GET', '/user/existsUsernameNotId', '用户管理', b'1', b'1', '用户管理 账号是否被使用(不包含自己)', 1399985191002447872, '2022-06-04 18:45:09.570000', 1399985191002447872, '2022-06-04 18:45:09.570000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132807847938, 'CategoryController#findTree', '获取类目树', 'GET', '/category/findTree', '类目管理', b'1', b'1', '类目管理 获取类目树', 1399985191002447872, '2022-06-04 18:45:09.570000', 1399985191002447872, '2022-06-04 18:45:09.570000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132812042240, 'PaymentController#findStatusByBusinessId', '根据业务ID获取支付状态', 'GET', '/payment/findStatusByBusinessId', '支付记录', b'1', b'1', '支付记录 根据业务ID获取支付状态', 1399985191002447872, '2022-06-04 18:45:09.571000', 1399985191002447872, '2022-06-04 18:45:09.571000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132812042241, 'BrandController#update', '修改', 'POST', '/brand/update', '品牌', b'1', b'1', '品牌 修改', 1399985191002447872, '2022-06-04 18:45:09.571000', 1399985191002447872, '2022-06-04 18:45:09.571000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132812042242, 'WalletLogController#page', '查询钱包日志(分页)', 'GET', '/wallet/log/page', '钱包日志相关的接口', b'1', b'1', '钱包日志相关的接口 查询钱包日志(分页)', 1399985191002447872, '2022-06-04 18:45:09.572000', 1399985191002447872, '2022-06-04 18:45:09.572000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132816236544, 'DataSensitiveDemoController#findById', '通过ID查询', 'GET', '/demo/data/sensitive/findById', '数据脱敏演示', b'1', b'1', '数据脱敏演示 通过ID查询', 1399985191002447872, '2022-06-04 18:45:09.572000', 1399985191002447872, '2022-06-04 18:45:09.572000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132816236545, 'OrderPreviewController#previewOrderPriceNoCheck', '预览价格(手动无检查)', 'POST', '/order/preview/previewOrderPriceNoCheck', '订单计算', b'1', b'1', '订单计算 预览价格(手动无检查)', 1399985191002447872, '2022-06-04 18:45:09.572000', 1399985191002447872, '2022-06-04 18:45:09.572000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132820430848, 'InventoryController#increaseAvailable', '增补指定 SKU 的可售库存', 'POST', '/inventory/increaseAvailable', '库存操作', b'1', b'1', '库存操作 增补指定 SKU 的可售库存', 1399985191002447872, '2022-06-04 18:45:09.573000', 1399985191002447872, '2022-06-04 18:45:09.573000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132820430849, 'CategoryController#add', '增加新类目', 'POST', '/category/add', '类目管理', b'1', b'1', '类目管理 增加新类目', 1399985191002447872, '2022-06-04 18:45:09.573000', 1399985191002447872, '2022-06-04 18:45:09.573000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132820430850, 'DictionaryController#page', '分页', 'GET', '/translate/page', '字典', b'1', b'1', '字典 分页', 1399985191002447872, '2022-06-04 18:45:09.573000', 1399985191002447872, '2022-06-04 18:45:09.573000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132824625152, 'PaymentController#findByBusinessId', '根据businessId获取列表', 'GET', '/payment/findByBusinessId', '支付记录', b'1', b'1', '支付记录 根据businessId获取列表', 1399985191002447872, '2022-06-04 18:45:09.574000', 1399985191002447872, '2022-06-04 18:45:09.574000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132824625153, 'BrandController#add', '添加', 'POST', '/brand/add', '品牌', b'1', b'1', '品牌 添加', 1399985191002447872, '2022-06-04 18:45:09.574000', 1399985191002447872, '2022-06-04 18:45:09.574000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132824625154, 'SuperQueryDemoController#page', '分页查询', 'GET', '/demo/super/query/page', '超级查询演示', b'1', b'1', '超级查询演示 分页查询', 1399985191002447872, '2022-06-04 18:45:09.574000', 1399985191002447872, '2022-06-04 18:45:09.574000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132828819456, 'ActivityController#add', '注册活动', 'POST', '/activity/add', '活动', b'1', b'1', '活动 注册活动', 1399985191002447872, '2022-06-04 18:45:09.575000', 1399985191002447872, '2022-06-04 18:45:09.575000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132828819457, 'SystemParamController#delete', '删除', 'DELETE', '/system/param/delete', '系统参数', b'1', b'1', '系统参数 删除', 1399985191002447872, '2022-06-04 18:45:09.575000', 1399985191002447872, '2022-06-04 18:45:09.575000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132828819458, 'UserSocialLoginController#page', '分页', 'GET', '/user/social/page', '用户三方登录管理', b'1', b'1', '用户三方登录管理 分页', 1399985191002447872, '2022-06-04 18:45:09.575000', 1399985191002447872, '2022-06-04 18:45:09.575000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132833013760, 'DataScopeController#delete', '删除', 'DELETE', '/data/scope/delete', '数据范围权限配置', b'1', b'1', '数据范围权限配置 删除', 1399985191002447872, '2022-06-04 18:45:09.576000', 1399985191002447872, '2022-06-04 18:45:09.576000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132833013761, 'MultipleOpenApiWebMvcResource#openapiJson', 'openapiJson', 'GET', '/v3/api-docs/{group}', 'MultipleOpenApiWebMvcResource', b'0', b'0', 'MultipleOpenApiWebMvcResource openapiJson', 1399985191002447872, '2022-06-04 18:45:09.576000', 1399985191002447872, '2022-06-04 18:47:14.753000', b'0', 1); -INSERT INTO `iam_perm_path` VALUES (1533037132833013762, 'UserRoleController#findRolesByUser', '根据用户ID获取到角色集合', 'GET', '/user/role/findRolesByUser', '用户角色管理', b'1', b'1', '用户角色管理 根据用户ID获取到角色集合', 1399985191002447872, '2022-06-04 18:45:09.576000', 1399985191002447872, '2022-06-04 18:45:09.576000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132837208064, 'RoleMenuController#findPermissionIdsByRole', '根据角色id获取关联权限id集合(包含资源和菜单)', 'GET', '/role/menu/findPermissionIdsByRole', '角色菜单权限关系', b'1', b'1', '角色菜单权限关系 根据角色id获取关联权限id集合(包含资源和菜单)', 1399985191002447872, '2022-06-04 18:45:09.577000', 1399985191002447872, '2022-06-04 18:45:09.577000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132837208065, 'DingRobotConfigController#existsByCode', '编码是否被使用', 'GET', '/ding/robot/config/existsByCode', '钉钉机器人配置', b'1', b'1', '钉钉机器人配置 编码是否被使用', 1399985191002447872, '2022-06-04 18:45:09.577000', 1399985191002447872, '2022-06-04 18:45:09.578000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132841402368, 'VoucherController#findById', '单条查询', 'GET', '/voucher/findById', '储值卡', b'1', b'1', '储值卡 单条查询', 1399985191002447872, '2022-06-04 18:45:09.578000', 1399985191002447872, '2022-06-04 18:45:09.578000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132841402369, 'RolePathController#findPathsByUser', '根据用户id获取角色授权(请求权限列表)', 'GET', '/role/path/findPathsByUser', '角色请求权限消息关系', b'1', b'1', '角色请求权限消息关系 根据用户id获取角色授权(请求权限列表)', 1399985191002447872, '2022-06-04 18:45:09.578000', 1399985191002447872, '2022-06-04 18:45:09.578000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132841402370, 'InventoryController#getAvailable', '获取指定 SKU 的可用库存', 'GET', '/inventory/getAvailable', '库存操作', b'1', b'1', '库存操作 获取指定 SKU 的可用库存', 1399985191002447872, '2022-06-04 18:45:09.578000', 1399985191002447872, '2022-06-04 18:45:09.578000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132845596672, 'CategoryParameterController#findById', '通过ID查询', 'GET', '/categoryParameter/findById', '类目参数', b'1', b'1', '类目参数 通过ID查询', 1399985191002447872, '2022-06-04 18:45:09.579000', 1399985191002447872, '2022-06-04 18:45:09.579000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132845596673, 'CategoryController#update', '更新类目', 'POST', '/category/update', '类目管理', b'1', b'1', '类目管理 更新类目', 1399985191002447872, '2022-06-04 18:45:09.579000', 1399985191002447872, '2022-06-04 18:45:09.579000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132849790976, 'ClientController#add', '添加终端', 'POST', '/client/add', '终端管理', b'1', b'1', '终端管理 添加终端', 1399985191002447872, '2022-06-04 18:45:09.580000', 1399985191002447872, '2022-06-04 18:45:09.580000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132853985280, 'VoucherController#lock', '冻结', 'POST', '/voucher/lock', '储值卡', b'1', b'1', '储值卡 冻结', 1399985191002447872, '2022-06-04 18:45:09.581000', 1399985191002447872, '2022-06-04 18:45:09.581000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132853985281, 'DataScopeController#deleteUserAssigns', '批量删除关联用户', 'DELETE', '/data/scope/deleteUserAssigns', '数据范围权限配置', b'1', b'1', '数据范围权限配置 批量删除关联用户', 1399985191002447872, '2022-06-04 18:45:09.581000', 1399985191002447872, '2022-06-04 18:45:09.581000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132858179584, 'DictionaryItemController#update', '修改字典项（返回字典项对象）', 'POST', '/translate/item/update', '字典项', b'1', b'1', '字典项 修改字典项（返回字典项对象）', 1399985191002447872, '2022-06-04 18:45:09.582000', 1399985191002447872, '2022-06-04 18:45:09.582000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132858179585, 'CategoryParameterGroupController#update', '修改', 'POST', '/categoryParameterGroup/update', '类目参数组', b'1', b'1', '类目参数组 修改', 1399985191002447872, '2022-06-04 18:45:09.582000', 1399985191002447872, '2022-06-04 18:45:09.582000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132862373888, 'SuperQueryDemoController#superQuery', '超级查询(分页)', 'POST', '/demo/super/query/superQuery', '超级查询演示', b'1', b'1', '超级查询演示 超级查询(分页)', 1399985191002447872, '2022-06-04 18:45:09.583000', 1399985191002447872, '2022-06-04 18:45:09.583000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132862373889, 'AggregateController#createAggregatePay', '创建聚合支付', 'POST', '/aggregate/createAggregatePay', '聚合支付', b'1', b'1', '聚合支付 创建聚合支付', 1399985191002447872, '2022-06-04 18:45:09.583000', 1399985191002447872, '2022-06-04 18:45:09.583000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132862373890, 'CategoryParameterController#page', '分页查询(限定类目和分组id)', 'GET', '/categoryParameter/page', '类目参数', b'1', b'1', '类目参数 分页查询(限定类目和分组id)', 1399985191002447872, '2022-06-04 18:45:09.583000', 1399985191002447872, '2022-06-04 18:45:09.583000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132866568192, 'WalletController#createWallet', '开通用户钱包操作', 'POST', '/wallet/createWallet', '钱包相关的接口', b'1', b'1', '钱包相关的接口 开通用户钱包操作', 1399985191002447872, '2022-06-04 18:45:09.584000', 1399985191002447872, '2022-06-04 18:45:09.584000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132866568193, 'CategoryParameterController#existsByName', '判断类目参数是否已经存在(不包含自身)', 'GET', '/categoryParameter/existsByNameNotId', '类目参数', b'1', b'1', '类目参数 判断类目参数是否已经存在(不包含自身)', 1399985191002447872, '2022-06-04 18:45:09.584000', 1399985191002447872, '2022-06-04 18:45:09.584000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132870762496, 'AlipayConfigController#findById', '根据Id查询', 'GET', '/alipay/findById', '支付宝配置', b'1', b'1', '支付宝配置 根据Id查询', 1399985191002447872, '2022-06-04 18:45:09.585000', 1399985191002447872, '2022-06-04 18:45:09.585000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132870762497, 'PermMenuController#menuTree', '获取菜单树', 'GET', '/perm/menu/menuTree', '菜单权限资源', b'1', b'1', '菜单权限资源 获取菜单树', 1399985191002447872, '2022-06-04 18:45:09.585000', 1399985191002447872, '2022-06-04 18:45:09.585000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132870762498, 'DataScopeController#getDeptIds', '获取关联部门id', 'GET', '/data/scope/getDeptIds', '数据范围权限配置', b'1', b'1', '数据范围权限配置 获取关联部门id', 1399985191002447872, '2022-06-04 18:45:09.585000', 1399985191002447872, '2022-06-04 18:45:09.585000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132874956800, 'QuartzJobLogController#findById', '单条', 'GET', '/quartz/log/findById', '定时任务执行日志', b'1', b'1', '定时任务执行日志 单条', 1399985191002447872, '2022-06-04 18:45:09.586000', 1399985191002447872, '2022-06-04 18:45:09.586000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132874956801, 'IdempotencyDemoController#lock5', '分布式锁(暂停5秒)', 'GET', '/demo/lock/lock5', '幂等控制演示', b'1', b'1', '幂等控制演示 分布式锁(暂停5秒)', 1399985191002447872, '2022-06-04 18:45:09.586000', 1399985191002447872, '2022-06-04 18:45:09.586000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132874956802, 'DingTalkConfigController#findAll', '查询全部', 'GET', '/ding/config/findAll', '钉钉配置', b'1', b'1', '钉钉配置 查询全部', 1399985191002447872, '2022-06-04 18:45:09.586000', 1399985191002447872, '2022-06-04 18:45:09.586000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132874956803, 'DingRobotConfigController#update', '修改机器人配置', 'POST', '/ding/robot/config/update', '钉钉机器人配置', b'1', b'1', '钉钉机器人配置 修改机器人配置', 1399985191002447872, '2022-06-04 18:45:09.586000', 1399985191002447872, '2022-06-04 18:45:09.586000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132879151104, 'PayNotifyRecordController#page', '分页', 'GET', '/pay/notify/record/page', '支付回调记录', b'1', b'1', '支付回调记录 分页', 1399985191002447872, '2022-06-04 18:45:09.587000', 1399985191002447872, '2022-06-04 18:45:09.587000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132879151105, 'CouponController#getByIds', '批量优惠券', 'GET', '/coupon/getById', '优惠券', b'1', b'1', '优惠券 批量优惠券', 1399985191002447872, '2022-06-04 18:45:09.587000', 1399985191002447872, '2022-06-04 18:45:09.587000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132879151106, 'GoodsSkuController#findBySkuIds', '获取sku集合', 'GET', '/sku/findBySkuIds', 'sku操作', b'1', b'1', 'sku操作 获取sku集合', 1399985191002447872, '2022-06-04 18:45:09.587000', 1399985191002447872, '2022-06-04 18:45:09.587000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132883345408, 'SuperQueryDemoController#findById', '通过ID查询', 'GET', '/demo/super/query/findById', '超级查询演示', b'1', b'1', '超级查询演示 通过ID查询', 1399985191002447872, '2022-06-04 18:45:09.588000', 1399985191002447872, '2022-06-04 18:45:09.588000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132883345409, 'CashierController#combinationPay', '发起支付(组合支付)', 'POST', '/cashier/combinationPay', '结算台', b'1', b'1', '结算台 发起支付(组合支付)', 1399985191002447872, '2022-06-04 18:45:09.588000', 1399985191002447872, '2022-06-04 18:45:09.588000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132883345410, 'DataScopeController#page', '分页', 'GET', '/data/scope/page', '数据范围权限配置', b'1', b'1', '数据范围权限配置 分页', 1399985191002447872, '2022-06-04 18:45:09.588000', 1399985191002447872, '2022-06-04 18:45:09.588000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132883345411, 'SpecificationController#page', '分页查询', 'GET', '/specification/page', '规格', b'1', b'1', '规格 分页查询', 1399985191002447872, '2022-06-04 18:45:09.588000', 1399985191002447872, '2022-06-04 18:45:09.588000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132887539712, 'PermMenuController#existsByPermCode', '编码是否被使用(不包含自己)', 'GET', '/perm/menu/existsByPermCodeNotId', '菜单权限资源', b'1', b'1', '菜单权限资源 编码是否被使用(不包含自己)', 1399985191002447872, '2022-06-04 18:45:09.589000', 1399985191002447872, '2022-06-04 18:45:09.589000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132887539713, 'OnlineUserController#logoutByUserId', '踢人下线', 'POST', '/user/online/logoutByUserId', '在线用户', b'1', b'1', '在线用户 踢人下线', 1399985191002447872, '2022-06-04 18:45:09.589000', 1399985191002447872, '2022-06-04 18:45:09.589000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132887539714, 'CategoryParameterGroupController#add', '添加', 'POST', '/categoryParameterGroup/add', '类目参数组', b'1', b'1', '类目参数组 添加', 1399985191002447872, '2022-06-04 18:45:09.589000', 1399985191002447872, '2022-06-04 18:45:09.589000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132891734016, 'FIleUpLoadController#page', '分页', 'GET', '/file/page', '文件上传', b'1', b'1', '文件上传 分页', 1399985191002447872, '2022-06-04 18:45:09.590000', 1399985191002447872, '2022-06-04 18:45:09.590000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132891734017, 'OpenApiWebMvcResource#openapiYaml', 'openapiYaml', 'GET', '/v3/api-docs.yaml', 'OpenApiWebMvcResource', b'0', b'0', 'OpenApiWebMvcResource openapiYaml', 1399985191002447872, '2022-06-04 18:45:09.590000', 1399985191002447872, '2022-06-04 18:47:19.608000', b'0', 1); -INSERT INTO `iam_perm_path` VALUES (1533037132891734018, 'WeChatPayConfigController#update', '更新', 'POST', '/wechat/pay/update', '微信支付', b'1', b'1', '微信支付 更新', 1399985191002447872, '2022-06-04 18:45:09.590000', 1399985191002447872, '2022-06-04 18:45:09.590000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132891734019, 'RolePathController#findIdsByRole', '根据角色id获取关联权限id', 'GET', '/role/path/findIdsByRole', '角色请求权限消息关系', b'1', b'1', '角色请求权限消息关系 根据角色id获取关联权限id', 1399985191002447872, '2022-06-04 18:45:09.590000', 1399985191002447872, '2022-06-04 18:45:09.590000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132895928320, 'DataVersionLogController#findById', '获取', 'GET', '/log/dataVersion/findById', '数据版本日志', b'1', b'1', '数据版本日志 获取', 1399985191002447872, '2022-06-04 18:45:09.591000', 1399985191002447872, '2022-06-04 18:45:09.591000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132895928321, 'DeptController#tree', '树状展示', 'GET', '/dept/tree', '部门管理', b'1', b'1', '部门管理 树状展示', 1399985191002447872, '2022-06-04 18:45:09.591000', 1399985191002447872, '2022-06-04 18:45:09.591000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132895928322, 'UserInfoController#existsPhone', '手机号是否被使用', 'GET', '/user/existsPhone', '用户管理', b'1', b'1', '用户管理 手机号是否被使用', 1399985191002447872, '2022-06-04 18:45:09.591000', 1399985191002447872, '2022-06-04 18:45:09.591000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132900122624, 'TestController#hello', '测试', 'GET', '/test/hello', '测试控制器', b'1', b'1', '测试控制器 测试', 1399985191002447872, '2022-06-04 18:45:09.592000', 1399985191002447872, '2022-06-04 18:45:09.592000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132900122625, 'PayController#pay', '支付', 'POST', '/uni_pay/pay', '统一支付', b'1', b'1', '统一支付 支付', 1399985191002447872, '2022-06-04 18:45:09.592000', 1399985191002447872, '2022-06-04 18:45:09.592000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132900122626, 'RoleController#dropdown', '角色下拉框', 'GET', '/role/dropdown', '角色管理', b'1', b'1', '角色管理 角色下拉框', 1399985191002447872, '2022-06-04 18:45:09.592000', 1399985191002447872, '2022-06-04 18:45:09.592000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132900122627, 'DataSensitiveDemoController#page', '分页查询', 'GET', '/demo/data/sensitive/page', '数据脱敏演示', b'1', b'1', '数据脱敏演示 分页查询', 1399985191002447872, '2022-06-04 18:45:09.592000', 1399985191002447872, '2022-06-04 18:45:09.592000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132904316928, 'CouponController#findByIds', '批量查询优惠券', 'GET', '/coupon/findByIds', '优惠券', b'1', b'1', '优惠券 批量查询优惠券', 1399985191002447872, '2022-06-04 18:45:09.593000', 1399985191002447872, '2022-06-04 18:45:09.593000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132904316929, 'DingRobotConfigController#page', '分页', 'GET', '/ding/robot/config/page', '钉钉机器人配置', b'1', b'1', '钉钉机器人配置 分页', 1399985191002447872, '2022-06-04 18:45:09.593000', 1399985191002447872, '2022-06-04 18:45:09.593000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132904316930, 'CouponController#lockByIds', '批量锁定优惠券', 'POST', '/coupon/lockByIds', '优惠券', b'1', b'1', '优惠券 批量锁定优惠券', 1399985191002447872, '2022-06-04 18:45:09.593000', 1399985191002447872, '2022-06-04 18:45:09.593000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132908511232, 'ClientController#superPage', '超级查询', 'POST', '/client/superPage', '终端管理', b'1', b'1', '终端管理 超级查询', 1399985191002447872, '2022-06-04 18:45:09.594000', 1399985191002447872, '2022-06-04 18:45:09.594000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132908511233, 'DataPermDemoController#page', '分页查询', 'GET', '/demo/data/perm/page', '数据权限演示', b'1', b'1', '数据权限演示 分页查询', 1399985191002447872, '2022-06-04 18:45:09.594000', 1399985191002447872, '2022-06-04 18:45:09.594000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132908511234, 'OrderOperateController#paidOrderState', '付款成功状态变更', 'POST', '/order/paidOrderState', '订单操作', b'1', b'1', '订单操作 付款成功状态变更', 1399985191002447872, '2022-06-04 18:45:09.594000', 1399985191002447872, '2022-06-04 18:45:09.594000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132908511235, 'UserInfoController#getLoginAfterUserInfo', '登录后获取用户信息', 'GET', '/user/getLoginAfterUserInfo', '用户管理', b'1', b'1', '用户管理 登录后获取用户信息', 1399985191002447872, '2022-06-04 18:45:09.594000', 1399985191002447872, '2022-06-04 18:45:09.594000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132912705536, 'FIleUpLoadController#download', '下载文件', 'GET', '/file/download/{id}', '文件上传', b'0', b'0', '文件上传 下载文件', 1399985191002447872, '2022-06-04 18:45:09.595000', 1399985191002447872, '2022-06-04 18:46:04.706000', b'0', 1); -INSERT INTO `iam_perm_path` VALUES (1533037132912705537, 'CategoryParameterGroupController#existsByName', '判断类目参数组是否已经存在(不包含自身)', 'GET', '/categoryParameterGroup/existsByNameNotId', '类目参数组', b'1', b'1', '类目参数组 判断类目参数组是否已经存在(不包含自身)', 1399985191002447872, '2022-06-04 18:45:09.595000', 1399985191002447872, '2022-06-04 18:45:09.595000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132916899840, 'UserAdminController#update', '修改用户', 'POST', '/user/admin/update', '管理用户(管理员级别)', b'1', b'1', '管理用户(管理员级别) 修改用户', 1399985191002447872, '2022-06-04 18:45:09.596000', 1399985191002447872, '2022-06-04 18:45:09.596000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132916899841, 'OrderOperateController#cancelOrderState', '取消订单', 'POST', '/order/cancelOrderState', '订单操作', b'1', b'1', '订单操作 取消订单', 1399985191002447872, '2022-06-04 18:45:09.596000', 1399985191002447872, '2022-06-04 18:45:09.596000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132916899842, 'ClientController#delete', '删除终端', 'DELETE', '/client/delete', '终端管理', b'1', b'1', '终端管理 删除终端', 1399985191002447872, '2022-06-04 18:45:09.596000', 1399985191002447872, '2022-06-04 18:45:09.596000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132916899843, 'PaymentController#findPayTypeInfoByBusinessId', '根据businessId获取订单支付方式', 'GET', '/payment/findPayTypeInfoByBusinessId', '支付记录', b'1', b'1', '支付记录 根据businessId获取订单支付方式', 1399985191002447872, '2022-06-04 18:45:09.596000', 1399985191002447872, '2022-06-04 18:45:09.596000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132921094144, 'DingTalkConfigController#add', '新增配置', 'POST', '/ding/config/add', '钉钉配置', b'1', b'1', '钉钉配置 新增配置', 1399985191002447872, '2022-06-04 18:45:09.597000', 1399985191002447872, '2022-06-04 18:45:09.597000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132921094145, 'SpecificationController#update', '修改', 'POST', '/specification/update', '规格', b'1', b'1', '规格 修改', 1399985191002447872, '2022-06-04 18:45:09.597000', 1399985191002447872, '2022-06-04 18:45:09.597000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132921094146, 'InventoryController#unlockInventory', '释放预占的SKU库存，需使用token', 'POST', '/inventory/unlockInventory', '库存操作', b'1', b'1', '库存操作 释放预占的SKU库存，需使用token', 1399985191002447872, '2022-06-04 18:45:09.597000', 1399985191002447872, '2022-06-04 18:45:09.597000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132925288448, 'CategoryParameterController#existsByName', '判断类目参数是否已经存在', 'GET', '/categoryParameter/existsByName', '类目参数', b'1', b'1', '类目参数 判断类目参数是否已经存在', 1399985191002447872, '2022-06-04 18:45:09.598000', 1399985191002447872, '2022-06-04 18:45:09.598000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132925288449, 'DataEncryptDemoController#delete', '删除', 'DELETE', '/demo/data/encrypt/delete', '数据加密解密演示', b'1', b'1', '数据加密解密演示 删除', 1399985191002447872, '2022-06-04 18:45:09.598000', 1399985191002447872, '2022-06-04 18:45:09.598000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132925288450, 'AlipayConfigController#setUpActivity', '启用指定的支付宝配置', 'POST', '/alipay/setUpActivity', '支付宝配置', b'1', b'1', '支付宝配置 启用指定的支付宝配置', 1399985191002447872, '2022-06-04 18:45:09.598000', 1399985191002447872, '2022-06-04 18:45:09.598000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132929482752, 'DataScopeController#findById', '获取', 'GET', '/data/scope/findById', '数据范围权限配置', b'1', b'1', '数据范围权限配置 获取', 1399985191002447872, '2022-06-04 18:45:09.599000', 1399985191002447872, '2022-06-04 18:45:09.599000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132929482753, 'ClientController#findByCode', '通过code查询终端', 'GET', '/client/findByCode', '终端管理', b'1', b'1', '终端管理 通过code查询终端', 1399985191002447872, '2022-06-04 18:45:09.599000', 1399985191002447872, '2022-06-04 18:45:09.599000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132929482754, 'DataPermDemoController#delete', '删除', 'DELETE', '/demo/data/perm/delete', '数据权限演示', b'1', b'1', '数据权限演示 删除', 1399985191002447872, '2022-06-04 18:45:09.599000', 1399985191002447872, '2022-06-04 18:45:09.599000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132933677056, 'DingRobotSendController#sendMarkdown', '测试发送Markdown', 'POST', '/ding/robot/send/markdown', '钉钉机器人发送', b'1', b'1', '钉钉机器人发送 测试发送Markdown', 1399985191002447872, '2022-06-04 18:45:09.600000', 1399985191002447872, '2022-06-04 18:45:09.600000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132933677057, 'OrderRecommendController#findActivity', '查询适用的活动', 'POST', '/order/recommend/findActivity', '订单优惠选择与推荐', b'1', b'1', '订单优惠选择与推荐 查询适用的活动', 1399985191002447872, '2022-06-04 18:45:09.600000', 1399985191002447872, '2022-06-04 18:45:09.600000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132933677058, 'ActivityController#get', '查询活动', 'GET', '/activity//get/{id}', '活动', b'1', b'1', '活动 查询活动', 1399985191002447872, '2022-06-04 18:45:09.600000', 1399985191002447872, '2022-06-04 18:45:09.600000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132937871360, 'QuartzJobController#judgeJobClass', '判断是否是定时任务类', 'GET', '/quartz/judgeJobClass', '定时任务', b'1', b'1', '定时任务 判断是否是定时任务类', 1399985191002447872, '2022-06-04 18:45:09.601000', 1399985191002447872, '2022-06-04 18:45:09.601000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132937871361, 'TokenEndpoint#loginOpenId', '三方登录登录', 'POST', '/token/loginOpenId', '认证相关', b'1', b'1', '认证相关 三方登录登录', 1399985191002447872, '2022-06-04 18:45:09.601000', 1399985191002447872, '2022-06-04 18:45:09.601000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132937871362, 'AlipayConfigController#clearActivity', '清除指定的支付宝配置', 'POST', '/alipay/clearActivity', '支付宝配置', b'1', b'1', '支付宝配置 清除指定的支付宝配置', 1399985191002447872, '2022-06-04 18:45:09.601000', 1399985191002447872, '2022-06-04 18:45:09.601000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132942065664, 'StrategyController#update', '更新策略', 'POST', '/strategy/update', '策略定义', b'1', b'1', '策略定义 更新策略', 1399985191002447872, '2022-06-04 18:45:09.602000', 1399985191002447872, '2022-06-04 18:45:09.602000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132942065665, 'UserDeptController#findAllByUser', '根据用户ID获取到部门集合', 'GET', '/user/dept/findAllByUser', '用户部门关联关系', b'1', b'1', '用户部门关联关系 根据用户ID获取到部门集合', 1399985191002447872, '2022-06-04 18:45:09.602000', 1399985191002447872, '2022-06-04 18:45:09.602000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132942065666, 'StrategyController#findConfigs', '获取参数配置', 'GET', '/strategy/findConfigs', '策略定义', b'1', b'1', '策略定义 获取参数配置', 1399985191002447872, '2022-06-04 18:45:09.602000', 1399985191002447872, '2022-06-04 18:45:09.602000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132946259968, 'RoleController#existsByCode', '编码是否被使用', 'GET', '/role/existsByCode', '角色管理', b'1', b'1', '角色管理 编码是否被使用', 1399985191002447872, '2022-06-04 18:45:09.603000', 1399985191002447872, '2022-06-04 18:45:09.603000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132946259969, 'DingRobotSendController#sendText', '测试发送text', 'POST', '/ding/robot/send/text', '钉钉机器人发送', b'1', b'1', '钉钉机器人发送 测试发送text', 1399985191002447872, '2022-06-04 18:45:09.603000', 1399985191002447872, '2022-06-04 18:45:09.603000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132946259970, 'QuartzJobController#stop', '停止', 'POST', '/quartz/stop', '定时任务', b'1', b'1', '定时任务 停止', 1399985191002447872, '2022-06-04 18:45:09.603000', 1399985191002447872, '2022-06-04 18:45:09.603000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132950454272, 'SystemParamController#update', '更新', 'POST', '/system/param/update', '系统参数', b'1', b'1', '系统参数 更新', 1399985191002447872, '2022-06-04 18:45:09.604000', 1399985191002447872, '2022-06-04 18:45:09.604000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132950454273, 'CodeGeneratorController#codeGenPreview', '预览生成代码', 'POST', '/gen/code/codeGenPreview', '代码生成', b'1', b'1', '代码生成 预览生成代码', 1399985191002447872, '2022-06-04 18:45:09.604000', 1399985191002447872, '2022-06-04 18:45:09.604000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132950454274, 'DataScopeController#saveDeptAssign', '保存关联部门', 'POST', '/data/scope/saveDeptAssign', '数据范围权限配置', b'1', b'1', '数据范围权限配置 保存关联部门', 1399985191002447872, '2022-06-04 18:45:09.604000', 1399985191002447872, '2022-06-04 18:45:09.604000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132950454275, 'PayCallbackController#wechat', '微信支付回调', 'POST', '/pay/callback/wechat', '支付回调', b'1', b'1', '支付回调 微信支付回调', 1399985191002447872, '2022-06-04 18:45:09.604000', 1399985191002447872, '2022-06-04 18:45:09.604000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132954648576, 'UserDeptController#saveAndUpdate', '给用户分配部门', 'POST', '/user/dept/saveAndUpdate', '用户部门关联关系', b'1', b'1', '用户部门关联关系 给用户分配部门', 1399985191002447872, '2022-06-04 18:45:09.605000', 1399985191002447872, '2022-06-04 18:45:09.605000', b'1', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132954648577, 'BrandController#page', '分页查询', 'GET', '/brand/page', '品牌', b'1', b'1', '品牌 分页查询', 1399985191002447872, '2022-06-04 18:45:09.605000', 1399985191002447872, '2022-06-04 18:45:09.605000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132954648578, 'QuartzJobController#page', '分页', 'GET', '/quartz/page', '定时任务', b'1', b'1', '定时任务 分页', 1399985191002447872, '2022-06-04 18:45:09.605000', 1399985191002447872, '2022-06-04 18:45:09.605000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132958842880, 'DictionaryController#findAll', '查询全部', 'GET', '/translate/findAll', '字典', b'1', b'1', '字典 查询全部', 1399985191002447872, '2022-06-04 18:45:09.606000', 1399985191002447872, '2022-06-04 18:45:09.606000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132958842881, 'DingRobotConfigController#delete', '删除', 'DELETE', '/ding/robot/config/delete', '钉钉机器人配置', b'1', b'1', '钉钉机器人配置 删除', 1399985191002447872, '2022-06-04 18:45:09.606000', 1399985191002447872, '2022-06-04 18:45:09.606000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132958842882, 'RoleMenuController#getPermissions', '获取菜单和资源权限', 'GET', '/role/menu/getPermissions', '角色菜单权限关系', b'1', b'1', '角色菜单权限关系 获取菜单和资源权限', 1399985191002447872, '2022-06-04 18:45:09.606000', 1399985191002447872, '2022-06-04 18:45:09.606000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132963037184, 'VoucherController#findByCardNo', '根据卡号查询', 'GET', '/voucher/findByCardNo', '储值卡', b'1', b'1', '储值卡 根据卡号查询', 1399985191002447872, '2022-06-04 18:45:09.607000', 1399985191002447872, '2022-06-04 18:45:09.607000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132963037185, 'DingTalkConfigController#findById', '获取详情', 'GET', '/ding/config/findById', '钉钉配置', b'1', b'1', '钉钉配置 获取详情', 1399985191002447872, '2022-06-04 18:45:09.607000', 1399985191002447872, '2022-06-04 18:45:09.607000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132963037186, 'UserAdminController#findById', '根据用户id查询用户', 'GET', '/user/admin/findById', '管理用户(管理员级别)', b'1', b'1', '管理用户(管理员级别) 根据用户id查询用户', 1399985191002447872, '2022-06-04 18:45:09.607000', 1399985191002447872, '2022-06-04 18:45:09.607000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132967231488, 'QuartzJobLogController#page', '分页', 'GET', '/quartz/log/page', '定时任务执行日志', b'1', b'1', '定时任务执行日志 分页', 1399985191002447872, '2022-06-04 18:45:09.608000', 1399985191002447872, '2022-06-04 18:45:09.608000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132967231489, 'DingTalkConfigController#clearEnable', '清除启用状态', 'POST', '/ding/config/clearEnable', '钉钉配置', b'1', b'1', '钉钉配置 清除启用状态', 1399985191002447872, '2022-06-04 18:45:09.608000', 1399985191002447872, '2022-06-04 18:45:09.608000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132967231490, 'CouponTemplateController#get', '优惠券模板详情', 'POST', '/coupon/template/get/{id}', '优惠券模板', b'1', b'1', '优惠券模板 优惠券模板详情', 1399985191002447872, '2022-06-04 18:45:09.608000', 1399985191002447872, '2022-06-04 18:45:09.608000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132967231491, 'SystemParamController#page', '分页', 'GET', '/system/param/page', '系统参数', b'1', b'1', '系统参数 分页', 1399985191002447872, '2022-06-04 18:45:09.608000', 1399985191002447872, '2022-06-04 18:45:09.609000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132971425792, 'InventoryController#reduceInventory', '扣减指定 SKU 的预占库存，增加对应售出', 'POST', '/inventory/reduceInventory', '库存操作', b'1', b'1', '库存操作 扣减指定 SKU 的预占库存，增加对应售出', 1399985191002447872, '2022-06-04 18:45:09.609000', 1399985191002447872, '2022-06-04 18:45:09.609000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132971425793, 'WalletController#getWalletInfo', '获取钱包综合信息', 'GET', '/wallet/getWalletInfo', '钱包相关的接口', b'1', b'1', '钱包相关的接口 获取钱包综合信息', 1399985191002447872, '2022-06-04 18:45:09.609000', 1399985191002447872, '2022-06-04 18:45:09.609000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132971425794, 'WalletController#pageByNotWallet', '分页', 'GET', '/wallet/pageByNotWallet', '钱包相关的接口', b'1', b'1', '钱包相关的接口 分页', 1399985191002447872, '2022-06-04 18:45:09.609000', 1399985191002447872, '2022-06-04 18:45:09.609000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132975620096, 'UserAdminController#lock', '锁定用户', 'POST', '/user/admin/lock', '管理用户(管理员级别)', b'1', b'1', '管理用户(管理员级别) 锁定用户', 1399985191002447872, '2022-06-04 18:45:09.610000', 1399985191002447872, '2022-06-04 18:45:09.610000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132975620097, 'TestController#say', '测试回声', 'GET', '/test/say', '测试控制器', b'1', b'1', '测试控制器 测试回声', 1399985191002447872, '2022-06-04 18:45:09.610000', 1399985191002447872, '2022-06-04 18:45:09.610000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132975620098, 'PayController#refund', '退款', 'POST', '/uni_pay/refund', '统一支付', b'1', b'1', '统一支付 退款', 1399985191002447872, '2022-06-04 18:45:09.610000', 1399985191002447872, '2022-06-04 18:45:09.610000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132979814400, 'WeChatPayConfigController#setUpActivity', '设置启用的微信支付配置', 'POST', '/wechat/pay/setUpActivity', '微信支付', b'1', b'1', '微信支付 设置启用的微信支付配置', 1399985191002447872, '2022-06-04 18:45:09.611000', 1399985191002447872, '2022-06-04 18:45:09.611000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132979814401, 'TestController#sendWsByUserId', '发送ws消息', 'POST', '/test/sendWsByUserId', '测试控制器', b'1', b'1', '测试控制器 发送ws消息', 1399985191002447872, '2022-06-04 18:45:09.611000', 1399985191002447872, '2022-06-04 18:45:09.611000', b'1', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132979814402, 'PermMenuController#findById', '根据id查询', 'GET', '/perm/menu/findById', '菜单权限资源', b'1', b'1', '菜单权限资源 根据id查询', 1399985191002447872, '2022-06-04 18:45:09.611000', 1399985191002447872, '2022-06-04 18:45:09.611000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132979814403, 'WeChatPayConfigController#clearActivity', '清除指定的微信支付配置', 'POST', '/wechat/pay/clearActivity', '微信支付', b'1', b'1', '微信支付 清除指定的微信支付配置', 1399985191002447872, '2022-06-04 18:45:09.611000', 1399985191002447872, '2022-06-04 18:45:09.611000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132984008704, 'PermPathController#findById', '获取详情', 'GET', '/perm/path/findById', '请求权限资源', b'1', b'1', '请求权限资源 获取详情', 1399985191002447872, '2022-06-04 18:45:09.612000', 1399985191002447872, '2022-06-04 18:45:09.612000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132984008705, 'RefundRecordController#findById', '根据id查询', 'GET', '/pay/refund/findById', '退款记录', b'1', b'1', '退款记录 根据id查询', 1399985191002447872, '2022-06-04 18:45:09.612000', 1399985191002447872, '2022-06-04 18:45:09.612000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132984008706, 'DatabaseTableController#findAll', '表列表', 'GET', '/gen/table/findAll', '数据库表信息', b'1', b'1', '数据库表信息 表列表', 1399985191002447872, '2022-06-04 18:45:09.612000', 1399985191002447872, '2022-06-04 18:45:09.612000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132988203008, 'CategoryParameterGroupController#delete', '删除', 'DELETE', '/categoryParameterGroup/delete', '类目参数组', b'1', b'1', '类目参数组 删除', 1399985191002447872, '2022-06-04 18:45:09.613000', 1399985191002447872, '2022-06-04 18:45:09.613000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132988203009, 'InventoryController#unlockInventoryWithoutToken', '解锁没有令牌的库存', 'POST', '/inventory/unlockInventoryWithoutToken', '库存操作', b'1', b'1', '库存操作 解锁没有令牌的库存', 1399985191002447872, '2022-06-04 18:45:09.613000', 1399985191002447872, '2022-06-04 18:45:09.613000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132988203010, 'SystemParamController#findById', '获取单条', 'GET', '/system/param/findById', '系统参数', b'1', b'1', '系统参数 获取单条', 1399985191002447872, '2022-06-04 18:45:09.613000', 1399985191002447872, '2022-06-04 18:45:09.613000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132992397312, 'WalletController#findByUser', '根据用户查询钱包', 'GET', '/wallet/findByUser', '钱包相关的接口', b'1', b'1', '钱包相关的接口 根据用户查询钱包', 1399985191002447872, '2022-06-04 18:45:09.614000', 1399985191002447872, '2022-06-04 18:45:09.614000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132992397313, 'SuperQueryDemoController#add', '添加', 'POST', '/demo/super/query/add', '超级查询演示', b'1', b'1', '超级查询演示 添加', 1399985191002447872, '2022-06-04 18:45:09.614000', 1399985191002447872, '2022-06-04 18:45:09.614000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132992397314, 'SpecificationController#findAll', '查询所有', 'GET', '/specification/findAll', '规格', b'1', b'1', '规格 查询所有', 1399985191002447872, '2022-06-04 18:45:09.614000', 1399985191002447872, '2022-06-04 18:45:09.614000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132992397315, 'DingRobotConfigController#findById', '获取详情', 'GET', '/ding/robot/config/findById', '钉钉机器人配置', b'1', b'1', '钉钉机器人配置 获取详情', 1399985191002447872, '2022-06-04 18:45:09.614000', 1399985191002447872, '2022-06-04 18:45:09.614000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132996591616, 'UserInfoController#updateBaseInfo', '修改用户基础信息', 'POST', '/user/updateBaseInfo', '用户管理', b'1', b'1', '用户管理 修改用户基础信息', 1399985191002447872, '2022-06-04 18:45:09.615000', 1399985191002447872, '2022-06-04 18:45:09.615000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132996591617, 'DataScopeController#findAll', '查询全部', 'GET', '/data/scope/findAll', '数据范围权限配置', b'1', b'1', '数据范围权限配置 查询全部', 1399985191002447872, '2022-06-04 18:45:09.615000', 1399985191002447872, '2022-06-04 18:45:09.615000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037132996591618, 'UserDataScopeController#findAllByUser', '根据用户ID获取到部门集合', 'GET', '/user/data/scope/findAllByUser', '用户数据权限配置', b'1', b'1', '用户数据权限配置 根据用户ID获取到部门集合', 1399985191002447872, '2022-06-04 18:45:09.615000', 1399985191002447872, '2022-06-04 18:45:09.615000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133000785920, 'StrategyController#findAll', '查询全部策略', 'GET', '/strategy/findAll', '策略定义', b'1', b'1', '策略定义 查询全部策略', 1399985191002447872, '2022-06-04 18:45:09.616000', 1399985191002447872, '2022-06-04 18:45:09.616000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133000785921, 'PaymentController#findById', '根据id获取', 'GET', '/payment/findById', '支付记录', b'1', b'1', '支付记录 根据id获取', 1399985191002447872, '2022-06-04 18:45:09.616000', 1399985191002447872, '2022-06-04 18:45:09.616000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133000785922, 'CouponTemplateController#addCouponTemplate', '新建优惠券模板', 'POST', '/coupon/template/add', '优惠券模板', b'1', b'1', '优惠券模板 新建优惠券模板', 1399985191002447872, '2022-06-04 18:45:09.616000', 1399985191002447872, '2022-06-04 18:45:09.616000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133000785923, 'WalletController#page', '分页', 'GET', '/wallet/page', '钱包相关的接口', b'1', b'1', '钱包相关的接口 分页', 1399985191002447872, '2022-06-04 18:45:09.616000', 1399985191002447872, '2022-06-04 18:45:09.616000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133004980224, 'InventoryController#reduceSoldAndCapacity', '扣减指定 SKU 的售出库存并减少总库存', 'POST', '/inventory/reduceSoldAndCapacity', '库存操作', b'1', b'1', '库存操作 扣减指定 SKU 的售出库存并减少总库存', 1399985191002447872, '2022-06-04 18:45:09.617000', 1399985191002447872, '2022-06-04 18:45:09.617000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133004980225, 'MultipleOpenApiWebMvcResource#openapiYaml', 'openapiYaml', 'GET', '/v3/api-docs.yaml/{group}', 'MultipleOpenApiWebMvcResource', b'0', b'0', 'MultipleOpenApiWebMvcResource openapiYaml', 1399985191002447872, '2022-06-04 18:45:09.617000', 1399985191002447872, '2022-06-04 18:47:22.698000', b'0', 1); -INSERT INTO `iam_perm_path` VALUES (1533037133004980226, 'DataEncryptDemoController#page', '分页查询', 'GET', '/demo/data/encrypt/page', '数据加密解密演示', b'1', b'1', '数据加密解密演示 分页查询', 1399985191002447872, '2022-06-04 18:45:09.617000', 1399985191002447872, '2022-06-04 18:45:09.617000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133009174528, 'QuartzJobController#start', '启动', 'POST', '/quartz/start', '定时任务', b'1', b'1', '定时任务 启动', 1399985191002447872, '2022-06-04 18:45:09.618000', 1399985191002447872, '2022-06-04 18:45:09.618000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133009174529, 'AppVersionController#page', '分页', 'GET', '/app/version/page', 'app版本管理', b'1', b'1', 'app版本管理 分页', 1399985191002447872, '2022-06-04 18:45:09.618000', 1399985191002447872, '2022-06-04 18:45:09.618000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133009174530, 'FIleUpLoadController#local', '上传', 'POST', '/file/upload', '文件上传', b'0', b'0', '文件上传 上传', 1399985191002447872, '2022-06-04 18:45:09.618000', 1399985191002447872, '2022-06-04 18:46:08.153000', b'0', 1); -INSERT INTO `iam_perm_path` VALUES (1533037133009174531, 'AppVersionController#delete', '删除', 'DELETE', '/app/version/delete', 'app版本管理', b'1', b'1', 'app版本管理 删除', 1399985191002447872, '2022-06-04 18:45:09.618000', 1399985191002447872, '2022-06-04 18:45:09.618000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133013368832, 'DeptController#deleteAndChildren', '强制级联删除', 'DELETE', '/dept/deleteAndChildren', '部门管理', b'1', b'1', '部门管理 强制级联删除', 1399985191002447872, '2022-06-04 18:45:09.619000', 1399985191002447872, '2022-06-04 18:45:09.619000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133013368833, 'SuperQueryDemoController#delete', '删除', 'DELETE', '/demo/super/query/delete', '超级查询演示', b'1', b'1', '超级查询演示 删除', 1399985191002447872, '2022-06-04 18:45:09.619000', 1399985191002447872, '2022-06-04 18:45:09.619000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133013368834, 'ClientController#existsByCode', '编码是否被使用', 'GET', '/client/existsByCode', '终端管理', b'1', b'1', '终端管理 编码是否被使用', 1399985191002447872, '2022-06-04 18:45:09.619000', 1399985191002447872, '2022-06-04 18:45:09.619000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133017563136, 'OrderOperateController#placeOrder', '传入订单和优惠, 下单', 'POST', '/order/placeOrder', '订单操作', b'1', b'1', '订单操作 传入订单和优惠, 下单', 1399985191002447872, '2022-06-04 18:45:09.620000', 1399985191002447872, '2022-06-04 18:45:09.620000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133017563137, 'GoodsController#findById', '查询包含商品信息', 'GET', '/goods/findById', '商品管理', b'1', b'1', '商品管理 查询包含商品信息', 1399985191002447872, '2022-06-04 18:45:09.620000', 1399985191002447872, '2022-06-04 18:45:09.620000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133021757440, 'GoodsSkuController#add', '添加商品sku', 'POST', '/sku/add', 'sku操作', b'1', b'1', 'sku操作 添加商品sku', 1399985191002447872, '2022-06-04 18:45:09.621000', 1399985191002447872, '2022-06-04 18:45:09.621000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133021757441, 'LoginLogController#findById', '获取', 'GET', '/log/login/findById', '登录日志', b'1', b'1', '登录日志 获取', 1399985191002447872, '2022-06-04 18:45:09.621000', 1399985191002447872, '2022-06-04 18:45:09.621000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133021757442, 'CategoryParameterGroupController#existsByName', '判断类目参数组是否已经存在', 'GET', '/categoryParameterGroup/existsByName', '类目参数组', b'1', b'1', '类目参数组 判断类目参数组是否已经存在', 1399985191002447872, '2022-06-04 18:45:09.621000', 1399985191002447872, '2022-06-04 18:45:09.621000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133025951744, 'UserInfoController#updatePassword', '修改密码', 'POST', '/user/updatePassword', '用户管理', b'1', b'1', '用户管理 修改密码', 1399985191002447872, '2022-06-04 18:45:09.622000', 1399985191002447872, '2022-06-04 18:45:09.622000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133025951745, 'DataScopeController#existsByName', '名称是否被使用', 'GET', '/data/scope/existsByName', '数据范围权限配置', b'1', b'1', '数据范围权限配置 名称是否被使用', 1399985191002447872, '2022-06-04 18:45:09.622000', 1399985191002447872, '2022-06-04 18:45:09.622000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133025951746, 'GoodsSkuController#getById', '获取sku', 'GET', '/sku/get', 'sku操作', b'1', b'1', 'sku操作 获取sku', 1399985191002447872, '2022-06-04 18:45:09.622000', 1399985191002447872, '2022-06-04 18:45:09.622000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133030146048, 'GoodsController#add', '添加商品', 'POST', '/goods/add', '商品管理', b'1', b'1', '商品管理 添加商品', 1399985191002447872, '2022-06-04 18:45:09.623000', 1399985191002447872, '2022-06-04 18:45:09.623000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133030146049, 'IdempotencyDemoController#lock0', '分布式锁(不暂停)', 'POST', '/demo/lock/lock0', '幂等控制演示', b'1', b'1', '幂等控制演示 分布式锁(不暂停)', 1399985191002447872, '2022-06-04 18:45:09.623000', 1399985191002447872, '2022-06-04 18:45:09.623000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133030146050, 'RoleController#existsByName', '名称是否被使用(不包含自己)', 'GET', '/role/existsByNameNotId', '角色管理', b'1', b'1', '角色管理 名称是否被使用(不包含自己)', 1399985191002447872, '2022-06-04 18:45:09.623000', 1399985191002447872, '2022-06-04 18:45:09.623000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133030146051, 'CaptchaController#imgCaptcha', '获取图片验证码', 'POST', '/captcha/imgCaptcha', '验证码服务', b'1', b'1', '验证码服务 获取图片验证码', 1399985191002447872, '2022-06-04 18:45:09.623000', 1399985191002447872, '2022-06-04 18:45:09.623000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133034340352, 'PaymentController#page', '分页查询', 'GET', '/payment/page', '支付记录', b'1', b'1', '支付记录 分页查询', 1399985191002447872, '2022-06-04 18:45:09.624000', 1399985191002447872, '2022-06-04 18:45:09.624000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133034340353, 'OpenApiWebMvcResource#openapiJson', 'openapiJson', 'GET', '/v3/api-docs', 'OpenApiWebMvcResource', b'0', b'0', 'OpenApiWebMvcResource openapiJson', 1399985191002447872, '2022-06-04 18:45:09.624000', 1399985191002447872, '2022-06-04 18:47:25.990000', b'0', 1); -INSERT INTO `iam_perm_path` VALUES (1533037133034340354, 'UserAdminController#page', '分页', 'GET', '/user/admin/page', '管理用户(管理员级别)', b'1', b'1', '管理用户(管理员级别) 分页', 1399985191002447872, '2022-06-04 18:45:09.624000', 1399985191002447872, '2022-06-04 18:45:09.624000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133034340355, 'SuperQueryDemoController#update', '修改', 'POST', '/demo/super/query/update', '超级查询演示', b'1', b'1', '超级查询演示 修改', 1399985191002447872, '2022-06-04 18:45:09.624000', 1399985191002447872, '2022-06-04 18:45:09.625000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133038534656, 'OperateLogController#page', '分页', 'GET', '/log/operate/page', '操作日志', b'1', b'1', '操作日志 分页', 1399985191002447872, '2022-06-04 18:45:09.625000', 1399985191002447872, '2022-06-04 18:45:09.625000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133038534657, 'DictionaryController#findById', '根据id获取', 'GET', '/translate/findById', '字典', b'1', b'1', '字典 根据id获取', 1399985191002447872, '2022-06-04 18:45:09.625000', 1399985191002447872, '2022-06-04 18:45:09.625000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133042728960, 'DingRobotConfigController#findAll', '查询全部', 'GET', '/ding/robot/config/findAll', '钉钉机器人配置', b'1', b'1', '钉钉机器人配置 查询全部', 1399985191002447872, '2022-06-04 18:45:09.626000', 1399985191002447872, '2022-06-04 18:45:09.626000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133042728961, 'StrategyRegisterController#findAll', '查询全部', 'GET', '/strategy/register/findAll', '策略注册', b'1', b'1', '策略注册 查询全部', 1399985191002447872, '2022-06-04 18:45:09.626000', 1399985191002447872, '2022-06-04 18:45:09.626000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133042728962, 'CategoryController#findById', '通过 id 获取指定类目', 'GET', '/category/findById', '类目管理', b'1', b'1', '类目管理 通过 id 获取指定类目', 1399985191002447872, '2022-06-04 18:45:09.626000', 1399985191002447872, '2022-06-04 18:45:09.626000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133046923264, 'CategoryController#findBindSpecIds', '根据类目id查询关联的绑定规格id集合', 'GET', '/category/findBindSpecIds', '类目管理', b'1', b'1', '类目管理 根据类目id查询关联的绑定规格id集合', 1399985191002447872, '2022-06-04 18:45:09.627000', 1399985191002447872, '2022-06-04 18:45:09.627000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133046923265, 'RefundRecordController#page', '分页', 'GET', '/pay/refund/page', '退款记录', b'1', b'1', '退款记录 分页', 1399985191002447872, '2022-06-04 18:45:09.627000', 1399985191002447872, '2022-06-04 18:45:09.627000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133046923266, 'RoleController#delete', '删除角色', 'DELETE', '/role/delete', '角色管理', b'1', b'1', '角色管理 删除角色', 1399985191002447872, '2022-06-04 18:45:09.627000', 1399985191002447872, '2022-06-04 18:45:09.627000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133051117568, 'GoodsController#findByCategory', '按类目查询', 'GET', '/goods/findByCategory', '商品管理', b'1', b'1', '商品管理 按类目查询', 1399985191002447872, '2022-06-04 18:45:09.628000', 1399985191002447872, '2022-06-04 18:45:09.628000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133051117569, 'IdempotencyDemoController#idempotency', '幂等演示', 'POST', '/demo/lock/idempotency', '幂等控制演示', b'1', b'1', '幂等控制演示 幂等演示', 1399985191002447872, '2022-06-04 18:45:09.628000', 1399985191002447872, '2022-06-04 18:45:09.628000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133051117570, 'AppVersionController#add', '添加', 'POST', '/app/version/add', 'app版本管理', b'1', b'1', 'app版本管理 添加', 1399985191002447872, '2022-06-04 18:45:09.628000', 1399985191002447872, '2022-06-04 18:45:09.628000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133055311872, 'TestController#sequenceZdy', '序列生成器自定义', 'GET', '/test/sequenceZdy', '测试控制器', b'1', b'1', '测试控制器 发号器自定义', 1399985191002447872, '2022-06-04 18:45:09.629000', 1399985191002447872, '2022-06-04 18:45:09.629000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133055311873, 'CategoryParameterController#delete', '删除', 'DELETE', '/categoryParameter/delete', '类目参数', b'1', b'1', '类目参数 删除', 1399985191002447872, '2022-06-04 18:45:09.629000', 1399985191002447872, '2022-06-04 18:45:09.629000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133055311874, 'DataSensitiveDemoController#update', '修改', 'POST', '/demo/data/sensitive/update', '数据脱敏演示', b'1', b'1', '数据脱敏演示 修改', 1399985191002447872, '2022-06-04 18:45:09.629000', 1399985191002447872, '2022-06-04 18:45:09.629000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133055311875, 'SpecificationController#add', '添加', 'POST', '/specification/add', '规格', b'1', b'1', '规格 添加', 1399985191002447872, '2022-06-04 18:45:09.629000', 1399985191002447872, '2022-06-04 18:45:09.629000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133059506176, 'PayNotifyRecordController#findById', '根据id查询', 'GET', '/pay/notify/record/findById', '支付回调记录', b'1', b'1', '支付回调记录 根据id查询', 1399985191002447872, '2022-06-04 18:45:09.630000', 1399985191002447872, '2022-06-04 18:45:09.630000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133059506177, 'DataSensitiveDemoController#add', '添加', 'POST', '/demo/data/sensitive/add', '数据脱敏演示', b'1', b'1', '数据脱敏演示 添加', 1399985191002447872, '2022-06-04 18:45:09.630000', 1399985191002447872, '2022-06-04 18:45:09.630000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133059506178, 'CouponController#findCoupon', '个人可用的优惠券', 'GET', '/coupon/findCoupon', '优惠券', b'1', b'1', '优惠券 个人可用的优惠券', 1399985191002447872, '2022-06-04 18:45:09.630000', 1399985191002447872, '2022-06-04 18:45:09.630000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133063700480, 'RoleMenuController#save', '保存请求权限关系', 'POST', '/role/menu/save', '角色菜单权限关系', b'1', b'1', '角色菜单权限关系 保存请求权限关系', 1399985191002447872, '2022-06-04 18:45:09.631000', 1399985191002447872, '2022-06-04 18:45:09.631000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133063700481, 'OrderFindController#findOrderSkuIds', '查询订单包含的skuIds', 'GET', '/order/findOrderSkuIds', '订单查询', b'1', b'1', '订单查询 查询订单包含的skuIds', 1399985191002447872, '2022-06-04 18:45:09.631000', 1399985191002447872, '2022-06-04 18:45:09.631000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133063700482, 'CategoryController#bindBrand', '绑定品牌', 'POST', '/category/bindBrand', '类目管理', b'1', b'1', '类目管理 绑定品牌', 1399985191002447872, '2022-06-04 18:45:09.631000', 1399985191002447872, '2022-06-04 18:45:09.631000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133067894784, 'FIleUpLoadController#preview', '预览文件', 'GET', '/file/preview/{id}', '文件上传', b'0', b'0', '文件上传 预览文件', 1399985191002447872, '2022-06-04 18:45:09.632000', 1399985191002447872, '2022-06-04 18:46:13.683000', b'0', 1); -INSERT INTO `iam_perm_path` VALUES (1533037133067894785, 'DatabaseTableController#findColumnByTableName', '获取数据表行信息', 'GET', '/gen/table/findColumnByTableName', '数据库表信息', b'1', b'1', '数据库表信息 获取数据表行信息', 1399985191002447872, '2022-06-04 18:45:09.632000', 1399985191002447872, '2022-06-04 18:45:09.632000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133067894786, 'LoginLogController#page', '分页', 'GET', '/log/login/page', '登录日志', b'1', b'1', '登录日志 分页', 1399985191002447872, '2022-06-04 18:45:09.632000', 1399985191002447872, '2022-06-04 18:45:09.632000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133067894787, 'CategoryController#findAll', '获取所有类目', 'GET', '/category/findAll', '类目管理', b'1', b'1', '类目管理 获取所有类目', 1399985191002447872, '2022-06-04 18:45:09.632000', 1399985191002447872, '2022-06-04 18:45:09.632000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133072089088, 'WalletLogController#pageByWalletId', '根据钱包id查询钱包日志(分页)', 'GET', '/wallet/log/pageByWalletId', '钱包日志相关的接口', b'1', b'1', '钱包日志相关的接口 根据钱包id查询钱包日志(分页)', 1399985191002447872, '2022-06-04 18:45:09.633000', 1399985191002447872, '2022-06-04 18:45:09.633000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133072089089, 'CategoryParameterGroupController#page', '分页查询', 'GET', '/categoryParameterGroup/page', '类目参数组', b'1', b'1', '类目参数组 分页查询', 1399985191002447872, '2022-06-04 18:45:09.633000', 1399985191002447872, '2022-06-04 18:45:09.633000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133072089090, 'RoleController#page', '分页查询角色', 'GET', '/role/page', '角色管理', b'1', b'1', '角色管理 分页查询角色', 1399985191002447872, '2022-06-04 18:45:09.633000', 1399985191002447872, '2022-06-04 18:45:09.633000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133072089091, 'WeChatPayConfigController#add', '添加微信支付配置', 'POST', '/wechat/pay/add', '微信支付', b'1', b'1', '微信支付 添加微信支付配置', 1399985191002447872, '2022-06-04 18:45:09.633000', 1399985191002447872, '2022-06-04 18:45:09.633000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133076283392, 'UserSocialLoginController#findById', '获取详情', 'POST', '/user/social/findById', '用户三方登录管理', b'1', b'1', '用户三方登录管理 获取详情', 1399985191002447872, '2022-06-04 18:45:09.634000', 1399985191002447872, '2022-06-04 18:45:09.634000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133076283393, 'DictionaryItemController#add', '添加字典项（返回字典项对象）', 'POST', '/translate/item/add', '字典项', b'1', b'1', '字典项 添加字典项（返回字典项对象）', 1399985191002447872, '2022-06-04 18:45:09.634000', 1399985191002447872, '2022-06-04 18:45:09.634000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133076283394, 'PaymentController#superPage', '分页查询(超级查询)', 'POST', '/payment/superPage', '支付记录', b'1', b'1', '支付记录 分页查询(超级查询)', 1399985191002447872, '2022-06-04 18:45:09.634000', 1399985191002447872, '2022-06-04 18:45:09.634000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133076283395, 'MessageQueueDemoController#sendMqttMsg', '发送MQTT消息', 'POST', '/demo/mq/sendMqttMsg', '测试消息队列', b'1', b'1', '测试消息队列 发送MQTT消息', 1399985191002447872, '2022-06-04 18:45:09.635000', 1399985191002447872, '2022-06-04 18:45:09.635000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133080477696, 'WalletController#lock', '锁定钱包', 'POST', '/wallet/lock', '钱包相关的接口', b'1', b'1', '钱包相关的接口 锁定钱包', 1399985191002447872, '2022-06-04 18:45:09.635000', 1399985191002447872, '2022-06-04 18:45:09.635000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133080477697, 'VoucherController#page', '分页', 'GET', '/voucher/page', '储值卡', b'1', b'1', '储值卡 分页', 1399985191002447872, '2022-06-04 18:45:09.635000', 1399985191002447872, '2022-06-04 18:45:09.635000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133080477698, 'UserAdminController#restartPassword', '重置密码', 'POST', '/user/admin/restartPassword', '管理用户(管理员级别)', b'1', b'1', '管理用户(管理员级别) 重置密码', 1399985191002447872, '2022-06-04 18:45:09.635000', 1399985191002447872, '2022-06-04 18:45:09.635000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133080477699, 'DingTalkConfigController#page', '分页', 'GET', '/ding/config/page', '钉钉配置', b'1', b'1', '钉钉配置 分页', 1399985191002447872, '2022-06-04 18:45:09.635000', 1399985191002447872, '2022-06-04 18:45:09.635000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133084672000, 'VoucherController#unlock', '启用', 'POST', '/voucher/unlock', '储值卡', b'1', b'1', '储值卡 启用', 1399985191002447872, '2022-06-04 18:45:09.636000', 1399985191002447872, '2022-06-04 18:45:09.636000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133084672001, 'OrderFindController#page', '订单列表 分页', 'GET', '/order/page', '订单查询', b'1', b'1', '订单查询 订单列表 分页', 1399985191002447872, '2022-06-04 18:45:09.636000', 1399985191002447872, '2022-06-04 18:45:09.636000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133084672002, 'UserAdminController#unlock', '解锁用户', 'POST', '/user/admin/unlock', '管理用户(管理员级别)', b'1', b'1', '管理用户(管理员级别) 解锁用户', 1399985191002447872, '2022-06-04 18:45:09.636000', 1399985191002447872, '2022-06-04 18:45:09.636000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133088866304, 'MessageQueueDemoController#sendRedisMsg', '发送RedisMq消息', 'POST', '/demo/mq/sendRedisMsg', '测试消息队列', b'1', b'1', '测试消息队列 发送RedisMq消息', 1399985191002447872, '2022-06-04 18:45:09.637000', 1399985191002447872, '2022-06-04 18:45:09.637000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133088866305, 'DictionaryItemController#findById', '根据字典项ID查询', 'GET', '/translate/item/findById', '字典项', b'1', b'1', '字典项 根据字典项ID查询', 1399985191002447872, '2022-06-04 18:45:09.637000', 1399985191002447872, '2022-06-04 18:45:09.637000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133088866306, 'GoodsController#findAll', '查询全部', 'GET', '/goods/findAll', '商品管理', b'1', b'1', '商品管理 查询全部', 1399985191002447872, '2022-06-04 18:45:09.637000', 1399985191002447872, '2022-06-04 18:45:09.637000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133088866307, 'WeChatPayConfigController#findPayWayList', '微信支持支付方式', 'GET', '/wechat/pay/findPayWayList', '微信支付', b'1', b'1', '微信支付 微信支持支付方式', 1399985191002447872, '2022-06-04 18:45:09.637000', 1399985191002447872, '2022-06-04 18:45:09.637000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133093060608, 'DataScopeController#existsByName', '名称是否被使用(不包含自己)', 'GET', '/data/scope/existsByNameNotId', '数据范围权限配置', b'1', b'1', '数据范围权限配置 名称是否被使用(不包含自己)', 1399985191002447872, '2022-06-04 18:45:09.638000', 1399985191002447872, '2022-06-04 18:45:09.638000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133093060609, 'CashierController#singlePay', '发起支付(单渠道)', 'POST', '/cashier/singlePay', '结算台', b'1', b'1', '结算台 发起支付(单渠道)', 1399985191002447872, '2022-06-04 18:45:09.638000', 1399985191002447872, '2022-06-04 18:45:09.638000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133093060610, 'QuartzJobController#findById', '单条', 'GET', '/quartz/findById', '定时任务', b'1', b'1', '定时任务 单条', 1399985191002447872, '2022-06-04 18:45:09.638000', 1399985191002447872, '2022-06-04 18:45:09.638000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133093060611, 'DataVersionLogController#page', '分页', 'GET', '/log/dataVersion/page', '数据版本日志', b'1', b'1', '数据版本日志 分页', 1399985191002447872, '2022-06-04 18:45:09.638000', 1399985191002447872, '2022-06-04 18:45:09.638000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133097254912, 'DictionaryItemController#pageByDictionaryId', '分页查询指定字典下的字典项', 'GET', '/translate/item/pageByDictionaryId', '字典项', b'1', b'1', '字典项 分页查询指定字典下的字典项', 1399985191002447872, '2022-06-04 18:45:09.639000', 1399985191002447872, '2022-06-04 18:45:09.639000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133097254913, 'FIleUpLoadController#getFilePreviewUrlPrefix', '获取文件预览地址前缀', 'GET', '/file/getFilePreviewUrlPrefix', '文件上传', b'0', b'0', '文件上传 获取文件预览地址前缀', 1399985191002447872, '2022-06-04 18:45:09.639000', 1399985191002447872, '2022-06-04 18:46:20.486000', b'0', 1); -INSERT INTO `iam_perm_path` VALUES (1533037133097254914, 'DictionaryItemController#existsByCode', '编码是否被使用(不包含自己)', 'GET', '/translate/item/existsByCodeNotId', '字典项', b'1', b'1', '字典项 编码是否被使用(不包含自己)', 1399985191002447872, '2022-06-04 18:45:09.639000', 1399985191002447872, '2022-06-04 18:45:09.639000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133097254915, 'UserInfoController#getUserSecurityInfo', '查询用户安全信息', 'GET', '/user/getUserSecurityInfo', '用户管理', b'1', b'1', '用户管理 查询用户安全信息', 1399985191002447872, '2022-06-04 18:45:09.639000', 1399985191002447872, '2022-06-04 18:45:09.639000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133101449216, 'DictionaryItemController#delete', '删除字典项', 'DELETE', '/translate/item/delete', '字典项', b'1', b'1', '字典项 删除字典项', 1399985191002447872, '2022-06-04 18:45:09.640000', 1399985191002447872, '2022-06-04 18:45:09.640000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133101449217, 'PermMenuController#resourceList', '资源列表', 'GET', '/perm/menu/resourceList', '菜单权限资源', b'1', b'1', '菜单权限资源 资源列表', 1399985191002447872, '2022-06-04 18:45:09.640000', 1399985191002447872, '2022-06-04 18:45:09.640000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133101449218, 'DatabaseTableController#page', '表列表分页', 'GET', '/gen/table/page', '数据库表信息', b'1', b'1', '数据库表信息 表列表分页', 1399985191002447872, '2022-06-04 18:45:09.640000', 1399985191002447872, '2022-06-04 18:45:09.640000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133101449219, 'DictionaryController#add', '添加', 'POST', '/translate/add', '字典', b'1', b'1', '字典 添加', 1399985191002447872, '2022-06-04 18:45:09.640000', 1399985191002447872, '2022-06-04 18:45:09.640000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133105643520, 'WalletController#unlock', '解锁钱包', 'POST', '/wallet/unlock', '钱包相关的接口', b'1', b'1', '钱包相关的接口 解锁钱包', 1399985191002447872, '2022-06-04 18:45:09.641000', 1399985191002447872, '2022-06-04 18:45:09.641000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133109837824, 'QuartzJobController#add', '添加', 'POST', '/quartz/add', '定时任务', b'1', b'1', '定时任务 添加', 1399985191002447872, '2022-06-04 18:45:09.642000', 1399985191002447872, '2022-06-04 18:45:09.642000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133109837825, 'DataScopeController#findUsersByDataScopeId', '获取关联的用户列表', 'GET', '/data/scope/findUsersByDataScopeId', '数据范围权限配置', b'1', b'1', '数据范围权限配置 获取关联的用户列表', 1399985191002447872, '2022-06-04 18:45:09.642000', 1399985191002447872, '2022-06-04 18:45:09.642000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133109837826, 'DataScopeController#update', '更新', 'POST', '/data/scope/update', '数据范围权限配置', b'1', b'1', '数据范围权限配置 更新', 1399985191002447872, '2022-06-04 18:45:09.642000', 1399985191002447872, '2022-06-04 18:45:09.642000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133109837827, 'SpecificationController#findById', '通过ID查询', 'GET', '/specification/findById', '规格', b'1', b'1', '规格 通过ID查询', 1399985191002447872, '2022-06-04 18:45:09.642000', 1399985191002447872, '2022-06-04 18:45:09.642000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133114032128, 'OnlineUserController#findBySessionId', '获取单条', 'GET', '/user/online/findBySessionId', '在线用户', b'1', b'1', '在线用户 获取单条', 1399985191002447872, '2022-06-04 18:45:09.643000', 1399985191002447872, '2022-06-04 18:45:09.643000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133114032129, 'CategoryController#delete', '通过 id 删除类目', 'DELETE', '/category/delete', '类目管理', b'1', b'1', '类目管理 通过 id 删除类目', 1399985191002447872, '2022-06-04 18:45:09.643000', 1399985191002447872, '2022-06-04 18:45:09.643000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133114032130, 'TestController#sequence', '序列生成器', 'GET', '/test/sequence', '测试控制器', b'1', b'1', '测试控制器 发号器', 1399985191002447872, '2022-06-04 18:45:09.643000', 1399985191002447872, '2022-06-04 18:45:09.643000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133118226432, 'VoucherController#lockBatch', '批量冻结', 'POST', '/voucher/lockBatch', '储值卡', b'1', b'1', '储值卡 批量冻结', 1399985191002447872, '2022-06-04 18:45:09.644000', 1399985191002447872, '2022-06-04 18:45:09.644000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133118226433, 'CategoryParameterGroupController#findAll', '查询所有', 'GET', '/categoryParameterGroup/findAll', '类目参数组', b'1', b'1', '类目参数组 查询所有', 1399985191002447872, '2022-06-04 18:45:09.644000', 1399985191002447872, '2022-06-04 18:45:09.644000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133118226434, 'CodeGeneratorController#genCodeZip', '下载生成代码', 'POST', '/gen/code/genCodeZip', '代码生成', b'1', b'1', '代码生成 下载生成代码', 1399985191002447872, '2022-06-04 18:45:09.644000', 1399985191002447872, '2022-06-04 18:45:09.644000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133118226435, 'DictionaryItemController#findByDictionaryId', '查询指定字典ID下的所有字典项', 'GET', '/translate/item/findByDictionaryId', '字典项', b'1', b'1', '字典项 查询指定字典ID下的所有字典项', 1399985191002447872, '2022-06-04 18:45:09.644000', 1399985191002447872, '2022-06-04 18:45:09.644000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133122420736, 'OrderFindController#findPayTimeoutOrderIdsByType', '获取指定类型超时订单的id集合', 'GET', '/order/findPayTimeoutOrderIdsByType', '订单查询', b'1', b'1', '订单查询 获取指定类型超时订单的id集合', 1399985191002447872, '2022-06-04 18:45:09.645000', 1399985191002447872, '2022-06-04 18:45:09.645000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133122420737, 'UserAdminController#add', '添加用户', 'POST', '/user/admin/add', '管理用户(管理员级别)', b'1', b'1', '管理用户(管理员级别) 添加用户', 1399985191002447872, '2022-06-04 18:45:09.645000', 1399985191002447872, '2022-06-04 18:45:09.645000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133122420738, 'DictionaryController#existsByCode', '编码是否被使用(不包含自己)', 'GET', '/translate/existsByCodeNotId', '字典', b'1', b'1', '字典 编码是否被使用(不包含自己)', 1399985191002447872, '2022-06-04 18:45:09.645000', 1399985191002447872, '2022-06-04 18:45:09.645000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133122420739, 'DeptController#findById', '获取', 'GET', '/dept/findById', '部门管理', b'1', b'1', '部门管理 获取', 1399985191002447872, '2022-06-04 18:45:09.645000', 1399985191002447872, '2022-06-04 18:45:09.645000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133126615040, 'VoucherController#generationBatch', '批量生成储值卡', 'POST', '/voucher/generationBatch', '储值卡', b'1', b'1', '储值卡 批量生成储值卡', 1399985191002447872, '2022-06-04 18:45:09.646000', 1399985191002447872, '2022-06-04 18:45:09.646000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133126615041, 'UserDataScopeController#findDataScopeIdsByUser', '根据用户ID获取到部门id集合', 'GET', '/user/data/scope/findIdsByUser', '用户数据权限配置', b'1', b'1', '用户数据权限配置 根据用户ID获取到部门id集合', 1399985191002447872, '2022-06-04 18:45:09.646000', 1399985191002447872, '2022-06-04 18:45:09.646000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133126615042, 'VoucherController#unlockBatch', '批量启用', 'POST', '/voucher/unlockBatch', '储值卡', b'1', b'1', '储值卡 批量启用', 1399985191002447872, '2022-06-04 18:45:09.646000', 1399985191002447872, '2022-06-04 18:45:09.646000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133130809344, 'AlipayConfigController#page', '分页', 'GET', '/alipay/page', '支付宝配置', b'1', b'1', '支付宝配置 分页', 1399985191002447872, '2022-06-04 18:45:09.647000', 1399985191002447872, '2022-06-04 18:45:09.647000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133130809345, 'PermPathController#page', '权限分页', 'GET', '/perm/path/page', '请求权限资源', b'1', b'1', '请求权限资源 权限分页', 1399985191002447872, '2022-06-04 18:45:09.647000', 1399985191002447872, '2022-06-04 18:45:09.647000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133130809346, 'DictionaryController#existsByCode', '编码是否被使用', 'GET', '/translate/existsByCode', '字典', b'1', b'1', '字典 编码是否被使用', 1399985191002447872, '2022-06-04 18:45:09.647000', 1399985191002447872, '2022-06-04 18:45:09.647000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133135003648, 'QuartzJobController#update', '更新', 'POST', '/quartz/update', '定时任务', b'1', b'1', '定时任务 更新', 1399985191002447872, '2022-06-04 18:45:09.648000', 1399985191002447872, '2022-06-04 18:45:09.648000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133135003649, 'DingAccessController#genThirdLoginUrl', '生成第三方登录网址', 'GET', '/ding/access/genThirdLoginUrl', '钉钉Access', b'1', b'1', '钉钉Access 生成第三方登录网址', 1399985191002447872, '2022-06-04 18:45:09.648000', 1399985191002447872, '2022-06-04 18:45:09.648000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133135003650, 'ActivityController#findAll', '查询活动', 'GET', '/activity/findAll', '活动', b'1', b'1', '活动 查询活动', 1399985191002447872, '2022-06-04 18:45:09.648000', 1399985191002447872, '2022-06-04 18:45:09.648000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133135003651, 'UserInfoController#getUserBaseInfo', '查询用户基础信息', 'GET', '/user/getUserBaseInfo', '用户管理', b'1', b'1', '用户管理 查询用户基础信息', 1399985191002447872, '2022-06-04 18:45:09.648000', 1399985191002447872, '2022-06-04 18:45:09.648000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133139197952, 'MessageQueueDemoController#sendKeyExpired', '创建15秒后过期的事件', 'POST', '/demo/mq/sendKeyExpired', '测试消息队列', b'1', b'1', '测试消息队列 创建15秒后过期的事件', 1399985191002447872, '2022-06-04 18:45:09.649000', 1399985191002447872, '2022-06-04 18:45:09.649000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133139197953, 'OrderPreviewController#previewOrderPrice', '预览价格(手动)', 'POST', '/order/preview/previewOrderPrice', '订单计算', b'1', b'1', '订单计算 预览价格(手动)', 1399985191002447872, '2022-06-04 18:45:09.649000', 1399985191002447872, '2022-06-04 18:45:09.649000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133139197954, 'WalletLogController#pageByPersonal', '个人钱包日志', 'POST', '/wallet/log/pageByPersonal', '钱包日志相关的接口', b'1', b'1', '钱包日志相关的接口 个人钱包日志', 1399985191002447872, '2022-06-04 18:45:09.649000', 1399985191002447872, '2022-06-04 18:45:09.649000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133143392256, 'PermMenuController#delete', '删除', 'DELETE', '/perm/menu/delete', '菜单权限资源', b'1', b'1', '菜单权限资源 删除', 1399985191002447872, '2022-06-04 18:45:09.650000', 1399985191002447872, '2022-06-04 18:45:09.650000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133143392257, 'CategoryParameterController#add', '添加', 'POST', '/categoryParameter/add', '类目参数', b'1', b'1', '类目参数 添加', 1399985191002447872, '2022-06-04 18:45:09.650000', 1399985191002447872, '2022-06-04 18:45:09.650000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133143392258, 'PermPathController#update', '更新权限', 'POST', '/perm/path/update', '请求权限资源', b'1', b'1', '请求权限资源 更新权限', 1399985191002447872, '2022-06-04 18:45:09.650000', 1399985191002447872, '2022-06-04 18:45:09.650000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133147586560, 'BrandController#delete', '删除', 'DELETE', '/brand/delete', '品牌', b'1', b'1', '品牌 删除', 1399985191002447872, '2022-06-04 18:45:09.651000', 1399985191002447872, '2022-06-04 18:45:09.651000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133147586561, 'DingTalkConfigController#update', '修改配置', 'POST', '/ding/config/update', '钉钉配置', b'1', b'1', '钉钉配置 修改配置', 1399985191002447872, '2022-06-04 18:45:09.651000', 1399985191002447872, '2022-06-04 18:45:09.651000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133147586562, 'OrderFindController#getWholeById', '获取完整订单详情', 'GET', '/order/getWholeById', '订单查询', b'1', b'1', '订单查询 获取完整订单详情', 1399985191002447872, '2022-06-04 18:45:09.651000', 1399985191002447872, '2022-06-04 18:45:09.651000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133147586563, 'SystemParamController#existsByKeyNotId', '判断编码是否存在(不包含自己)', 'GET', '/system/param/existsByKeyNotId', '系统参数', b'1', b'1', '系统参数 判断编码是否存在(不包含自己)', 1399985191002447872, '2022-06-04 18:45:09.651000', 1399985191002447872, '2022-06-04 18:45:09.651000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133151780864, 'CashierController#aggregatePay', '扫码聚合支付(单渠道)', 'GET', '/cashier/aggregatePay', '结算台', b'1', b'1', '结算台 扫码聚合支付(单渠道)', 1399985191002447872, '2022-06-04 18:45:09.652000', 1399985191002447872, '2022-06-04 18:45:09.652000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133151780865, 'RoleController#existsByCode', '编码是否被使用(不包含自己)', 'GET', '/role/existsByCodeNotId', '角色管理', b'1', b'1', '角色管理 编码是否被使用(不包含自己)', 1399985191002447872, '2022-06-04 18:45:09.652000', 1399985191002447872, '2022-06-04 18:45:09.652000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133151780866, 'ClientController#findAllByAlonePrem', '查询有独立菜单和权限的终端列表', 'GET', '/client/findAllByAlonePrem', '终端管理', b'1', b'1', '终端管理 查询有独立菜单和权限的终端列表', 1399985191002447872, '2022-06-04 18:45:09.652000', 1399985191002447872, '2022-06-04 18:45:09.652000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133151780867, 'RoleController#existsByName', '名称是否被使用', 'GET', '/role/existsByName', '角色管理', b'1', b'1', '角色管理 名称是否被使用', 1399985191002447872, '2022-06-04 18:45:09.652000', 1399985191002447872, '2022-06-04 18:45:09.652000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133155975168, 'RoleController#findById', '通过ID查询角色', 'GET', '/role/findById', '角色管理', b'1', b'1', '角色管理 通过ID查询角色', 1399985191002447872, '2022-06-04 18:45:09.653000', 1399985191002447872, '2022-06-04 18:45:09.653000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133155975169, 'AppVersionController#findById', '查询详情', 'POST', '/app/version/findById', 'app版本管理', b'1', b'1', 'app版本管理 查询详情', 1399985191002447872, '2022-06-04 18:45:09.653000', 1399985191002447872, '2022-06-04 18:45:09.653000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133155975170, 'PayCallbackController#aliPay', '支付宝回调', 'POST', '/pay/callback/aliPay', '支付回调', b'1', b'1', '支付回调 支付宝回调', 1399985191002447872, '2022-06-04 18:45:09.653000', 1399985191002447872, '2022-06-04 18:45:09.653000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133155975171, 'QuartzJobController#execute', '立即执行', 'POST', '/quartz/execute', '定时任务', b'1', b'1', '定时任务 立即执行', 1399985191002447872, '2022-06-04 18:45:09.653000', 1399985191002447872, '2022-06-04 18:45:09.653000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133155975172, 'CouponTemplateController#findAll', '查询优惠券模板', 'POST', '/coupon/template/findAll', '优惠券模板', b'1', b'1', '优惠券模板 查询优惠券模板', 1399985191002447872, '2022-06-04 18:45:09.653000', 1399985191002447872, '2022-06-04 18:45:09.653000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133160169472, 'WeChatPayConfigController#page', '分页', 'GET', '/wechat/pay/page', '微信支付', b'1', b'1', '微信支付 分页', 1399985191002447872, '2022-06-04 18:45:09.654000', 1399985191002447872, '2022-06-04 18:45:09.654000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133160169473, 'TokenEndpoint#logout', '退出', 'POST', '/token/logout', '认证相关', b'1', b'1', '认证相关 退出', 1399985191002447872, '2022-06-04 18:45:09.654000', 1399985191002447872, '2022-06-04 18:45:09.654000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133160169474, 'DeptController#update', '更新', 'POST', '/dept/update', '部门管理', b'1', b'1', '部门管理 更新', 1399985191002447872, '2022-06-04 18:45:09.654000', 1399985191002447872, '2022-06-04 18:45:09.654000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133160169475, 'FIleUpLoadController#getFileDownloadUrl', '获取文件下载地址', 'GET', '/file/getFileDownloadUrl', '文件上传', b'0', b'0', '文件上传 获取文件下载地址', 1399985191002447872, '2022-06-04 18:45:09.654000', 1399985191002447872, '2022-06-04 18:46:24.445000', b'0', 1); -INSERT INTO `iam_perm_path` VALUES (1533037133160169476, 'DataEncryptDemoController#update', '修改', 'POST', '/demo/data/encrypt/update', '数据加密解密演示', b'1', b'1', '数据加密解密演示 修改', 1399985191002447872, '2022-06-04 18:45:09.654000', 1399985191002447872, '2022-06-04 18:45:09.654000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133164363776, 'CouponController#lockById', '锁定优惠券', 'POST', '/coupon/lockById', '优惠券', b'1', b'1', '优惠券 锁定优惠券', 1399985191002447872, '2022-06-04 18:45:09.655000', 1399985191002447872, '2022-06-04 18:45:09.655000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133164363777, 'ClientController#update', '修改终端（返回终端对象）', 'POST', '/client/update', '终端管理', b'1', b'1', '终端管理 修改终端（返回终端对象）', 1399985191002447872, '2022-06-04 18:45:09.655000', 1399985191002447872, '2022-06-04 18:45:09.655000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133164363778, 'BrandController#findById', '通过ID查询', 'GET', '/brand/findById', '品牌', b'1', b'1', '品牌 通过ID查询', 1399985191002447872, '2022-06-04 18:45:09.655000', 1399985191002447872, '2022-06-04 18:45:09.655000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133164363779, 'WeChatPayConfigController#findById', '根据Id查询', 'GET', '/wechat/pay/findById', '微信支付', b'1', b'1', '微信支付 根据Id查询', 1399985191002447872, '2022-06-04 18:45:09.655000', 1399985191002447872, '2022-06-04 18:45:09.655000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133168558080, 'UserRoleController#findRoleIdsByUser', '根据用户ID获取到角色id集合', 'GET', '/user/role/findRoleIdsByUser', '用户角色管理', b'1', b'1', '用户角色管理 根据用户ID获取到角色id集合', 1399985191002447872, '2022-06-04 18:45:09.656000', 1399985191002447872, '2022-06-04 18:45:09.656000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1533037133168558081, 'SpecificationController#delete', '删除', 'DELETE', '/specification/delete', '规格', b'1', b'1', '规格 删除', 1399985191002447872, '2022-06-04 18:45:09.656000', 1399985191002447872, '2022-06-04 18:45:09.656000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534396720414330880, 'TestController#validation', '校验测试', 'GET', '/test/validation', '测试控制器', b'1', b'1', '测试控制器 校验测试', 1399985191002447872, '2022-06-08 12:47:40.516000', 1399985191002447872, '2022-06-08 12:47:40.516000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534396720414330881, 'UserRoleController#saveAssign', '给用户分配角色', 'POST', '/user/role/saveAssign', '用户角色管理', b'1', b'1', '用户角色管理 给用户分配角色', 1399985191002447872, '2022-06-08 12:47:40.516000', 1399985191002447872, '2022-06-08 12:47:40.516000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534396720414330882, 'UserAdminController#lockBatch', '批量锁定用户', 'POST', '/user/admin/lockBatch', '管理用户(管理员级别)', b'1', b'1', '管理用户(管理员级别) 批量锁定用户', 1399985191002447872, '2022-06-08 12:47:40.516000', 1399985191002447872, '2022-06-08 12:47:40.516000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534396720414330883, 'UserDataScopeController#saveAssignBatch', '给用户分配权限(批量)', 'POST', '/user/data/scope/saveAssignBatch', '用户数据权限配置', b'1', b'1', '用户数据权限配置 给用户分配权限(批量)', 1399985191002447872, '2022-06-08 12:47:40.516000', 1399985191002447872, '2022-06-08 12:47:40.516000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534396720414330884, 'UserDeptController#saveAssign', '给用户分配部门', 'POST', '/user/dept/saveAssign', '用户部门关联关系', b'1', b'1', '用户部门关联关系 给用户分配部门', 1399985191002447872, '2022-06-08 12:47:40.516000', 1399985191002447872, '2022-06-08 12:47:40.516000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534396720414330885, 'PermPathController#batchUpdateEnable', '批量更新状态', 'POST', '/perm/path/batchUpdateEnable', '请求权限资源', b'1', b'1', '请求权限资源 批量更新状态', 1399985191002447872, '2022-06-08 12:47:40.516000', 1399985191002447872, '2022-06-08 12:47:40.516000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534396720414330886, 'UserAdminController#unlockBatch', '批量解锁用户', 'POST', '/user/admin/unlockBatch', '管理用户(管理员级别)', b'1', b'1', '管理用户(管理员级别) 批量解锁用户', 1399985191002447872, '2022-06-08 12:47:40.516000', 1399985191002447872, '2022-06-08 12:47:40.516000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534396720414330887, 'UserDeptController#saveAssignBatch', '给用户分配部门(批量)', 'POST', '/user/dept/saveAssignBatch', '用户部门关联关系', b'1', b'1', '用户部门关联关系 给用户分配部门(批量)', 1399985191002447872, '2022-06-08 12:47:40.516000', 1399985191002447872, '2022-06-08 12:47:40.516000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534396720414330888, 'UserRoleController#saveAssignBatch', '给用户分配角色(批量)', 'POST', '/user/role/saveAssignBatch', '用户角色管理', b'1', b'1', '用户角色管理 给用户分配角色(批量)', 1399985191002447872, '2022-06-08 12:47:40.516000', 1399985191002447872, '2022-06-08 12:47:40.516000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534396720414330889, 'PlumeLogMainController#getRunModel', 'getRunModel', 'GET', '/plumelog/getRunModel', 'PlumeLogMainController', b'1', b'1', 'PlumeLogMainController getRunModel', 1399985191002447872, '2022-06-08 12:47:40.516000', 1399985191002447872, '2022-06-08 12:47:40.516000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307008, 'MessageTemplateController#existsByCode', '编码是否被使用(不包含自己)', 'GET', '/message/template/existsByCodeNotId', '消息模板', b'1', b'1', '消息模板 编码是否被使用(不包含自己)', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307009, 'PermPathController#deleteBatch', '批量删除', 'DELETE', '/perm/path/deleteBatch', '请求权限资源', b'1', b'1', '请求权限资源 批量删除', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307010, 'MessageTemplateController#rendering', '渲染模板', 'GET', '/message/template/rendering', '消息模板', b'1', b'1', '消息模板 渲染模板', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307011, 'SiteMessageController#send', '发送站内信', 'POST', '/site/message/send', '站内信', b'1', b'1', '站内信 发送站内信', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307012, 'SiteMessageController#read', '标为已读', 'POST', '/site/message/read', '站内信', b'1', b'1', '站内信 标为已读', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307013, 'MailSendController#sentSimpleMail', '发送简单邮件', 'POST', '/mail/send/sentSimpleMail', '邮件发送', b'1', b'1', '邮件发送 发送简单邮件', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307014, 'SiteMessageController#page', '消息分页', 'GET', '/site/message/page', '站内信', b'1', b'1', '站内信 消息分页', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307015, 'MailConfigController#existsByCode', '编码是否被使用', 'GET', '/mail/config/existsByCode', '邮箱配置', b'1', b'1', '邮箱配置 编码是否被使用', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307016, 'SiteMessageController#getSenderCount', '获取发送消息条数', 'GET', '/site/message/getSenderCount', '站内信', b'1', b'1', '站内信 获取发送消息条数', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307017, 'MailConfigController#setUpActivity', '设置启用的邮箱配置', 'POST', '/mail/config/setUpActivity', '邮箱配置', b'1', b'1', '邮箱配置 设置启用的邮箱配置', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307018, 'MessageTemplateController#add', '添加', 'POST', '/message/template/add', '消息模板', b'1', b'1', '消息模板 添加', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307019, 'MailConfigController#page', '分页', 'GET', '/mail/config/page', '邮箱配置', b'1', b'1', '邮箱配置 分页', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307020, 'MailConfigController#existsByCode', '编码是否被使用(不包含自己)', 'GET', '/mail/config/existsByCodeNotId', '邮箱配置', b'1', b'1', '邮箱配置 编码是否被使用(不包含自己)', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307021, 'MailConfigController#findAll', '获取所有邮箱配置', 'GET', '/mail/config/findAll', '邮箱配置', b'1', b'1', '邮箱配置 获取所有邮箱配置', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307022, 'MailConfigController#findById', '通过 id 获取指定邮箱配置', 'GET', '/mail/config/findById', '邮箱配置', b'1', b'1', '邮箱配置 通过 id 获取指定邮箱配置', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307023, 'MessageTemplateController#delete', '删除', 'DELETE', '/message/template/delete', '消息模板', b'1', b'1', '消息模板 删除', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307024, 'NcDemoController#sendMsg', '消息发送测试', 'GET', '/nc/test/sendMsg', 'nc测试', b'1', b'1', 'nc测试 消息发送测试', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307025, 'SiteMessageController#findById', '消息详情', 'GET', '/site/message/findById', '站内信', b'1', b'1', '站内信 消息详情', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307026, 'MailConfigController#updateMailConfig', '更新邮箱配置', 'POST', '/mail/config/update', '邮箱配置', b'1', b'1', '邮箱配置 更新邮箱配置', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307027, 'MailConfigController#add', '增加新邮箱配置', 'POST', '/mail/config/add', '邮箱配置', b'1', b'1', '邮箱配置 增加新邮箱配置', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307028, 'MailConfigController#delete', '删除', 'DELETE', '/mail/config/delete', '邮箱配置', b'1', b'1', '邮箱配置 删除', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307029, 'MessageTemplateController#existsByCode', '编码是否被使用', 'GET', '/message/template/existsByCode', '消息模板', b'1', b'1', '消息模板 编码是否被使用', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307030, 'MessageTemplateController#page', '分页', 'GET', '/message/template/page', '消息模板', b'1', b'1', '消息模板 分页', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307031, 'SiteMessageController#pageByReceive', '接收消息分页', 'GET', '/site/message/pageByReceive', '站内信', b'1', b'1', '站内信 接收消息分页', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307032, 'SiteMessageController#getReceiveCount', '获取接收消息条数', 'GET', '/site/message/getReceiveCount', '站内信', b'1', b'1', '站内信 获取接收消息条数', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307033, 'MailSendController#sendMail', '发送邮件', 'POST', '/mail/send/sendMail', '邮件发送', b'1', b'1', '邮件发送 发送邮件', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307034, 'SiteMessageController#pageBySender', '发送消息分页', 'GET', '/site/message/pageBySender', '站内信', b'1', b'1', '站内信 发送消息分页', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307035, 'MessageTemplateController#update', '更新', 'POST', '/message/template/update', '消息模板', b'1', b'1', '消息模板 更新', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534778144875307036, 'MessageTemplateController#findById', '获取详情', 'GET', '/message/template/findById', '消息模板', b'1', b'1', '消息模板 获取详情', 1399985191002447872, '2022-06-09 14:03:19.194000', 1399985191002447872, '2022-06-09 14:03:19.194000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1534816201016037376, 'TestController#userNotice', '用户全局ws消息通知测试', 'GET', '/test/userNotice', '测试控制器', b'1', b'1', '测试控制器 用户全局ws消息通知测试', 1399985191002447872, '2022-06-09 16:34:32.485000', 1399985191002447872, '2022-06-09 16:34:32.486000', b'0', 0); -INSERT INTO `iam_perm_path` VALUES (1535126126934061056, 'GlobalWebsocketDemoController#send', '发送消息', 'POST', '/demo/global/ws/send', '全局websocket通知demo', b'1', b'1', '全局websocket通知demo 发送消息', 1399985191002447872, '2022-06-10 13:06:04.582000', 1399985191002447872, '2022-06-10 13:06:04.582000', b'0', 0); --- ---------------------------- --- Table structure for iam_role_menu --- ---------------------------- -CREATE TABLE `iam_role_menu` ( - `id` bigint(20) NOT NULL, - `role_id` bigint(20) NOT NULL COMMENT '角色id', - `client_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '终端code', - `permission_id` bigint(20) NOT NULL COMMENT '菜单权限id', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '角色菜单权限表' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of iam_role_menu --- ---------------------------- -INSERT INTO `iam_role_menu` VALUES (1533038290578358272, 1405414804771971072, 'admin', 1414596052497092608); -INSERT INTO `iam_role_menu` VALUES (1533038290578358273, 1405414804771971072, 'admin', 1414596773275652096); -INSERT INTO `iam_role_menu` VALUES (1533038290578358274, 1405414804771971072, 'admin', 1431083330909208576); -INSERT INTO `iam_role_menu` VALUES (1533038290578358275, 1405414804771971072, 'admin', 1452567897717321728); -INSERT INTO `iam_role_menu` VALUES (1533038290578358276, 1405414804771971072, 'admin', 1435143678721236992); -INSERT INTO `iam_role_menu` VALUES (1533038290578358277, 1405414804771971072, 'admin', 1435476255797624832); -INSERT INTO `iam_role_menu` VALUES (1533038290578358278, 1405414804771971072, 'admin', 1480839877352476672); -INSERT INTO `iam_role_menu` VALUES (1533038290578358279, 1405414804771971072, 'admin', 1452569339987472384); -INSERT INTO `iam_role_menu` VALUES (1533038290578358280, 1405414804771971072, 'admin', 1414596805538238464); -INSERT INTO `iam_role_menu` VALUES (1533038290578358281, 1405414804771971072, 'admin', 1431089129232498688); -INSERT INTO `iam_role_menu` VALUES (1533038290578358282, 1405414804771971072, 'admin', 1474694545336676352); -INSERT INTO `iam_role_menu` VALUES (1533038290578358283, 1405414804771971072, 'admin', 1452569691537256448); -INSERT INTO `iam_role_menu` VALUES (1533038290578358284, 1405414804771971072, 'admin', 1414596647509446656); -INSERT INTO `iam_role_menu` VALUES (1533038290578358285, 1405414804771971072, 'admin', 1414596842322284544); -INSERT INTO `iam_role_menu` VALUES (1533038290578358286, 1405414804771971072, 'admin', 1431082258161434624); -INSERT INTO `iam_role_menu` VALUES (1533038290578358287, 1405414804771971072, 'admin', 1450473063320526848); -INSERT INTO `iam_role_menu` VALUES (1533038290578358288, 1405414804771971072, 'admin', 1452571269199540224); -INSERT INTO `iam_role_menu` VALUES (1533038290578358289, 1405414804771971072, 'admin', 1414596877617352704); -INSERT INTO `iam_role_menu` VALUES (1533038290578358290, 1405414804771971072, 'admin', 1450803906215886848); -INSERT INTO `iam_role_menu` VALUES (1533038290578358291, 1405414804771971072, 'admin', 1452638905302966272); -INSERT INTO `iam_role_menu` VALUES (1533038290578358292, 1405414804771971072, 'admin', 1490984296616263680); -INSERT INTO `iam_role_menu` VALUES (1533038290578358293, 1405414804771971072, 'admin', 1495013564652429312); -INSERT INTO `iam_role_menu` VALUES (1533038290578358294, 1405414804771971072, 'admin', 1431152689832525824); -INSERT INTO `iam_role_menu` VALUES (1533038290578358295, 1405414804771971072, 'admin', 1431153358157348864); -INSERT INTO `iam_role_menu` VALUES (1533038290578358296, 1405414804771971072, 'admin', 1438061887002759168); -INSERT INTO `iam_role_menu` VALUES (1533038290578358297, 1405414804771971072, 'admin', 1438072357281542144); -INSERT INTO `iam_role_menu` VALUES (1533038290578358298, 1405414804771971072, 'admin', 1439196893514031104); -INSERT INTO `iam_role_menu` VALUES (1533038290578358299, 1405414804771971072, 'admin', 1440216178722050048); -INSERT INTO `iam_role_menu` VALUES (1533038290578358300, 1405414804771971072, 'admin', 1440216612211757056); -INSERT INTO `iam_role_menu` VALUES (1533038290578358301, 1405414804771971072, 'admin', 1450827660459458560); -INSERT INTO `iam_role_menu` VALUES (1533038290578358302, 1405414804771971072, 'admin', 1450819607680991232); -INSERT INTO `iam_role_menu` VALUES (1533038290578358303, 1405414804771971072, 'admin', 1450821723027881984); -INSERT INTO `iam_role_menu` VALUES (1533038290578358304, 1405414804771971072, 'admin', 1450821877831254016); -INSERT INTO `iam_role_menu` VALUES (1533038290578358305, 1405414804771971072, 'admin', 1450822511087271936); -INSERT INTO `iam_role_menu` VALUES (1533038290578358306, 1405414804771971072, 'admin', 1511266086400524288); -INSERT INTO `iam_role_menu` VALUES (1533038290578358307, 1405414804771971072, 'admin', 1450822842995130368); -INSERT INTO `iam_role_menu` VALUES (1533038290578358308, 1405414804771971072, 'admin', 1450825488577544192); -INSERT INTO `iam_role_menu` VALUES (1533038290578358309, 1405414804771971072, 'admin', 1501847310319972352); -INSERT INTO `iam_role_menu` VALUES (1533038290578358310, 1405414804771971072, 'admin', 1450823960236081152); -INSERT INTO `iam_role_menu` VALUES (1533038290578358311, 1405414804771971072, 'admin', 1450824117849636864); -INSERT INTO `iam_role_menu` VALUES (1533038290578358312, 1405414804771971072, 'admin', 1450824319868289024); -INSERT INTO `iam_role_menu` VALUES (1533038290578358313, 1405414804771971072, 'admin', 1450824637876224000); -INSERT INTO `iam_role_menu` VALUES (1533038290578358314, 1405414804771971072, 'admin', 1450824875198332928); -INSERT INTO `iam_role_menu` VALUES (1533038290578358315, 1405414804771971072, 'admin', 1450825615857893376); -INSERT INTO `iam_role_menu` VALUES (1533038290578358316, 1405414804771971072, 'admin', 1450826890318135296); -INSERT INTO `iam_role_menu` VALUES (1533038290578358317, 1405414804771971072, 'admin', 1450827159626006528); -INSERT INTO `iam_role_menu` VALUES (1533038290578358318, 1405414804771971072, 'admin', 1450827308515409920); -INSERT INTO `iam_role_menu` VALUES (1533038290578358319, 1405414804771971072, 'admin', 1450825819436826624); -INSERT INTO `iam_role_menu` VALUES (1533038290578358320, 1405414804771971072, 'admin', 1501740492360962048); -INSERT INTO `iam_role_menu` VALUES (1533038290578358321, 1405414804771971072, 'admin', 1501742229142556672); -INSERT INTO `iam_role_menu` VALUES (1533038290578358322, 1405414804771971072, 'admin', 1501742417378725888); -INSERT INTO `iam_role_menu` VALUES (1533038290578358323, 1405414804771971072, 'admin', 1502926397176242176); -INSERT INTO `iam_role_menu` VALUES (1533038290578358324, 1405414804771971072, 'admin', 1523860792695283712); -INSERT INTO `iam_role_menu` VALUES (1533038290578358325, 1405414804771971072, 'admin', 1523941932282114048); -INSERT INTO `iam_role_menu` VALUES (1533038290578358326, 1405414804771971072, 'admin', 1523942130555252736); -INSERT INTO `iam_role_menu` VALUES (1533038290578358327, 1405414804771971072, 'admin', 1524044195818278912); -INSERT INTO `iam_role_menu` VALUES (1533038290578358328, 1405414804771971072, 'admin', 1524044395823665152); -INSERT INTO `iam_role_menu` VALUES (1533038290578358329, 1405414804771971072, 'admin', 1524044678314233856); -INSERT INTO `iam_role_menu` VALUES (1533038290578358330, 1405414804771971072, 'admin', 1525472571967860736); -INSERT INTO `iam_role_menu` VALUES (1533038290578358331, 1405414804771971072, 'admin', 1495968302034210816); -INSERT INTO `iam_role_menu` VALUES (1533038290578358332, 1405414804771971072, 'admin', 1495969099987963904); -INSERT INTO `iam_role_menu` VALUES (1533038290578358333, 1405414804771971072, 'admin', 1506910599819165696); -INSERT INTO `iam_role_menu` VALUES (1533038290578358334, 1405414804771971072, 'admin', 1506910885463851008); -INSERT INTO `iam_role_menu` VALUES (1533038290578358335, 1405414804771971072, 'admin', 1506911113394913280); -INSERT INTO `iam_role_menu` VALUES (1533038290578358336, 1405414804771971072, 'admin', 1496020308992143360); -INSERT INTO `iam_role_menu` VALUES (1533038290578358337, 1405414804771971072, 'admin', 1507998458886197248); -INSERT INTO `iam_role_menu` VALUES (1533038290578358338, 1405414804771971072, 'admin', 1509488473583562752); -INSERT INTO `iam_role_menu` VALUES (1533038290578358339, 1405414804771971072, 'admin', 1530120084482084864); -INSERT INTO `iam_role_menu` VALUES (1533038290578358340, 1405414804771971072, 'admin', 1414596052497092608); -INSERT INTO `iam_role_menu` VALUES (1533038290578358341, 1405414804771971072, 'admin', 1414596773275652096); -INSERT INTO `iam_role_menu` VALUES (1533038290578358342, 1405414804771971072, 'admin', 1431083330909208576); -INSERT INTO `iam_role_menu` VALUES (1533038290578358343, 1405414804771971072, 'admin', 1452567897717321728); -INSERT INTO `iam_role_menu` VALUES (1533038290578358344, 1405414804771971072, 'admin', 1435143678721236992); -INSERT INTO `iam_role_menu` VALUES (1533038290578358345, 1405414804771971072, 'admin', 1435476255797624832); -INSERT INTO `iam_role_menu` VALUES (1533038290578358346, 1405414804771971072, 'admin', 1480839877352476672); -INSERT INTO `iam_role_menu` VALUES (1533038290578358347, 1405414804771971072, 'admin', 1452569339987472384); -INSERT INTO `iam_role_menu` VALUES (1533038290578358348, 1405414804771971072, 'admin', 1414596805538238464); -INSERT INTO `iam_role_menu` VALUES (1533038290578358349, 1405414804771971072, 'admin', 1431089129232498688); -INSERT INTO `iam_role_menu` VALUES (1533038290578358350, 1405414804771971072, 'admin', 1474694545336676352); -INSERT INTO `iam_role_menu` VALUES (1533038290578358351, 1405414804771971072, 'admin', 1452569691537256448); -INSERT INTO `iam_role_menu` VALUES (1533038290578358352, 1405414804771971072, 'admin', 1414596647509446656); -INSERT INTO `iam_role_menu` VALUES (1533038290578358353, 1405414804771971072, 'admin', 1414596842322284544); -INSERT INTO `iam_role_menu` VALUES (1533038290578358354, 1405414804771971072, 'admin', 1431082258161434624); -INSERT INTO `iam_role_menu` VALUES (1533038290578358355, 1405414804771971072, 'admin', 1450473063320526848); -INSERT INTO `iam_role_menu` VALUES (1533038290578358356, 1405414804771971072, 'admin', 1452571269199540224); -INSERT INTO `iam_role_menu` VALUES (1533038290578358357, 1405414804771971072, 'admin', 1414596877617352704); -INSERT INTO `iam_role_menu` VALUES (1533038290578358358, 1405414804771971072, 'admin', 1450803906215886848); -INSERT INTO `iam_role_menu` VALUES (1533038290578358359, 1405414804771971072, 'admin', 1452638905302966272); -INSERT INTO `iam_role_menu` VALUES (1533038290578358360, 1405414804771971072, 'admin', 1490984296616263680); -INSERT INTO `iam_role_menu` VALUES (1533038290578358361, 1405414804771971072, 'admin', 1495013564652429312); -INSERT INTO `iam_role_menu` VALUES (1533038290578358362, 1405414804771971072, 'admin', 1431152689832525824); -INSERT INTO `iam_role_menu` VALUES (1533038290578358363, 1405414804771971072, 'admin', 1431153358157348864); -INSERT INTO `iam_role_menu` VALUES (1533038290578358364, 1405414804771971072, 'admin', 1438061887002759168); -INSERT INTO `iam_role_menu` VALUES (1533038290578358365, 1405414804771971072, 'admin', 1438072357281542144); -INSERT INTO `iam_role_menu` VALUES (1533038290578358366, 1405414804771971072, 'admin', 1439196893514031104); -INSERT INTO `iam_role_menu` VALUES (1533038290578358367, 1405414804771971072, 'admin', 1440216178722050048); -INSERT INTO `iam_role_menu` VALUES (1533038290578358368, 1405414804771971072, 'admin', 1440216612211757056); -INSERT INTO `iam_role_menu` VALUES (1533038290578358369, 1405414804771971072, 'admin', 1450827660459458560); -INSERT INTO `iam_role_menu` VALUES (1533038290578358370, 1405414804771971072, 'admin', 1450819607680991232); -INSERT INTO `iam_role_menu` VALUES (1533038290578358371, 1405414804771971072, 'admin', 1450821723027881984); -INSERT INTO `iam_role_menu` VALUES (1533038290578358372, 1405414804771971072, 'admin', 1450821877831254016); -INSERT INTO `iam_role_menu` VALUES (1533038290578358373, 1405414804771971072, 'admin', 1450822511087271936); -INSERT INTO `iam_role_menu` VALUES (1533038290578358374, 1405414804771971072, 'admin', 1511266086400524288); -INSERT INTO `iam_role_menu` VALUES (1533038290578358375, 1405414804771971072, 'admin', 1450822842995130368); -INSERT INTO `iam_role_menu` VALUES (1533038290578358376, 1405414804771971072, 'admin', 1450825488577544192); -INSERT INTO `iam_role_menu` VALUES (1533038290578358377, 1405414804771971072, 'admin', 1501847310319972352); -INSERT INTO `iam_role_menu` VALUES (1533038290578358378, 1405414804771971072, 'admin', 1450823960236081152); -INSERT INTO `iam_role_menu` VALUES (1533038290578358379, 1405414804771971072, 'admin', 1450824117849636864); -INSERT INTO `iam_role_menu` VALUES (1533038290578358380, 1405414804771971072, 'admin', 1450824319868289024); -INSERT INTO `iam_role_menu` VALUES (1533038290578358381, 1405414804771971072, 'admin', 1450824637876224000); -INSERT INTO `iam_role_menu` VALUES (1533038290578358382, 1405414804771971072, 'admin', 1450824875198332928); -INSERT INTO `iam_role_menu` VALUES (1533038290578358383, 1405414804771971072, 'admin', 1450825615857893376); -INSERT INTO `iam_role_menu` VALUES (1533038290578358384, 1405414804771971072, 'admin', 1450826890318135296); -INSERT INTO `iam_role_menu` VALUES (1533038290578358385, 1405414804771971072, 'admin', 1450827159626006528); -INSERT INTO `iam_role_menu` VALUES (1533038290578358386, 1405414804771971072, 'admin', 1450827308515409920); -INSERT INTO `iam_role_menu` VALUES (1533038290578358387, 1405414804771971072, 'admin', 1450825819436826624); -INSERT INTO `iam_role_menu` VALUES (1533038290578358388, 1405414804771971072, 'admin', 1501740492360962048); -INSERT INTO `iam_role_menu` VALUES (1533038290578358389, 1405414804771971072, 'admin', 1501742229142556672); -INSERT INTO `iam_role_menu` VALUES (1533038290578358390, 1405414804771971072, 'admin', 1501742417378725888); -INSERT INTO `iam_role_menu` VALUES (1533038290578358391, 1405414804771971072, 'admin', 1502926397176242176); -INSERT INTO `iam_role_menu` VALUES (1533038290578358392, 1405414804771971072, 'admin', 1523860792695283712); -INSERT INTO `iam_role_menu` VALUES (1533038290578358393, 1405414804771971072, 'admin', 1523941932282114048); -INSERT INTO `iam_role_menu` VALUES (1533038290578358394, 1405414804771971072, 'admin', 1523942130555252736); -INSERT INTO `iam_role_menu` VALUES (1533038290578358395, 1405414804771971072, 'admin', 1524044195818278912); -INSERT INTO `iam_role_menu` VALUES (1533038290578358396, 1405414804771971072, 'admin', 1524044395823665152); -INSERT INTO `iam_role_menu` VALUES (1533038290578358397, 1405414804771971072, 'admin', 1524044678314233856); -INSERT INTO `iam_role_menu` VALUES (1533038290578358398, 1405414804771971072, 'admin', 1525472571967860736); -INSERT INTO `iam_role_menu` VALUES (1533038290578358399, 1405414804771971072, 'admin', 1495968302034210816); -INSERT INTO `iam_role_menu` VALUES (1533038290578358400, 1405414804771971072, 'admin', 1495969099987963904); -INSERT INTO `iam_role_menu` VALUES (1533038290578358401, 1405414804771971072, 'admin', 1506910599819165696); -INSERT INTO `iam_role_menu` VALUES (1533038290578358402, 1405414804771971072, 'admin', 1506910885463851008); -INSERT INTO `iam_role_menu` VALUES (1533038290578358403, 1405414804771971072, 'admin', 1506911113394913280); -INSERT INTO `iam_role_menu` VALUES (1533038290578358404, 1405414804771971072, 'admin', 1496020308992143360); -INSERT INTO `iam_role_menu` VALUES (1533038290578358405, 1405414804771971072, 'admin', 1507998458886197248); -INSERT INTO `iam_role_menu` VALUES (1533038290578358406, 1405414804771971072, 'admin', 1509488473583562752); -INSERT INTO `iam_role_menu` VALUES (1533038290578358407, 1405414804771971072, 'admin', 1530120084482084864); -INSERT INTO `iam_role_menu` VALUES (1533038290578358408, 1405414804771971072, 'admin', 1414596052497092608); -INSERT INTO `iam_role_menu` VALUES (1533038290578358409, 1405414804771971072, 'admin', 1414596773275652096); -INSERT INTO `iam_role_menu` VALUES (1533038290578358410, 1405414804771971072, 'admin', 1431083330909208576); -INSERT INTO `iam_role_menu` VALUES (1533038290578358411, 1405414804771971072, 'admin', 1452567897717321728); -INSERT INTO `iam_role_menu` VALUES (1533038290578358412, 1405414804771971072, 'admin', 1435143678721236992); -INSERT INTO `iam_role_menu` VALUES (1533038290578358413, 1405414804771971072, 'admin', 1435476255797624832); -INSERT INTO `iam_role_menu` VALUES (1533038290578358414, 1405414804771971072, 'admin', 1480839877352476672); -INSERT INTO `iam_role_menu` VALUES (1533038290578358415, 1405414804771971072, 'admin', 1452569339987472384); -INSERT INTO `iam_role_menu` VALUES (1533038290578358416, 1405414804771971072, 'admin', 1414596805538238464); -INSERT INTO `iam_role_menu` VALUES (1533038290578358417, 1405414804771971072, 'admin', 1431089129232498688); -INSERT INTO `iam_role_menu` VALUES (1533038290578358418, 1405414804771971072, 'admin', 1474694545336676352); -INSERT INTO `iam_role_menu` VALUES (1533038290578358419, 1405414804771971072, 'admin', 1452569691537256448); -INSERT INTO `iam_role_menu` VALUES (1533038290578358420, 1405414804771971072, 'admin', 1414596647509446656); -INSERT INTO `iam_role_menu` VALUES (1533038290578358421, 1405414804771971072, 'admin', 1414596842322284544); -INSERT INTO `iam_role_menu` VALUES (1533038290578358422, 1405414804771971072, 'admin', 1431082258161434624); -INSERT INTO `iam_role_menu` VALUES (1533038290578358423, 1405414804771971072, 'admin', 1450473063320526848); -INSERT INTO `iam_role_menu` VALUES (1533038290578358424, 1405414804771971072, 'admin', 1452571269199540224); -INSERT INTO `iam_role_menu` VALUES (1533038290578358425, 1405414804771971072, 'admin', 1414596877617352704); -INSERT INTO `iam_role_menu` VALUES (1533038290578358426, 1405414804771971072, 'admin', 1450803906215886848); -INSERT INTO `iam_role_menu` VALUES (1533038290578358427, 1405414804771971072, 'admin', 1452638905302966272); -INSERT INTO `iam_role_menu` VALUES (1533038290578358428, 1405414804771971072, 'admin', 1490984296616263680); -INSERT INTO `iam_role_menu` VALUES (1533038290578358429, 1405414804771971072, 'admin', 1495013564652429312); -INSERT INTO `iam_role_menu` VALUES (1533038290578358430, 1405414804771971072, 'admin', 1431152689832525824); -INSERT INTO `iam_role_menu` VALUES (1533038290578358431, 1405414804771971072, 'admin', 1431153358157348864); -INSERT INTO `iam_role_menu` VALUES (1533038290578358432, 1405414804771971072, 'admin', 1438061887002759168); -INSERT INTO `iam_role_menu` VALUES (1533038290578358433, 1405414804771971072, 'admin', 1438072357281542144); -INSERT INTO `iam_role_menu` VALUES (1533038290578358434, 1405414804771971072, 'admin', 1439196893514031104); -INSERT INTO `iam_role_menu` VALUES (1533038290578358435, 1405414804771971072, 'admin', 1440216178722050048); -INSERT INTO `iam_role_menu` VALUES (1533038290578358436, 1405414804771971072, 'admin', 1440216612211757056); -INSERT INTO `iam_role_menu` VALUES (1533038290578358437, 1405414804771971072, 'admin', 1450827660459458560); -INSERT INTO `iam_role_menu` VALUES (1533038290578358438, 1405414804771971072, 'admin', 1450819607680991232); -INSERT INTO `iam_role_menu` VALUES (1533038290578358439, 1405414804771971072, 'admin', 1450821723027881984); -INSERT INTO `iam_role_menu` VALUES (1533038290578358440, 1405414804771971072, 'admin', 1450821877831254016); -INSERT INTO `iam_role_menu` VALUES (1533038290578358441, 1405414804771971072, 'admin', 1450822511087271936); -INSERT INTO `iam_role_menu` VALUES (1533038290578358442, 1405414804771971072, 'admin', 1511266086400524288); -INSERT INTO `iam_role_menu` VALUES (1533038290578358443, 1405414804771971072, 'admin', 1450822842995130368); -INSERT INTO `iam_role_menu` VALUES (1533038290578358444, 1405414804771971072, 'admin', 1450825488577544192); -INSERT INTO `iam_role_menu` VALUES (1533038290578358445, 1405414804771971072, 'admin', 1501847310319972352); -INSERT INTO `iam_role_menu` VALUES (1533038290578358446, 1405414804771971072, 'admin', 1450823960236081152); -INSERT INTO `iam_role_menu` VALUES (1533038290578358447, 1405414804771971072, 'admin', 1450824117849636864); -INSERT INTO `iam_role_menu` VALUES (1533038290578358448, 1405414804771971072, 'admin', 1450824319868289024); -INSERT INTO `iam_role_menu` VALUES (1533038290578358449, 1405414804771971072, 'admin', 1450824637876224000); -INSERT INTO `iam_role_menu` VALUES (1533038290578358450, 1405414804771971072, 'admin', 1450824875198332928); -INSERT INTO `iam_role_menu` VALUES (1533038290578358451, 1405414804771971072, 'admin', 1450825615857893376); -INSERT INTO `iam_role_menu` VALUES (1533038290578358452, 1405414804771971072, 'admin', 1450826890318135296); -INSERT INTO `iam_role_menu` VALUES (1533038290578358453, 1405414804771971072, 'admin', 1450827159626006528); -INSERT INTO `iam_role_menu` VALUES (1533038290578358454, 1405414804771971072, 'admin', 1450827308515409920); -INSERT INTO `iam_role_menu` VALUES (1533038290578358455, 1405414804771971072, 'admin', 1450825819436826624); -INSERT INTO `iam_role_menu` VALUES (1533038290578358456, 1405414804771971072, 'admin', 1501740492360962048); -INSERT INTO `iam_role_menu` VALUES (1533038290578358457, 1405414804771971072, 'admin', 1501742229142556672); -INSERT INTO `iam_role_menu` VALUES (1533038290578358458, 1405414804771971072, 'admin', 1501742417378725888); -INSERT INTO `iam_role_menu` VALUES (1533038290578358459, 1405414804771971072, 'admin', 1502926397176242176); -INSERT INTO `iam_role_menu` VALUES (1533038290578358460, 1405414804771971072, 'admin', 1523860792695283712); -INSERT INTO `iam_role_menu` VALUES (1533038290578358461, 1405414804771971072, 'admin', 1523941932282114048); -INSERT INTO `iam_role_menu` VALUES (1533038290578358462, 1405414804771971072, 'admin', 1523942130555252736); -INSERT INTO `iam_role_menu` VALUES (1533038290578358463, 1405414804771971072, 'admin', 1524044195818278912); -INSERT INTO `iam_role_menu` VALUES (1533038290578358464, 1405414804771971072, 'admin', 1524044395823665152); -INSERT INTO `iam_role_menu` VALUES (1533038290578358465, 1405414804771971072, 'admin', 1524044678314233856); -INSERT INTO `iam_role_menu` VALUES (1533038290578358466, 1405414804771971072, 'admin', 1525472571967860736); -INSERT INTO `iam_role_menu` VALUES (1533038290578358467, 1405414804771971072, 'admin', 1495968302034210816); -INSERT INTO `iam_role_menu` VALUES (1533038290578358468, 1405414804771971072, 'admin', 1495969099987963904); -INSERT INTO `iam_role_menu` VALUES (1533038290578358469, 1405414804771971072, 'admin', 1506910599819165696); -INSERT INTO `iam_role_menu` VALUES (1533038290578358470, 1405414804771971072, 'admin', 1506910885463851008); -INSERT INTO `iam_role_menu` VALUES (1533038290578358471, 1405414804771971072, 'admin', 1506911113394913280); -INSERT INTO `iam_role_menu` VALUES (1533038290578358472, 1405414804771971072, 'admin', 1496020308992143360); -INSERT INTO `iam_role_menu` VALUES (1533038290578358473, 1405414804771971072, 'admin', 1507998458886197248); -INSERT INTO `iam_role_menu` VALUES (1533038290578358474, 1405414804771971072, 'admin', 1509488473583562752); -INSERT INTO `iam_role_menu` VALUES (1533038290578358475, 1405414804771971072, 'admin', 1530120084482084864); - --- ---------------------------- --- Table structure for base_dict_item --- ---------------------------- -CREATE TABLE `base_dict_item` ( - `id` bigint(20) NOT NULL, - `dict_id` bigint(20) NOT NULL COMMENT '字典id', - `dict_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '字典code', - `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '字典项code', - `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '字典项名称', - `sort_no` double(8, 2) NOT NULL COMMENT '排序', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - `version` int(8) NOT NULL COMMENT '版本', - PRIMARY KEY (`id`) USING BTREE, - INDEX `idx_dictionary_id`(`dict_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典项' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of base_dict_item --- ---------------------------- -INSERT INTO `base_dict_item` VALUES (1422931375807242241, 1422929378374828033, 'Sex', '1', '男', 0.00, '男性', 0, '2021-08-04 22:44:11', 0, '2021-08-04 22:44:11', 0, 2); -INSERT INTO `base_dict_item` VALUES (1425729455402401794, 1422929378374828033, 'Sex', '2', '女', 0.00, '女性', 0, '2021-08-12 16:02:46', 0, '2021-08-12 16:02:46', 0, 1); -INSERT INTO `base_dict_item` VALUES (1425744258544136194, 1425744045414772737, 'MenuType', '0', '顶级菜单', 0.00, '顶级菜单', 0, '2021-08-12 17:01:35', 0, '2021-08-12 17:01:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1425744436592340993, 1425744045414772737, 'MenuType', '1', '子菜单', 0.00, '子菜单', 0, '2021-08-12 17:02:17', 0, '2021-08-12 17:02:17', 0, 0); -INSERT INTO `base_dict_item` VALUES (1425744470582980610, 1425744045414772737, 'MenuType', '2', '按钮权限', 0.00, '按钮权限', 0, '2021-08-12 17:02:26', 0, '2021-08-12 17:02:26', 0, 0); -INSERT INTO `base_dict_item` VALUES (1430094707250413568, 1422929378374828033, 'Sex', '0', '未知', 0.00, '不确定性别', 1399985191002447872, '2021-08-24 17:08:43', 1399985191002447872, '2021-08-24 17:08:43', 0, 0); -INSERT INTO `base_dict_item` VALUES (1435830086406463488, 1435829999592759296, 'UserStatusCode', '1', '正常', 0.00, 'NORMAL', 1399985191002447872, '2021-09-09 12:59:04', 1399985191002447872, '2021-09-09 12:59:04', 0, 0); -INSERT INTO `base_dict_item` VALUES (1435830141855162368, 1435829999592759296, 'UserStatusCode', '2', '锁定', 0.00, 'LOCK, 多次登录失败被锁定', 1399985191002447872, '2021-09-09 12:59:17', 1399985191002447872, '2021-09-09 12:59:17', 0, 1); -INSERT INTO `base_dict_item` VALUES (1435830260503633920, 1435829999592759296, 'UserStatusCode', '3', '封禁', 0.00, 'BAN', 1399985191002447872, '2021-09-09 12:59:45', 1399985191002447872, '2021-09-09 12:59:45', 0, 0); -INSERT INTO `base_dict_item` VALUES (1435838374749626368, 1435838066191458304, 'LogBusinessType', 'other', '其它', 0.00, '', 1399985191002447872, '2021-09-09 13:32:00', 1399985191002447872, '2021-09-09 13:32:00', 0, 0); -INSERT INTO `base_dict_item` VALUES (1435838414436130816, 1435838066191458304, 'LogBusinessType', 'insert', '新增', 0.00, '', 1399985191002447872, '2021-09-09 13:32:09', 1399985191002447872, '2021-09-09 13:32:09', 0, 0); -INSERT INTO `base_dict_item` VALUES (1435838467624099840, 1435838066191458304, 'LogBusinessType', 'update', '修改', 0.00, '', 1399985191002447872, '2021-09-09 13:32:22', 1399985191002447872, '2021-09-09 13:32:22', 0, 0); -INSERT INTO `base_dict_item` VALUES (1435838502755590144, 1435838066191458304, 'LogBusinessType', 'delete', '删除', 0.00, '', 1399985191002447872, '2021-09-09 13:32:30', 1399985191002447872, '2021-09-09 13:32:30', 0, 0); -INSERT INTO `base_dict_item` VALUES (1435838546934194176, 1435838066191458304, 'LogBusinessType', 'grant', '授权', 0.00, '', 1399985191002447872, '2021-09-09 13:32:41', 1399985191002447872, '2021-09-09 13:32:41', 0, 0); -INSERT INTO `base_dict_item` VALUES (1435838605537009664, 1435838066191458304, 'LogBusinessType', 'export', '导出', 0.00, '', 1399985191002447872, '2021-09-09 13:32:55', 1399985191002447872, '2021-09-09 13:32:55', 0, 0); -INSERT INTO `base_dict_item` VALUES (1435838705457913856, 1435838066191458304, 'LogBusinessType', 'import', '导入', 0.00, '', 1399985191002447872, '2021-09-09 13:33:19', 1399985191002447872, '2021-09-09 13:33:19', 0, 0); -INSERT INTO `base_dict_item` VALUES (1435838745861644288, 1435838066191458304, 'LogBusinessType', 'force', '强退', 0.00, '', 1399985191002447872, '2021-09-09 13:33:28', 1399985191002447872, '2021-09-09 13:33:28', 0, 0); -INSERT INTO `base_dict_item` VALUES (1435838786273763328, 1435838066191458304, 'LogBusinessType', 'clean', '清空数据', 0.00, '', 1399985191002447872, '2021-09-09 13:33:38', 1399985191002447872, '2021-09-09 13:33:38', 0, 0); -INSERT INTO `base_dict_item` VALUES (1438079113630003200, 1438078864509317120, 'MailSecurityCode', '1', '普通方式', 0.00, 'SECURITY_TYPE_PLAIN', 1399985191002447872, '2021-09-15 17:55:54', 1399985191002447872, '2021-09-15 17:55:54', 0, 0); -INSERT INTO `base_dict_item` VALUES (1438080323061755904, 1438078864509317120, 'MailSecurityCode', '2', 'TLS方式', 0.00, 'SECURITY_TYPE_TLS', 1399985191002447872, '2021-09-15 18:00:42', 1399985191002447872, '2021-09-15 18:00:42', 0, 0); -INSERT INTO `base_dict_item` VALUES (1438080372231581696, 1438078864509317120, 'MailSecurityCode', '3', 'SSL方式', 0.00, 'SECURITY_TYPE_SSL', 1399985191002447872, '2021-09-15 18:00:54', 1399985191002447872, '2021-09-15 18:00:54', 0, 0); -INSERT INTO `base_dict_item` VALUES (1439961603914047488, 1439961232651034624, 'MessageTemplateCode', '5', '微信', -10.00, 'WECHAT', 1399985191002447872, '2021-09-20 22:36:14', 1399985191002447872, '2021-09-20 22:36:14', 0, 1); -INSERT INTO `base_dict_item` VALUES (1439961704321490944, 1439961232651034624, 'MessageTemplateCode', '4', 'Email', 0.00, 'EMAIL', 1399985191002447872, '2021-09-20 22:36:38', 1399985191002447872, '2021-09-20 22:36:38', 0, 0); -INSERT INTO `base_dict_item` VALUES (1439962132744478720, 1439961232651034624, 'MessageTemplateCode', '3', '短信', 0.00, 'SMS', 1399985191002447872, '2021-09-20 22:38:20', 1399985191002447872, '2021-09-20 22:38:20', 0, 0); -INSERT INTO `base_dict_item` VALUES (1439962205578567680, 1439961232651034624, 'MessageTemplateCode', '2', '钉钉机器人', 0.00, 'DING_TALK_ROBOT', 1399985191002447872, '2021-09-20 22:38:38', 1399985191002447872, '2021-09-20 22:38:38', 0, 0); -INSERT INTO `base_dict_item` VALUES (1439962267511660544, 1439961232651034624, 'MessageTemplateCode', '1', '钉钉', 0.00, 'DING_TALK', 1399985191002447872, '2021-09-20 22:38:52', 1399985191002447872, '2021-09-20 22:38:52', 0, 0); -INSERT INTO `base_dict_item` VALUES (1452836696873984000, 1452836604783845376, 'SocialType', 'WeChat', '微信', 0.00, '', 1399985191002447872, '2021-10-26 11:17:16', 1399985191002447872, '2021-10-26 11:17:16', 0, 0); -INSERT INTO `base_dict_item` VALUES (1452837435482529792, 1452836604783845376, 'SocialType', 'QQ', 'QQ', 0.00, '', 1399985191002447872, '2021-10-26 11:20:12', 1399985191002447872, '2021-10-26 11:20:12', 0, 0); -INSERT INTO `base_dict_item` VALUES (1452837523030237184, 1452836604783845376, 'SocialType', 'DingTalk', '钉钉', 0.00, '', 1399985191002447872, '2021-10-26 11:20:33', 1399985191002447872, '2021-10-26 11:20:33', 0, 0); -INSERT INTO `base_dict_item` VALUES (1452844537911406592, 1452843488735621120, 'ParamType', '1', '系统参数', 0.00, '', 1399985191002447872, '2021-10-26 11:48:25', 1399985191002447872, '2021-10-26 11:48:25', 0, 0); -INSERT INTO `base_dict_item` VALUES (1452844565031776256, 1452843488735621120, 'ParamType', '2', '用户参数', 0.00, '', 1399985191002447872, '2021-10-26 11:48:32', 1399985191002447872, '2021-10-26 11:48:32', 0, 2); -INSERT INTO `base_dict_item` VALUES (1496026946344005632, 1496024933900169216, 'Political', '1', '中共党员', 1.00, '', 1399985191002447872, '2022-02-22 15:39:54', 1399985191002447872, '2022-02-22 15:39:54', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496027004560945152, 1496024933900169216, 'Political', '2', '中共预备党员', 2.00, '', 1399985191002447872, '2022-02-22 15:40:07', 1399985191002447872, '2022-02-22 15:40:07', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496027039264616448, 1496024933900169216, 'Political', '3', '共青团员', 3.00, '', 1399985191002447872, '2022-02-22 15:40:16', 1399985191002447872, '2022-02-22 15:40:16', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496027077550223360, 1496024933900169216, 'Political', '4', '民革党员', 4.00, '', 1399985191002447872, '2022-02-22 15:40:25', 1399985191002447872, '2022-02-22 15:40:25', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496027123461074944, 1496024933900169216, 'Political', '5', '民盟盟员', 5.00, '', 1399985191002447872, '2022-02-22 15:40:36', 1399985191002447872, '2022-02-22 15:40:36', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496027197566038016, 1496024933900169216, 'Political', '6', '民建会员', 6.00, '', 1399985191002447872, '2022-02-22 15:40:53', 1399985191002447872, '2022-02-22 15:40:53', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496027234803068928, 1496024933900169216, 'Political', '7', '民进会员', 7.00, '', 1399985191002447872, '2022-02-22 15:41:02', 1399985191002447872, '2022-02-22 15:41:02', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496027272941875200, 1496024933900169216, 'Political', '8', '农工党党员', 8.00, '', 1399985191002447872, '2022-02-22 15:41:11', 1399985191002447872, '2022-02-22 15:41:11', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496027306634719232, 1496024933900169216, 'Political', '9', '致公党党员', 9.00, '', 1399985191002447872, '2022-02-22 15:41:19', 1399985191002447872, '2022-02-22 15:41:19', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496027369796743168, 1496024933900169216, 'Political', '10', '九三学社社员', 10.00, '', 1399985191002447872, '2022-02-22 15:41:34', 1399985191002447872, '2022-02-22 15:41:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496027408141070336, 1496024933900169216, 'Political', '11', '台盟盟员', 11.00, '', 1399985191002447872, '2022-02-22 15:41:44', 1399985191002447872, '2022-02-22 15:41:44', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496027456849522688, 1496024933900169216, 'Political', '12', '无党派人士', 12.00, '', 1399985191002447872, '2022-02-22 15:41:55', 1399985191002447872, '2022-02-22 15:41:55', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496027516639326208, 1496024933900169216, 'Political', '13', '群众', 13.00, '', 1399985191002447872, '2022-02-22 15:42:09', 1399985191002447872, '2022-02-22 15:42:10', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780500696539136, 1496722894707728384, 'PayChannel', '1', '支付宝', 1.00, '', 1399985191002447872, '2022-02-24 17:34:15', 1399985191002447872, '2022-03-08 11:02:59', 0, 3); -INSERT INTO `base_dict_item` VALUES (1496780576818962432, 1496722894707728384, 'PayChannel', '2', '微信', 2.00, '', 1399985191002447872, '2022-02-24 17:34:33', 1399985191002447872, '2022-03-08 11:04:00', 0, 2); -INSERT INTO `base_dict_item` VALUES (1496780712492113920, 1496723207565058048, 'PayWay', '1', 'wap支付', 0.00, '', 1399985191002447872, '2022-02-24 17:35:05', 1399985191002447872, '2022-02-24 17:35:05', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780757647990784, 1496723207565058048, 'PayWay', '2', '应用支付', 0.00, '', 1399985191002447872, '2022-02-24 17:35:16', 1399985191002447872, '2022-02-24 17:35:16', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780799691694080, 1496723207565058048, 'PayWay', '3', 'web支付', 0.00, '', 1399985191002447872, '2022-02-24 17:35:26', 1399985191002447872, '2022-02-24 17:35:26', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780838451257344, 1496723207565058048, 'PayWay', '4', '二维码扫码支付', 0.00, '', 1399985191002447872, '2022-02-24 17:35:35', 1399985191002447872, '2022-02-24 17:35:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780876388737024, 1496723207565058048, 'PayWay', '5', '付款码支付', 0.00, '', 1399985191002447872, '2022-02-24 17:35:44', 1399985191002447872, '2022-02-24 17:35:44', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497141630803566592, 1497140849954185216, 'PayStatus', '3', '支付取消', 0.00, '', 1399985191002447872, '2022-02-25 17:29:15', 1399985191002447872, '2022-02-25 17:29:15', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497141652379066368, 1497140849954185216, 'PayStatus', '2', '失败', 0.00, '', 1399985191002447872, '2022-02-25 17:29:20', 1399985191002447872, '2022-02-25 17:29:20', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497141681915355136, 1497140849954185216, 'PayStatus', '1', '成功', 0.00, '', 1399985191002447872, '2022-02-25 17:29:27', 1399985191002447872, '2022-02-25 17:29:27', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497141712743489536, 1497140849954185216, 'PayStatus', '0', '支付中', 0.00, '', 1399985191002447872, '2022-02-25 17:29:35', 1399985191002447872, '2022-02-25 17:29:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497506810439892992, 1497140849954185216, 'PayStatus', '4', '部分退款', 1.00, '部分退款', 1399985191002447872, '2022-02-26 17:40:21', 1399985191002447872, '2022-03-04 21:22:46', 0, 7); -INSERT INTO `base_dict_item` VALUES (1499367587857694720, 1497140849954185216, 'PayStatus', '5', '已退款', 2.00, '完全退款', 1399985191002447872, '2022-03-03 20:54:25', 1399985191002447872, '2022-03-04 21:22:49', 0, 3); -INSERT INTO `base_dict_item` VALUES (1501030031432847360, 1496722894707728384, 'PayChannel', '3', '云闪付', 3.00, '', 1399985191002447872, '2022-03-08 11:00:22', 1399985191002447872, '2022-03-08 11:04:07', 0, 2); -INSERT INTO `base_dict_item` VALUES (1501030073489133568, 1496722894707728384, 'PayChannel', '4', '现金', 4.00, '', 1399985191002447872, '2022-03-08 11:00:32', 1399985191002447872, '2022-03-08 11:04:10', 0, 2); -INSERT INTO `base_dict_item` VALUES (1501030108314439680, 1496722894707728384, 'PayChannel', '5', '钱包', 5.00, '', 1399985191002447872, '2022-03-08 11:00:40', 1399985191002447872, '2022-03-08 11:04:14', 0, 2); -INSERT INTO `base_dict_item` VALUES (1501031490513768448, 1501031423232937984, 'AsyncPayChannel', '3', '云闪付', 0.00, '', 1399985191002447872, '2022-03-08 11:06:10', 1399985191002447872, '2022-03-08 11:06:10', 0, 0); -INSERT INTO `base_dict_item` VALUES (1501031518208757760, 1501031423232937984, 'AsyncPayChannel', '2', '微信', 0.00, '', 1399985191002447872, '2022-03-08 11:06:16', 1399985191002447872, '2022-03-08 11:06:16', 0, 0); -INSERT INTO `base_dict_item` VALUES (1501031544360243200, 1501031423232937984, 'AsyncPayChannel', '1', '支付宝', 0.00, '', 1399985191002447872, '2022-03-08 11:06:23', 1399985191002447872, '2022-03-08 11:06:23', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502276841057005568, 1502276739978473472, 'WalletStatus', '2', '禁用', 0.00, '', 1399985191002447872, '2022-03-11 21:34:45', 1399985191002447872, '2022-03-11 21:34:45', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502276862108217344, 1502276739978473472, 'WalletStatus', '1', '正常', 0.00, '', 1399985191002447872, '2022-03-11 21:34:50', 1399985191002447872, '2022-03-11 21:34:50', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502624716257456128, 1502624515799085056, 'WalletLogType', '1', '开通', 0.00, '', 1399985191002447872, '2022-03-12 20:37:04', 1399985191002447872, '2022-03-12 20:37:04', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502624931978899456, 1502624515799085056, 'WalletLogType', '2', '主动充值', 0.00, '', 1399985191002447872, '2022-03-12 20:37:56', 1399985191002447872, '2022-03-12 20:37:56', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502624956209393664, 1502624515799085056, 'WalletLogType', '3', '自动充值', 0.00, '', 1399985191002447872, '2022-03-12 20:38:02', 1399985191002447872, '2022-03-12 20:38:02', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625014719934464, 1502624515799085056, 'WalletLogType', '4', '余额变动', 0.00, '', 1399985191002447872, '2022-03-12 20:38:16', 1399985191002447872, '2022-03-12 20:38:16', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625053097816064, 1502624515799085056, 'WalletLogType', '5', '支付', 0.00, '', 1399985191002447872, '2022-03-12 20:38:25', 1399985191002447872, '2022-03-12 20:38:25', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625091639275520, 1502624515799085056, 'WalletLogType', '6', '系统扣除余额', 0.00, '', 1399985191002447872, '2022-03-12 20:38:34', 1399985191002447872, '2022-03-12 20:38:34', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625123725701120, 1502624515799085056, 'WalletLogType', '7', '退款', 0.00, '', 1399985191002447872, '2022-03-12 20:38:42', 1399985191002447872, '2022-03-12 20:38:42', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625783145787392, 1502624632392347648, 'WalletLogOperation', '1', '系统操作', 0.00, '', 1399985191002447872, '2022-03-12 20:41:19', 1399985191002447872, '2022-03-12 20:41:19', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625814837948416, 1502624632392347648, 'WalletLogOperation', '2', '管理员操作', 0.00, '', 1399985191002447872, '2022-03-12 20:41:26', 1399985191002447872, '2022-03-12 20:41:26', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625850355314688, 1502624632392347648, 'WalletLogOperation', '3', '用户操作', 0.00, '', 1399985191002447872, '2022-03-12 20:41:35', 1399985191002447872, '2022-03-12 20:41:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1503340241493135360, 1503340128037212160, 'VoucherStatus', '1', '启用', 0.00, '', 1399985191002447872, '2022-03-14 20:00:19', 1399985191002447872, '2022-03-14 20:00:19', 0, 0); -INSERT INTO `base_dict_item` VALUES (1503340326645895168, 1503340128037212160, 'VoucherStatus', '2', '停用', 0.00, '', 1399985191002447872, '2022-03-14 20:00:39', 1399985191002447872, '2022-03-14 20:00:39', 0, 0); -INSERT INTO `base_dict_item` VALUES (1505112357976612864, 1496722894707728384, 'PayChannel', '6', '储值卡', 0.00, '', 1399985191002447872, '2022-03-19 17:22:04', 1399985191002447872, '2022-03-19 17:22:04', 0, 0); -INSERT INTO `base_dict_item` VALUES (1524356452720758784, 1524356376518643712, 'GoodsParamType', 'input', '手工录入', 0.00, '', 1399985191002447872, '2022-05-11 19:51:14', 1399985191002447872, '2022-05-11 19:51:14', 0, 0); -INSERT INTO `base_dict_item` VALUES (1524356510157557760, 1524356376518643712, 'GoodsParamType', 'select', '列表选择', 0.00, '', 1399985191002447872, '2022-05-11 19:51:28', 1399985191002447872, '2022-05-11 19:51:28', 0, 0); - --- ---------------------------- --- Table structure for iam_perm_menu --- ---------------------------- -CREATE TABLE `iam_perm_menu` ( - `id` bigint(20) NOT NULL, - `client_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '终端code', - `parent_id` bigint(20) NULL DEFAULT NULL COMMENT '父id', - `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '菜单名称', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '路由名称', - `perm_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '菜单权限编码', - `effect` bit(1) NULL DEFAULT NULL COMMENT '是否有效', - `icon` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '菜单图标', - `hidden` bit(1) NOT NULL COMMENT '是否隐藏', - `hide_children_in_menu` bit(1) NOT NULL COMMENT '是否隐藏子菜单', - `component` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '组件', - `component_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '组件名字', - `path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '路径', - `redirect` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '菜单跳转地址(重定向)', - `sort_no` double NOT NULL COMMENT '菜单排序', - `menu_type` int(5) NOT NULL COMMENT '类型（0：一级菜单；1：子菜单 ；2：按钮权限）', - `leaf` bit(1) NULL DEFAULT NULL COMMENT '是否叶子节点', - `keep_alive` bit(1) NULL DEFAULT NULL COMMENT '是否缓存页面', - `target_outside` bit(1) NULL DEFAULT NULL COMMENT '是否外部打开方式', - `hidden_header_content` bit(1) NULL DEFAULT NULL COMMENT '隐藏的标题内容', - `admin` bit(1) NOT NULL COMMENT '系统菜单', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '权限_菜单' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of iam_perm_menu --- ---------------------------- -INSERT INTO `iam_perm_menu` VALUES (1414596052497092608, 'admin', NULL, '系统管理', 'system', '', NULL, 'desktop', b'0', b'0', 'RouteView', '', '/system', '/system/user', 0, 0, b'0', b'1', b'0', b'0', b'1', NULL, 1399985191002447872, '2021-08-27 10:32:53', 1399985191002447872, '2021-08-27 10:02:16', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1414596647509446656, 'admin', 1452569691537256448, '用户管理', 'User', '', NULL, '', b'0', b'0', 'system/user/UserList', '', '/system/userAuth/user', '', 0, 1, b'0', b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-08-27 10:32:53', 1399985191002447872, '2021-08-27 10:17:40', 4, 0); -INSERT INTO `iam_perm_menu` VALUES (1414596773275652096, 'admin', 1414596052497092608, '菜单管理', 'Menu', '', NULL, '', b'0', b'0', 'system/menu/MenuList', '', '/system/permission/menu', '', 0, 1, b'0', b'1', b'0', b'0', b'1', NULL, 1399985191002447872, '2021-08-27 10:32:53', 1399985191002447872, '2021-08-26 23:56:16', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1414596805538238464, 'admin', 1452569339987472384, '角色管理', 'Role', '', NULL, '', b'0', b'0', 'system/role/RoleList', '', '/system/permission/role', '', 0, 1, b'1', b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-08-27 10:32:53', 1399985191002447872, '2021-08-26 23:56:04', 4, 0); -INSERT INTO `iam_perm_menu` VALUES (1414596842322284544, 'admin', 1452569691537256448, '部门管理', 'Dept', '', NULL, '', b'0', b'0', 'system/dept/DeptList', '', '/system/userAuth/dept', '', 0, 1, b'1', b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-08-27 10:32:53', 1399985191002447872, '2021-08-26 23:56:31', 7, 0); -INSERT INTO `iam_perm_menu` VALUES (1414596877617352704, 'admin', 1452571269199540224, '数据字典', 'Dict', '', b'0', '', b'0', b'0', 'system/translate/DictList', '', '/system/config/translate', '', 0, 1, b'1', b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-08-27 10:32:53', 1399985191002447872, '2022-05-19 09:04:55', 11, 0); -INSERT INTO `iam_perm_menu` VALUES (1431082258161434624, 'admin', 1452569691537256448, '在线用户管理', 'OnlineUser', '', NULL, '', b'0', b'0', 'system/online/OnlineUserList', NULL, '/system/userAuth/online', '', 0, 1, b'1', b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-08-27 10:32:53', 1399985191002447872, '2021-08-27 10:32:53', 6, 0); -INSERT INTO `iam_perm_menu` VALUES (1431083330909208576, 'admin', 1414596052497092608, '终端管理', 'Client', '', b'0', '', b'0', b'0', 'system/client/ClientList', NULL, '/system/config/client', '', 0, 1, b'1', b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-08-27 10:37:09', 1399985191002447872, '2022-05-19 09:04:25', 6, 0); -INSERT INTO `iam_perm_menu` VALUES (1431089129232498688, 'admin', 1452569339987472384, '请求权限管理', 'Path', '', NULL, '', b'0', b'0', 'system/path/PathList', NULL, '/system/permission/path', '', 0, 1, b'1', b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-08-27 11:00:11', 1399985191002447872, '2021-08-27 11:00:11', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1431152689832525824, 'admin', NULL, '系统监控', 'monitor', '', b'0', 'radar-chart', b'0', b'0', 'RouteView', NULL, '/monitor', '', 0, 0, b'1', b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2021-08-27 15:12:45', 1399985191002447872, '2022-06-07 10:30:49', 18, 0); -INSERT INTO `iam_perm_menu` VALUES (1431153358157348864, 'admin', 1431152689832525824, '接口文档', 'ApiSwagger', '', b'0', '', b'0', b'0', '', NULL, 'http://127.0.0.1:9999/doc.html', '', 0, 1, b'1', b'1', b'1', b'0', b'0', NULL, 1399985191002447872, '2021-08-27 15:15:25', 1399985191002447872, '2022-06-07 11:06:52', 15, 0); -INSERT INTO `iam_perm_menu` VALUES (1435143678721236992, 'admin', 1452567897717321728, '登录日志', 'LoginLog', '', NULL, '', b'0', b'0', 'starter/log/LoginLogList', NULL, '/system/log/loginLog', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-09-07 15:31:31', 1399985191002447872, '2021-09-07 15:31:31', 5, 0); -INSERT INTO `iam_perm_menu` VALUES (1435476255797624832, 'admin', 1452567897717321728, '操作日志', 'OperateLog', '', NULL, '', b'0', b'0', 'starter/log/OperateLogList', NULL, '/system/log/OperateLog', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-09-08 13:33:04', 1399985191002447872, '2021-09-08 13:33:04', 7, 0); -INSERT INTO `iam_perm_menu` VALUES (1438061887002759168, 'admin', NULL, '通知管理', 'notice', '', NULL, 'message', b'0', b'0', 'RouteView', NULL, '/notice', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-09-15 16:47:26', 1399985191002447872, '2021-09-15 16:47:26', 3, 0); -INSERT INTO `iam_perm_menu` VALUES (1438072357281542144, 'admin', 1438061887002759168, '邮件配置', 'MailConfig', '', NULL, '', b'0', b'0', 'notice/mail/MailConfigList', NULL, '/notice/mailConfig', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-09-15 17:29:03', 1399985191002447872, '2021-09-15 17:29:03', 3, 0); -INSERT INTO `iam_perm_menu` VALUES (1439196893514031104, 'admin', 1438061887002759168, '消息模板', 'MessageTemplate', '', NULL, '', b'0', b'0', 'notice/template/TemplateList', NULL, '/notice/template', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-09-18 19:57:33', 1399985191002447872, '2021-09-18 19:57:33', 3, 0); -INSERT INTO `iam_perm_menu` VALUES (1440216178722050048, 'admin', 1438061887002759168, '钉钉', 'DingTalk', '', NULL, '', b'0', b'0', 'RouteView', NULL, '/notice/dingTalk', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-09-21 15:27:50', 1399985191002447872, '2021-09-21 15:27:50', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1440216612211757056, 'admin', 1440216178722050048, '钉钉机器人', 'DingTalkRobot', '', NULL, '', b'0', b'0', 'notice/dingTalk/robot/DingRobotConfigList', NULL, '/notice/dingTalk/robot', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-09-21 15:29:33', 1399985191002447872, '2021-09-21 15:29:33', 3, 0); -INSERT INTO `iam_perm_menu` VALUES (1450473063320526848, 'admin', 1452569691537256448, '第三方登录', 'Social', '', NULL, '', b'0', b'0', 'system/social/SocialList', NULL, '/system/userAuth/social', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-19 22:45:01', 1399985191002447872, '2021-10-19 22:45:01', 4, 0); -INSERT INTO `iam_perm_menu` VALUES (1450803906215886848, 'admin', 1452571269199540224, '定时任务', 'QuartzJobList', '', NULL, '', b'0', b'0', 'starter/quartz/QuartzJobList', NULL, '/system/config/quartz', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 20:39:41', 1399985191002447872, '2021-10-20 20:39:41', 5, 0); -INSERT INTO `iam_perm_menu` VALUES (1450819607680991232, 'admin', NULL, '第三方对接', 'social', '', b'0', 'branches', b'0', b'0', 'RouteView', NULL, '/social', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 21:42:04', 1399985191002447872, '2022-04-05 16:53:25', 3, 0); -INSERT INTO `iam_perm_menu` VALUES (1450821723027881984, 'admin', 1450819607680991232, '微信', 'SocialWeChat', '', NULL, '', b'0', b'0', 'RouteView', NULL, '/social/wechat', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 21:50:28', 1399985191002447872, '2021-10-20 21:50:28', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1450821877831254016, 'admin', 1450819607680991232, '企业微信', 'SocialWeCom', '', NULL, '', b'0', b'0', 'RouteView', NULL, '/social/wecom', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 21:51:05', 1399985191002447872, '2021-10-20 21:51:05', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1450822511087271936, 'admin', 1450819607680991232, '钉钉', 'SocialDingTalk', '', NULL, '', b'0', b'0', 'RouteView', NULL, '/social/dingtalk', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 21:53:36', 1399985191002447872, '2021-10-20 21:53:36', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1450822842995130368, 'admin', NULL, '支付管理', 'PayManager', '', NULL, 'pay-circle', b'0', b'0', 'RouteView', NULL, '/payment', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 21:54:55', 1399985191002447872, '2021-10-20 21:54:55', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1450823960236081152, 'admin', 1450822842995130368, '支付通道', 'PayChannel', '', NULL, '', b'0', b'0', 'RouteView', NULL, '/payment/channel', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 21:59:22', 1399985191002447872, '2021-10-20 21:59:22', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1450824117849636864, 'admin', 1450823960236081152, '支付宝', 'AliPayConfig', '', NULL, '', b'0', b'0', 'payment/channel/alipay/AliPayConfigList', NULL, '/payment/channel/alipay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 21:59:59', 1399985191002447872, '2021-10-20 21:59:59', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1450824319868289024, 'admin', 1450823960236081152, '微信支付', 'WeChatPayConfig', '', NULL, '', b'0', b'0', 'payment/channel/wechat/WeChatConfigList', NULL, '/payment/channel/wechat', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:00:48', 1399985191002447872, '2021-10-20 22:00:48', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1450824637876224000, 'admin', 1450823960236081152, '云闪付', 'UnionPayConfig', '', b'0', '', b'0', b'0', 'payment/channel/unionpay/UnionPayConfigList', NULL, '/payment/channel/unionpay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:02:03', 1399985191002447872, '2022-03-04 16:12:13', 3, 0); -INSERT INTO `iam_perm_menu` VALUES (1450824875198332928, 'admin', 1450823960236081152, '现金支付', 'CashPayConfig', '', b'0', '', b'1', b'0', '', NULL, '/payment/channel/cash', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:03:00', 1399985191002447872, '2022-03-04 16:12:08', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1450825488577544192, 'admin', 1450822842995130368, '收银台', 'PayCashier', '', NULL, '', b'0', b'0', 'payment/cashier/Cashier', NULL, '/payment/cashier', '', -1, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:05:26', 1399985191002447872, '2021-10-20 22:05:26', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1450825615857893376, 'admin', 1450822842995130368, '订单管理', 'PayOrder', '', NULL, '', b'0', b'0', 'RouteView', NULL, '/payment/order', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:05:57', 1399985191002447872, '2021-10-20 22:05:57', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1450825819436826624, 'admin', 1450822842995130368, '回调记录', 'PayNotify', '', NULL, '', b'0', b'0', 'payment/notify/PayNotifyRecordList', NULL, '/payment/notify', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:06:45', 1399985191002447872, '2021-10-20 22:06:45', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1450826890318135296, 'admin', 1450825615857893376, '支付订单', 'PaymentOrder', '', b'0', '', b'0', b'0', 'payment/order/payment/PaymentList', NULL, '/payment/order/payment', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:11:00', 1399985191002447872, '2022-02-25 15:17:07', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1450827159626006528, 'admin', 1450825615857893376, '退款订单', 'ReturnOrder', '', b'0', '', b'0', b'0', 'payment/order/refund/RefundRecordList', NULL, '/payment/order/return', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:12:05', 1399985191002447872, '2022-03-04 15:44:06', 4, 0); -INSERT INTO `iam_perm_menu` VALUES (1450827308515409920, 'admin', 1450825615857893376, '转账订单', 'TransferOrder', '', b'0', '', b'1', b'0', 'payment/order/transfer/TransferList', NULL, '/payment/order/transfer', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:12:40', 1399985191002447872, '2022-03-04 15:33:31', 3, 0); -INSERT INTO `iam_perm_menu` VALUES (1450827660459458560, 'admin', 1438061887002759168, '微信', 'NoticeWeChat', '', NULL, '', b'0', b'0', '', NULL, '/notice/wechat', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:14:04', 1399985191002447872, '2021-10-20 22:14:04', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1452567897717321728, 'admin', 1414596052497092608, '审计日志', 'auditLog', '', NULL, '', b'0', b'0', 'RouteView', NULL, '/system/log', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-25 17:29:09', 1399985191002447872, '2021-10-25 17:29:09', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1452569339987472384, 'admin', 1414596052497092608, '权限管理', 'permission', '', NULL, '', b'0', b'0', 'RouteView', NULL, '/system/permission', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-25 17:34:53', 1399985191002447872, '2021-10-25 17:34:53', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1452569691537256448, 'admin', 1414596052497092608, '用户信息', 'userAuth', '', NULL, '', b'0', b'0', 'RouteView', NULL, '/system/userAuth', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-25 17:36:17', 1399985191002447872, '2021-10-25 17:36:17', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1452571269199540224, 'admin', 1414596052497092608, '系统配置', 'systemConfig', '', NULL, '', b'0', b'0', 'RouteView', NULL, '/system/config', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-25 17:42:33', 1399985191002447872, '2021-10-25 17:42:33', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1452638905302966272, 'admin', 1452571269199540224, '系统参数', 'SystemParam', '', NULL, '', b'0', b'0', 'system/param/SystemParamList', NULL, '/system/config/param', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-25 22:11:18', 1399985191002447872, '2021-10-25 22:11:18', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1474694545336676352, 'admin', 1452569339987472384, '数据范围权限', 'DataScope', '', NULL, '', b'0', b'0', 'system/scope/DataScopeList', NULL, '/system/permission/data', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-12-25 18:52:33', 1399985191002447872, '2021-12-25 18:52:33', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1476489893513404416, 'admin', 1414596052497092608, '22', NULL, '22', b'1', NULL, b'0', b'0', NULL, NULL, NULL, NULL, 0, 2, NULL, b'0', b'0', b'0', b'0', '', 1399985191002447872, '2021-12-30 17:46:37', 1399985191002447872, '2021-12-30 17:46:37', 4, 1); -INSERT INTO `iam_perm_menu` VALUES (1478002945936015360, 'admin', 1414596052497092608, '1', NULL, '1', b'1', NULL, b'0', b'0', NULL, NULL, NULL, NULL, 0, 2, NULL, b'0', b'0', b'0', b'0', '', 1399985191002447872, '2022-01-03 21:58:57', 1399985191002447872, '2022-01-03 21:58:57', 0, 1); -INSERT INTO `iam_perm_menu` VALUES (1478004271512240128, 'admin', 1414596052497092608, '22', NULL, '22', b'1', NULL, b'0', b'0', NULL, NULL, NULL, NULL, 0, 2, NULL, b'0', b'0', b'0', b'0', '', 1399985191002447872, '2022-01-03 22:04:13', 1399985191002447872, '2022-01-03 22:04:13', 0, 1); -INSERT INTO `iam_perm_menu` VALUES (1480839877352476672, 'admin', 1452567897717321728, '数据版本日志', 'DataVersionLog', NULL, b'0', '', b'0', b'0', 'starter/log/DataVersionLogList', NULL, '/system/log/DataVersionLog', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-01-11 17:51:54', 1399985191002447872, '2022-01-11 17:51:54', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1490984296616263680, 'admin', 1452571269199540224, '文件管理', 'FIleUpLoad', NULL, b'0', '', b'0', b'0', 'starter/file/FileUploadList', NULL, '/system/config/file', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-02-08 17:42:12', 1399985191002447872, '2022-02-08 17:42:12', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1495013564652429312, 'admin', 1452571269199540224, '代码生成', 'CodeGen', NULL, b'0', '', b'0', b'0', 'starter/codegen/CodeGenList', NULL, '/system/config/codeGen', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-02-19 20:33:04', 1399985191002447872, '2022-02-19 20:33:05', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1495968302034210816, 'admin', NULL, '功能演示', 'Demo', NULL, b'0', 'block', b'0', b'0', 'RouteView', NULL, '/demo', '', 99, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-02-22 11:46:52', 1399985191002447872, '2022-05-10 11:02:05', 3, 0); -INSERT INTO `iam_perm_menu` VALUES (1495969099987963904, 'admin', 1495968302034210816, '数据相关', 'DemoData', NULL, b'0', '', b'0', b'0', 'RouteView', NULL, '/demo/data', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-02-22 11:50:02', 1399985191002447872, '2022-03-24 16:27:46', 4, 0); -INSERT INTO `iam_perm_menu` VALUES (1496020308992143360, 'admin', 1495968302034210816, '超级查询', 'SuperQueryDemo', NULL, b'0', '', b'0', b'0', 'demo/query/SuperQueryDemoList', NULL, '/demo/query/super', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-02-22 15:13:31', 1399985191002447872, '2022-05-27 17:34:41', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1501740492360962048, 'admin', 1450822842995130368, '钱包管理', 'Wallet', NULL, b'0', '', b'0', b'0', 'RouteView', NULL, '/payment/wallet', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-10 10:03:29', 1399985191002447872, '2022-03-10 10:04:53', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1501742229142556672, 'admin', 1501740492360962048, '钱包列表', 'WalletList', NULL, b'0', '', b'0', b'0', 'payment/wallet/list/WalletList', NULL, '/payment/wallet/list', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-10 10:10:23', 1399985191002447872, '2022-03-10 17:06:19', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1501742417378725888, 'admin', 1501740492360962048, '个人钱包', 'PersonalWallet', NULL, b'0', '', b'0', b'0', 'payment/wallet/list/WalletList', NULL, '/payment/wallet/personal', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-10 10:11:08', 1399985191002447872, '2022-03-10 17:06:10', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1501847310319972352, 'admin', 1450822842995130368, '组合支付', 'CombinationCashier', NULL, b'0', '', b'0', b'0', 'payment/combination/CombinationCashier', NULL, '/payment/combination', '', -0.5, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-10 17:07:56', 1399985191002447872, '2022-03-10 17:09:28', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1502926397176242176, 'admin', 1450822842995130368, '储值卡', 'Voucher', NULL, b'0', '', b'0', b'0', 'payment/voucher/VoucherList', NULL, '/payment/voucher', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-13 16:35:51', 1399985191002447872, '2022-03-14 19:39:45', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1506910599819165696, 'admin', 1495969099987963904, '数据权限', 'DataPermDemoList', NULL, b'0', '', b'0', b'0', 'demo/data/perm/DataPermDemoList', NULL, '/demo/data/perm', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-24 16:27:39', 1399985191002447872, '2022-03-24 16:28:56', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1506910885463851008, 'admin', 1495969099987963904, '加密解密', 'DataEncryptDemo', NULL, b'0', '', b'0', b'0', 'demo/data/encrypt/DataEncryptDemoList', NULL, '/demo/data/encrypt', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-24 16:28:47', 1399985191002447872, '2022-03-24 16:28:47', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1506911113394913280, 'admin', 1495969099987963904, '数据脱敏', 'DataSensitiveDemo', NULL, b'0', '', b'0', b'0', 'demo/data/sensitive/DataSensitiveDemoList', NULL, '/demo/data/sensitive', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-24 16:29:41', 1399985191002447872, '2022-03-24 17:16:03', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1507998458886197248, 'admin', 1495968302034210816, 'WS演示', 'WebsocketDemo', NULL, b'0', '', b'0', b'0', 'demo/ws/WebsocketDemo', NULL, '/demo/ws', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-27 16:30:25', 1399985191002447872, '2022-03-27 16:30:25', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1509488473583562752, 'admin', 1495968302034210816, '幂等请求演示', 'IdempotentDemo', NULL, b'0', '', b'0', b'0', 'demo/idempotent/Idempotent', NULL, '/demo/idempotent', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-31 19:11:12', 1399985191002447872, '2022-05-27 17:35:00', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1511266086400524288, 'admin', 1450822511087271936, '钉钉配置', 'DingTalkConfig', NULL, b'0', '', b'0', b'0', 'social/dingtalk/config/DingTalkConfigList', NULL, '/social/dingtalk/config', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-04-05 16:54:48', 1399985191002447872, '2022-04-05 16:54:48', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1523860792695283712, 'admin', NULL, '商品管理', 'GoodsManager', NULL, b'0', 'car', b'0', b'0', 'RouteView', NULL, '/goods', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-10 11:01:40', 1399985191002447872, '2022-05-10 11:02:45', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1523941932282114048, 'admin', 1523860792695283712, '类目管理', 'CategoryManager', NULL, b'0', '', b'0', b'0', 'RouteView', NULL, '/goods/category', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-10 16:24:05', 1399985191002447872, '2022-05-10 16:24:17', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1523942130555252736, 'admin', 1523941932282114048, '类目', 'Category', NULL, b'0', '', b'0', b'0', 'goods/category/CategoryList', NULL, '/goods/category/category', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-10 16:24:52', 1399985191002447872, '2022-05-10 16:25:23', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1524044195818278912, 'admin', 1523941932282114048, '品牌', 'Brand', NULL, b'0', '', b'0', b'0', 'goods/brand/BrandList', NULL, '/goods/category/brand', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-10 23:10:26', 1399985191002447872, '2022-05-10 23:14:20', 4, 0); -INSERT INTO `iam_perm_menu` VALUES (1524044395823665152, 'admin', 1523941932282114048, '规格', 'SpecificationList', NULL, b'0', '', b'0', b'0', 'goods/spec/SpecificationList', NULL, '/goods/category/spec', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-10 23:11:14', 1399985191002447872, '2022-05-10 23:13:51', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1524044678314233856, 'admin', 1523941932282114048, '参数组', 'ParameterGroup', NULL, b'0', '', b'1', b'0', 'goods/parameter/ParameterGroupList', NULL, '/goods/category/parameter', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-10 23:12:21', 1399985191002447872, '2022-05-12 20:30:23', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1525472571967860736, 'admin', 1523860792695283712, '商品', 'Goods', '', b'0', '', b'0', b'0', 'goods/goods/GoodsList', NULL, '/goods/goods', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-14 21:46:18', 1399985191002447872, '2022-05-14 21:46:18', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1530120084482084864, 'admin', 1495968302034210816, '消息中间件演示', 'MQDemo', NULL, b'0', '', b'0', b'0', 'demo/mq/MqDemo', NULL, '/demo/mq', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-27 17:33:51', 1399985191002447872, '2022-05-31 15:12:15', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1530120684645044224, 'admin', 1530120084482084864, 'MQTT消息', 'MqttDemo', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/mq/mqtt', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-27 17:36:14', 1399985191002447872, '2022-05-27 17:36:14', 0, 1); -INSERT INTO `iam_perm_menu` VALUES (1530120821144473600, 'admin', 1530120084482084864, 'RabbitMQ', 'RabbitDemo', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/mq/rabbit', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-27 17:36:47', 1399985191002447872, '2022-05-27 17:36:47', 0, 1); -INSERT INTO `iam_perm_menu` VALUES (1534000136370204672, 'admin', 1431152689832525824, 'ELK日志', 'ELK', '', b'0', '', b'0', b'0', '', NULL, 'http://elk.dev.bootx.cn:5601/app/discover', '', 0, 1, NULL, b'1', b'1', b'0', b'0', NULL, 1399985191002447872, '2022-06-07 10:31:48', 1399985191002447872, '2022-06-07 10:31:48', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1534008203006652416, 'admin', 1431152689832525824, 'PlumeLog日志', 'PlumeLog', '', b'0', '', b'0', b'0', '', NULL, 'http://127.0.0.1:9999/plumelog/#/', '', 0, 1, NULL, b'1', b'1', b'0', b'0', NULL, 1399985191002447872, '2022-06-07 11:03:51', 1399985191002447872, '2022-06-07 11:06:13', 1, 0); - --- ---------------------------- --- Table structure for base_dict --- ---------------------------- -CREATE TABLE `base_dict` ( - `id` bigint(20) NOT NULL, - `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '编码', - `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '名称', - `group_tag` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '分类标签', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', - `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - `version` int(8) NULL DEFAULT NULL COMMENT '版本', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of base_dict --- ---------------------------- -INSERT INTO `base_dict` VALUES (1422929378374828033, 'Sex', '性别', '基础属性', '性别', 0, '2021-08-04 22:36:15', 1399985191002447872, '2022-05-11 19:48:40', 0, 6); -INSERT INTO `base_dict` VALUES (1425744045414772737, 'MenuType', '菜单类型', '系统属性', '菜单类型', 0, '2021-08-12 17:00:44', 1399985191002447872, '2022-05-11 19:48:44', 0, 4); -INSERT INTO `base_dict` VALUES (1430063572491411456, 'loginType', '字典类型', NULL, '字典类型', 1399985191002447872, '2021-08-24 15:05:00', 1399985191002447872, '2021-08-24 15:05:00', 1, 2); -INSERT INTO `base_dict` VALUES (1435829999592759296, 'UserStatusCode', '用户状态码', '系统属性', '用户状态码', 1399985191002447872, '2021-09-09 12:58:43', 1399985191002447872, '2022-05-11 19:48:56', 0, 2); -INSERT INTO `base_dict` VALUES (1435838066191458304, 'LogBusinessType', '业务操作类型', '系统属性', '操作日志记录的业务操作类型', 1399985191002447872, '2021-09-09 13:30:46', 1399985191002447872, '2022-05-11 19:49:00', 0, 2); -INSERT INTO `base_dict` VALUES (1438078864509317120, 'MailSecurityCode', '邮箱安全方式编码', '消息服务', '邮箱安全方式编码', 1399985191002447872, '2021-09-15 17:54:54', 1399985191002447872, '2022-05-11 19:49:06', 0, 2); -INSERT INTO `base_dict` VALUES (1439961232651034624, 'MessageTemplateCode', '消息模板类型', '消息服务', '消息模板类型', 1399985191002447872, '2021-09-20 22:34:46', 1399985191002447872, '2022-05-11 19:48:34', 0, 1); -INSERT INTO `base_dict` VALUES (1452836604783845376, 'SocialType', '三方系统类型', '系统属性', '三方系统类型', 1399985191002447872, '2021-10-26 11:16:54', 1399985191002447872, '2022-05-11 19:48:28', 0, 3); -INSERT INTO `base_dict` VALUES (1452843488735621120, 'ParamType', '参数类型', '系统属性', '参数类型', 1399985191002447872, '2021-10-26 11:44:15', 1399985191002447872, '2022-05-11 19:48:21', 0, 2); -INSERT INTO `base_dict` VALUES (1496024933900169216, 'Political', '政治面貌', '基础数据', '政治面貌', 1399985191002447872, '2022-02-22 15:31:54', 1399985191002447872, '2022-05-11 19:48:04', 0, 1); -INSERT INTO `base_dict` VALUES (1496722894707728384, 'PayChannel', '支付通道', '支付服务', '支付宝, 微信, 云闪付等', 1399985191002447872, '2022-02-24 13:45:21', 1399985191002447872, '2022-05-11 19:47:51', 0, 1); -INSERT INTO `base_dict` VALUES (1496723207565058048, 'PayWay', '支付方式', '支付服务', '扫码支付、Wap、App支付等', 1399985191002447872, '2022-02-24 13:46:35', 1399985191002447872, '2022-05-11 19:47:46', 0, 1); -INSERT INTO `base_dict` VALUES (1497140849954185216, 'PayStatus', '支付状态', '支付服务', '支付中,成功,失败等', 1399985191002447872, '2022-02-25 17:26:09', 1399985191002447872, '2022-05-11 19:47:40', 0, 2); -INSERT INTO `base_dict` VALUES (1501031423232937984, 'AsyncPayChannel', '异步支付通道', '支付服务', '如微信支付宝云闪付等第三方支付', 1399985191002447872, '2022-03-08 11:05:54', 1399985191002447872, '2022-05-11 19:47:37', 0, 1); -INSERT INTO `base_dict` VALUES (1502276739978473472, 'WalletStatus', '钱包状态', '支付服务', '钱包状态', 1399985191002447872, '2022-03-11 21:34:20', 1399985191002447872, '2022-05-11 19:47:33', 0, 2); -INSERT INTO `base_dict` VALUES (1502624342339448832, 'WalletOperation', '钱包日志操作类型', NULL, '', 1399985191002447872, '2022-03-12 20:35:35', 1399985191002447872, '2022-03-12 20:35:35', 1, 0); -INSERT INTO `base_dict` VALUES (1502624515799085056, 'WalletLogType', '钱包日志类型', '支付服务', '钱包日志类型', 1399985191002447872, '2022-03-12 20:36:17', 1399985191002447872, '2022-05-11 19:47:29', 0, 1); -INSERT INTO `base_dict` VALUES (1502624632392347648, 'WalletLogOperation', '钱包日志操作类型', '支付服务', '钱包日志操作类型', 1399985191002447872, '2022-03-12 20:36:44', 1399985191002447872, '2022-05-11 19:47:21', 0, 1); -INSERT INTO `base_dict` VALUES (1503340128037212160, 'VoucherStatus', '储值卡状态', '支付服务', '储值卡状态', 1399985191002447872, '2022-03-14 19:59:52', 1399985191002447872, '2022-05-11 19:47:12', 0, 1); -INSERT INTO `base_dict` VALUES (1524356168611188736, 'input', '手工输入', '商品服务', '', 1399985191002447872, '2022-05-11 19:50:06', 1399985191002447872, '2022-05-11 19:50:06', 1, 0); -INSERT INTO `base_dict` VALUES (1524356376518643712, 'GoodsParamType', '参数类型', '商品服务', '列表/手动输入', 1399985191002447872, '2022-05-11 19:50:56', 1399985191002447872, '2022-05-14 23:05:41', 0, 1); - --- ---------------------------- --- Table structure for iam_dept --- ---------------------------- -CREATE TABLE `iam_dept` ( - `id` bigint(20) NOT NULL COMMENT 'ID', - `parent_id` bigint(20) NULL DEFAULT NULL COMMENT '父机构ID', - `dept_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '机构/部门名称', - `sort_no` int(11) NOT NULL DEFAULT 0 COMMENT '排序', - `org_category` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '1' COMMENT '机构类别 1公司 2部门 3岗位', - `org_code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '机构编码', - `mobile` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '手机号', - `fax` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '传真', - `address` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '地址', - `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '部门组织机构表' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of iam_dept --- ---------------------------- -INSERT INTO `iam_dept` VALUES (1259382878857957377, NULL, 'Bootx Platform总公司', 0, '1', '1', '', NULL, '济南市高新区齐鲁软件园', NULL, -1, '2020-05-10 15:20:51', -1, '2020-05-10 17:52:15', 4, 0); -INSERT INTO `iam_dept` VALUES (1477976804995026944, NULL, 'Bootx Cloud公司', 0, '1', '1', '', NULL, '济南市高新区汉峪金谷', '', 1399985191002447872, '2022-01-03 20:15:04', 1399985191002447872, '2022-01-03 20:15:05', 0, 1); -INSERT INTO `iam_dept` VALUES (1477977184768282624, NULL, 'Bootx Cloud公司', 0, '1', '1', '', NULL, '', '', 1399985191002447872, '2022-01-03 20:16:35', 1399985191002447872, '2022-01-03 20:16:35', 0, 1); -INSERT INTO `iam_dept` VALUES (1477977301365739520, NULL, 'Bootx Cloud总公司', 0, '1', '2', '', NULL, '济南市高新区汉峪金谷', '', 1399985191002447872, '2022-01-03 20:17:03', 1399985191002447872, '2022-01-03 20:17:03', 1, 0); -INSERT INTO `iam_dept` VALUES (1477977592291053568, 1259382878857957377, 'bp济南分公司', 0, '1', '1_1', '', NULL, '', '', 1399985191002447872, '2022-01-03 20:18:12', 1399985191002447872, '2022-01-03 20:18:12', 1, 0); -INSERT INTO `iam_dept` VALUES (1477977690928500736, 1259382878857957377, '历城分公司', 0, '1', '1_2', '', NULL, '', '', 1399985191002447872, '2022-01-03 20:18:36', 1399985191002447872, '2022-01-03 20:18:36', 0, 1); -INSERT INTO `iam_dept` VALUES (1477977827897692160, 1259382878857957377, 'bp潍坊分公司', 0, '1', '1_2', '', NULL, '', '', 1399985191002447872, '2022-01-03 20:19:08', 1399985191002447872, '2022-01-03 20:19:08', 0, 0); -INSERT INTO `iam_dept` VALUES (1477977880947249152, 1477977301365739520, 'bc菏泽分公司', 0, '1', '2_1', '', NULL, '', '', 1399985191002447872, '2022-01-03 20:19:21', 1399985191002447872, '2022-01-03 20:19:21', 0, 0); -INSERT INTO `iam_dept` VALUES (1477977930175795200, 1477977301365739520, 'bc日照分公司', 0, '1', '2_2', '', NULL, '', '', 1399985191002447872, '2022-01-03 20:19:33', 1399985191002447872, '2022-01-03 20:19:33', 0, 0); -INSERT INTO `iam_dept` VALUES (1477978464559484928, 1477977592291053568, '历城办事部', 0, '2', '1_1_1', '', NULL, '', '', 1399985191002447872, '2022-01-03 20:21:40', 1399985191002447872, '2022-01-03 20:21:40', 1, 0); -INSERT INTO `iam_dept` VALUES (1477978512177418240, 1477977592291053568, '历下办事部', 0, '2', '1_1_2', '', NULL, '', '', 1399985191002447872, '2022-01-03 20:21:51', 1399985191002447872, '2022-01-03 20:21:52', 0, 0); -INSERT INTO `iam_dept` VALUES (1477978610865197056, 1477977592291053568, '高新办事部', 0, '2', '1_1_2', '', NULL, '', '', 1399985191002447872, '2022-01-03 20:22:15', 1399985191002447872, '2022-01-03 20:22:15', 0, 0); -INSERT INTO `iam_dept` VALUES (1477978810526650368, 1477977827897692160, '奎文办事部', 0, '2', '1_2_1', '', NULL, '', '', 1399985191002447872, '2022-01-03 20:23:03', 1399985191002447872, '2022-01-03 20:23:03', 0, 0); -INSERT INTO `iam_dept` VALUES (1477978883247493120, 1477977827897692160, '潍城办事部', 0, '2', '1_2_2', '', NULL, '', '', 1399985191002447872, '2022-01-03 20:23:20', 1399985191002447872, '2022-01-03 20:23:20', 0, 0); - --- ---------------------------- --- Table structure for iam_data_scope --- ---------------------------- -CREATE TABLE `iam_data_scope` ( - `id` bigint(20) NOT NULL COMMENT '角色ID', - `code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '编码', - `name` varchar(150) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '名称', - `type` int(4) NOT NULL COMMENT '类型', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '说明', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据范围权限' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of iam_data_scope --- ---------------------------- -INSERT INTO `iam_data_scope` VALUES (1474706893178871808, 'self', '自身数据', 1, '只能查看自身范围的数据', 1399985191002447872, '2021-12-25 19:41:37', 1399985191002447872, '2021-12-25 19:41:37', 1, 0); -INSERT INTO `iam_data_scope` VALUES (1474717084985270272, 'user', '用户数据权限', 2, '用户数据权限', 1399985191002447872, '2021-12-25 20:22:07', 1399985191002447872, '2021-12-25 20:22:07', 0, 0); -INSERT INTO `iam_data_scope` VALUES (1474717160671485952, 'dept', '部门权限', 3, '', 1399985191002447872, '2021-12-25 20:22:25', 1399985191002447872, '2021-12-25 20:22:25', 0, 0); -INSERT INTO `iam_data_scope` VALUES (1474717276908232704, 'userAndDept', '用户和部门权限', 4, '', 1399985191002447872, '2021-12-25 20:22:52', 1399985191002447872, '2021-12-25 20:22:52', 0, 0); -INSERT INTO `iam_data_scope` VALUES (1474717344562356224, 'all', '全部数据', 5, '', 1399985191002447872, '2021-12-25 20:23:09', 1399985191002447872, '2021-12-25 20:23:09', 0, 0); -INSERT INTO `iam_data_scope` VALUES (1477990268903804928, 'belong_dept', '所在部门', 6, '', 1399985191002447872, '2022-01-03 21:08:34', 1399985191002447872, '2022-01-03 21:08:35', 0, 0); -INSERT INTO `iam_data_scope` VALUES (1477990290521247744, 'belong_dept', '所在部门', 6, '', 1399985191002447872, '2022-01-03 21:08:40', 1399985191002447872, '2022-01-03 21:08:40', 0, 1); -INSERT INTO `iam_data_scope` VALUES (1477990439800721408, 'belong_dept_and_sub', '所在及下级部门', 7, '', 1399985191002447872, '2022-01-03 21:09:15', 1399985191002447872, '2022-01-03 21:09:15', 0, 0); - --- ---------------------------- --- Table structure for goods_category --- ---------------------------- -CREATE TABLE `goods_category` ( - `id` bigint(20) NOT NULL, - `pid` bigint(20) NULL DEFAULT NULL COMMENT '上级类目id', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '类目名称', - `image` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '图标/图片地址', - `enable` bit(1) NOT NULL COMMENT '是否启用', - `sort_no` double(8, 2) NULL DEFAULT NULL COMMENT '排序', - `level` int(5) NULL DEFAULT NULL COMMENT '层级', - `remark` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '类目' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Table structure for sales_match_rule --- ---------------------------- -CREATE TABLE `sales_match_rule` ( - `id` bigint(20) NOT NULL, - `strategy_register_id` bigint(20) NOT NULL COMMENT '关联策略注册id', - `register_type` int(6) NOT NULL COMMENT '策略类型 策略/优惠券', - `feature_type` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '特征类型(sku/spu/shop)', - `feature_point` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '特征点', - `match_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '匹配类型', - `creator` bigint(20) NULL DEFAULT NULL, - `create_time` datetime(6) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `version` int(11) NOT NULL, - `deleted` bit(1) NOT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '匹配检查' ROW_FORMAT = DYNAMIC; - - --- ---------------------------- --- Table structure for iam_user_info --- ---------------------------- -CREATE TABLE `iam_user_info` ( - `id` bigint(20) NOT NULL, - `name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '名称', - `username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '账号', - `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '密码', - `phone` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '手机号', - `email` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '邮箱', - `client_ids` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '关联终端ids', - `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '头像', - `source` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '注册来源', - `admin` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否超级管理员', - `register_time` datetime(0) NULL DEFAULT NULL COMMENT '注册时间', - `status` tinyint(4) NOT NULL COMMENT '账号状态', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户信息' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of iam_user_info --- ---------------------------- -INSERT INTO `iam_user_info` VALUES (1399985191002447872, '小小明', 'xxm', 'f52020dca765fd3943ed40a615dc2c5c', '13300000000', 'xxm1995@outlook.com', '', NULL, NULL, b'1', '2021-06-02 15:04:12', 1, 1, '2021-06-02 15:04:15', 1399985191002447872, '2022-05-18 17:16:57', 47, 0); -INSERT INTO `iam_user_info` VALUES (1414143554414059520, '小小明1995', 'xxm1995', 'f52020dca765fd3943ed40a615dc2c5c', '13000000000', 'xxm1995@foxmail.com', NULL, NULL, NULL, b'1', '2021-07-11 16:44:31', 1, 1, '2021-07-11 16:44:32', 1414143554414059520, '2022-05-27 13:57:33', 3, 0); -INSERT INTO `iam_user_info` VALUES (1435894470432456704, '管理员', 'admin', 'f52020dca765fd3943ed40a615dc2c5c', '13000001111', 'admin@qq.com', '1430430071299207168', '', NULL, b'0', '2021-09-09 17:14:52', 1, 1399985191002447872, '2021-09-09 17:14:54', 1399985191002447872, '2022-06-05 20:26:45', 4, 0); -INSERT INTO `iam_user_info` VALUES (1435967884114194432, '测试', 'test', 'f52020dca765fd3943ed40a615dc2c5c', '13311111111', 'test@qq.com', '1430430071299207168', '', NULL, b'0', '2021-09-09 22:06:37', 1, 1414143554414059520, '2021-09-09 22:06:37', 1399985191002447872, '2022-05-31 15:59:37', 9, 0); -INSERT INTO `iam_user_info` VALUES (1477990832987361280, '测试用户001', 'test001', 'f52020dca765fd3943ed40a615dc2c5c', '', '', '1430430071299207168', '', NULL, b'0', '2022-01-03 21:10:49', 1, 1399985191002447872, '2022-01-03 21:10:49', 1399985191002447872, '2022-06-05 20:26:26', 1, 0); -INSERT INTO `iam_user_info` VALUES (1477997391729631232, '测试用户002', 'test002', 'f52020dca765fd3943ed40a615dc2c5c', '', '', '1430430071299207168', '', NULL, b'0', '2022-01-03 21:36:53', 1, 1399985191002447872, '2022-01-03 21:36:53', 1399985191002447872, '2022-06-05 20:26:19', 1, 0); -INSERT INTO `iam_user_info` VALUES (1477997602862505984, '测试用户003', 'test003', 'f52020dca765fd3943ed40a615dc2c5c', '', '', '1430430071299207168', '', NULL, b'0', '2022-01-03 21:37:43', 1, 1399985191002447872, '2022-01-03 21:37:43', 1399985191002447872, '2022-05-19 13:00:05', 4, 0); - --- ---------------------------- --- Table structure for iam_user_expand_info --- ---------------------------- -CREATE TABLE `iam_user_expand_info` ( - `id` bigint(20) NOT NULL, - `sex` int(4) NULL DEFAULT NULL COMMENT '性别', - `birthday` date NULL DEFAULT NULL COMMENT '生日', - `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '头像', - `last_login_time` datetime(0) NULL DEFAULT NULL COMMENT '上次登录时间', - `current_login_time` datetime(0) NULL DEFAULT NULL COMMENT '本次登录时间', - `initial_password` bit(1) NOT NULL COMMENT '是否初始密码', - `last_change_password_time` datetime(0) NULL DEFAULT NULL COMMENT '上次修改密码时间', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户扩展信息' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of iam_user_expand_info --- ---------------------------- -INSERT INTO `iam_user_expand_info` VALUES (1399985191002447872, 1, '1996-12-01', '1495331905770315776', '2022-06-04 17:42:28', '2022-06-04 18:35:09', b'0', '2022-01-09 11:36:05', 1, '2021-06-02 15:04:15', 0, '2022-06-04 18:35:09', 140, 0); -INSERT INTO `iam_user_expand_info` VALUES (1414143554414059520, 1, NULL, '1530065639127871488', NULL, '2022-05-27 13:56:02', b'0', NULL, 1, '2021-07-11 16:44:32', 1414143554414059520, '2022-05-27 13:57:32', 2, 0); -INSERT INTO `iam_user_expand_info` VALUES (1435894470432456704, 1, NULL, NULL, NULL, NULL, b'0', NULL, 1399985191002447872, '2021-09-09 17:14:54', 1399985191002447872, '2021-09-09 17:14:54', 0, 0); -INSERT INTO `iam_user_expand_info` VALUES (1435967884114194432, 1, NULL, NULL, NULL, '2022-05-31 15:59:42', b'0', NULL, 1414143554414059520, '2021-09-09 22:06:37', 0, '2022-05-31 15:59:42', 1, 0); -INSERT INTO `iam_user_expand_info` VALUES (1477990832987361280, 1, NULL, NULL, NULL, NULL, b'0', NULL, 1399985191002447872, '2022-01-03 21:10:49', 1399985191002447872, '2022-01-03 21:10:49', 0, 0); -INSERT INTO `iam_user_expand_info` VALUES (1477997391729631232, 1, NULL, NULL, NULL, NULL, b'0', NULL, 1399985191002447872, '2022-01-03 21:36:53', 1399985191002447872, '2022-01-03 21:36:53', 0, 0); -INSERT INTO `iam_user_expand_info` VALUES (1477997602862505984, 1, NULL, NULL, NULL, '2022-06-01 16:51:46', b'0', NULL, 1399985191002447872, '2022-01-03 21:37:43', 0, '2022-06-01 16:51:46', 1, 0); - --- ---------------------------- --- Table structure for iam_user_dept --- ---------------------------- -CREATE TABLE `iam_user_dept` ( - `id` bigint(20) NOT NULL, - `user_id` bigint(20) NOT NULL COMMENT '用户id', - `dept_id` bigint(20) NOT NULL COMMENT '部门id', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '用户部门关联表' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of iam_user_dept --- ---------------------------- -INSERT INTO `iam_user_dept` VALUES (1450088892861501440, 1399985191002447872, 1259383345604300802); -INSERT INTO `iam_user_dept` VALUES (1478741775450312704, 1435967884114194432, 1477978464559484928); -INSERT INTO `iam_user_dept` VALUES (1478741775450312705, 1435967884114194432, 1477978610865197056); -INSERT INTO `iam_user_dept` VALUES (1478741775446118400, 1435967884114194432, 1477978810526650368); -INSERT INTO `iam_user_dept` VALUES (1477996765012533248, 1477990832987361280, 1477977592291053568); -INSERT INTO `iam_user_dept` VALUES (1477997463997489152, 1477997391729631232, 1477978610865197056); -INSERT INTO `iam_user_dept` VALUES (1477997655618461696, 1477997602862505984, 1477978610865197056); - --- ---------------------------- --- Table structure for sales_check_rule --- ---------------------------- -CREATE TABLE `sales_check_rule` ( - `id` bigint(20) NOT NULL, - `strategy_register_id` bigint(20) NOT NULL COMMENT '关联策略注册id', - `register_type` int(6) NOT NULL COMMENT '策略类型 策略/优惠券', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '规则名称', - `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '规则code', - `rule_type` int(11) NOT NULL COMMENT '规则类型', - `strategy_id` bigint(20) NULL DEFAULT NULL COMMENT '对应策略id', - `addition` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '附加对象 json', - `priority` int(11) NULL DEFAULT NULL COMMENT '优先级', - `creator` bigint(20) NULL DEFAULT NULL, - `create_time` datetime(6) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `version` int(11) NULL DEFAULT NULL, - `deleted` bit(1) NOT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '检查规则' ROW_FORMAT = DYNAMIC; - - --- ---------------------------- --- Table structure for starter_file_upload_info --- ---------------------------- -CREATE TABLE `starter_file_upload_info` ( - `id` bigint(20) NOT NULL COMMENT '主键', - `file_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '存储位置', - `file_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件名称', - `file_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件类型', - `file_suffix` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件后缀', - `file_size` double(8, 0) NULL DEFAULT NULL COMMENT '文件大小', - `external_storage_id` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '外部关联id', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '上传文件信息' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of starter_file_upload_info --- ---------------------------- -INSERT INTO `starter_file_upload_info` VALUES (1495330622946631680, NULL, 'blob', 'jpg', 'jpg', 68, '62120ac9efeec06e2275fc52', 1399985191002447872, '2022-02-20 17:32:57'); -INSERT INTO `starter_file_upload_info` VALUES (1495331213525606400, NULL, 'blob', 'jpg', 'jpg', 68, '62120b55efeec06e2275fc54', 1399985191002447872, '2022-02-20 17:35:28'); -INSERT INTO `starter_file_upload_info` VALUES (1495331812178616320, NULL, 'blob', 'jpg', 'jpg', 74, '62120be4efeec06e2275fc56', 1399985191002447872, '2022-02-20 17:37:43'); -INSERT INTO `starter_file_upload_info` VALUES (1495331905770315776, NULL, 'blob', 'jpg', 'jpg', 76, '62120bfaefeec06e2275fc58', 1399985191002447872, '2022-02-20 17:38:03'); -INSERT INTO `starter_file_upload_info` VALUES (1530065639127871488, NULL, 'blob', 'jpg', 'jpg', 83, '6290684abf0e90583f414dcf', 1414143554414059520, '2022-05-27 13:57:31'); - --- ---------------------------- --- Table structure for sales_strategy_register --- ---------------------------- -CREATE TABLE `sales_strategy_register` ( - `id` bigint(20) NOT NULL, - `strategy_id` bigint(20) NULL DEFAULT NULL COMMENT '策略id', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '策略注册名称', - `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `strategy_type` int(11) NULL DEFAULT NULL COMMENT '策略类型(1活动/2优惠券)', - `creator` bigint(20) NULL DEFAULT NULL, - `create_time` datetime(6) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `version` int(11) NOT NULL, - `deleted` bit(1) NOT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '策略注册' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Table structure for pay_voucher --- ---------------------------- -CREATE TABLE `pay_voucher` ( - `id` bigint(20) NOT NULL, - `card_no` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '卡号', - `batch_no` bigint(20) NULL DEFAULT NULL COMMENT '批次号', - `face_value` decimal(15, 2) NULL DEFAULT NULL COMMENT '面值', - `balance` decimal(15, 2) NULL DEFAULT NULL COMMENT '余额', - `enduring` bit(1) NOT NULL COMMENT '是否长期有效', - `start_time` datetime(0) NULL DEFAULT NULL COMMENT '开始时间', - `end_time` datetime(0) NULL DEFAULT NULL COMMENT '结束时间', - `status` int(2) NOT NULL COMMENT '状态', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '储值卡' ROW_FORMAT = DYNAMIC; - - --- ---------------------------- --- Table structure for iam_data_scope_user --- ---------------------------- -CREATE TABLE `iam_data_scope_user` ( - `id` bigint(20) NOT NULL, - `data_scope_id` bigint(20) NOT NULL COMMENT '数据范围id', - `user_id` bigint(20) NOT NULL COMMENT '用户id', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '数据范围用户关联配置' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of iam_data_scope_user --- ---------------------------- -INSERT INTO `iam_data_scope_user` VALUES (1478738754876149760, 1474717084985270272, 1399985191002447872); -INSERT INTO `iam_data_scope_user` VALUES (1478738766460817408, 1474717084985270272, 1414143554414059520); -INSERT INTO `iam_data_scope_user` VALUES (1478738811792855040, 1474717084985270272, 1477997602862505984); -INSERT INTO `iam_data_scope_user` VALUES (1478747304583114752, 1474717084985270272, 1435894470432456704); -INSERT INTO `iam_data_scope_user` VALUES (1478747304587309056, 1474717084985270272, 1477997391729631232); - --- ---------------------------- --- Table structure for demo_super_query --- ---------------------------- -CREATE TABLE `demo_super_query` ( - `id` bigint(20) NOT NULL COMMENT '角色ID', - `name` varchar(150) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '名称', - `age` int(5) NULL DEFAULT NULL COMMENT '年龄', - `vip` bit(1) NULL DEFAULT NULL COMMENT '是否vip', - `birthday` date NULL DEFAULT NULL COMMENT '生日', - `work_time` time(0) NULL DEFAULT NULL COMMENT '上班时间', - `registration_time` datetime(0) NULL DEFAULT NULL COMMENT '注册时间', - `political` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '政治面貌', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '超级查询演示' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of demo_super_query --- ---------------------------- -INSERT INTO `demo_super_query` VALUES (1496046463434567680, '小小明', 18, b'1', '1998-01-23', '08:30:00', '2022-02-22 16:57:27', '13', '这是备注', 1399985191002447872, '2022-02-22 16:57:27', 1399985191002447872, '2022-02-22 17:03:34', 1, 0); -INSERT INTO `demo_super_query` VALUES (1496372341213433856, '关羽', 52, b'1', '2000-02-23', '14:31:36', '2022-02-23 14:32:22', '1', '', 1399985191002447872, '2022-02-23 14:32:22', 1399985191002447872, '2022-02-23 14:32:22', 0, 0); -INSERT INTO `demo_super_query` VALUES (1496372489909899264, '张飞', 54, b'0', '1996-02-11', '08:00:00', '2022-02-23 14:32:58', '7', '备注', 1399985191002447872, '2022-02-23 14:32:58', 1399985191002447872, '2022-02-23 14:32:58', 0, 0); -INSERT INTO `demo_super_query` VALUES (1496372766427779072, '梁冀', 38, b'1', '1958-02-08', '08:30:00', '2022-02-23 14:34:03', '1', '', 1399985191002447872, '2022-02-23 14:34:03', 1399985191002447872, '2022-02-23 14:34:03', 0, 0); -INSERT INTO `demo_super_query` VALUES (1496373512871284736, '刘备', 108, b'0', '1993-11-12', '09:30:10', '2022-02-23 14:37:01', '2', '刘羽禅的粑粑', 1399985191002447872, '2022-02-23 14:37:01', 1399985191002447872, '2022-02-23 14:37:01', 0, 0); - --- ---------------------------- --- Table structure for sales_strategy --- ---------------------------- -CREATE TABLE `sales_strategy` ( - `id` bigint(20) NOT NULL, - `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '唯一编码', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', - `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `engine_type` int(1) NOT NULL COMMENT '引擎类型, java/js/groovy', - `target_type` int(11) NOT NULL COMMENT '目标类型', - `rule_script` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '规则脚本', - `show` int(1) NULL DEFAULT NULL COMMENT '是否展示 0不展示，1展示(default)', - `state` int(1) NOT NULL COMMENT '0 可用 1 不可用', - `creator` bigint(20) NULL DEFAULT NULL, - `create_time` datetime(6) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `version` int(11) NOT NULL, - `deleted` bit(1) NOT NULL, - `tid` bigint(20) NULL DEFAULT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '策略' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of sales_strategy --- ---------------------------- -INSERT INTO `sales_strategy` VALUES (1382516141636866048, 'instantReduction', '立减策略', '立减指定的金额', 1, 1, NULL, 1, 1, 1, '2021-04-15 10:08:28.720000', 1, '2021-04-15 10:08:28.720000', 0, b'0', 10011); -INSERT INTO `sales_strategy` VALUES (1382517531398524928, 'fullReduction', '满减策略', '满减策略', 1, 1, NULL, 1, 1, 1, '2021-04-15 10:14:00.075000', 1, '2021-04-15 10:14:00.075000', 0, b'0', 10011); -INSERT INTO `sales_strategy` VALUES (1394909889247203328, 'channelCheck', '渠道检查', '渠道检查', 1, 2, NULL, 1, 1, 1, '2021-05-19 14:56:48.426000', 1, '2021-05-19 14:56:48.426000', 0, b'0', 10011); -INSERT INTO `sales_strategy` VALUES (1395320340615417856, 'obtainMultiple', '多张领取检查', '多张领取检查', 1, 3, '', NULL, 1, 1, '2021-05-20 18:07:47.642000', 1, '2021-05-20 18:07:47.642000', 0, b'0', 10011); - --- ---------------------------- --- Table structure for iam_user_data_scope --- ---------------------------- -CREATE TABLE `iam_user_data_scope` ( - `id` bigint(20) NOT NULL COMMENT '主键', - `user_id` bigint(20) NOT NULL COMMENT '用户ID', - `data_scope_id` bigint(20) NOT NULL COMMENT '数据权限ID', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户数据范围关系\r\n' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of iam_user_data_scope --- ---------------------------- -INSERT INTO `iam_user_data_scope` VALUES (1477617820165345280, 1414143554414059520, 1474717084985270272); -INSERT INTO `iam_user_data_scope` VALUES (1477991040840290304, 1477990832987361280, 1477990439800721408); -INSERT INTO `iam_user_data_scope` VALUES (1477997504506077184, 1477997391729631232, 1477990268903804928); -INSERT INTO `iam_user_data_scope` VALUES (1477997685993611264, 1477997602862505984, 1474706893178871808); - --- ---------------------------- --- Table structure for iam_role --- ---------------------------- -CREATE TABLE `iam_role` ( - `id` bigint(20) NOT NULL COMMENT '角色ID', - `code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '编码', - `name` varchar(150) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '名称', - `internal` bit(1) NOT NULL COMMENT '是否系统内置', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '说明', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '角色' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of iam_role --- ---------------------------- -INSERT INTO `iam_role` VALUES (1405414804771971072, 'admin', '管理员', b'1', '管理员', 1, '2021-06-17 14:39:35', 1399985191002447872, '2021-07-18 22:31:02', 6, 0); -INSERT INTO `iam_role` VALUES (1416730722714144768, 'test', '测试', b'0', '测试角色', 1399985191002447872, '2021-07-18 20:05:01', 1399985191002447872, '2021-07-18 20:16:15', 1, 0); -INSERT INTO `iam_role` VALUES (1422832797731778562, 'user', '用户', b'0', '用户角色', 0, '2021-08-04 16:12:29', 1399985191002447872, '2021-08-04 16:15:03', 7, 1); -INSERT INTO `iam_role` VALUES (1428891259564445696, 'manager', '管理者', b'0', 'manager管理者', 1399985191002447872, '2021-08-21 09:26:38', 1399985191002447872, '2021-08-21 09:26:39', 0, 1); - --- ---------------------------- --- Table structure for goods_brand --- ---------------------------- -CREATE TABLE `goods_brand` ( - `id` bigint(20) NOT NULL, - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '品牌名称', - `logo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '品牌图标', - `enable` bit(1) NULL DEFAULT NULL COMMENT '是否启用', - `remark` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '品牌' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of goods_brand --- ---------------------------- -INSERT INTO `goods_brand` VALUES (1524046765181800448, '鸭鸭', '', NULL, '', 1399985191002447872, '2022-05-10 23:20:39', 1399985191002447872, '2022-05-10 23:20:39', 0, 0); -INSERT INTO `goods_brand` VALUES (1525092807788691456, '微信', '', b'1', '', 1399985191002447872, '2022-05-13 20:37:15', 1399985191002447872, '2022-05-13 20:37:15', 0, 0); -INSERT INTO `goods_brand` VALUES (1525092835118776320, '舜泰', '', b'1', '', 1399985191002447872, '2022-05-13 20:37:21', 1399985191002447872, '2022-05-13 20:37:21', 0, 0); -INSERT INTO `goods_brand` VALUES (1525092854139944960, '绿城', '', b'1', '', 1399985191002447872, '2022-05-13 20:37:26', 1399985191002447872, '2022-05-13 20:37:26', 0, 0); - --- ---------------------------- --- Table structure for base_param --- ---------------------------- -CREATE TABLE `base_param` ( - `id` bigint(20) NOT NULL, - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称', - `param_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '参数键名', - `value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '参数值', - `type` int(4) NULL DEFAULT NULL COMMENT '参数类型', - `internal` bit(1) NOT NULL COMMENT '内置参数', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - `version` int(8) NOT NULL COMMENT '版本', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统参数配置' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of base_param --- ---------------------------- -INSERT INTO `base_param` VALUES (1452842684284891136, '测试', 'test.v1', '123', 1, b'0', NULL, 1399985191002447872, '2021-10-26 11:41:03', 1399985191002447872, '2021-10-26 11:41:03', 0, 0); -INSERT INTO `base_param` VALUES (1500338438182789120, '结算台聚合支付请求地址', 'CashierAggregateUrl', 'http://pay1.bootx.cn/cashier/aggregatePay?key=', 1, b'1', '', 1399985191002447872, '2022-03-06 13:12:13', 1399985191002447872, '2022-05-01 15:03:03', 0, 3); -INSERT INTO `base_param` VALUES (1520668030248361984, '文件服务器地址', 'FileServerUrl', 'http://127.0.0.1:9999', 1, b'1', '', 1399985191002447872, '2022-05-01 15:34:46', 1399985191002447872, '2022-05-19 12:53:21', 0, 5); -INSERT INTO `base_param` VALUES (1529281530059161600, 'websocket服务器地址', 'WebsocketServerUrl', 'ws://127.0.0.1:9999', 1, b'1', '', 1399985191002447872, '2022-05-25 10:01:44', 1399985191002447872, '2022-05-25 10:01:44', 0, 0); - --- ---------------------------- --- Table structure for sales_strategy_config --- ---------------------------- -CREATE TABLE `sales_strategy_config` ( - `id` bigint(20) NOT NULL, - `strategy_id` bigint(20) NULL DEFAULT NULL COMMENT '策略id', - `type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数类型', - `key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '方法参数名', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称', - `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `creator` bigint(20) NULL DEFAULT NULL, - `create_time` datetime(6) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `version` int(11) NOT NULL, - `deleted` bit(1) NOT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '策略参数定义' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of sales_strategy_config --- ---------------------------- -INSERT INTO `sales_strategy_config` VALUES (1382517531788595199, 1382516141636866048, 'BigDecimal', 'amount', '立减金额', '立减金额', 1, '2021-04-15 10:08:28.873000', 1, '2021-04-15 10:08:28.873000', 0, b'0'); -INSERT INTO `sales_strategy_config` VALUES (1382517531788595200, 1382517531398524928, 'BigDecimal', 'satisfy', '满多少', '配置满多少的字段', 1, '2021-04-15 10:14:00.169000', 1, '2021-04-15 10:14:00.169000', 0, b'0'); -INSERT INTO `sales_strategy_config` VALUES (1382517531788595201, 1382517531398524928, 'BigDecimal', 'minus', '减多少', '配置减多少的字段', 1, '2021-04-15 10:14:00.169000', 1, '2021-04-15 10:14:00.169000', 0, b'0'); - --- ---------------------------- --- Table structure for sales_activity --- ---------------------------- -CREATE TABLE `sales_activity` ( - `id` bigint(20) NOT NULL, - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'name', - `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `strategy_id` bigint(255) NULL DEFAULT NULL COMMENT '策略id', - `strategy_register_id` bigint(20) NOT NULL COMMENT '策略注册id', - `activity_mutual` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动互斥', - `start_time` datetime(6) NOT NULL COMMENT '有效开始时间', - `end_time` datetime(6) NOT NULL COMMENT '有效结束时间', - `creator` bigint(20) NULL DEFAULT NULL, - `create_time` datetime(6) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `version` int(11) NOT NULL, - `deleted` bit(1) NOT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '优惠活动' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of sales_activity --- ---------------------------- -INSERT INTO `sales_activity` VALUES (1394892920481533952, '100-16', '100-16活动策略2', NULL, 1394892919403597824, '', '2021-05-18 17:43:59.000000', '2021-07-01 17:44:02.000000', 1, '2021-05-19 13:49:22.757000', 1, '2021-05-19 13:49:22.757000', 0, b'0'); -INSERT INTO `sales_activity` VALUES (1394918400265965568, '100-5', '100-5活动策略3', NULL, 1394918398827319296, '', '2021-05-18 17:43:59.000000', '2021-07-01 17:44:02.000000', 1, '2021-05-19 15:30:37.611000', 1, '2021-05-19 15:30:37.611000', 0, b'0'); -INSERT INTO `sales_activity` VALUES (1395308738893729792, '50-20', '50-20活动策略3', 1382517531398524928, 1395308573587820544, '', '2021-05-18 17:43:59.000000', '2021-07-01 17:44:02.000000', 1, '2021-05-20 17:21:41.592000', 1, '2021-05-20 17:21:41.592000', 0, b'0'); - --- ---------------------------- --- Table structure for pay_wallet --- ---------------------------- -CREATE TABLE `pay_wallet` ( - `id` bigint(20) NOT NULL, - `user_id` bigint(20) NOT NULL COMMENT '关联用户id', - `balance` decimal(19, 2) NOT NULL COMMENT '余额', - `status` int(11) NOT NULL COMMENT '状态', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE, - INDEX `pk_user_id`(`user_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '钱包' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of pay_wallet --- ---------------------------- -INSERT INTO `pay_wallet` VALUES (1336489524259352576, 1399985191002447872, 999982.96, 1, NULL, '2022-03-11 21:37:33', 1399985191002447872, '2022-05-03 21:24:04', 29, 0); -INSERT INTO `pay_wallet` VALUES (1502554238582968320, 1414143554414059520, 1019.00, 1, 1399985191002447872, '2022-03-12 15:57:01', 1399985191002447872, '2022-03-13 11:21:10', 2, 0); -INSERT INTO `pay_wallet` VALUES (1502848353136791552, 1435894470432456704, 100.00, 1, 1399985191002447872, '2022-03-13 11:25:44', 1399985191002447872, '2022-03-24 13:22:37', 1, 0); - --- ---------------------------- --- Table structure for iam_client --- ---------------------------- -CREATE TABLE `iam_client` ( - `id` bigint(20) NOT NULL, - `code` varchar(21) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编码', - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', - `system` bit(1) NOT NULL COMMENT '是否系统内置', - `alone_prem` bit(1) NOT NULL COMMENT '是否有独立菜单和权限', - `timeout` bigint(11) NULL DEFAULT NULL COMMENT '在线时长 秒', - `captcha` bit(1) NOT NULL COMMENT '启用验证码', - `pwd_err_num` int(8) NOT NULL COMMENT '密码错误次数', - `enable` bit(1) NOT NULL COMMENT '是否可用', - `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '认证终端' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of iam_client --- ---------------------------- -INSERT INTO `iam_client` VALUES (1430430071299207168, 'admin', 'pc管理端', b'1', b'1', 3600, b'0', -1, b'1', 'pc浏览器', 1399985191002447872, '2021-08-25 15:21:20', 1399985191002447872, '2022-04-24 19:51:13', 16, 0); -INSERT INTO `iam_client` VALUES (1430478946919653376, 'miniApp', '微信小程序', b'0', b'0', 99999, b'1', 0, b'1', NULL, 1399985191002447872, '2021-08-25 18:35:33', 1399985191002447872, '2021-08-25 18:35:33', 2, 0); -INSERT INTO `iam_client` VALUES (1435138582839009280, 'phone', '手机短信登录', b'0', b'1', 3600, b'1', 0, b'1', '', 1399985191002447872, '2021-09-07 15:11:16', 1399985191002447872, '2022-05-27 11:28:42', 3, 0); - --- ---------------------------- --- Table structure for demo_data_perm --- ---------------------------- -CREATE TABLE `demo_data_perm` ( - `id` bigint(20) NOT NULL COMMENT '角色ID', - `name` varchar(150) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '名称', - `creator_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者名称', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '说明', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据权限演示' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of demo_data_perm --- ---------------------------- -INSERT INTO `demo_data_perm` VALUES (1495969849707220992, '33', 'xxm', '444', 1399985191002447872, '2022-02-22 11:53:01', 1399985191002447872, '2022-02-22 11:53:01', 0, 0); -INSERT INTO `demo_data_perm` VALUES (1506921683460521984, '测试', '小小明', NULL, 1399985191002447872, '2022-03-24 17:11:41', 1399985191002447872, '2022-03-24 17:11:41', 0, 0); -INSERT INTO `demo_data_perm` VALUES (1531547191561072640, '测试', '测试', '123', 1435967884114194432, '2022-05-31 16:04:40', 1435967884114194432, '2022-05-31 16:04:40', 0, 0); - --- ---------------------------- --- Table structure for common_sequence_range --- ---------------------------- -CREATE TABLE `common_sequence_range` ( - `id` bigint(20) NOT NULL COMMENT '主键', - `range_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '区间key', - `range_value` bigint(20) NOT NULL COMMENT '区间开始值', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '序列生成器队列区间管理' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of common_sequence_range --- ---------------------------- -INSERT INTO `common_sequence_range` VALUES (1470679520373862400, 'Sequence:cs', 2006, 0, '2021-12-14 16:58:16', 0, '2021-12-14 16:58:16', 6, 0); -INSERT INTO `common_sequence_range` VALUES (1470679955230908416, 'cs', 2020, 0, '2021-12-14 17:00:00', 0, '2021-12-14 17:00:00', 13, 0); - --- ---------------------------- --- Table structure for starter_audit_data_version --- ---------------------------- -CREATE TABLE `starter_audit_data_version` ( - `id` bigint(20) NOT NULL, - `data_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '数据名称', - `data_id` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '数据主键', - `data_content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '数据内容', - `version` int(10) NOT NULL COMMENT '版本', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据版本日志' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of starter_audit_data_version --- ---------------------------- -INSERT INTO `starter_audit_data_version` VALUES (1480550993828446208, 'client', '1', '{\"dataName\":\"client\",\"dataId\":\"1\",\"dataContent\":{\"id\":\"1\",\"creator\":null,\"createTime\":\"2022-01-10 22:43:58\",\"lastModifier\":null,\"lastModifiedTime\":null,\"deleted\":false,\"version\":0,\"code\":null,\"name\":null,\"timeout\":null,\"captcha\":false,\"enable\":false,\"description\":null}}', 1, 0, '2022-01-10 22:43:59'); -INSERT INTO `starter_audit_data_version` VALUES (1480551021779288064, 'client', '1', '{\"dataName\":\"client\",\"dataId\":\"1\",\"dataContent\":{\"id\":\"1\",\"creator\":null,\"createTime\":\"2022-01-10 22:44:05\",\"lastModifier\":null,\"lastModifiedTime\":null,\"deleted\":false,\"version\":0,\"code\":null,\"name\":null,\"timeout\":null,\"captcha\":false,\"enable\":false,\"description\":null}}', 2, 0, '2022-01-10 22:44:06'); - --- ---------------------------- --- Table structure for sales_coupon_template --- ---------------------------- -CREATE TABLE `sales_coupon_template` ( - `id` bigint(20) NOT NULL, - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', - `strategy_register_id` bigint(20) NOT NULL COMMENT '策略注册id', - `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `num` int(11) NOT NULL COMMENT '数量', - `channel_ids` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '渠道', - `activity_mutual` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '活动互斥', - `coupon_mutual` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '优惠券互斥', - `effective_type` int(8) NOT NULL COMMENT '有效类型', - `time_type` int(8) NULL DEFAULT NULL COMMENT '时间类型', - `effective_time` bigint(20) NULL DEFAULT NULL COMMENT '有效时间', - `start_time` datetime(6) NULL DEFAULT NULL COMMENT '开始时间', - `end_time` datetime(6) NULL DEFAULT NULL COMMENT '结束时间', - `creator` bigint(20) NULL DEFAULT NULL, - `create_time` datetime(6) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `version` int(11) NOT NULL, - `deleted` bit(1) NOT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '优惠券模板' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of sales_coupon_template --- ---------------------------- -INSERT INTO `sales_coupon_template` VALUES (1395284918623424512, '100-33', 1395284918430486528, '100-33优惠券', 999, NULL, '', '', 0, 1, NULL, NULL, NULL, 1, '2021-05-20 15:47:02.397000', 1, '2021-05-20 15:58:10.795000', 1, b'0'); -INSERT INTO `sales_coupon_template` VALUES (1395320423364841472, '100-33', 1395320422941216768, '100-33优惠券', 988, NULL, '', '', 0, 1, NULL, NULL, NULL, 1, '2021-05-20 18:08:07.387000', 1, '2021-05-20 18:28:33.743000', 12, b'0'); - --- ---------------------------- --- Table structure for qrtz_locks --- ---------------------------- -CREATE TABLE `qrtz_locks` ( - `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `LOCK_NAME` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - PRIMARY KEY (`SCHED_NAME`, `LOCK_NAME`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of qrtz_locks --- ---------------------------- -INSERT INTO `qrtz_locks` VALUES ('quartzScheduler', 'STATE_ACCESS'); -INSERT INTO `qrtz_locks` VALUES ('quartzScheduler', 'TRIGGER_ACCESS'); - --- ---------------------------- --- Table structure for iam_data_scope_dept --- ---------------------------- -CREATE TABLE `iam_data_scope_dept` ( - `id` bigint(20) NOT NULL, - `data_scope_id` bigint(20) NOT NULL COMMENT '数据范围id', - `dept_id` bigint(20) NOT NULL COMMENT '部门id', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '数据范围部门关联配置' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of iam_data_scope_dept --- ---------------------------- -INSERT INTO `iam_data_scope_dept` VALUES (1478742690014101504, 1474717160671485952, 1477978464559484928); -INSERT INTO `iam_data_scope_dept` VALUES (1478742920071675904, 1474717160671485952, 1477977592291053568); - --- ---------------------------- --- Table structure for goods_category_specification --- ---------------------------- -CREATE TABLE `goods_category_specification` ( - `id` bigint(20) NOT NULL, - `category_id` bigint(20) NOT NULL COMMENT '分类id', - `specification_id` bigint(20) NOT NULL COMMENT '规格id', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '类目规格关联' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of goods_category_specification --- ---------------------------- -INSERT INTO `goods_category_specification` VALUES (1525131071690076160, 1523994966466924544, 1524258633343254528); -INSERT INTO `goods_category_specification` VALUES (1525131071694270464, 1523994966466924544, 1524360756764590080); - --- ---------------------------- --- Table structure for ding_robot_config --- ---------------------------- -CREATE TABLE `ding_robot_config` ( - `id` bigint(20) NOT NULL, - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', - `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `access_token` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '钉钉机器人访问token', - `enable_signature_check` bit(1) NOT NULL COMMENT '是否开启验签', - `sign_secret` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '钉钉机器人私钥', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(6) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(6) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` bit(1) NOT NULL COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '钉钉机器人配置' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of ding_robot_config --- ---------------------------- -INSERT INTO `ding_robot_config` VALUES (1333022277138264064, 'bootx机器人', 'bootx', '4a6212971d64208f45d647190ebc69986d6e9b67faf6aa7f1c8fc332f6652060', b'1', 'SECb6f9f872847caec745fcf10a46f4250b36c0337bade670d2f1f4756682b8cad2', 'bootx群机器人', -1, '2020-11-29 20:17:31.875000', -1, '2020-11-29 20:17:31.875000', 1, b'0'); -INSERT INTO `ding_robot_config` VALUES (1454001517812203520, '33', '12', '111111111111111111', b'1', '', '', 1399985191002447872, '2021-10-29 16:25:50.547000', 1399985191002447872, '2021-10-29 16:25:50.597000', 2, b'1'); - --- ---------------------------- --- Table structure for ding_config --- ---------------------------- -CREATE TABLE `ding_config` ( - `id` bigint(20) NOT NULL, - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', - `app_key` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL, - `app_secret` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL, - `enable` bit(1) NOT NULL COMMENT '是否启用', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(6) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(6) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` bit(1) NOT NULL COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '钉钉配置' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of ding_config --- ---------------------------- -INSERT INTO `ding_config` VALUES (1511265279181553664, '测试钉钉小程序配置', 'dingg4kj0ymmvbrvrg5a', 'Ushk8RuIT694Y7qhPQs2PHa0MFHa4PjHVUv1Th4AYW8W5kuDRcwnV3irpnAupAJK', b'0', '备注', 0, '2022-04-05 16:51:35.166000', 1399985191002447872, '2022-04-05 18:02:13.542000', 3, b'0'); -INSERT INTO `ding_config` VALUES (1511283139236810752, '测试钉钉h5配置', 'dingcksft7waezipjcjq', 'WCc3q4-iOFxSmPG_OyKIKL1l0DvM-HX0B2_jsbOrOxxsYuy0iBCXKTyFbv2RZ3jX', b'1', NULL, 1399985191002447872, '2022-04-05 18:02:33.334000', 1399985191002447872, '2022-04-05 18:04:25.936000', 3, b'0'); - --- ---------------------------- --- Table structure for demo_data_sensitive --- ---------------------------- -CREATE TABLE `demo_data_sensitive` ( - `id` bigint(20) NOT NULL COMMENT '角色ID', - `chinese_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '中文名字', - `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '密码', - `id_card` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '身份证号', - `mobile_phone` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '手机号', - `car_license` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '车牌号', - `email` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '电子邮件', - `other` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '其他', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据脱敏演示' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of demo_data_sensitive --- ---------------------------- -INSERT INTO `demo_data_sensitive` VALUES (1506942377435037696, '刘向东', '123456', '372921199302021125', '13324591123', '鲁A8S8866', 'bootx123@outlook.com', '测试测试测试测试测试测试测试问题', 1399985191002447872, '2022-03-24 18:33:55', 1399985191002447872, '2022-03-24 18:36:09', 2, 0); -INSERT INTO `demo_data_sensitive` VALUES (1506943326094352384, '成是非', '99885511', '101278112512107721', '18855446622', '汉S123456', 'chengshifei@foxmail.com', '这个就是就是就是就是就是就是这样的', 1399985191002447872, '2022-03-24 18:33:55', 1399985191002447872, '2022-03-24 18:35:00', 1, 0); - --- ---------------------------- --- Table structure for demo_data_encrypt --- ---------------------------- -CREATE TABLE `demo_data_encrypt` ( - `id` bigint(20) NOT NULL, - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', - `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '内容', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据加密解密演示' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of demo_data_encrypt --- ---------------------------- -INSERT INTO `demo_data_encrypt` VALUES (1506922411881103360, '测试加密效果', 'eI2RIrRLG+QUna3jMK+kejyJTTKdPFhaYWP4EhktJ2lkGTEsIxZesetNTzcqUA934ZN/OUdw4aj4t5Q+u1sH7A==', 1399985191002447872, '2022-03-24 17:14:35', 1399985191002447872, '2022-03-24 17:23:41', 1, 0); -INSERT INTO `demo_data_encrypt` VALUES (1506943412354408448, '测试下', 'Dgv5OSNiXuknceoZzeOUOQ==', 1399985191002447872, '2022-03-24 17:14:35', 1399985191002447872, '2022-03-24 17:23:41', 1, 0); - --- ---------------------------- --- Table structure for iam_user_role --- ---------------------------- -CREATE TABLE `iam_user_role` ( - `id` bigint(20) NOT NULL COMMENT '主键', - `user_id` bigint(20) NOT NULL COMMENT '用户ID', - `role_id` bigint(20) NOT NULL COMMENT '角色ID', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户角色关系\r\n' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of iam_user_role --- ---------------------------- -INSERT INTO `iam_user_role` VALUES (1533038443724980224, 1435894470432456704, 1405414804771971072); - --- ---------------------------- --- Table structure for goods_category_brand --- ---------------------------- -CREATE TABLE `goods_category_brand` ( - `id` bigint(20) NOT NULL, - `category_id` bigint(20) NOT NULL COMMENT '分类id', - `brand_id` bigint(20) NOT NULL COMMENT '品牌id', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '类目品牌关联' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for base_key_value --- ---------------------------- -CREATE TABLE `base_key_value` ( - `id` bigint(20) NOT NULL, - `key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '参数键名', - `value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '参数值', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - `version` int(8) NOT NULL COMMENT '版本', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'kv存储' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of base_key_value --- ---------------------------- - --- ---------------------------- --- Table structure for starter_quartz_job_log --- ---------------------------- -CREATE TABLE `starter_quartz_job_log` ( - `id` bigint(20) NOT NULL COMMENT '主键', - `handler_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理器名称', - `class_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理器全限定名', - `success` bit(1) NOT NULL COMMENT '是否执行成功', - `error_message` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '错误信息', - `start_time` datetime(0) NULL DEFAULT NULL COMMENT '开始时间', - `end_time` datetime(0) NULL DEFAULT NULL COMMENT '结束时间', - `duration` bigint(255) NULL DEFAULT NULL COMMENT '执行时长', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '任务执行日志' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of starter_quartz_job_log --- ---------------------------- - --- ---------------------------- --- Table structure for starter_quartz_job --- ---------------------------- -CREATE TABLE `starter_quartz_job` ( - `id` bigint(20) NOT NULL COMMENT '主键', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '任务名称', - `job_class_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '任务类名', - `cron` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'cron表达式', - `parameter` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '参数', - `state` int(4) NULL DEFAULT NULL COMMENT '状态', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '定时任务' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of starter_quartz_job --- ---------------------------- -INSERT INTO `starter_quartz_job` VALUES (1456579473573867520, '测试任务', 'cn.bootx.starter.quartz.task.TestTask', '* * * * * ?', '{\"aaa\":\"5255\"}', 0, '测试任务', 1399985191002447872, '2021-11-05 19:09:43', 1399985191002447872, '2022-05-26 15:37:35', 22, 0); - --- ---------------------------- --- Table structure for starter_audit_operate_log --- ---------------------------- -CREATE TABLE `starter_audit_operate_log` ( - `id` bigint(20) NOT NULL, - `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作模块', - `operate_id` bigint(20) NULL DEFAULT NULL COMMENT '操作人员id', - `username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作人员账号', - `business_type` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务类型', - `method` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '请求方法', - `request_method` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '请求方式', - `operate_url` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '请求url', - `operate_ip` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作ip', - `operate_location` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作地点', - `operate_param` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '请求参数', - `operate_return` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '返回参数', - `success` bit(1) NULL DEFAULT NULL COMMENT '是否成功', - `error_msg` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '错误提示', - `operate_time` datetime(0) NULL DEFAULT NULL COMMENT '操作时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '操作日志' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of starter_audit_operate_log --- ---------------------------- - --- ---------------------------- --- Table structure for starter_audit_login_log --- ---------------------------- -CREATE TABLE `starter_audit_login_log` ( - `id` bigint(20) NOT NULL, - `user_id` bigint(11) NULL DEFAULT NULL COMMENT '用户id', - `account` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户名称', - `login` bit(1) NULL DEFAULT NULL COMMENT '登录成功状态', - `client` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '终端', - `ip` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '登录IP地址', - `login_location` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '登录地点', - `os` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作系统', - `browser` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '浏览器类型', - `msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '提示消息', - `login_time` datetime(0) NULL DEFAULT NULL COMMENT '访问时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '登陆日志' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of starter_audit_login_log --- ---------------------------- - --- ---------------------------- --- Table structure for sales_strategy_config_value --- ---------------------------- -CREATE TABLE `sales_strategy_config_value` ( - `id` bigint(20) NOT NULL, - `strategy_id` bigint(20) NULL DEFAULT NULL COMMENT '策略id', - `strategy_register_id` bigint(20) NULL DEFAULT NULL COMMENT '策略注册id', - `strategy_config_id` bigint(20) NULL DEFAULT NULL COMMENT '策略定义id', - `key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '策略参数key', - `value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数值', - `creator` bigint(20) NULL DEFAULT NULL, - `create_time` datetime(6) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `version` int(11) NOT NULL, - `deleted` bit(1) NOT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '策略配置参数' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of sales_strategy_config_value --- ---------------------------- - --- ---------------------------- --- Table structure for sales_strategy_check_rule --- ---------------------------- -CREATE TABLE `sales_strategy_check_rule` ( - `id` bigint(20) NOT NULL, - `register_id` bigint(20) NULL DEFAULT NULL COMMENT '模板id', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '规则名称', - `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '规则code', - `type` int(11) NOT NULL COMMENT '类型', - `addition` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附加参数 json', - `creator` bigint(20) NULL DEFAULT NULL, - `create_time` datetime(6) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `version` int(11) NULL DEFAULT NULL, - `deleted` bit(1) NOT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '策略规则检查' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of sales_strategy_check_rule --- ---------------------------- - --- ---------------------------- --- Table structure for sales_coupon --- ---------------------------- -CREATE TABLE `sales_coupon` ( - `id` bigint(20) NOT NULL, - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', - `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `template_id` bigint(20) NULL DEFAULT NULL COMMENT '模板id', - `strategy_register_id` bigint(20) NULL DEFAULT NULL COMMENT '策略注册id', - `start_time` datetime(6) NULL DEFAULT NULL COMMENT '有效开始时间', - `end_time` datetime(6) NULL DEFAULT NULL COMMENT '有效结束时间', - `status` int(6) NOT NULL COMMENT '状态', - `obtain_time` datetime(6) NULL DEFAULT NULL COMMENT '领取时间', - `used_time` datetime(6) NULL DEFAULT NULL COMMENT '使用时间', - `order_id` bigint(20) NULL DEFAULT NULL COMMENT '所用订单Id', - `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户id', - `creator` bigint(20) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `create_time` datetime(6) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `version` int(11) NULL DEFAULT NULL, - `deleted` bit(1) NOT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '优惠券' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of sales_coupon --- ---------------------------- - --- ---------------------------- --- Table structure for qrtz_triggers --- ---------------------------- -CREATE TABLE `qrtz_triggers` ( - `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_GROUP` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `JOB_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `JOB_GROUP` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `DESCRIPTION` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `NEXT_FIRE_TIME` bigint(13) NULL DEFAULT NULL, - `PREV_FIRE_TIME` bigint(13) NULL DEFAULT NULL, - `PRIORITY` int(11) NULL DEFAULT NULL, - `TRIGGER_STATE` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_TYPE` varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `START_TIME` bigint(13) NOT NULL, - `END_TIME` bigint(13) NULL DEFAULT NULL, - `CALENDAR_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `MISFIRE_INSTR` smallint(2) NULL DEFAULT NULL, - `JOB_DATA` blob NULL, - PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE, - INDEX `IDX_QRTZ_T_NFT_ST`(`SCHED_NAME`, `TRIGGER_STATE`, `NEXT_FIRE_TIME`) USING BTREE, - INDEX `IDX_QRTZ_T_N_STATE`(`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`, `TRIGGER_STATE`) USING BTREE, - INDEX `IDX_QRTZ_T_NEXT_FIRE_TIME`(`SCHED_NAME`, `NEXT_FIRE_TIME`) USING BTREE, - INDEX `IDX_QRTZ_T_C`(`SCHED_NAME`, `CALENDAR_NAME`) USING BTREE, - INDEX `IDX_QRTZ_T_NFT_ST_MISFIRE`(`SCHED_NAME`, `MISFIRE_INSTR`, `NEXT_FIRE_TIME`, `TRIGGER_STATE`) USING BTREE, - INDEX `IDX_QRTZ_T_G`(`SCHED_NAME`, `TRIGGER_GROUP`) USING BTREE, - INDEX `IDX_QRTZ_T_J`(`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`) USING BTREE, - INDEX `IDX_QRTZ_T_JG`(`SCHED_NAME`, `JOB_GROUP`) USING BTREE, - INDEX `IDX_QRTZ_T_N_G_STATE`(`SCHED_NAME`, `TRIGGER_GROUP`, `TRIGGER_STATE`) USING BTREE, - INDEX `IDX_QRTZ_T_NFT_MISFIRE`(`SCHED_NAME`, `MISFIRE_INSTR`, `NEXT_FIRE_TIME`) USING BTREE, - INDEX `IDX_QRTZ_T_STATE`(`SCHED_NAME`, `TRIGGER_STATE`) USING BTREE, - INDEX `IDX_QRTZ_T_NFT_ST_MISFIRE_GRP`(`SCHED_NAME`, `MISFIRE_INSTR`, `NEXT_FIRE_TIME`, `TRIGGER_GROUP`, `TRIGGER_STATE`) USING BTREE, - CONSTRAINT `qrtz_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`) REFERENCES `qrtz_job_details` (`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`) ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of qrtz_triggers --- ---------------------------- - --- ---------------------------- --- Table structure for qrtz_simprop_triggers --- ---------------------------- -CREATE TABLE `qrtz_simprop_triggers` ( - `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_GROUP` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `STR_PROP_1` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `STR_PROP_2` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `STR_PROP_3` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `INT_PROP_1` int(11) NULL DEFAULT NULL, - `INT_PROP_2` int(11) NULL DEFAULT NULL, - `LONG_PROP_1` bigint(20) NULL DEFAULT NULL, - `LONG_PROP_2` bigint(20) NULL DEFAULT NULL, - `DEC_PROP_1` decimal(13, 4) NULL DEFAULT NULL, - `DEC_PROP_2` decimal(13, 4) NULL DEFAULT NULL, - `BOOL_PROP_1` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `BOOL_PROP_2` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE, - CONSTRAINT `qrtz_simprop_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `qrtz_triggers` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of qrtz_simprop_triggers --- ---------------------------- - --- ---------------------------- --- Table structure for qrtz_simple_triggers --- ---------------------------- -CREATE TABLE `qrtz_simple_triggers` ( - `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_GROUP` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `REPEAT_COUNT` bigint(7) NOT NULL, - `REPEAT_INTERVAL` bigint(12) NOT NULL, - `TIMES_TRIGGERED` bigint(10) NOT NULL, - PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE, - CONSTRAINT `qrtz_simple_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `qrtz_triggers` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of qrtz_simple_triggers --- ---------------------------- - --- ---------------------------- --- Table structure for qrtz_scheduler_state --- ---------------------------- -CREATE TABLE `qrtz_scheduler_state` ( - `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `INSTANCE_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `LAST_CHECKIN_TIME` bigint(13) NOT NULL, - `CHECKIN_INTERVAL` bigint(13) NOT NULL, - PRIMARY KEY (`SCHED_NAME`, `INSTANCE_NAME`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of qrtz_scheduler_state --- ---------------------------- -INSERT INTO `qrtz_scheduler_state` VALUES ('quartzScheduler', 'xxm1638448483700', 1638451157328, 10000); - --- ---------------------------- --- Table structure for qrtz_paused_trigger_grps --- ---------------------------- -CREATE TABLE `qrtz_paused_trigger_grps` ( - `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_GROUP` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - PRIMARY KEY (`SCHED_NAME`, `TRIGGER_GROUP`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of qrtz_paused_trigger_grps --- ---------------------------- - --- ---------------------------- --- Table structure for qrtz_job_details --- ---------------------------- -CREATE TABLE `qrtz_job_details` ( - `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `JOB_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `JOB_GROUP` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `DESCRIPTION` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `JOB_CLASS_NAME` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `IS_DURABLE` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `IS_NONCONCURRENT` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `IS_UPDATE_DATA` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `REQUESTS_RECOVERY` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `JOB_DATA` blob NULL, - PRIMARY KEY (`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`) USING BTREE, - INDEX `IDX_QRTZ_J_GRP`(`SCHED_NAME`, `JOB_GROUP`) USING BTREE, - INDEX `IDX_QRTZ_J_REQ_RECOVERY`(`SCHED_NAME`, `REQUESTS_RECOVERY`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of qrtz_job_details --- ---------------------------- - --- ---------------------------- --- Table structure for qrtz_fired_triggers --- ---------------------------- -CREATE TABLE `qrtz_fired_triggers` ( - `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `ENTRY_ID` varchar(95) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_GROUP` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `INSTANCE_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `FIRED_TIME` bigint(13) NOT NULL, - `SCHED_TIME` bigint(13) NOT NULL, - `PRIORITY` int(11) NOT NULL, - `STATE` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `JOB_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `JOB_GROUP` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `IS_NONCONCURRENT` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `REQUESTS_RECOVERY` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - PRIMARY KEY (`SCHED_NAME`, `ENTRY_ID`) USING BTREE, - INDEX `IDX_QRTZ_FT_T_G`(`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE, - INDEX `IDX_QRTZ_FT_TRIG_INST_NAME`(`SCHED_NAME`, `INSTANCE_NAME`) USING BTREE, - INDEX `IDX_QRTZ_FT_J_G`(`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`) USING BTREE, - INDEX `IDX_QRTZ_FT_INST_JOB_REQ_RCVRY`(`SCHED_NAME`, `INSTANCE_NAME`, `REQUESTS_RECOVERY`) USING BTREE, - INDEX `IDX_QRTZ_FT_TG`(`SCHED_NAME`, `TRIGGER_GROUP`) USING BTREE, - INDEX `IDX_QRTZ_FT_JG`(`SCHED_NAME`, `JOB_GROUP`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of qrtz_fired_triggers --- ---------------------------- - --- ---------------------------- --- Table structure for qrtz_cron_triggers --- ---------------------------- -CREATE TABLE `qrtz_cron_triggers` ( - `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_GROUP` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `CRON_EXPRESSION` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TIME_ZONE_ID` varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE, - CONSTRAINT `qrtz_cron_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `qrtz_triggers` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of qrtz_cron_triggers --- ---------------------------- - --- ---------------------------- --- Table structure for qrtz_calendars --- ---------------------------- -CREATE TABLE `qrtz_calendars` ( - `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `CALENDAR_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `CALENDAR` blob NOT NULL, - PRIMARY KEY (`SCHED_NAME`, `CALENDAR_NAME`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of qrtz_calendars --- ---------------------------- - --- ---------------------------- --- Table structure for qrtz_blob_triggers --- ---------------------------- -CREATE TABLE `qrtz_blob_triggers` ( - `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_GROUP` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `BLOB_DATA` blob NULL, - PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE, - INDEX `SCHED_NAME`(`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE, - CONSTRAINT `qrtz_blob_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `qrtz_triggers` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of qrtz_blob_triggers --- ---------------------------- - --- ---------------------------- --- Table structure for pay_wechat_payment --- ---------------------------- -CREATE TABLE `pay_wechat_payment` ( - `id` bigint(20) NOT NULL, - `payment_id` bigint(20) NOT NULL COMMENT '交易记录ID', - `pay_status` int(11) NOT NULL COMMENT '支付状态', - `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户ID', - `trade_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '微信交易号', - `amount` decimal(19, 2) NOT NULL COMMENT '交易金额', - `refundable_balance` decimal(19, 2) NULL DEFAULT NULL COMMENT '可退款金额', - `business_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务id', - `pay_time` datetime(6) NULL DEFAULT NULL COMMENT '支付时间', - `creator` bigint(20) NULL DEFAULT NULL, - `create_time` datetime(6) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `version` int(11) NOT NULL, - `deleted` bit(1) NOT NULL, - `tid` bigint(20) NOT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '微信支付记录' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of pay_wechat_payment --- ---------------------------- - --- ---------------------------- --- Table structure for pay_wechat_pay_config --- ---------------------------- -CREATE TABLE `pay_wechat_pay_config` ( - `id` bigint(20) NOT NULL, - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `app_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '微信应用AppId', - `sl_app_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务商应用编号', - `api_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商户平台「API安全」中的 API 密钥', - `api_key3` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商户平台「API安全」中的 APIv3 密钥', - `mch_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商户号', - `sl_mch_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务商商户号', - `auth_type` int(3) NULL DEFAULT NULL COMMENT '认证方式', - `cert_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'API 证书中的 p12', - `cert_pem_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'API 证书中的 key.pem', - `key_pem_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'API 证书中的 cert.pem', - `domain` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '应用域名，回调中会使用此参数', - `notify_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务器异步通知页面路径', - `return_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '页面跳转同步通知页面路径', - `partner_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '同 apiKey 后续版本会舍弃', - `is_default` bit(1) NULL DEFAULT NULL COMMENT '是否默认', - `pay_ways` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '支持的支付类型', - `sandbox` bit(1) NOT NULL COMMENT '是否沙箱环境', - `activity` bit(1) NOT NULL COMMENT '是否启用', - `state` int(11) NULL DEFAULT NULL COMMENT '状态', - `creator` bigint(20) NULL DEFAULT NULL, - `create_time` datetime(6) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `version` int(11) NOT NULL, - `deleted` bit(1) NOT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '微信支付配置' ROW_FORMAT = DYNAMIC; - --- Table structure for pay_wallet_payment --- ---------------------------- -CREATE TABLE `pay_wallet_payment` ( - `id` bigint(20) NOT NULL, - `payment_id` bigint(20) NOT NULL COMMENT '交易记录ID', - `business_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务id', - `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户ID', - `wallet_id` bigint(20) NULL DEFAULT NULL COMMENT '钱包ID', - `amount` decimal(19, 2) NULL DEFAULT NULL COMMENT '交易金额', - `refundable_balance` decimal(19, 2) NULL DEFAULT NULL COMMENT '可退款金额', - `pay_time` datetime(6) NULL DEFAULT NULL COMMENT '支付时间', - `pay_status` int(11) NOT NULL COMMENT '支付状态', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '钱包交易记录表' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of pay_wallet_payment --- ---------------------------- - --- ---------------------------- --- Table structure for pay_wallet_log --- ---------------------------- -CREATE TABLE `pay_wallet_log` ( - `id` bigint(20) NOT NULL, - `wallet_id` bigint(20) NOT NULL COMMENT '钱包id', - `user_id` bigint(20) NOT NULL COMMENT '用户id', - `type` int(11) NOT NULL COMMENT '类型', - `payment_id` bigint(20) NULL DEFAULT NULL COMMENT '交易记录ID', - `client_ip` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作终端ip', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `business_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务ID', - `operation_source` int(11) NOT NULL COMMENT '操作源', - `amount` decimal(19, 2) NULL DEFAULT NULL COMMENT '金额', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '钱包日志' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of pay_wallet_log --- ---------------------------- - --- ---------------------------- --- Table structure for pay_voucher_payment --- ---------------------------- -CREATE TABLE `pay_voucher_payment` ( - `id` bigint(20) NOT NULL, - `voucher_ids` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '储值卡id列表', - `payment_id` bigint(20) NOT NULL COMMENT '支付id', - `business_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务id', - `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户ID', - `amount` decimal(19, 2) NULL DEFAULT NULL COMMENT '金额', - `refundable_balance` decimal(19, 2) NULL DEFAULT NULL COMMENT '可退款金额', - `pay_status` int(11) NULL DEFAULT NULL COMMENT '支付状态', - `pay_time` datetime(6) NULL DEFAULT NULL COMMENT '支付时间', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '储值卡支付记录' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of pay_voucher_payment --- ---------------------------- - --- ---------------------------- --- Table structure for pay_voucher_log --- ---------------------------- -CREATE TABLE `pay_voucher_log` ( - `id` bigint(20) NOT NULL, - `voucher_id` bigint(20) NOT NULL, - `voucher_no` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `amount` decimal(19, 2) NULL DEFAULT NULL, - `type` int(5) NOT NULL COMMENT '类型', - `payment_id` bigint(20) NULL DEFAULT NULL COMMENT '交易记录ID', - `business_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务ID', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '储值卡日志' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of pay_voucher_log --- ---------------------------- - --- ---------------------------- --- Table structure for pay_refund_record --- ---------------------------- -CREATE TABLE `pay_refund_record` ( - `id` bigint(20) NOT NULL, - `payment_id` bigint(20) NOT NULL COMMENT '支付记录id', - `business_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '关联业务id', - `refund_request_no` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '异步方式关联退款请求号', - `user_id` bigint(20) NOT NULL COMMENT '用户id', - `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '标题', - `amount` decimal(19, 2) NOT NULL COMMENT '金额', - `refundable_balance` decimal(19, 2) NULL DEFAULT NULL COMMENT '剩余可退款金额', - `refundable_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '可退款信息', - `refund_status` int(2) NULL DEFAULT NULL COMMENT '退款状态', - `refund_time` datetime(6) NULL DEFAULT NULL COMMENT '支付时间', - `client_ip` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ip', - `error_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '错误码', - `error_msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '错误信息', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '退款记录' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of pay_refund_record --- ---------------------------- - --- ---------------------------- --- Table structure for pay_payment --- ---------------------------- -CREATE TABLE `pay_payment` ( - `id` bigint(20) NOT NULL, - `user_id` bigint(20) NOT NULL COMMENT '用户id', - `business_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '业务id', - `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '标题', - `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `amount` decimal(19, 2) NOT NULL COMMENT '金额', - `refundable_balance` decimal(19, 2) NULL DEFAULT NULL COMMENT '可退款余额', - `pay_status` int(11) NOT NULL COMMENT '支付状态', - `error_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '错误码', - `error_msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '错误信息', - `pay_type_info` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '支付信息', - `async_pay_mode` bit(1) NOT NULL COMMENT '是否是异步支付', - `async_pay_channel` int(11) NULL DEFAULT NULL COMMENT '异步支付方式', - `pay_channel_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '支付通道信息列表', - `refundable_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '可退款信息', - `pay_time` datetime(6) NULL DEFAULT NULL COMMENT '支付时间', - `expired_time` datetime(6) NULL DEFAULT NULL COMMENT '过期时间', - `client_ip` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ip', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '支付记录' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of pay_payment --- ---------------------------- - --- ---------------------------- --- Table structure for pay_pay_order_log --- ---------------------------- -CREATE TABLE `pay_pay_order_log` ( - `id` bigint(20) NOT NULL, - `payment_id` bigint(20) NOT NULL COMMENT '支付id', - `business_pay_param` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '订单扩展业务参数', - `pay_order_param` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '订单参数', - `creator` bigint(20) NULL DEFAULT NULL, - `create_time` datetime(6) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `version` int(11) NOT NULL, - `deleted` bit(1) NOT NULL, - `tid` bigint(20) NOT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '支付关联订单信息' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of pay_pay_order_log --- ---------------------------- - --- ---------------------------- --- Table structure for pay_pay_notify_record --- ---------------------------- -CREATE TABLE `pay_pay_notify_record` ( - `id` bigint(20) NOT NULL, - `payment_id` bigint(20) NOT NULL COMMENT '支付号', - `notify_info` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '通知消息', - `pay_channel` int(11) NOT NULL COMMENT '支付通道', - `status` int(2) NOT NULL COMMENT '处理状态', - `msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '提示信息', - `notify_time` datetime(6) NULL DEFAULT NULL COMMENT '回调时间', - `creator` bigint(20) NULL DEFAULT NULL, - `create_time` datetime(6) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `version` int(11) NOT NULL, - `deleted` bit(1) NOT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '支付回调记录' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of pay_pay_notify_record --- ---------------------------- - --- ---------------------------- --- Table structure for order_order_item_billing --- ---------------------------- -CREATE TABLE `order_order_item_billing` ( - `id` bigint(20) NOT NULL, - `order_billing_id` bigint(20) NULL DEFAULT NULL COMMENT '账单id', - `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户id', - `order_id` bigint(20) NULL DEFAULT NULL COMMENT '订单id', - `order_item_id` bigint(20) NULL DEFAULT NULL COMMENT '订单项id', - `sku_id` bigint(20) NULL DEFAULT NULL COMMENT '订单项目skuId', - `transaction_purpose` int(11) NOT NULL COMMENT '交易目的', - `transaction_type` int(11) NOT NULL COMMENT '交易类型(名目)', - `pay_type` int(11) NOT NULL COMMENT '支付类型', - `amount` decimal(19, 2) NULL DEFAULT NULL COMMENT '支付金额', - `count` int(11) NULL DEFAULT NULL COMMENT '使用数量', - `bookkeeping_time` bigint(20) NULL DEFAULT NULL COMMENT '入账时间', - `creator` bigint(20) NULL DEFAULT NULL, - `create_time` datetime(6) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `version` int(11) NOT NULL, - `deleted` bit(1) NOT NULL, - `tid` bigint(20) NOT NULL, - `business_type` int(11) NULL DEFAULT NULL, - `source_item_billing_id` bigint(20) NULL DEFAULT NULL, - `source_order_item_id` bigint(20) NULL DEFAULT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单明细账单' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of order_order_item_billing --- ---------------------------- - --- ---------------------------- --- Table structure for order_order_billing --- ---------------------------- -CREATE TABLE `order_order_billing` ( - `id` bigint(20) NOT NULL, - `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户id', - `channel_id` bigint(20) NULL DEFAULT NULL COMMENT '渠道id', - `order_id` bigint(20) NULL DEFAULT NULL COMMENT '订单id', - `pay_type` int(11) NOT NULL COMMENT '交易目的', - `transaction_purpose` int(11) NOT NULL COMMENT '交易类型', - `transaction_type` int(11) NOT NULL COMMENT '支付类型', - `amount` decimal(19, 2) NULL DEFAULT NULL COMMENT '金额', - `count` int(11) NULL DEFAULT NULL COMMENT '交易数量', - `business_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务id', - `creator` bigint(20) NULL DEFAULT NULL, - `create_time` datetime(6) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `version` int(11) NOT NULL, - `deleted` bit(1) NOT NULL, - `tid` bigint(20) NOT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单账单' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of order_order_billing --- ---------------------------- - --- ---------------------------- --- Table structure for pay_cash_payment --- ---------------------------- -CREATE TABLE `pay_cash_payment` ( - `id` bigint(20) NOT NULL, - `payment_id` bigint(20) NOT NULL COMMENT '支付id', - `business_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务id', - `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户ID', - `amount` decimal(19, 2) NULL DEFAULT NULL COMMENT '金额', - `refundable_balance` decimal(19, 2) NULL DEFAULT NULL COMMENT '可退款金额', - `pay_status` int(11) NULL DEFAULT NULL COMMENT '支付状态', - `pay_time` datetime(6) NULL DEFAULT NULL COMMENT '支付时间', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '现金交易记录' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of pay_cash_payment --- ---------------------------- - --- ---------------------------- --- Table structure for pay_alipay_config --- ---------------------------- -CREATE TABLE `pay_alipay_config` ( - `id` bigint(20) NOT NULL, - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `app_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '支付宝商户appId', - `notify_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务器异步通知页面路径', - `return_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '页面跳转同步通知页面路径', - `server_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '请求网关地址', - `auth_type` int(4) NOT NULL COMMENT '认证方式', - `sign_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '签名类型', - `alipay_public_key` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '支付宝公钥', - `private_key` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '私钥', - `app_cert` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '应用公钥', - `alipay_cert` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '支付宝公钥证书', - `alipay_root_cert` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '支付宝CA根证书', - `sandbox` bit(1) NOT NULL COMMENT '是否沙箱环境', - `expire_time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '超时配置', - `pay_ways` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '支持的支付类型', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `activity` bit(1) NOT NULL COMMENT '是否启用', - `state` int(11) NOT NULL COMMENT '状态', - `creator` bigint(20) NULL DEFAULT NULL, - `create_time` datetime(6) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `version` int(11) NOT NULL, - `deleted` bit(1) NOT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '支付宝配置' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Table structure for pay_ali_payment --- ---------------------------- -CREATE TABLE `pay_ali_payment` ( - `id` bigint(20) NOT NULL, - `payment_id` bigint(20) NULL DEFAULT NULL COMMENT '交易记录ID', - `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户ID', - `amount` decimal(19, 2) NULL DEFAULT NULL COMMENT '交易金额', - `refundable_balance` decimal(19, 2) NULL DEFAULT NULL COMMENT '可退款余额', - `business_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '业务id', - `pay_status` int(11) NULL DEFAULT NULL COMMENT '支付状态', - `pay_time` datetime(6) NULL DEFAULT NULL COMMENT '支付时间', - `trade_no` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '支付宝关联流水号', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(6) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(6) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NULL DEFAULT NULL COMMENT '版本', - `deleted` bit(1) NOT NULL COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '支付宝支付记录' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of pay_ali_payment --- ---------------------------- - --- ---------------------------- --- Table structure for order_order_strategy_mapping --- ---------------------------- -CREATE TABLE `order_order_strategy_mapping` ( - `id` bigint(20) NOT NULL, - `order_id` bigint(20) NULL DEFAULT NULL COMMENT '订单id', - `order_detail_id` bigint(20) NULL DEFAULT NULL COMMENT '明细id', - `strategy_id` bigint(20) NULL DEFAULT NULL COMMENT '策略ID', - `strategy_type` int(11) NULL DEFAULT NULL COMMENT '策略类型(普通/优惠券ID)', - `strategy_register_id` bigint(20) NULL DEFAULT NULL COMMENT '策略注册ID', - `price_change` decimal(19, 2) NULL DEFAULT NULL COMMENT '价格变动', - `desc` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注信息', - `coupon_id` bigint(20) NULL DEFAULT NULL, - `creator` bigint(20) NULL DEFAULT NULL, - `create_time` datetime(6) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `version` int(11) NOT NULL, - `deleted` bit(1) NOT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单策略映射' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of order_order_strategy_mapping --- ---------------------------- - --- ---------------------------- --- Table structure for order_order_detail --- ---------------------------- -CREATE TABLE `order_order_detail` ( - `id` bigint(20) NOT NULL, - `active_id` bigint(20) NULL DEFAULT NULL COMMENT '活动id', - `shop_id` bigint(20) NULL DEFAULT NULL COMMENT '店铺id', - `order_id` bigint(20) NULL DEFAULT NULL COMMENT '订单id', - `category_id` bigint(20) NULL DEFAULT NULL COMMENT '类目id', - `goods_id` bigint(20) NULL DEFAULT NULL COMMENT '商品id', - `sku_id` bigint(20) NULL DEFAULT NULL COMMENT '库存id', - `goods_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品名称', - `goods_price` decimal(19, 2) NULL DEFAULT NULL COMMENT '商品价格', - `num` int(11) NOT NULL COMMENT '数量', - `total_amount` decimal(19, 2) NULL DEFAULT NULL COMMENT '总价', - `pay_amount` decimal(19, 2) NULL DEFAULT NULL COMMENT '支付价', - `state` int(11) NULL DEFAULT NULL COMMENT '状态', - `addition` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附加参数', - `creator` bigint(20) NULL DEFAULT NULL, - `create_time` datetime(6) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `version` int(11) NOT NULL, - `deleted` bit(1) NOT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单明细' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of order_order_detail --- ---------------------------- - --- ---------------------------- --- Table structure for order_order --- ---------------------------- -CREATE TABLE `order_order` ( - `id` bigint(20) NOT NULL, - `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '编码', - `contact_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系人', - `contact_phone` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '手机号', - `contact_email` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系邮箱', - `channel_id` bigint(20) NULL DEFAULT NULL COMMENT '渠道', - `pay_time` datetime(6) NULL DEFAULT NULL COMMENT '支付时间', - `user_id` bigint(20) NULL DEFAULT NULL COMMENT '购买用户id', - `status` int(11) NOT NULL COMMENT '状态', - `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `type` int(11) NULL DEFAULT NULL COMMENT '类型', - `total_amount` decimal(19, 2) NULL DEFAULT NULL COMMENT '总金额', - `pay_amount` decimal(19, 2) NULL DEFAULT NULL COMMENT '实付金额', - `coupon_ids` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所用优惠券ids', - `address_info` json NULL COMMENT '地址参数', - `invoice_info` json NULL COMMENT '发票参数', - `addition` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附加参数', - `device_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '设备id', - `source` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源', - `business_id` bigint(20) NULL DEFAULT NULL COMMENT '业务id', - `creator` bigint(20) NULL DEFAULT NULL, - `create_time` datetime(6) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `version` int(11) NOT NULL, - `deleted` bit(1) NOT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of order_order --- ---------------------------- - --- ---------------------------- --- Table structure for notice_wechat_config --- ---------------------------- -CREATE TABLE `notice_wechat_config` ( - `id` bigint(18) NOT NULL, - `tid` bigint(18) NOT NULL COMMENT '租户id', - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, - `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL, - `corp_id` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, - `corp_secret` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, - `is_default` tinyint(1) NULL DEFAULT 0 COMMENT '是否默认配置，0:否。1:是', - `creator` bigint(18) NULL DEFAULT NULL, - `create_time` datetime(0) NULL DEFAULT NULL, - `last_modifier` bigint(18) NULL DEFAULT NULL, - `last_modified_time` datetime(0) NULL DEFAULT NULL, - `version` int(10) NULL DEFAULT NULL, - `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '微信消息配置' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of notice_wechat_config --- ---------------------------- -INSERT INTO `notice_wechat_config` VALUES (181361815405135421, 0, 'test01', 'test01', 'ww9d6247559117d202', '8n6A3SzN-DJNkw8wyCcJnr8-SOjFFWSOlBqZN8vypKM', 1, 1415, '2018-11-20 11:07:07', 1415, '2018-11-20 11:07:07', 0, 0); - --- ---------------------------- --- Table structure for notice_sms_config --- ---------------------------- -CREATE TABLE `notice_sms_config` ( - `id` bigint(18) NOT NULL, - `tid` bigint(18) NOT NULL COMMENT '租户id', - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, - `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL, - `account_sid` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, - `path_sid` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '发送号码的唯一标识(基于twillio的命名风格)', - `auth_token` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, - `from_num` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, - `is_default` tinyint(1) NULL DEFAULT 0 COMMENT '是否默认配置，0:否。1:是', - `creator` bigint(18) NULL DEFAULT NULL, - `create_time` datetime(0) NULL DEFAULT NULL, - `last_modifier` bigint(18) NULL DEFAULT NULL, - `last_modified_time` datetime(0) NULL DEFAULT NULL, - `version` int(10) NULL DEFAULT NULL, - `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - `secret` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL, - `isp` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL, - `reply_msg` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '短信配置' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of notice_sms_config --- ---------------------------- - --- ---------------------------- --- Table structure for notice_site_message --- ---------------------------- -CREATE TABLE `notice_site_message` ( - `id` bigint(20) NOT NULL COMMENT '主键', - `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '消息标题', - `content` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '消息内容', - `sender_id` bigint(20) NULL DEFAULT NULL COMMENT '发送者id', - `sender_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发送者姓名', - `receive_id` bigint(20) NULL DEFAULT NULL COMMENT '接收者id', - `receive_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '接收者姓名', - `sender_time` datetime(0) NULL DEFAULT NULL COMMENT '发送时间', - `have_read` bit(1) NULL DEFAULT NULL COMMENT '是否已读', - `read_time` datetime(0) NULL DEFAULT NULL COMMENT '已读时间', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '站内信' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of notice_site_message --- ---------------------------- -INSERT INTO `notice_site_message` VALUES (1424212599079161857, '测试消息', '测试测试测试', 1399985191002447872, '小小明', 1414143554414059520, 'xxm', '2021-08-08 11:34:11', b'0', NULL, 1399985191002447872, '2021-08-08 11:35:19', 1399985191002447872, '2021-08-08 11:35:19', 0, 0); - --- ---------------------------- --- Table structure for notice_message_template --- ---------------------------- -CREATE TABLE `notice_message_template` ( - `id` bigint(20) NOT NULL, - `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编码', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', - `data` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '模板数据', - `type` int(11) NULL DEFAULT NULL COMMENT '模板类型', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '消息模板' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of notice_message_template --- ---------------------------- -INSERT INTO `notice_message_template` VALUES (1424936204932169730, 'cs', '测试', 'hello ${msg}6666666666666666666666666666', 1, '测试模板', 0, '2021-08-10 11:30:40', 0, '2021-08-10 11:30:40', 0, 0); - --- ---------------------------- --- Table structure for notice_mail_config --- ---------------------------- -CREATE TABLE `notice_mail_config` ( - `id` bigint(20) NOT NULL, - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '编号', - `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '名称', - `host` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '邮箱服务器host', - `port` int(5) NOT NULL COMMENT '邮箱服务器 port', - `username` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '邮箱服务器 username', - `password` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '邮箱服务器 password', - `sender` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '邮箱服务器 sender', - `from_` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '邮箱服务器 from', - `activity` tinyint(1) NULL DEFAULT 0 COMMENT '是否默认配置，0:否。1:是', - `security_type` int(2) NULL DEFAULT NULL COMMENT '安全传输方式 1:plain 2:tls 3:ssl', - `creator` bigint(18) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(18) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - `version` int(8) NULL DEFAULT NULL COMMENT '版本', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '邮件配置' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Table structure for iam_user_social --- ---------------------------- -CREATE TABLE `iam_user_social` ( - `id` bigint(20) NOT NULL COMMENT '主键', - `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户id', - `we_chat_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '微信openId', - `qq_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'qqId', - `weibo_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '微博Id', - `gitee_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '码云唯一标识', - `ding_talk_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '钉钉唯一标识', - `we_com_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '企业微信唯一标识', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户三方登录' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Table structure for goods_specification --- ---------------------------- -CREATE TABLE `goods_specification` ( - `id` bigint(20) NOT NULL, - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '规格名称', - `type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '类型', - `options` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '规格列表值', - `state` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态', - `remark` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '规格' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for goods_goods_sku_packing --- ---------------------------- -CREATE TABLE `goods_goods_sku_packing` ( - `id` bigint(20) NOT NULL, - `goods_id` bigint(20) NULL DEFAULT NULL COMMENT '打包品', - `packed_goods_id` bigint(20) NULL DEFAULT NULL COMMENT '被打包品', - `goods_sku_id` bigint(20) NULL DEFAULT NULL COMMENT '打包SKU', - `packed_sku_id` bigint(20) NULL DEFAULT NULL COMMENT '被打包SKU', - `create_time` datetime(6) NULL DEFAULT NULL, - `creator` bigint(20) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `version` int(11) NULL DEFAULT NULL, - `deleted` bit(1) NOT NULL, - `tid` bigint(20) NULL DEFAULT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'sku打包关系' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of goods_goods_sku_packing --- ---------------------------- - --- ---------------------------- --- Table structure for goods_goods_sku_attr --- ---------------------------- -CREATE TABLE `goods_goods_sku_attr` ( - `id` bigint(20) NOT NULL, - `cid` bigint(20) NULL DEFAULT NULL COMMENT '类目 id', - `goods_id` bigint(20) NULL DEFAULT NULL COMMENT '商品 id', - `sku_id` bigint(20) NULL DEFAULT NULL COMMENT 'SKU id', - `attr_def_id` bigint(20) NULL DEFAULT NULL COMMENT '属性定义 id', - `attr_value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '属性值', - `attr_value_display` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '显示值', - `tid` bigint(20) NOT NULL, - `attr_values_display` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `attr_value_displays` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'sku属性' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Table structure for goods_goods_sku --- ---------------------------- -CREATE TABLE `goods_goods_sku` ( - `id` bigint(20) NOT NULL, - `cid` bigint(20) NULL DEFAULT NULL COMMENT '所属类目id', - `goods_id` bigint(20) NULL DEFAULT NULL COMMENT '所属商品 id', - `shop_id` bigint(20) NULL DEFAULT NULL COMMENT '所属商户', - `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '外部编码', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'SKU 名称', - `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `packing` bit(1) NOT NULL COMMENT '是否打包品', - `addition` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附加信息', - `business_id` bigint(20) NULL DEFAULT NULL COMMENT '业务id', - `attr_def_ids` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '生成此商品 SKU 的属性定义的 id 拼接串', - `attr_values` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '属性值id拼接串', - `attr_value_displays` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '示值拼接串', - `is_unlimited` bit(1) NOT NULL COMMENT '是否无限库存', - `capacity` int(11) NOT NULL COMMENT '初始库存', - `locked` int(11) NOT NULL COMMENT '预占库存', - `sold` int(11) NOT NULL COMMENT '已用库存', - `available` int(11) NOT NULL COMMENT '可用库存', - `sale_state` int(11) NULL DEFAULT NULL COMMENT '销售状态', - `sale_off_time` datetime(6) NULL DEFAULT NULL COMMENT '上架时间', - `sale_on_time` datetime(6) NULL DEFAULT NULL COMMENT '下架时间', - `price` decimal(19, 2) NULL DEFAULT NULL COMMENT '价格', - `state` int(11) NOT NULL COMMENT '状态', - `creator` bigint(20) NULL DEFAULT NULL, - `create_time` datetime(6) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `version` int(11) NULL DEFAULT NULL, - `deleted` bit(1) NOT NULL, - `tid` bigint(20) NULL DEFAULT NULL, - `out_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品sku' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of goods_goods_sku --- ---------------------------- - --- ---------------------------- --- Table structure for goods_goods_packing --- ---------------------------- -CREATE TABLE `goods_goods_packing` ( - `id` bigint(20) NOT NULL, - `goods_id` bigint(20) NULL DEFAULT NULL COMMENT '打包品', - `packed_goods_id` bigint(20) NULL DEFAULT NULL COMMENT '被打包品', - `create_time` datetime(6) NULL DEFAULT NULL, - `creator` bigint(20) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `version` int(11) NULL DEFAULT NULL, - `deleted` bit(1) NOT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品打包关系' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of goods_goods_packing --- ---------------------------- - --- ---------------------------- --- Table structure for goods_goods --- ---------------------------- -CREATE TABLE `goods_goods` ( - `id` bigint(20) NOT NULL, - `cid` bigint(20) NULL DEFAULT NULL COMMENT '类目id', - `cname` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '类目名称', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品名', - `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '编码', - `packing` bit(1) NOT NULL COMMENT '是否是打包品', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `addition` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附加参数', - `state` int(11) NOT NULL COMMENT '状态', - `banner_uri` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `display_price` decimal(19, 2) NULL DEFAULT NULL, - `goods_type` int(11) NULL DEFAULT NULL, - `main_uri` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `sale_off_time` datetime(6) NULL DEFAULT NULL, - `sale_on_time` datetime(6) NULL DEFAULT NULL, - `sale_state` int(11) NULL DEFAULT NULL, - `shop_id` bigint(20) NULL DEFAULT NULL, - `attr_def_ids` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `attr_value_displays` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `attr_values` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `display_lower_price` decimal(19, 2) NULL DEFAULT NULL, - `display_upper_price` decimal(19, 2) NULL DEFAULT NULL, - `creator` bigint(20) NULL DEFAULT NULL, - `create_time` datetime(6) NULL DEFAULT NULL, - `last_modifier` bigint(20) NULL DEFAULT NULL, - `last_modified_time` datetime(6) NULL DEFAULT NULL, - `version` int(11) NULL DEFAULT NULL, - `deleted` bit(1) NOT NULL, - `out_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品spu' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Table structure for goods_category_parameter_group --- ---------------------------- -CREATE TABLE `goods_category_parameter_group` ( - `id` bigint(20) NOT NULL, - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', - `sort_no` double(8, 2) NULL DEFAULT NULL COMMENT '排序', - `category_id` bigint(20) NULL DEFAULT NULL COMMENT '类目id', - `remark` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '类目参数组' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for goods_category_parameter --- ---------------------------- -CREATE TABLE `goods_category_parameter` ( - `id` bigint(20) NOT NULL, - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '品牌名称', - `type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '类型', - `options` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '选择值(列表)', - `required` bit(1) NULL DEFAULT NULL COMMENT '是否必填', - `sort_no` double(8, 2) NULL DEFAULT NULL COMMENT '排序', - `group_id` bigint(20) NULL DEFAULT NULL COMMENT '参数组id', - `category_id` bigint(20) NULL DEFAULT NULL COMMENT '类目id', - `remark` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '类目参数' ROW_FORMAT = Dynamic; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/_config/sql/1.1.x/1.1.0-bate/V1.1.0_220624__bate3.sql b/_config/sql/1.1.x/1.1.0-bate/V1.1.0_220624__bate3.sql deleted file mode 100644 index 7bb5eb4c8b1ec15db1969b0db99332298df07489..0000000000000000000000000000000000000000 --- a/_config/sql/1.1.x/1.1.0-bate/V1.1.0_220624__bate3.sql +++ /dev/null @@ -1,19 +0,0 @@ -SET FOREIGN_KEY_CHECKS = 0; - -ALTER TABLE `base_key_value` MODIFY COLUMN `value` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '参数值' AFTER `key`;INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1535451167008436224, 'admin', 1431152689832525824, '系统信息', 'SysInfo', NULL, b'0', '', b'0', b'0', 'starter/monitor/SystemInfoMonitor', NULL, '/monitor/sysinfo', '', 0, 1, NULL, b'0', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-11 10:37:40', 1399985191002447872, '2022-06-13 13:07:46', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1535965936371085312, 'admin', 1431152689832525824, 'Redis监控', 'RedisInfoMonitor', NULL, b'0', '', b'0', b'0', 'starter/monitor/RedisInfoMonitor', NULL, '/monitor/redis', '', 0, 1, NULL, b'0', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-12 20:43:11', 1399985191002447872, '2022-06-13 13:07:38', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1537730140522348544, 'admin', 1438061887002759168, '站内信', 'SiteMessage', '', b'0', '', b'0', b'0', 'notice/site/SiteMessage', NULL, '/notice/siteMessage', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-17 17:33:30', 1399985191002447872, '2022-06-17 17:33:30', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1537732440632524800, 'admin', NULL, '个人办公', 'person', '', b'0', 'user', b'0', b'0', 'RouteView', NULL, '/person', '', -99, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-17 17:42:38', 1399985191002447872, '2022-06-17 17:45:24', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1537733801860333568, 'admin', 1537732440632524800, '我的消息', 'PersonSiteMessage', NULL, b'0', '', b'0', b'0', 'Dev', NULL, '/person/siteMessage', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-17 17:48:03', 1399985191002447872, '2022-06-21 20:52:50', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1537735851818024960, 'admin', 1537732440632524800, '待办任务', 'PersonTaskList', NULL, b'0', '', b'0', b'0', 'Dev', NULL, '/person/taskList', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-17 17:56:11', 1399985191002447872, '2022-06-21 20:52:42', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1538160478872625152, 'admin', 1495968302034210816, '富文本编辑', 'WangEditorDemo', NULL, b'0', '', b'0', b'0', 'demo/wangeditor/WangEditorDemo', NULL, '/demo/wangEditor', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-18 22:03:30', 1399985191002447872, '2022-06-18 22:03:31', 0, 0); - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = NULL, `title` = '系统监控', `name` = 'monitor', `perm_code` = '', `effect` = b'0', `icon` = 'radar-chart', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/monitor', `redirect` = '', `sort_no` = 0, `menu_type` = 0, `leaf` = b'1', `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2021-08-27 15:12:45', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-17 17:57:30', `version` = 21, `deleted` = 0 WHERE `id` = 1431152689832525824; -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1438061887002759168, `title` = '微信', `name` = 'NoticeWeChat', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'Dev', `component_name` = NULL, `path` = '/notice/wechat', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 22:14:04', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-21 20:53:04', `version` = 1, `deleted` = 0 WHERE `id` = 1450827660459458560; - -UPDATE `iam_user_expand_info` SET `sex` = 1, `birthday` = '1996-12-01', `avatar` = '1495331905770315776', `last_login_time` = '2022-06-22 00:27:07', `current_login_time` = '2022-06-22 00:51:30', `initial_password` = b'0', `last_change_password_time` = '2022-06-19 21:25:00', `creator` = 1, `create_time` = '2021-06-02 15:04:15', `last_modifier` = 0, `last_modified_time` = '2022-06-22 00:51:30', `version` = 180, `deleted` = 0 WHERE `id` = 1399985191002447872; - -UPDATE `starter_quartz_job` SET `name` = '测试任务', `job_class_name` = 'cn.bootx.starter.quartz.task.TestTask', `cron` = '50 0 * * * ? *', `parameter` = '{\"aaa\":\"5255\"}', `state` = 0, `remark` = '测试任务', `creator` = 1399985191002447872, `create_time` = '2021-11-05 19:09:43', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-22 00:37:48', `version` = 25, `deleted` = 0 WHERE `id` = 1456579473573867520; - -SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/_config/sql/1.1.x/1.1.0-bate/V1.1.0_220702__bate4.sql b/_config/sql/1.1.x/1.1.0-bate/V1.1.0_220702__bate4.sql deleted file mode 100644 index c576614b799e0ee44beaf3222448a779f66f1410..0000000000000000000000000000000000000000 --- a/_config/sql/1.1.x/1.1.0-bate/V1.1.0_220702__bate4.sql +++ /dev/null @@ -1,165 +0,0 @@ -SET FOREIGN_KEY_CHECKS = 0; - -CREATE TABLE `iam_application` ( - `id` bigint(20) NOT NULL, - `code` varchar(21) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编码', - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', - `system` bit(1) NOT NULL COMMENT '是否系统内置', - `enable` bit(1) NOT NULL COMMENT '是否可用', - `client_ids` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '关联终端', - `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '认证应用' ROW_FORMAT = DYNAMIC; - -ALTER TABLE `iam_client` DROP COLUMN `alone_prem`; - -ALTER TABLE `iam_perm_menu` ADD COLUMN `app_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '应用code' AFTER `id`; -ALTER TABLE `iam_perm_menu` DROP COLUMN `client_code`; -ALTER TABLE `iam_role_menu` ADD COLUMN `app_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '应用code' AFTER `role_id`; -ALTER TABLE `iam_role_menu` DROP COLUMN `client_code`; - -ALTER TABLE `iam_perm_path` MODIFY COLUMN `code` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '权限标识' AFTER `id`; - -ALTER TABLE `iam_user_info` ADD COLUMN `app_ids` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '关联应用ds' AFTER `email`; -ALTER TABLE `iam_user_info` DROP COLUMN `client_ids`; - -ALTER TABLE `iam_user_social` COMMENT = '用户三方登录绑定'; -ALTER TABLE `iam_user_social` ADD INDEX `pk_user_index`(`user_id`) USING BTREE COMMENT '用户id索引'; - -CREATE TABLE `iam_user_social_info` ( - `id` bigint(20) NOT NULL COMMENT '主键', - `user_id` bigint(20) NOT NULL COMMENT '用户id', - `client_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '第三方终端类型', - `username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '用户名', - `nickname` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '用户昵称', - `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '用户头像', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE, - INDEX `pk_user_client`(`user_id`, `client_code`) USING BTREE COMMENT '用户id和终端code' -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '用户三方登录绑定详情' ROW_FORMAT = Dynamic; - -ALTER TABLE `starter_file_upload_info` MODIFY COLUMN `file_size` bigint(20) NULL DEFAULT NULL COMMENT '文件大小' AFTER `file_suffix`;SET FOREIGN_KEY_CHECKS = 1; - -INSERT INTO `iam_application` VALUES (1430430071299207168, 'admin', 'pc管理端', b'1', b'1', '1430430071299207168,1435138582839009280,1430478946919653376,1542091599907115008,1542804450312122368,1543126042909016064', 'pc浏览器', 1399985191002447872, '2021-08-25 15:21:20', 1399985191002447872, '2022-07-02 14:55:11', 4, 0); -INSERT INTO `iam_application` VALUES (1430430071299207169, 'h5', 'h5端', b'1', b'1', '1430430071299207168,1435138582839009280', '手机wap', 1399985191002447872, '2021-08-25 15:21:20', 1399985191002447872, '2022-06-29 18:31:45', 1, 0); -INSERT INTO `iam_client` VALUES (1542091599907115008, 'dingTalk', '钉钉', b'0', 5, b'0', -1, b'1', '', 1399985191002447872, '2022-06-29 18:24:23', 1399985191002447872, '2022-07-02 14:55:01', 5, 0); -INSERT INTO `iam_client` VALUES (1542804450312122368, 'weCom', '企业微信', b'0', 5, b'0', -1, b'1', '', 1399985191002447872, '2022-07-01 17:37:00', 1399985191002447872, '2022-07-01 17:37:00', 0, 0); - -INSERT INTO `iam_client`(`id`, `code`, `name`, `system`, `timeout`, `captcha`, `pwd_err_num`, `enable`, `description`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1543126042909016064, 'WeChat', '微信登录', b'0', 5, b'0', -1, b'1', '', 1399985191002447872, '2022-07-02 14:54:53', 1399985191002447872, '2022-07-02 14:54:53', 0, 0); -UPDATE `iam_client` SET `code` = 'password', `name` = '账号密码登陆', `system` = b'1', `timeout` = 3600, `captcha` = b'0', `pwd_err_num` = -1, `enable` = b'1', `description` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-25 15:21:20', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-04-24 19:51:13', `version` = 16, `deleted` = 0 WHERE `id` = 1430430071299207168; -UPDATE `iam_client` SET `code` = 'phone', `name` = '手机短信登录', `system` = b'0', `timeout` = 3600, `captcha` = b'1', `pwd_err_num` = 0, `enable` = b'1', `description` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-09-07 15:11:16', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-26 21:35:20', `version` = 4, `deleted` = 0 WHERE `id` = 1435138582839009280; - -INSERT INTO `iam_perm_menu` VALUES (1541355214204030976, 'admin', 1541427353886859264, '认证应用', 'AuthApplication', '', b'0', '', b'0', b'0', 'system/client/ApplicationList', NULL, '/system/config/application', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-08-27 10:37:08', 1399985191002447872, '2022-06-27 22:25:37', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1541427353886859264, 'admin', 1414596052497092608, '认证管理', 'Auth', '', b'0', '', b'0', b'0', 'RouteView', NULL, '/system/auth', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-27 22:24:54', 1399985191002447872, '2022-06-27 22:24:54', 0, 0); - -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = NULL, `title` = '系统管理', `name` = 'system', `perm_code` = '', `effect` = NULL, `icon` = 'desktop', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = '', `path` = '/system', `redirect` = '/system/user', `sort_no` = 0, `menu_type` = 0, `leaf` = b'0', `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'1', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-27 10:32:53', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-08-27 10:02:16', `version` = 2, `deleted` = 0 WHERE `id` = 1414596052497092608; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1452569691537256448, `title` = '用户管理', `name` = 'User', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'system/user/UserList', `component_name` = '', `path` = '/system/userAuth/user', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = b'0', `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-27 10:32:53', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-08-27 10:17:40', `version` = 4, `deleted` = 0 WHERE `id` = 1414596647509446656; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1414596052497092608, `title` = '菜单管理', `name` = 'Menu', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'system/menu/MenuList', `component_name` = '', `path` = '/system/permission/menu', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = b'0', `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'1', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-27 10:32:53', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-08-26 23:56:16', `version` = 2, `deleted` = 0 WHERE `id` = 1414596773275652096; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1452569339987472384, `title` = '角色管理', `name` = 'Role', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'system/role/RoleList', `component_name` = '', `path` = '/system/permission/role', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = b'1', `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-27 10:32:53', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-08-26 23:56:04', `version` = 4, `deleted` = 0 WHERE `id` = 1414596805538238464; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1452569691537256448, `title` = '部门管理', `name` = 'Dept', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'system/dept/DeptList', `component_name` = '', `path` = '/system/userAuth/dept', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = b'1', `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-27 10:32:53', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-08-26 23:56:31', `version` = 7, `deleted` = 0 WHERE `id` = 1414596842322284544; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1452571269199540224, `title` = '数据字典', `name` = 'Dict', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'system/translate/DictList', `component_name` = '', `path` = '/system/config/translate', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = b'1', `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-27 10:32:53', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-19 09:04:55', `version` = 11, `deleted` = 0 WHERE `id` = 1414596877617352704; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1452569691537256448, `title` = '在线用户管理', `name` = 'OnlineUser', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'system/online/OnlineUserList', `component_name` = NULL, `path` = '/system/userAuth/online', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = b'1', `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-27 10:32:53', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-08-27 10:32:53', `version` = 6, `deleted` = 0 WHERE `id` = 1431082258161434624; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1541427353886859264, `title` = '认证终端', `name` = 'Client', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'system/client/ClientList', `component_name` = NULL, `path` = '/system/config/client', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = b'1', `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-27 10:37:09', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-27 22:25:16', `version` = 8, `deleted` = 0 WHERE `id` = 1431083330909208576; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1452569339987472384, `title` = '请求权限管理', `name` = 'Path', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'system/path/PathList', `component_name` = NULL, `path` = '/system/permission/path', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = b'1', `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-27 11:00:11', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-08-27 11:00:11', `version` = 2, `deleted` = 0 WHERE `id` = 1431089129232498688; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = NULL, `title` = '系统监控', `name` = 'monitor', `perm_code` = '', `effect` = b'0', `icon` = 'radar-chart', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/monitor', `redirect` = '', `sort_no` = 0, `menu_type` = 0, `leaf` = b'1', `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2021-08-27 15:12:45', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-17 17:57:30', `version` = 21, `deleted` = 0 WHERE `id` = 1431152689832525824; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1431152689832525824, `title` = '接口文档', `name` = 'ApiSwagger', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '', `component_name` = NULL, `path` = 'http://127.0.0.1:9999/doc.html', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = b'1', `keep_alive` = b'1', `target_outside` = b'1', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-27 15:15:25', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-07 11:06:52', `version` = 15, `deleted` = 0 WHERE `id` = 1431153358157348864; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1452567897717321728, `title` = '登录日志', `name` = 'LoginLog', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'starter/log/LoginLogList', `component_name` = NULL, `path` = '/system/log/loginLog', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-09-07 15:31:31', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-09-07 15:31:31', `version` = 5, `deleted` = 0 WHERE `id` = 1435143678721236992; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1452567897717321728, `title` = '操作日志', `name` = 'OperateLog', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'starter/log/OperateLogList', `component_name` = NULL, `path` = '/system/log/OperateLog', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-09-08 13:33:04', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-09-08 13:33:04', `version` = 7, `deleted` = 0 WHERE `id` = 1435476255797624832; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = NULL, `title` = '通知管理', `name` = 'notice', `perm_code` = '', `effect` = NULL, `icon` = 'message', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/notice', `redirect` = '', `sort_no` = 0, `menu_type` = 0, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-09-15 16:47:26', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-09-15 16:47:26', `version` = 3, `deleted` = 0 WHERE `id` = 1438061887002759168; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1438061887002759168, `title` = '邮件配置', `name` = 'MailConfig', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'notice/mail/MailConfigList', `component_name` = NULL, `path` = '/notice/mailConfig', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-09-15 17:29:03', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-09-15 17:29:03', `version` = 3, `deleted` = 0 WHERE `id` = 1438072357281542144; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1438061887002759168, `title` = '消息模板', `name` = 'MessageTemplate', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'notice/template/TemplateList', `component_name` = NULL, `path` = '/notice/template', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-09-18 19:57:33', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-09-18 19:57:33', `version` = 3, `deleted` = 0 WHERE `id` = 1439196893514031104; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1438061887002759168, `title` = '钉钉', `name` = 'DingTalk', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/notice/dingTalk', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-09-21 15:27:50', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-09-21 15:27:50', `version` = 0, `deleted` = 0 WHERE `id` = 1440216178722050048; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1440216178722050048, `title` = '钉钉机器人', `name` = 'DingTalkRobot', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'notice/dingTalk/robot/DingRobotConfigList', `component_name` = NULL, `path` = '/notice/dingTalk/robot', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-09-21 15:29:33', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-09-21 15:29:33', `version` = 3, `deleted` = 0 WHERE `id` = 1440216612211757056; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1452569691537256448, `title` = '第三方登录', `name` = 'Social', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'system/social/SocialList', `component_name` = NULL, `path` = '/system/userAuth/social', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-19 22:45:01', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-19 22:45:01', `version` = 4, `deleted` = 0 WHERE `id` = 1450473063320526848; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1452571269199540224, `title` = '定时任务', `name` = 'QuartzJobList', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'starter/quartz/QuartzJobList', `component_name` = NULL, `path` = '/system/config/quartz', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 20:39:41', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-20 20:39:41', `version` = 5, `deleted` = 0 WHERE `id` = 1450803906215886848; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = NULL, `title` = '第三方对接', `name` = 'social', `perm_code` = '', `effect` = b'0', `icon` = 'branches', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/social', `redirect` = '', `sort_no` = 0, `menu_type` = 0, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 21:42:04', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-04-05 16:53:25', `version` = 3, `deleted` = 0 WHERE `id` = 1450819607680991232; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1450819607680991232, `title` = '微信', `name` = 'SocialWeChat', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/social/wechat', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 21:50:28', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-20 21:50:28', `version` = 1, `deleted` = 0 WHERE `id` = 1450821723027881984; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1450819607680991232, `title` = '企业微信', `name` = 'SocialWeCom', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/social/wecom', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 21:51:05', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-20 21:51:05', `version` = 2, `deleted` = 0 WHERE `id` = 1450821877831254016; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1450819607680991232, `title` = '钉钉', `name` = 'SocialDingTalk', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/social/dingtalk', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 21:53:36', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-20 21:53:36', `version` = 1, `deleted` = 0 WHERE `id` = 1450822511087271936; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = NULL, `title` = '支付管理', `name` = 'PayManager', `perm_code` = '', `effect` = NULL, `icon` = 'pay-circle', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/payment', `redirect` = '', `sort_no` = 0, `menu_type` = 0, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 21:54:55', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-20 21:54:55', `version` = 2, `deleted` = 0 WHERE `id` = 1450822842995130368; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1450822842995130368, `title` = '支付通道', `name` = 'PayChannel', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/payment/channel', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 21:59:22', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-20 21:59:22', `version` = 2, `deleted` = 0 WHERE `id` = 1450823960236081152; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1450823960236081152, `title` = '支付宝', `name` = 'AliPayConfig', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'payment/channel/alipay/AliPayConfigList', `component_name` = NULL, `path` = '/payment/channel/alipay', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 21:59:59', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-20 21:59:59', `version` = 1, `deleted` = 0 WHERE `id` = 1450824117849636864; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1450823960236081152, `title` = '微信支付', `name` = 'WeChatPayConfig', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'payment/channel/wechat/WeChatConfigList', `component_name` = NULL, `path` = '/payment/channel/wechat', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 22:00:48', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-20 22:00:48', `version` = 1, `deleted` = 0 WHERE `id` = 1450824319868289024; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1450823960236081152, `title` = '云闪付', `name` = 'UnionPayConfig', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'payment/channel/unionpay/UnionPayConfigList', `component_name` = NULL, `path` = '/payment/channel/unionpay', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 22:02:03', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-04 16:12:13', `version` = 3, `deleted` = 0 WHERE `id` = 1450824637876224000; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1450823960236081152, `title` = '现金支付', `name` = 'CashPayConfig', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'1', `hide_children_in_menu` = b'0', `component` = '', `component_name` = NULL, `path` = '/payment/channel/cash', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 22:03:00', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-04 16:12:08', `version` = 1, `deleted` = 0 WHERE `id` = 1450824875198332928; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1450822842995130368, `title` = '收银台', `name` = 'PayCashier', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'payment/cashier/Cashier', `component_name` = NULL, `path` = '/payment/cashier', `redirect` = '', `sort_no` = -1, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 22:05:26', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-20 22:05:26', `version` = 2, `deleted` = 0 WHERE `id` = 1450825488577544192; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1450822842995130368, `title` = '订单管理', `name` = 'PayOrder', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/payment/order', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 22:05:57', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-20 22:05:57', `version` = 2, `deleted` = 0 WHERE `id` = 1450825615857893376; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1450822842995130368, `title` = '回调记录', `name` = 'PayNotify', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'payment/notify/PayNotifyRecordList', `component_name` = NULL, `path` = '/payment/notify', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 22:06:45', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-20 22:06:45', `version` = 0, `deleted` = 0 WHERE `id` = 1450825819436826624; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1450825615857893376, `title` = '支付订单', `name` = 'PaymentOrder', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'payment/order/payment/PaymentList', `component_name` = NULL, `path` = '/payment/order/payment', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 22:11:00', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-02-25 15:17:07', `version` = 2, `deleted` = 0 WHERE `id` = 1450826890318135296; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1450825615857893376, `title` = '退款订单', `name` = 'ReturnOrder', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'payment/order/refund/RefundRecordList', `component_name` = NULL, `path` = '/payment/order/return', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 22:12:05', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-04 15:44:06', `version` = 4, `deleted` = 0 WHERE `id` = 1450827159626006528; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1450825615857893376, `title` = '转账订单', `name` = 'TransferOrder', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'1', `hide_children_in_menu` = b'0', `component` = 'payment/order/transfer/TransferList', `component_name` = NULL, `path` = '/payment/order/transfer', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 22:12:40', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-04 15:33:31', `version` = 3, `deleted` = 0 WHERE `id` = 1450827308515409920; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1438061887002759168, `title` = '微信', `name` = 'NoticeWeChat', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'Dev', `component_name` = NULL, `path` = '/notice/wechat', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 22:14:04', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-21 20:53:04', `version` = 1, `deleted` = 0 WHERE `id` = 1450827660459458560; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1414596052497092608, `title` = '审计日志', `name` = 'auditLog', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/system/log', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-25 17:29:09', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-25 17:29:09', `version` = 0, `deleted` = 0 WHERE `id` = 1452567897717321728; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1414596052497092608, `title` = '权限管理', `name` = 'permission', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/system/permission', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-25 17:34:53', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-25 17:34:53', `version` = 2, `deleted` = 0 WHERE `id` = 1452569339987472384; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1414596052497092608, `title` = '用户信息', `name` = 'userAuth', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/system/userAuth', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-25 17:36:17', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-25 17:36:17', `version` = 2, `deleted` = 0 WHERE `id` = 1452569691537256448; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1414596052497092608, `title` = '系统配置', `name` = 'systemConfig', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/system/config', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-25 17:42:33', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-25 17:42:33', `version` = 2, `deleted` = 0 WHERE `id` = 1452571269199540224; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1452571269199540224, `title` = '系统参数', `name` = 'SystemParam', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'system/param/SystemParamList', `component_name` = NULL, `path` = '/system/config/param', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-25 22:11:18', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-25 22:11:18', `version` = 1, `deleted` = 0 WHERE `id` = 1452638905302966272; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1452569339987472384, `title` = '数据范围权限', `name` = 'DataScope', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'system/scope/DataScopeList', `component_name` = NULL, `path` = '/system/permission/data', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-12-25 18:52:33', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-12-25 18:52:33', `version` = 1, `deleted` = 0 WHERE `id` = 1474694545336676352; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1414596052497092608, `title` = '22', `name` = NULL, `perm_code` = '22', `effect` = b'1', `icon` = NULL, `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = NULL, `component_name` = NULL, `path` = NULL, `redirect` = NULL, `sort_no` = 0, `menu_type` = 2, `leaf` = NULL, `keep_alive` = b'0', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = '', `creator` = 1399985191002447872, `create_time` = '2021-12-30 17:46:37', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-12-30 17:46:37', `version` = 4, `deleted` = 1 WHERE `id` = 1476489893513404416; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1414596052497092608, `title` = '1', `name` = NULL, `perm_code` = '1', `effect` = b'1', `icon` = NULL, `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = NULL, `component_name` = NULL, `path` = NULL, `redirect` = NULL, `sort_no` = 0, `menu_type` = 2, `leaf` = NULL, `keep_alive` = b'0', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = '', `creator` = 1399985191002447872, `create_time` = '2022-01-03 21:58:57', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-01-03 21:58:57', `version` = 0, `deleted` = 1 WHERE `id` = 1478002945936015360; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1414596052497092608, `title` = '22', `name` = NULL, `perm_code` = '22', `effect` = b'1', `icon` = NULL, `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = NULL, `component_name` = NULL, `path` = NULL, `redirect` = NULL, `sort_no` = 0, `menu_type` = 2, `leaf` = NULL, `keep_alive` = b'0', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = '', `creator` = 1399985191002447872, `create_time` = '2022-01-03 22:04:13', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-01-03 22:04:13', `version` = 0, `deleted` = 1 WHERE `id` = 1478004271512240128; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1452567897717321728, `title` = '数据版本日志', `name` = 'DataVersionLog', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'starter/log/DataVersionLogList', `component_name` = NULL, `path` = '/system/log/DataVersionLog', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-01-11 17:51:54', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-01-11 17:51:54', `version` = 0, `deleted` = 0 WHERE `id` = 1480839877352476672; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1452571269199540224, `title` = '文件管理', `name` = 'FIleUpLoad', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'starter/file/FileUploadList', `component_name` = NULL, `path` = '/system/config/file', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-02-08 17:42:12', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-02-08 17:42:12', `version` = 0, `deleted` = 0 WHERE `id` = 1490984296616263680; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1452571269199540224, `title` = '代码生成', `name` = 'CodeGen', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'starter/codegen/CodeGenList', `component_name` = NULL, `path` = '/system/config/codeGen', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-02-19 20:33:04', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-02-19 20:33:05', `version` = 0, `deleted` = 0 WHERE `id` = 1495013564652429312; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = NULL, `title` = '功能演示', `name` = 'Demo', `perm_code` = NULL, `effect` = b'0', `icon` = 'block', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/demo', `redirect` = '', `sort_no` = 99, `menu_type` = 0, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-02-22 11:46:52', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-10 11:02:05', `version` = 3, `deleted` = 0 WHERE `id` = 1495968302034210816; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1495968302034210816, `title` = '数据相关', `name` = 'DemoData', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/demo/data', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-02-22 11:50:02', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-24 16:27:46', `version` = 4, `deleted` = 0 WHERE `id` = 1495969099987963904; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1495968302034210816, `title` = '超级查询', `name` = 'SuperQueryDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'demo/query/SuperQueryDemoList', `component_name` = NULL, `path` = '/demo/query/super', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-02-22 15:13:31', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-27 17:34:41', `version` = 2, `deleted` = 0 WHERE `id` = 1496020308992143360; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1450822842995130368, `title` = '钱包管理', `name` = 'Wallet', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/payment/wallet', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-03-10 10:03:29', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-10 10:04:53', `version` = 1, `deleted` = 0 WHERE `id` = 1501740492360962048; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1501740492360962048, `title` = '钱包列表', `name` = 'WalletList', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'payment/wallet/list/WalletList', `component_name` = NULL, `path` = '/payment/wallet/list', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-03-10 10:10:23', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-10 17:06:19', `version` = 2, `deleted` = 0 WHERE `id` = 1501742229142556672; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1501740492360962048, `title` = '个人钱包', `name` = 'PersonalWallet', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'payment/wallet/list/WalletList', `component_name` = NULL, `path` = '/payment/wallet/personal', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-03-10 10:11:08', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-10 17:06:10', `version` = 2, `deleted` = 0 WHERE `id` = 1501742417378725888; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1450822842995130368, `title` = '组合支付', `name` = 'CombinationCashier', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'payment/combination/CombinationCashier', `component_name` = NULL, `path` = '/payment/combination', `redirect` = '', `sort_no` = -0.5, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-03-10 17:07:56', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-10 17:09:28', `version` = 2, `deleted` = 0 WHERE `id` = 1501847310319972352; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1450822842995130368, `title` = '储值卡', `name` = 'Voucher', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'payment/voucher/VoucherList', `component_name` = NULL, `path` = '/payment/voucher', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-03-13 16:35:51', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-14 19:39:45', `version` = 2, `deleted` = 0 WHERE `id` = 1502926397176242176; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1495969099987963904, `title` = '数据权限', `name` = 'DataPermDemoList', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'demo/data/perm/DataPermDemoList', `component_name` = NULL, `path` = '/demo/data/perm', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-03-24 16:27:39', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-24 16:28:56', `version` = 1, `deleted` = 0 WHERE `id` = 1506910599819165696; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1495969099987963904, `title` = '加密解密', `name` = 'DataEncryptDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'demo/data/encrypt/DataEncryptDemoList', `component_name` = NULL, `path` = '/demo/data/encrypt', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-03-24 16:28:47', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-24 16:28:47', `version` = 0, `deleted` = 0 WHERE `id` = 1506910885463851008; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1495969099987963904, `title` = '数据脱敏', `name` = 'DataSensitiveDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'demo/data/sensitive/DataSensitiveDemoList', `component_name` = NULL, `path` = '/demo/data/sensitive', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-03-24 16:29:41', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-24 17:16:03', `version` = 1, `deleted` = 0 WHERE `id` = 1506911113394913280; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1495968302034210816, `title` = 'WS演示', `name` = 'WebsocketDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'demo/ws/WebsocketDemo', `component_name` = NULL, `path` = '/demo/ws', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-03-27 16:30:25', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-27 16:30:25', `version` = 0, `deleted` = 0 WHERE `id` = 1507998458886197248; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1495968302034210816, `title` = '幂等请求演示', `name` = 'IdempotentDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'demo/idempotent/Idempotent', `component_name` = NULL, `path` = '/demo/idempotent', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-03-31 19:11:12', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-27 17:35:00', `version` = 1, `deleted` = 0 WHERE `id` = 1509488473583562752; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1450822511087271936, `title` = '钉钉配置', `name` = 'DingTalkConfig', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'social/dingtalk/config/DingTalkConfigList', `component_name` = NULL, `path` = '/social/dingtalk/config', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-04-05 16:54:48', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-04-05 16:54:48', `version` = 0, `deleted` = 0 WHERE `id` = 1511266086400524288; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = NULL, `title` = '商品管理', `name` = 'GoodsManager', `perm_code` = NULL, `effect` = b'0', `icon` = 'car', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/goods', `redirect` = '', `sort_no` = 0, `menu_type` = 0, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-05-10 11:01:40', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-10 11:02:45', `version` = 1, `deleted` = 0 WHERE `id` = 1523860792695283712; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1523860792695283712, `title` = '类目管理', `name` = 'CategoryManager', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/goods/category', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-05-10 16:24:05', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-10 16:24:17', `version` = 1, `deleted` = 0 WHERE `id` = 1523941932282114048; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1523941932282114048, `title` = '类目', `name` = 'Category', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'goods/category/CategoryList', `component_name` = NULL, `path` = '/goods/category/category', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-05-10 16:24:52', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-10 16:25:23', `version` = 1, `deleted` = 0 WHERE `id` = 1523942130555252736; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1523941932282114048, `title` = '品牌', `name` = 'Brand', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'goods/brand/BrandList', `component_name` = NULL, `path` = '/goods/category/brand', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-05-10 23:10:26', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-10 23:14:20', `version` = 4, `deleted` = 0 WHERE `id` = 1524044195818278912; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1523941932282114048, `title` = '规格', `name` = 'SpecificationList', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'goods/spec/SpecificationList', `component_name` = NULL, `path` = '/goods/category/spec', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-05-10 23:11:14', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-10 23:13:51', `version` = 1, `deleted` = 0 WHERE `id` = 1524044395823665152; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1523941932282114048, `title` = '参数组', `name` = 'ParameterGroup', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'1', `hide_children_in_menu` = b'0', `component` = 'goods/parameter/ParameterGroupList', `component_name` = NULL, `path` = '/goods/category/parameter', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-05-10 23:12:21', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-12 20:30:23', `version` = 2, `deleted` = 0 WHERE `id` = 1524044678314233856; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1523860792695283712, `title` = '商品', `name` = 'Goods', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'goods/goods/GoodsList', `component_name` = NULL, `path` = '/goods/goods', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-05-14 21:46:18', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-14 21:46:18', `version` = 0, `deleted` = 0 WHERE `id` = 1525472571967860736; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1495968302034210816, `title` = '消息中间件演示', `name` = 'MQDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'demo/mq/MqDemo', `component_name` = NULL, `path` = '/demo/mq', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-05-27 17:33:51', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-31 15:12:15', `version` = 1, `deleted` = 0 WHERE `id` = 1530120084482084864; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1530120084482084864, `title` = 'MQTT消息', `name` = 'MqttDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '', `component_name` = NULL, `path` = '/demo/mq/mqtt', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-05-27 17:36:14', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-27 17:36:14', `version` = 0, `deleted` = 1 WHERE `id` = 1530120684645044224; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1530120084482084864, `title` = 'RabbitMQ', `name` = 'RabbitDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '', `component_name` = NULL, `path` = '/demo/mq/rabbit', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-05-27 17:36:47', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-27 17:36:47', `version` = 0, `deleted` = 1 WHERE `id` = 1530120821144473600; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1431152689832525824, `title` = 'ELK日志', `name` = 'ELK', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '', `component_name` = NULL, `path` = 'http://elk.dev.bootx.cn:5601/app/discover', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'1', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-06-07 10:31:48', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-07 10:31:48', `version` = 0, `deleted` = 0 WHERE `id` = 1534000136370204672; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1431152689832525824, `title` = 'PlumeLog日志', `name` = 'PlumeLog', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '', `component_name` = NULL, `path` = 'http://127.0.0.1:9999/plumelog/#/', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'1', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-06-07 11:03:51', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-07 11:06:13', `version` = 1, `deleted` = 0 WHERE `id` = 1534008203006652416; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1431152689832525824, `title` = '系统信息', `name` = 'SysInfo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'starter/monitor/SystemInfoMonitor', `component_name` = NULL, `path` = '/monitor/sysinfo', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'0', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-06-11 10:37:40', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-13 13:07:46', `version` = 1, `deleted` = 0 WHERE `id` = 1535451167008436224; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1431152689832525824, `title` = 'Redis监控', `name` = 'RedisInfoMonitor', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'starter/monitor/RedisInfoMonitor', `component_name` = NULL, `path` = '/monitor/redis', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'0', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-06-12 20:43:11', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-13 13:07:38', `version` = 1, `deleted` = 0 WHERE `id` = 1535965936371085312; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1438061887002759168, `title` = '站内信', `name` = 'SiteMessage', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'notice/site/SiteMessage', `component_name` = NULL, `path` = '/notice/siteMessage', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-06-17 17:33:30', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-17 17:33:30', `version` = 0, `deleted` = 0 WHERE `id` = 1537730140522348544; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = NULL, `title` = '个人办公', `name` = 'person', `perm_code` = '', `effect` = b'0', `icon` = 'user', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/person', `redirect` = '', `sort_no` = -99, `menu_type` = 0, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-06-17 17:42:38', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-17 17:45:24', `version` = 2, `deleted` = 0 WHERE `id` = 1537732440632524800; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1537732440632524800, `title` = '我的消息', `name` = 'PersonSiteMessage', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'Dev', `component_name` = NULL, `path` = '/person/siteMessage', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-06-17 17:48:03', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-21 20:52:50', `version` = 1, `deleted` = 0 WHERE `id` = 1537733801860333568; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1537732440632524800, `title` = '待办任务', `name` = 'PersonTaskList', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'Dev', `component_name` = NULL, `path` = '/person/taskList', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-06-17 17:56:11', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-21 20:52:42', `version` = 1, `deleted` = 0 WHERE `id` = 1537735851818024960; -UPDATE `iam_perm_menu` SET `app_code` = 'admin', `parent_id` = 1495968302034210816, `title` = '富文本编辑', `name` = 'WangEditorDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'demo/wangeditor/WangEditorDemo', `component_name` = NULL, `path` = '/demo/wangEditor', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-06-18 22:03:30', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-18 22:03:31', `version` = 0, `deleted` = 0 WHERE `id` = 1538160478872625152; - -UPDATE `iam_user_expand_info` SET `sex` = 1, `birthday` = '1996-12-01', `avatar` = '1495331905770315776', `last_login_time` = '2022-07-02 16:26:31', `current_login_time` = '2022-07-02 17:21:14', `initial_password` = b'0', `last_change_password_time` = '2022-06-19 21:25:00', `creator` = 1, `create_time` = '2021-06-02 15:04:15', `last_modifier` = 0, `last_modified_time` = '2022-07-02 17:21:14', `version` = 253, `deleted` = 0 WHERE `id` = 1399985191002447872; -UPDATE `iam_user_expand_info` SET `sex` = 1, `birthday` = NULL, `avatar` = NULL, `last_login_time` = NULL, `current_login_time` = NULL, `initial_password` = b'0', `last_change_password_time` = '2022-06-29 00:39:23', `creator` = 1399985191002447872, `create_time` = '2021-09-09 17:14:54', `last_modifier` = 0, `last_modified_time` = '2022-06-29 00:39:23', `version` = 2, `deleted` = 0 WHERE `id` = 1435894470432456704; - -UPDATE `iam_user_info` SET `name` = '小小明', `username` = 'xxm', `password` = 'f52020dca765fd3943ed40a615dc2c5c', `phone` = '13333333333', `email` = 'xxm1995@outlook.com', `app_ids` = '1430430071299207168,1430430071299207169', `avatar` = NULL, `source` = NULL, `admin` = b'1', `register_time` = '2021-06-02 15:04:12', `status` = 1, `creator` = 1, `create_time` = '2021-06-02 15:04:15', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-27 23:09:31', `version` = 50, `deleted` = 0 WHERE `id` = 1399985191002447872; -UPDATE `iam_user_info` SET `name` = '管理员', `username` = 'admin', `password` = 'c80a93d89e6590e8909a1a9f842b1615', `phone` = '13000001111', `email` = 'admin@qq.com', `app_ids` = '1430430071299207168', `avatar` = '', `source` = NULL, `admin` = b'0', `register_time` = '2021-09-09 17:14:52', `status` = 1, `creator` = 1399985191002447872, `create_time` = '2021-09-09 17:14:54', `last_modifier` = 0, `last_modified_time` = '2022-06-29 00:39:23', `version` = 6, `deleted` = 0 WHERE `id` = 1435894470432456704; -UPDATE `iam_user_info` SET `name` = '测试', `username` = 'test', `password` = 'f52020dca765fd3943ed40a615dc2c5c', `phone` = '13311111111', `email` = 'test@qq.com', `app_ids` = '1430430071299207168', `avatar` = '', `source` = NULL, `admin` = b'0', `register_time` = '2021-09-09 22:06:37', `status` = 1, `creator` = 1414143554414059520, `create_time` = '2021-09-09 22:06:37', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-31 15:59:37', `version` = 9, `deleted` = 0 WHERE `id` = 1435967884114194432; -UPDATE `iam_user_info` SET `name` = '测试用户001', `username` = 'test001', `password` = 'f52020dca765fd3943ed40a615dc2c5c', `phone` = '', `email` = '', `app_ids` = '1430430071299207168', `avatar` = '', `source` = NULL, `admin` = b'0', `register_time` = '2022-01-03 21:10:49', `status` = 1, `creator` = 1399985191002447872, `create_time` = '2022-01-03 21:10:49', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-05 20:26:26', `version` = 1, `deleted` = 0 WHERE `id` = 1477990832987361280; -UPDATE `iam_user_info` SET `name` = '测试用户002', `username` = 'test002', `password` = 'f52020dca765fd3943ed40a615dc2c5c', `phone` = '', `email` = '', `app_ids` = '1430430071299207168', `avatar` = '', `source` = NULL, `admin` = b'0', `register_time` = '2022-01-03 21:36:53', `status` = 1, `creator` = 1399985191002447872, `create_time` = '2022-01-03 21:36:53', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-05 20:26:19', `version` = 1, `deleted` = 0 WHERE `id` = 1477997391729631232; -UPDATE `iam_user_info` SET `name` = '测试用户003', `username` = 'test003', `password` = 'f52020dca765fd3943ed40a615dc2c5c', `phone` = '', `email` = '', `app_ids` = '1430430071299207168', `avatar` = '', `source` = NULL, `admin` = b'0', `register_time` = '2022-01-03 21:37:43', `status` = 1, `creator` = 1399985191002447872, `create_time` = '2022-01-03 21:37:43', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-19 13:00:05', `version` = 4, `deleted` = 0 WHERE `id` = 1477997602862505984; - -INSERT INTO `iam_user_social` VALUES (1399985191002447872, 1399985191002447872, NULL, NULL, NULL, NULL, NULL, NULL, 0, '2022-06-29 18:44:34', 1399985191002447872, '2022-07-02 14:50:16', 4, 0); - -DELETE from iam_role_path; -DELETE from iam_role_menu; -DELETE from iam_perm_path; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/_config/sql/1.1.x/1.1.0-bate/V1.1.0_220707__bate4-fix.sql b/_config/sql/1.1.x/1.1.0-bate/V1.1.0_220707__bate4-fix.sql deleted file mode 100644 index df495e2663b1b3beea38b93ae93fb6c5ed170180..0000000000000000000000000000000000000000 --- a/_config/sql/1.1.x/1.1.0-bate/V1.1.0_220707__bate4-fix.sql +++ /dev/null @@ -1,301 +0,0 @@ -SET FOREIGN_KEY_CHECKS=0; - -ALTER TABLE `iam_client` ADD COLUMN `login_type_ids` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '关联登录方式\r\n' AFTER `enable`; - -ALTER TABLE `iam_client` DROP COLUMN `timeout`; - -ALTER TABLE `iam_client` DROP COLUMN `captcha`; - -ALTER TABLE `iam_client` DROP COLUMN `pwd_err_num`; - -CREATE TABLE `iam_login_type` ( - `id` bigint(20) NOT NULL, - `code` varchar(21) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编码', - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', - `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '类型', - `system` bit(1) NOT NULL COMMENT '是否系统内置', - `timeout` bigint(11) NULL DEFAULT NULL COMMENT '在线时长 秒', - `captcha` bit(1) NOT NULL COMMENT '启用验证码', - `pwd_err_num` int(8) NOT NULL COMMENT '密码错误次数', - `enable` bit(1) NOT NULL COMMENT '是否可用', - `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '登录方式' ROW_FORMAT = DYNAMIC; - -ALTER TABLE `iam_perm_menu` ADD COLUMN `client_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '终端code' AFTER `id`; - -ALTER TABLE `iam_perm_menu` DROP COLUMN `app_code`; - -ALTER TABLE `iam_role_menu` ADD COLUMN `client_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '终端code' AFTER `role_id`; - -ALTER TABLE `iam_role_menu` DROP COLUMN `app_code`; - -ALTER TABLE `iam_user_info` ADD COLUMN `client_ids` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '关联终端ds' AFTER `email`; - -ALTER TABLE `iam_user_info` DROP COLUMN `app_ids`; - -CREATE TABLE `iam_user_third` ( - `id` bigint(20) NOT NULL COMMENT '主键', - `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户id', - `we_chat_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '微信openId', - `qq_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'qqId', - `weibo_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '微博Id', - `gitee_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '码云唯一标识', - `ding_talk_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '钉钉唯一标识', - `we_com_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '企业微信唯一标识', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE, - INDEX `pk_user_index`(`user_id`) USING BTREE COMMENT '用户id索引' -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户三方登录绑定' ROW_FORMAT = DYNAMIC; - -CREATE TABLE `iam_user_third_info` ( - `id` bigint(20) NOT NULL COMMENT '主键', - `user_id` bigint(20) NOT NULL COMMENT '用户id', - `client_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '第三方终端类型', - `username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '用户名', - `nickname` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '用户昵称', - `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '用户头像', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE, - INDEX `pk_user_client`(`user_id`, `client_code`) USING BTREE COMMENT '用户id和终端code' -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '用户三方登录绑定详情' ROW_FORMAT = DYNAMIC; - -DROP TABLE `iam_application`; - -DROP TABLE `iam_user_social`; - -DROP TABLE `iam_user_social_info`; - - -DELETE FROM `iam_client` WHERE `id` = 1430478946919653376; - -DELETE FROM `iam_client` WHERE `id` = 1435138582839009280; - -DELETE FROM `iam_client` WHERE `id` = 1542091599907115008; - -DELETE FROM `iam_client` WHERE `id` = 1542804450312122368; - -DELETE FROM `iam_client` WHERE `id` = 1543126042909016064; - -INSERT INTO `iam_client` VALUES (1430430071299207169, 'h5', 'h5端', b'1', b'1', '1430430071299207168,1435138582839009280', '手机wap', 1399985191002447872, '2021-08-25 15:21:20', 1399985191002447872, '2022-06-29 18:31:45', 1, 0); - -UPDATE `iam_client` SET `code` = 'admin', `name` = 'pc管理端', `system` = b'1', `enable` = b'1', `login_type_ids` = '1430430071299207168,1435138582839009280,1430478946919653376,1542091599907115008,1542804450312122368,1543126042909016064', `description` = 'pc浏览器', `creator` = 1399985191002447872, `create_time` = '2021-08-25 15:21:20', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-07-02 14:55:11', `version` = 4, `deleted` = 0 WHERE `id` = 1430430071299207168; - -INSERT INTO `iam_login_type` VALUES (1430430071299207168, 'password', '账号密码登陆', 'password', b'1', 3600, b'0', -1, b'1', NULL, 1399985191002447872, '2021-08-25 15:21:20', 1399985191002447872, '2022-04-24 19:51:13', 16, 0); - -INSERT INTO `iam_login_type` VALUES (1430478946919653376, 'miniApp', '微信小程序', 'openId', b'0', 99999, b'1', 0, b'1', NULL, 1399985191002447872, '2021-08-25 18:35:33', 1399985191002447872, '2021-08-25 18:35:33', 2, 0); - -INSERT INTO `iam_login_type` VALUES (1435138582839009280, 'phone', '手机短信登录', 'openId', b'0', 3600, b'1', 0, b'1', NULL, 1399985191002447872, '2021-09-07 15:11:16', 1399985191002447872, '2022-06-26 21:35:20', 4, 0); - -INSERT INTO `iam_login_type` VALUES (1542091599907115008, 'dingTalk', '钉钉', 'openId', b'0', 5, b'0', -1, b'1', '', 1399985191002447872, '2022-06-29 18:24:23', 1399985191002447872, '2022-07-02 14:55:01', 5, 0); - -INSERT INTO `iam_login_type` VALUES (1542804450312122368, 'weCom', '企业微信', 'openId', b'0', 5, b'0', -1, b'1', '', 1399985191002447872, '2022-07-01 17:37:00', 1399985191002447872, '2022-07-01 17:37:00', 0, 0); - -INSERT INTO `iam_login_type` VALUES (1543126042909016064, 'WeChat', '微信登录', 'openId', b'0', 5, b'0', -1, b'1', '', 1399985191002447872, '2022-07-02 14:54:53', 1399985191002447872, '2022-07-02 14:54:53', 0, 0); - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = NULL, `title` = '系统管理', `name` = 'system', `perm_code` = '', `effect` = NULL, `icon` = 'desktop', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = '', `path` = '/system', `redirect` = '/system/user', `sort_no` = 0, `menu_type` = 0, `leaf` = b'0', `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'1', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-27 10:32:53', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-08-27 10:02:16', `version` = 2, `deleted` = 0 WHERE `id` = 1414596052497092608; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1452569691537256448, `title` = '用户管理', `name` = 'User', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'system/user/UserList', `component_name` = '', `path` = '/system/userAuth/user', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = b'0', `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-27 10:32:53', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-08-27 10:17:40', `version` = 4, `deleted` = 0 WHERE `id` = 1414596647509446656; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1414596052497092608, `title` = '菜单管理', `name` = 'Menu', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'system/menu/MenuList', `component_name` = '', `path` = '/system/permission/menu', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = b'0', `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'1', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-27 10:32:53', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-08-26 23:56:16', `version` = 2, `deleted` = 0 WHERE `id` = 1414596773275652096; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1452569339987472384, `title` = '角色管理', `name` = 'Role', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'system/role/RoleList', `component_name` = '', `path` = '/system/permission/role', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = b'1', `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-27 10:32:53', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-08-26 23:56:04', `version` = 4, `deleted` = 0 WHERE `id` = 1414596805538238464; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1452569691537256448, `title` = '部门管理', `name` = 'Dept', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'system/dept/DeptList', `component_name` = '', `path` = '/system/userAuth/dept', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = b'1', `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-27 10:32:53', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-08-26 23:56:31', `version` = 7, `deleted` = 0 WHERE `id` = 1414596842322284544; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1452571269199540224, `title` = '数据字典', `name` = 'Dict', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'system/translate/DictList', `component_name` = '', `path` = '/system/config/translate', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = b'1', `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-27 10:32:53', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-19 09:04:55', `version` = 11, `deleted` = 0 WHERE `id` = 1414596877617352704; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1452569691537256448, `title` = '在线用户管理', `name` = 'OnlineUser', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'system/online/OnlineUserList', `component_name` = NULL, `path` = '/system/userAuth/online', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = b'1', `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-27 10:32:53', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-08-27 10:32:53', `version` = 6, `deleted` = 0 WHERE `id` = 1431082258161434624; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1541427353886859264, `title` = '登录方式', `name` = 'LoginType', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'system/client/LoginTypeList', `component_name` = NULL, `path` = '/system/config/loginType', `redirect` = '', `sort_no` = 9, `menu_type` = 1, `leaf` = b'1', `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-27 10:37:09', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-07-05 21:18:12', `version` = 11, `deleted` = 0 WHERE `id` = 1431083330909208576; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1452569339987472384, `title` = '请求权限管理', `name` = 'Path', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'system/path/PathList', `component_name` = NULL, `path` = '/system/permission/path', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = b'1', `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-27 11:00:11', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-08-27 11:00:11', `version` = 2, `deleted` = 0 WHERE `id` = 1431089129232498688; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = NULL, `title` = '系统监控', `name` = 'monitor', `perm_code` = '', `effect` = b'0', `icon` = 'radar-chart', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/monitor', `redirect` = '', `sort_no` = 0, `menu_type` = 0, `leaf` = b'1', `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2021-08-27 15:12:45', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-17 17:57:30', `version` = 21, `deleted` = 0 WHERE `id` = 1431152689832525824; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1431152689832525824, `title` = '接口文档', `name` = 'ApiSwagger', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '', `component_name` = NULL, `path` = 'http://127.0.0.1:9999/doc.html', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = b'1', `keep_alive` = b'1', `target_outside` = b'1', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-27 15:15:25', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-07 11:06:52', `version` = 15, `deleted` = 0 WHERE `id` = 1431153358157348864; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1452567897717321728, `title` = '登录日志', `name` = 'LoginLog', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'starter/log/LoginLogList', `component_name` = NULL, `path` = '/system/log/loginLog', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-09-07 15:31:31', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-09-07 15:31:31', `version` = 5, `deleted` = 0 WHERE `id` = 1435143678721236992; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1452567897717321728, `title` = '操作日志', `name` = 'OperateLog', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'starter/log/OperateLogList', `component_name` = NULL, `path` = '/system/log/OperateLog', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-09-08 13:33:04', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-09-08 13:33:04', `version` = 7, `deleted` = 0 WHERE `id` = 1435476255797624832; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = NULL, `title` = '通知管理', `name` = 'notice', `perm_code` = '', `effect` = NULL, `icon` = 'message', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/notice', `redirect` = '', `sort_no` = 0, `menu_type` = 0, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-09-15 16:47:26', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-09-15 16:47:26', `version` = 3, `deleted` = 0 WHERE `id` = 1438061887002759168; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1438061887002759168, `title` = '邮件配置', `name` = 'MailConfig', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'notice/mail/MailConfigList', `component_name` = NULL, `path` = '/notice/mailConfig', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-09-15 17:29:03', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-09-15 17:29:03', `version` = 3, `deleted` = 0 WHERE `id` = 1438072357281542144; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1438061887002759168, `title` = '消息模板', `name` = 'MessageTemplate', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'notice/template/TemplateList', `component_name` = NULL, `path` = '/notice/template', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-09-18 19:57:33', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-09-18 19:57:33', `version` = 3, `deleted` = 0 WHERE `id` = 1439196893514031104; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1438061887002759168, `title` = '钉钉', `name` = 'DingTalk', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/notice/dingTalk', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-09-21 15:27:50', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-09-21 15:27:50', `version` = 0, `deleted` = 0 WHERE `id` = 1440216178722050048; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1440216178722050048, `title` = '钉钉机器人', `name` = 'DingTalkRobot', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'notice/dingTalk/robot/DingRobotConfigList', `component_name` = NULL, `path` = '/notice/dingTalk/robot', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-09-21 15:29:33', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-09-21 15:29:33', `version` = 3, `deleted` = 0 WHERE `id` = 1440216612211757056; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1452569691537256448, `title` = '第三方登录', `name` = 'Social', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'system/social/SocialList', `component_name` = NULL, `path` = '/system/userAuth/social', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-19 22:45:01', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-19 22:45:01', `version` = 4, `deleted` = 0 WHERE `id` = 1450473063320526848; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1452571269199540224, `title` = '定时任务', `name` = 'QuartzJobList', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'starter/quartz/QuartzJobList', `component_name` = NULL, `path` = '/system/config/quartz', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 20:39:41', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-20 20:39:41', `version` = 5, `deleted` = 0 WHERE `id` = 1450803906215886848; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = NULL, `title` = '第三方对接', `name` = 'social', `perm_code` = '', `effect` = b'0', `icon` = 'branches', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/social', `redirect` = '', `sort_no` = 0, `menu_type` = 0, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 21:42:04', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-04-05 16:53:25', `version` = 3, `deleted` = 0 WHERE `id` = 1450819607680991232; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450819607680991232, `title` = '微信', `name` = 'SocialWeChat', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/social/wechat', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 21:50:28', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-20 21:50:28', `version` = 1, `deleted` = 0 WHERE `id` = 1450821723027881984; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450819607680991232, `title` = '企业微信', `name` = 'SocialWeCom', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/social/wecom', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 21:51:05', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-20 21:51:05', `version` = 2, `deleted` = 0 WHERE `id` = 1450821877831254016; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450819607680991232, `title` = '钉钉', `name` = 'SocialDingTalk', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/social/dingtalk', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 21:53:36', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-20 21:53:36', `version` = 1, `deleted` = 0 WHERE `id` = 1450822511087271936; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = NULL, `title` = '支付管理', `name` = 'PayManager', `perm_code` = '', `effect` = NULL, `icon` = 'pay-circle', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/payment', `redirect` = '', `sort_no` = 0, `menu_type` = 0, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 21:54:55', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-20 21:54:55', `version` = 2, `deleted` = 0 WHERE `id` = 1450822842995130368; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450822842995130368, `title` = '支付通道', `name` = 'PayChannel', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/payment/channel', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 21:59:22', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-20 21:59:22', `version` = 2, `deleted` = 0 WHERE `id` = 1450823960236081152; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450823960236081152, `title` = '支付宝', `name` = 'AliPayConfig', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'payment/channel/alipay/AliPayConfigList', `component_name` = NULL, `path` = '/payment/channel/alipay', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 21:59:59', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-20 21:59:59', `version` = 1, `deleted` = 0 WHERE `id` = 1450824117849636864; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450823960236081152, `title` = '微信支付', `name` = 'WeChatPayConfig', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'payment/channel/wechat/WeChatConfigList', `component_name` = NULL, `path` = '/payment/channel/wechat', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 22:00:48', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-20 22:00:48', `version` = 1, `deleted` = 0 WHERE `id` = 1450824319868289024; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450823960236081152, `title` = '云闪付', `name` = 'UnionPayConfig', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'payment/channel/unionpay/UnionPayConfigList', `component_name` = NULL, `path` = '/payment/channel/unionpay', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 22:02:03', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-04 16:12:13', `version` = 3, `deleted` = 0 WHERE `id` = 1450824637876224000; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450823960236081152, `title` = '现金支付', `name` = 'CashPayConfig', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'1', `hide_children_in_menu` = b'0', `component` = '', `component_name` = NULL, `path` = '/payment/channel/cash', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 22:03:00', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-04 16:12:08', `version` = 1, `deleted` = 0 WHERE `id` = 1450824875198332928; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450822842995130368, `title` = '收银台', `name` = 'PayCashier', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'payment/cashier/Cashier', `component_name` = NULL, `path` = '/payment/cashier', `redirect` = '', `sort_no` = -1, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 22:05:26', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-20 22:05:26', `version` = 2, `deleted` = 0 WHERE `id` = 1450825488577544192; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450822842995130368, `title` = '订单管理', `name` = 'PayOrder', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/payment/order', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 22:05:57', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-20 22:05:57', `version` = 2, `deleted` = 0 WHERE `id` = 1450825615857893376; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450822842995130368, `title` = '回调记录', `name` = 'PayNotify', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'payment/notify/PayNotifyRecordList', `component_name` = NULL, `path` = '/payment/notify', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 22:06:45', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-20 22:06:45', `version` = 0, `deleted` = 0 WHERE `id` = 1450825819436826624; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450825615857893376, `title` = '支付订单', `name` = 'PaymentOrder', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'payment/order/payment/PaymentList', `component_name` = NULL, `path` = '/payment/order/payment', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 22:11:00', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-02-25 15:17:07', `version` = 2, `deleted` = 0 WHERE `id` = 1450826890318135296; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450825615857893376, `title` = '退款订单', `name` = 'ReturnOrder', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'payment/order/refund/RefundRecordList', `component_name` = NULL, `path` = '/payment/order/return', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 22:12:05', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-04 15:44:06', `version` = 4, `deleted` = 0 WHERE `id` = 1450827159626006528; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450825615857893376, `title` = '转账订单', `name` = 'TransferOrder', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'1', `hide_children_in_menu` = b'0', `component` = 'payment/order/transfer/TransferList', `component_name` = NULL, `path` = '/payment/order/transfer', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 22:12:40', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-04 15:33:31', `version` = 3, `deleted` = 0 WHERE `id` = 1450827308515409920; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1438061887002759168, `title` = '微信', `name` = 'NoticeWeChat', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'Dev', `component_name` = NULL, `path` = '/notice/wechat', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 22:14:04', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-21 20:53:04', `version` = 1, `deleted` = 0 WHERE `id` = 1450827660459458560; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1414596052497092608, `title` = '审计日志', `name` = 'auditLog', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/system/log', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-25 17:29:09', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-25 17:29:09', `version` = 0, `deleted` = 0 WHERE `id` = 1452567897717321728; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1414596052497092608, `title` = '权限管理', `name` = 'permission', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/system/permission', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-25 17:34:53', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-25 17:34:53', `version` = 2, `deleted` = 0 WHERE `id` = 1452569339987472384; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1414596052497092608, `title` = '用户信息', `name` = 'userAuth', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/system/userAuth', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-25 17:36:17', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-25 17:36:17', `version` = 2, `deleted` = 0 WHERE `id` = 1452569691537256448; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1414596052497092608, `title` = '系统配置', `name` = 'systemConfig', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/system/config', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-25 17:42:33', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-25 17:42:33', `version` = 2, `deleted` = 0 WHERE `id` = 1452571269199540224; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1452571269199540224, `title` = '系统参数', `name` = 'SystemParam', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'system/param/SystemParamList', `component_name` = NULL, `path` = '/system/config/param', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-25 22:11:18', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-10-25 22:11:18', `version` = 1, `deleted` = 0 WHERE `id` = 1452638905302966272; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1452569339987472384, `title` = '数据范围权限', `name` = 'DataScope', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'system/scope/DataScopeList', `component_name` = NULL, `path` = '/system/permission/data', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-12-25 18:52:33', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-12-25 18:52:33', `version` = 1, `deleted` = 0 WHERE `id` = 1474694545336676352; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1414596052497092608, `title` = '22', `name` = NULL, `perm_code` = '22', `effect` = b'1', `icon` = NULL, `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = NULL, `component_name` = NULL, `path` = NULL, `redirect` = NULL, `sort_no` = 0, `menu_type` = 2, `leaf` = NULL, `keep_alive` = b'0', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = '', `creator` = 1399985191002447872, `create_time` = '2021-12-30 17:46:37', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-12-30 17:46:37', `version` = 4, `deleted` = 1 WHERE `id` = 1476489893513404416; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1414596052497092608, `title` = '1', `name` = NULL, `perm_code` = '1', `effect` = b'1', `icon` = NULL, `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = NULL, `component_name` = NULL, `path` = NULL, `redirect` = NULL, `sort_no` = 0, `menu_type` = 2, `leaf` = NULL, `keep_alive` = b'0', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = '', `creator` = 1399985191002447872, `create_time` = '2022-01-03 21:58:57', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-01-03 21:58:57', `version` = 0, `deleted` = 1 WHERE `id` = 1478002945936015360; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1414596052497092608, `title` = '22', `name` = NULL, `perm_code` = '22', `effect` = b'1', `icon` = NULL, `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = NULL, `component_name` = NULL, `path` = NULL, `redirect` = NULL, `sort_no` = 0, `menu_type` = 2, `leaf` = NULL, `keep_alive` = b'0', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = '', `creator` = 1399985191002447872, `create_time` = '2022-01-03 22:04:13', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-01-03 22:04:13', `version` = 0, `deleted` = 1 WHERE `id` = 1478004271512240128; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1452567897717321728, `title` = '数据版本日志', `name` = 'DataVersionLog', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'starter/log/DataVersionLogList', `component_name` = NULL, `path` = '/system/log/DataVersionLog', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-01-11 17:51:54', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-01-11 17:51:54', `version` = 0, `deleted` = 0 WHERE `id` = 1480839877352476672; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1452571269199540224, `title` = '文件管理', `name` = 'FIleUpLoad', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'starter/file/FileUploadList', `component_name` = NULL, `path` = '/system/config/file', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-02-08 17:42:12', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-02-08 17:42:12', `version` = 0, `deleted` = 0 WHERE `id` = 1490984296616263680; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1452571269199540224, `title` = '代码生成', `name` = 'CodeGen', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'starter/codegen/CodeGenList', `component_name` = NULL, `path` = '/system/config/codeGen', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-02-19 20:33:04', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-02-19 20:33:05', `version` = 0, `deleted` = 0 WHERE `id` = 1495013564652429312; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = NULL, `title` = '功能演示', `name` = 'Demo', `perm_code` = NULL, `effect` = b'0', `icon` = 'block', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/demo', `redirect` = '', `sort_no` = 99, `menu_type` = 0, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-02-22 11:46:52', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-10 11:02:05', `version` = 3, `deleted` = 0 WHERE `id` = 1495968302034210816; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1495968302034210816, `title` = '数据相关', `name` = 'DemoData', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/demo/data', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-02-22 11:50:02', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-24 16:27:46', `version` = 4, `deleted` = 0 WHERE `id` = 1495969099987963904; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1495968302034210816, `title` = '超级查询', `name` = 'SuperQueryDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'demo/query/SuperQueryDemoList', `component_name` = NULL, `path` = '/demo/query/super', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-02-22 15:13:31', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-27 17:34:41', `version` = 2, `deleted` = 0 WHERE `id` = 1496020308992143360; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450822842995130368, `title` = '钱包管理', `name` = 'Wallet', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/payment/wallet', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-03-10 10:03:29', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-10 10:04:53', `version` = 1, `deleted` = 0 WHERE `id` = 1501740492360962048; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1501740492360962048, `title` = '钱包列表', `name` = 'WalletList', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'payment/wallet/list/WalletList', `component_name` = NULL, `path` = '/payment/wallet/list', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-03-10 10:10:23', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-10 17:06:19', `version` = 2, `deleted` = 0 WHERE `id` = 1501742229142556672; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1501740492360962048, `title` = '个人钱包', `name` = 'PersonalWallet', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'payment/wallet/list/WalletList', `component_name` = NULL, `path` = '/payment/wallet/personal', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-03-10 10:11:08', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-10 17:06:10', `version` = 2, `deleted` = 0 WHERE `id` = 1501742417378725888; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450822842995130368, `title` = '组合支付', `name` = 'CombinationCashier', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'payment/combination/CombinationCashier', `component_name` = NULL, `path` = '/payment/combination', `redirect` = '', `sort_no` = -0.5, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-03-10 17:07:56', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-10 17:09:28', `version` = 2, `deleted` = 0 WHERE `id` = 1501847310319972352; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450822842995130368, `title` = '储值卡', `name` = 'Voucher', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'payment/voucher/VoucherList', `component_name` = NULL, `path` = '/payment/voucher', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-03-13 16:35:51', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-14 19:39:45', `version` = 2, `deleted` = 0 WHERE `id` = 1502926397176242176; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1495969099987963904, `title` = '数据权限', `name` = 'DataPermDemoList', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'demo/data/perm/DataPermDemoList', `component_name` = NULL, `path` = '/demo/data/perm', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-03-24 16:27:39', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-24 16:28:56', `version` = 1, `deleted` = 0 WHERE `id` = 1506910599819165696; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1495969099987963904, `title` = '加密解密', `name` = 'DataEncryptDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'demo/data/encrypt/DataEncryptDemoList', `component_name` = NULL, `path` = '/demo/data/encrypt', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-03-24 16:28:47', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-24 16:28:47', `version` = 0, `deleted` = 0 WHERE `id` = 1506910885463851008; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1495969099987963904, `title` = '数据脱敏', `name` = 'DataSensitiveDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'demo/data/sensitive/DataSensitiveDemoList', `component_name` = NULL, `path` = '/demo/data/sensitive', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-03-24 16:29:41', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-24 17:16:03', `version` = 1, `deleted` = 0 WHERE `id` = 1506911113394913280; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1495968302034210816, `title` = 'WS演示', `name` = 'WebsocketDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'demo/ws/WebsocketDemo', `component_name` = NULL, `path` = '/demo/ws', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-03-27 16:30:25', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-03-27 16:30:25', `version` = 0, `deleted` = 0 WHERE `id` = 1507998458886197248; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1495968302034210816, `title` = '幂等请求演示', `name` = 'IdempotentDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'demo/idempotent/Idempotent', `component_name` = NULL, `path` = '/demo/idempotent', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-03-31 19:11:12', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-27 17:35:00', `version` = 1, `deleted` = 0 WHERE `id` = 1509488473583562752; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450822511087271936, `title` = '钉钉配置', `name` = 'DingTalkConfig', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'social/dingtalk/config/DingTalkConfigList', `component_name` = NULL, `path` = '/social/dingtalk/config', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-04-05 16:54:48', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-04-05 16:54:48', `version` = 0, `deleted` = 0 WHERE `id` = 1511266086400524288; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = NULL, `title` = '商品管理', `name` = 'GoodsManager', `perm_code` = NULL, `effect` = b'0', `icon` = 'car', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/goods', `redirect` = '', `sort_no` = 0, `menu_type` = 0, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-05-10 11:01:40', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-10 11:02:45', `version` = 1, `deleted` = 0 WHERE `id` = 1523860792695283712; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1523860792695283712, `title` = '类目管理', `name` = 'CategoryManager', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/goods/category', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-05-10 16:24:05', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-10 16:24:17', `version` = 1, `deleted` = 0 WHERE `id` = 1523941932282114048; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1523941932282114048, `title` = '类目', `name` = 'Category', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'goods/category/CategoryList', `component_name` = NULL, `path` = '/goods/category/category', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-05-10 16:24:52', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-10 16:25:23', `version` = 1, `deleted` = 0 WHERE `id` = 1523942130555252736; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1523941932282114048, `title` = '品牌', `name` = 'Brand', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'goods/brand/BrandList', `component_name` = NULL, `path` = '/goods/category/brand', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-05-10 23:10:26', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-10 23:14:20', `version` = 4, `deleted` = 0 WHERE `id` = 1524044195818278912; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1523941932282114048, `title` = '规格', `name` = 'SpecificationList', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'goods/spec/SpecificationList', `component_name` = NULL, `path` = '/goods/category/spec', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-05-10 23:11:14', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-10 23:13:51', `version` = 1, `deleted` = 0 WHERE `id` = 1524044395823665152; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1523941932282114048, `title` = '参数组', `name` = 'ParameterGroup', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'1', `hide_children_in_menu` = b'0', `component` = 'goods/parameter/ParameterGroupList', `component_name` = NULL, `path` = '/goods/category/parameter', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-05-10 23:12:21', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-12 20:30:23', `version` = 2, `deleted` = 0 WHERE `id` = 1524044678314233856; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1523860792695283712, `title` = '商品', `name` = 'Goods', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'goods/goods/GoodsList', `component_name` = NULL, `path` = '/goods/goods', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-05-14 21:46:18', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-14 21:46:18', `version` = 0, `deleted` = 0 WHERE `id` = 1525472571967860736; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1495968302034210816, `title` = '消息中间件演示', `name` = 'MQDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'demo/mq/MqDemo', `component_name` = NULL, `path` = '/demo/mq', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-05-27 17:33:51', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-31 15:12:15', `version` = 1, `deleted` = 0 WHERE `id` = 1530120084482084864; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1530120084482084864, `title` = 'MQTT消息', `name` = 'MqttDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '', `component_name` = NULL, `path` = '/demo/mq/mqtt', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-05-27 17:36:14', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-27 17:36:14', `version` = 0, `deleted` = 1 WHERE `id` = 1530120684645044224; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1530120084482084864, `title` = 'RabbitMQ', `name` = 'RabbitDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '', `component_name` = NULL, `path` = '/demo/mq/rabbit', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-05-27 17:36:47', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-27 17:36:47', `version` = 0, `deleted` = 1 WHERE `id` = 1530120821144473600; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1431152689832525824, `title` = 'ELK日志', `name` = 'ELK', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '', `component_name` = NULL, `path` = 'http://elk.dev.bootx.cn:5601/app/discover', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'1', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-06-07 10:31:48', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-07 10:31:48', `version` = 0, `deleted` = 0 WHERE `id` = 1534000136370204672; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1431152689832525824, `title` = 'PlumeLog日志', `name` = 'PlumeLog', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '', `component_name` = NULL, `path` = 'http://127.0.0.1:9999/plumelog/#/', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'1', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-06-07 11:03:51', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-07 11:06:13', `version` = 1, `deleted` = 0 WHERE `id` = 1534008203006652416; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1431152689832525824, `title` = '系统信息', `name` = 'SysInfo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'starter/monitor/SystemInfoMonitor', `component_name` = NULL, `path` = '/monitor/sysinfo', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'0', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-06-11 10:37:40', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-13 13:07:46', `version` = 1, `deleted` = 0 WHERE `id` = 1535451167008436224; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1431152689832525824, `title` = 'Redis监控', `name` = 'RedisInfoMonitor', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'starter/monitor/RedisInfoMonitor', `component_name` = NULL, `path` = '/monitor/redis', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'0', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-06-12 20:43:11', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-13 13:07:38', `version` = 1, `deleted` = 0 WHERE `id` = 1535965936371085312; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1438061887002759168, `title` = '站内信', `name` = 'SiteMessage', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'notice/site/SiteMessage', `component_name` = NULL, `path` = '/notice/siteMessage', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-06-17 17:33:30', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-17 17:33:30', `version` = 0, `deleted` = 0 WHERE `id` = 1537730140522348544; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = NULL, `title` = '个人办公', `name` = 'person', `perm_code` = '', `effect` = b'0', `icon` = 'user', `hidden` = b'1', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/person', `redirect` = '', `sort_no` = -99, `menu_type` = 0, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-06-17 17:42:38', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-07-04 22:28:06', `version` = 3, `deleted` = 0 WHERE `id` = 1537732440632524800; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1537732440632524800, `title` = '我的消息', `name` = 'PersonSiteMessage', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'Dev', `component_name` = NULL, `path` = '/person/siteMessage', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-06-17 17:48:03', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-21 20:52:50', `version` = 1, `deleted` = 0 WHERE `id` = 1537733801860333568; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1537732440632524800, `title` = '待办任务', `name` = 'PersonTaskList', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'Dev', `component_name` = NULL, `path` = '/person/taskList', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-06-17 17:56:11', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-21 20:52:42', `version` = 1, `deleted` = 0 WHERE `id` = 1537735851818024960; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1495968302034210816, `title` = '富文本编辑', `name` = 'WangEditorDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'demo/wangeditor/WangEditorDemo', `component_name` = NULL, `path` = '/demo/wangEditor', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-06-18 22:03:30', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-18 22:03:31', `version` = 0, `deleted` = 0 WHERE `id` = 1538160478872625152; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1541427353886859264, `title` = '认证终端', `name` = 'Client', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'system/client/ClientList', `component_name` = NULL, `path` = '/system/config/client', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-27 10:37:08', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-07-05 21:17:45', `version` = 3, `deleted` = 0 WHERE `id` = 1541355214204030976; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1414596052497092608, `title` = '认证管理', `name` = 'Auth', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/system/auth', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-06-27 22:24:54', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-27 22:24:54', `version` = 0, `deleted` = 0 WHERE `id` = 1541427353886859264; - -DELETE FROM `iam_user_expand_info` WHERE `id` = 1543942206966943744; - -UPDATE `iam_user_expand_info` SET `sex` = 1, `birthday` = '1996-12-01', `avatar` = '1495331905770315776', `last_login_time` = '2022-07-06 22:53:12', `current_login_time` = '2022-07-06 22:53:15', `initial_password` = b'0', `last_change_password_time` = '2022-06-19 21:25:00', `creator` = 1, `create_time` = '2021-06-02 15:04:15', `last_modifier` = 0, `last_modified_time` = '2022-07-06 22:53:15', `version` = 264, `deleted` = 0 WHERE `id` = 1399985191002447872; - -UPDATE `iam_user_expand_info` SET `sex` = 1, `birthday` = NULL, `avatar` = '1530065639127871488', `last_login_time` = '2022-05-27 13:56:02', `current_login_time` = '2022-07-04 22:39:33', `initial_password` = b'0', `last_change_password_time` = NULL, `creator` = 1, `create_time` = '2021-07-11 16:44:32', `last_modifier` = 0, `last_modified_time` = '2022-07-04 22:39:33', `version` = 3, `deleted` = 0 WHERE `id` = 1414143554414059520; - -DELETE FROM `iam_user_info` WHERE `id` = 1543942206966943744; - -UPDATE `iam_user_info` SET `name` = '小小明', `username` = 'xxm', `password` = 'f52020dca765fd3943ed40a615dc2c5c', `phone` = '13333333333', `email` = 'xxm1995@outlook.com', `client_ids` = '1430430071299207168,1430430071299207169', `avatar` = NULL, `source` = NULL, `admin` = b'1', `register_time` = '2021-06-02 15:04:12', `status` = 1, `creator` = 1, `create_time` = '2021-06-02 15:04:15', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-27 23:09:31', `version` = 50, `deleted` = 0 WHERE `id` = 1399985191002447872; - -UPDATE `iam_user_info` SET `name` = '管理员', `username` = 'admin', `password` = 'c80a93d89e6590e8909a1a9f842b1615', `phone` = '13000001111', `email` = 'admin@qq.com', `client_ids` = '1430430071299207168', `avatar` = '', `source` = NULL, `admin` = b'0', `register_time` = '2021-09-09 17:14:52', `status` = 1, `creator` = 1399985191002447872, `create_time` = '2021-09-09 17:14:54', `last_modifier` = 0, `last_modified_time` = '2022-06-29 00:39:23', `version` = 6, `deleted` = 0 WHERE `id` = 1435894470432456704; - -UPDATE `iam_user_info` SET `name` = '测试', `username` = 'test', `password` = 'f52020dca765fd3943ed40a615dc2c5c', `phone` = '13311111111', `email` = 'test@qq.com', `client_ids` = '1430430071299207168', `avatar` = '', `source` = NULL, `admin` = b'0', `register_time` = '2021-09-09 22:06:37', `status` = 1, `creator` = 1414143554414059520, `create_time` = '2021-09-09 22:06:37', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-31 15:59:37', `version` = 9, `deleted` = 0 WHERE `id` = 1435967884114194432; - -UPDATE `iam_user_info` SET `name` = '测试用户001', `username` = 'test001', `password` = 'f52020dca765fd3943ed40a615dc2c5c', `phone` = '', `email` = '', `client_ids` = '1430430071299207168', `avatar` = '', `source` = NULL, `admin` = b'0', `register_time` = '2022-01-03 21:10:49', `status` = 1, `creator` = 1399985191002447872, `create_time` = '2022-01-03 21:10:49', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-05 20:26:26', `version` = 1, `deleted` = 0 WHERE `id` = 1477990832987361280; - -UPDATE `iam_user_info` SET `name` = '测试用户002', `username` = 'test002', `password` = 'f52020dca765fd3943ed40a615dc2c5c', `phone` = '', `email` = '', `client_ids` = '1430430071299207168', `avatar` = '', `source` = NULL, `admin` = b'0', `register_time` = '2022-01-03 21:36:53', `status` = 1, `creator` = 1399985191002447872, `create_time` = '2022-01-03 21:36:53', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-05 20:26:19', `version` = 1, `deleted` = 0 WHERE `id` = 1477997391729631232; - -UPDATE `iam_user_info` SET `name` = '测试用户003', `username` = 'test003', `password` = 'f52020dca765fd3943ed40a615dc2c5c', `phone` = '', `email` = '', `client_ids` = '1430430071299207168', `avatar` = '', `source` = NULL, `admin` = b'0', `register_time` = '2022-01-03 21:37:43', `status` = 1, `creator` = 1399985191002447872, `create_time` = '2022-01-03 21:37:43', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-05-19 13:00:05', `version` = 4, `deleted` = 0 WHERE `id` = 1477997602862505984; - - -SET FOREIGN_KEY_CHECKS=1; diff --git a/_config/sql/1.1.x/1.1.0-bate/V1.1.0_220714__bate5.sql b/_config/sql/1.1.x/1.1.0-bate/V1.1.0_220714__bate5.sql deleted file mode 100644 index 2146d24c57ecfcb41eec50ecdb08156033333b9e..0000000000000000000000000000000000000000 --- a/_config/sql/1.1.x/1.1.0-bate/V1.1.0_220714__bate5.sql +++ /dev/null @@ -1,84 +0,0 @@ -SET FOREIGN_KEY_CHECKS=0; - -ALTER TABLE `pay_alipay_config` MODIFY COLUMN `expire_time` int(10) NOT NULL COMMENT '超时配置' AFTER `sandbox`; -ALTER TABLE `pay_alipay_config` MODIFY COLUMN `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人' AFTER `state`; -ALTER TABLE `pay_alipay_config` MODIFY COLUMN `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间' AFTER `creator`; -ALTER TABLE `pay_alipay_config` MODIFY COLUMN `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人' AFTER `create_time`; -ALTER TABLE `pay_alipay_config` MODIFY COLUMN `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间' AFTER `last_modifier`; -ALTER TABLE `pay_alipay_config` MODIFY COLUMN `version` int(11) NOT NULL COMMENT '版本' AFTER `last_modified_time`; -ALTER TABLE `pay_alipay_config` MODIFY COLUMN `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除' AFTER `version`; - -ALTER TABLE `pay_payment` MODIFY COLUMN `business_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '业务id' AFTER `user_id`; -ALTER TABLE `pay_payment` MODIFY COLUMN `title` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '标题' AFTER `business_id`; -ALTER TABLE `pay_payment` MODIFY COLUMN `description` varchar(240) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述' AFTER `title`; -ALTER TABLE `pay_payment` ADD UNIQUE INDEX `uniq_business_id`(`business_id`) USING BTREE COMMENT '业务编号id, 唯一ID'; - -ALTER TABLE `pay_wechat_pay_config` ADD COLUMN `api_version` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务商应用编号' AFTER `mch_id`; -ALTER TABLE `pay_wechat_pay_config` ADD COLUMN `api_key_v2` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商户平台「API安全」中的 APIv2 密钥' AFTER `api_version`; -ALTER TABLE `pay_wechat_pay_config` ADD COLUMN `api_key_v3` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商户平台「API安全」中的 APIv3 密钥' AFTER `api_key_v2`; -ALTER TABLE `pay_wechat_pay_config` ADD COLUMN `app_secret` varchar(150) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'APPID对应的接口密码，用于获取接口调用凭证access_token时使用' AFTER `api_key_v3`; -ALTER TABLE `pay_wechat_pay_config` ADD COLUMN `p12` bigint(20) NULL DEFAULT NULL COMMENT 'p12的文件id' AFTER `app_secret`; -ALTER TABLE `pay_wechat_pay_config` ADD COLUMN `cert_pem` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'API 证书中的 cert.pem' AFTER `p12`; -ALTER TABLE `pay_wechat_pay_config` ADD COLUMN `key_pem` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'API 证书中的 key.pem' AFTER `cert_pem`; -ALTER TABLE `pay_wechat_pay_config` ADD COLUMN `expire_time` int(10) NOT NULL COMMENT '超时配置' AFTER `sandbox`; -ALTER TABLE `pay_wechat_pay_config` MODIFY COLUMN `id` bigint(20) NOT NULL COMMENT '主键' FIRST; -ALTER TABLE `pay_wechat_pay_config` MODIFY COLUMN `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称' AFTER `id`; -ALTER TABLE `pay_wechat_pay_config` MODIFY COLUMN `app_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '微信应用AppId' AFTER `name`; -ALTER TABLE `pay_wechat_pay_config` MODIFY COLUMN `mch_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商户号' AFTER `app_id`; -ALTER TABLE `pay_wechat_pay_config` MODIFY COLUMN `pay_ways` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '支持的支付类型' AFTER `return_url`; -ALTER TABLE `pay_wechat_pay_config` MODIFY COLUMN `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注' AFTER `state`; -ALTER TABLE `pay_wechat_pay_config` MODIFY COLUMN `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人' AFTER `remark`; -ALTER TABLE `pay_wechat_pay_config` MODIFY COLUMN `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间' AFTER `creator`; -ALTER TABLE `pay_wechat_pay_config` MODIFY COLUMN `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人' AFTER `create_time`; -ALTER TABLE `pay_wechat_pay_config` MODIFY COLUMN `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间' AFTER `last_modifier`; -ALTER TABLE `pay_wechat_pay_config` MODIFY COLUMN `version` int(11) NOT NULL COMMENT '版本' AFTER `last_modified_time`; -ALTER TABLE `pay_wechat_pay_config` MODIFY COLUMN `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除' AFTER `version`; -ALTER TABLE `pay_wechat_pay_config` DROP COLUMN `sl_app_id`; -ALTER TABLE `pay_wechat_pay_config` DROP COLUMN `api_key`; -ALTER TABLE `pay_wechat_pay_config` DROP COLUMN `api_key3`; - -ALTER TABLE `pay_wechat_pay_config` DROP COLUMN `sl_mch_id`; -ALTER TABLE `pay_wechat_pay_config` DROP COLUMN `auth_type`; -ALTER TABLE `pay_wechat_pay_config` DROP COLUMN `cert_path`; -ALTER TABLE `pay_wechat_pay_config` DROP COLUMN `cert_pem_path`; -ALTER TABLE `pay_wechat_pay_config` DROP COLUMN `key_pem_path`; -ALTER TABLE `pay_wechat_pay_config` DROP COLUMN `partner_key`; -ALTER TABLE `pay_wechat_pay_config` DROP COLUMN `is_default`; - -ALTER TABLE `pay_wechat_payment` MODIFY COLUMN `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人' AFTER `pay_time`; -ALTER TABLE `pay_wechat_payment` MODIFY COLUMN `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间' AFTER `creator`; -ALTER TABLE `pay_wechat_payment` MODIFY COLUMN `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人' AFTER `create_time`; -ALTER TABLE `pay_wechat_payment` MODIFY COLUMN `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间' AFTER `last_modifier`; -ALTER TABLE `pay_wechat_payment` MODIFY COLUMN `version` int(11) NOT NULL COMMENT '版本' AFTER `last_modified_time`; -ALTER TABLE `pay_wechat_payment` MODIFY COLUMN `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除' AFTER `version`; -ALTER TABLE `pay_wechat_payment` DROP COLUMN `tid`; - -INSERT INTO `base_dict` VALUES (1546757092010078208, 'PayNotifyProcess', '支付回调处理状态', '支付服务', '成功/忽略/失败', 1399985191002447872, '2022-07-12 15:23:23', 1399985191002447872, '2022-07-12 15:23:53', 0, 1); - -INSERT INTO `base_dict_item` VALUES (1546757293592522752, 1546757092010078208, 'PayNotifyProcess', '0', '失败', 0.00, '', 1399985191002447872, '2022-07-12 15:24:11', 1399985191002447872, '2022-07-12 15:24:11', 0, 0); -INSERT INTO `base_dict_item` VALUES (1546757327901929472, 1546757092010078208, 'PayNotifyProcess', '1', '成功', -1.00, '', 1399985191002447872, '2022-07-12 15:24:19', 1399985191002447872, '2022-07-12 15:31:38', 0, 2); -INSERT INTO `base_dict_item` VALUES (1546757375637303296, 1546757092010078208, 'PayNotifyProcess', '2', '忽略', 0.00, '', 1399985191002447872, '2022-07-12 15:24:30', 1399985191002447872, '2022-07-12 15:24:30', 0, 0); - -INSERT INTO `base_param` VALUES (1545765299880448000, '服务器地址', 'ServerUrl', 'http://127.0.0.1:9999', 1, b'1', '', 1399985191002447872, '2022-07-09 21:42:21', 1399985191002447872, '2022-07-09 21:42:21', 0, 0); -INSERT INTO `base_param` VALUES (1547511252795912192, '微信jsapi支付回调服务地址', 'JsapiRedirectUrl', 'http://127.0.0.1/api/', 1, b'1', '', 1414143554414059520, '2022-07-14 17:20:09', 1414143554414059520, '2022-07-14 17:20:09', 0, 0); -UPDATE `base_param` SET `value` = 'http://127.0.0.1/api/' WHERE `id` = 1500338438182789120; - -INSERT INTO `iam_perm_menu` VALUES (1544952211901218816, 'admin', 1546850918849249280, '支付结算台演示', 'CashierDemo', NULL, b'0', '', b'0', b'0', '', NULL, '/cashier', '', 0, 1, NULL, b'0', b'1', b'0', b'0', NULL, 1399985191002447872, '2022-07-07 15:51:26', 1399985191002447872, '2022-07-12 21:36:34', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1546850918849249280, 'admin', 1495968302034210816, '支付演示', 'DemoPay', NULL, b'0', '', b'0', b'0', 'RouteView', NULL, '/demo/pay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-07-12 21:36:13', 1399985191002447872, '2022-07-12 21:36:13', 0, 0); - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1546850918849249280, `title` = '收银台', `name` = 'PayCashier', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'payment/cashier/Cashier', `component_name` = NULL, `path` = '/demo/pay/cashier', `redirect` = '', `sort_no` = -1, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 22:05:26', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-07-12 21:37:22', `version` = 3, `deleted` = 0 WHERE `id` = 1450825488577544192; -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1546850918849249280, `title` = '组合支付', `name` = 'CombinationCashier', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'payment/combination/CombinationCashier', `component_name` = NULL, `path` = '/demo/pay/combination', `redirect` = '', `sort_no` = -0.5, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-03-10 17:07:56', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-07-12 21:37:59', `version` = 4, `deleted` = 0 WHERE `id` = 1501847310319972352; - -UPDATE `iam_user_expand_info` SET `sex` = 1, `birthday` = '1996-12-01', `avatar` = '1495331905770315776', `last_login_time` = '2022-07-12 15:20:44', `current_login_time` = '2022-07-12 21:35:26', `initial_password` = b'0', `last_change_password_time` = '2022-06-19 21:25:00', `creator` = 1, `create_time` = '2021-06-02 15:04:15', `last_modifier` = 0, `last_modified_time` = '2022-07-12 21:35:26', `version` = 273, `deleted` = 0 WHERE `id` = 1399985191002447872; - -INSERT INTO `qrtz_cron_triggers` VALUES ('quartzScheduler', '1546857070483939328', 'DEFAULT', '0/5 * * * * ? *', 'Asia/Shanghai'); - -INSERT INTO `qrtz_fired_triggers` VALUES ('quartzScheduler', 'NON_CLUSTERED1657763850994', '1546857070483939328', 'DEFAULT', 'NON_CLUSTERED', 1657767410672, 1657767415000, 5, 'ACQUIRED', NULL, NULL, '0', '0'); - -INSERT INTO `qrtz_job_details` VALUES ('quartzScheduler', '1546857070483939328', 'DEFAULT', NULL, 'cn.bootx.payment.task.PayExpiredTimeTask', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C77080000001000000001740009706172616D65746572707800); - -INSERT INTO `qrtz_triggers` VALUES ('quartzScheduler', '1546857070483939328', 'DEFAULT', '1546857070483939328', 'DEFAULT', NULL, 1657767415000, 1657767410000, 5, 'ACQUIRED', 'CRON', 1657634445000, 0, NULL, 0, ''); - -INSERT INTO `starter_quartz_job` VALUES (1546857070483939328, '支付单超时检测', 'cn.bootx.payment.task.PayExpiredTimeTask', '0/5 * * * * ? *', NULL, 1, '检测超时的支付单, 超时后发送超时事件', 1399985191002447872, '2022-07-12 22:00:39', 1399985191002447872, '2022-07-12 22:00:45', 1, 0); - -SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/_config/sql/1.1.x/1.1.0-bate/V1.1.0_220728__bate6.sql b/_config/sql/1.1.x/1.1.0-bate/V1.1.0_220728__bate6.sql deleted file mode 100644 index dbd61cd3bfe08aa44440f6d18a6fa34ca41ec5e7..0000000000000000000000000000000000000000 --- a/_config/sql/1.1.x/1.1.0-bate/V1.1.0_220728__bate6.sql +++ /dev/null @@ -1,132 +0,0 @@ -SET FOREIGN_KEY_CHECKS=0; - -ALTER TABLE `iam_user_third_info` ADD COLUMN `third_user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '关联第三方平台的用户id' AFTER `avatar`; - -ALTER TABLE `iam_user_third_info` DROP COLUMN `deleted`; - -CREATE TABLE `starter_ding_media_md5` ( - `id` bigint(20) NOT NULL, - `media_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '媒体id', - `md5` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'md5值', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(6) NULL DEFAULT NULL COMMENT '创建时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '钉钉媒体文件MD5值关联关系' ROW_FORMAT = Dynamic; - -CREATE TABLE `starter_ding_robot_config` ( - `id` bigint(20) NOT NULL, - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', - `code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `access_token` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '钉钉机器人访问token', - `enable_signature_check` bit(1) NOT NULL COMMENT '是否开启验签', - `sign_secret` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '钉钉机器人私钥', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(6) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(6) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` bit(1) NOT NULL COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '钉钉机器人配置' ROW_FORMAT = DYNAMIC; - -CREATE TABLE `starter_wecom_robot_config` ( - `id` bigint(20) NOT NULL, - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `webhook_key` varchar(150) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'webhook地址的key值', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(6) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(6) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` bit(1) NOT NULL COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '企业微信机器人配置' ROW_FORMAT = DYNAMIC; - -CREATE TABLE `starter_wx_fans` ( - `id` bigint(20) NOT NULL, - `openid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '关联OpenId', - `subscribe_status` bit(1) NULL DEFAULT NULL COMMENT '订阅状态', - `subscribe_time` datetime(0) NULL DEFAULT NULL COMMENT '订阅时间', - `nickname` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '昵称', - `sex` varchar(3) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '性别', - `language` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '语言', - `country` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '国家', - `province` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '省份', - `city` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '城市', - `avatar_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '头像地址', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '微信公众号粉丝' ROW_FORMAT = Dynamic; - -CREATE TABLE `starter_wx_template` ( - `id` bigint(20) NOT NULL, - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', - `code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '编码', - `enable` bit(1) NOT NULL COMMENT '是否启用', - `template_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '模板ID', - `title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模板标题', - `primary_industry` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模板所属行业的一级行业', - `deputy_industry` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模板所属行业的二级行业', - `content` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模板内容', - `example` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '示例', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `inx_`(`template_id`) USING BTREE COMMENT '模板id' -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '微信消息模板' ROW_FORMAT = Dynamic; - -DROP TABLE `ding_config`; - -DROP TABLE `ding_robot_config`; - -UPDATE `flyway_schema_history` SET `version` = '1.1.0.220604', `description` = 'init', `type` = 'SQL', `script` = 'V1.1.0_220604__init.sql', `checksum` = -474276030, `installed_by` = 'bootx', `installed_on` = '2022-07-14 17:39:59', `execution_time` = 67308, `success` = 1 WHERE `installed_rank` = 1; - -UPDATE `flyway_schema_history` SET `version` = '1.1.0.220624', `description` = 'bate3', `type` = 'SQL', `script` = 'V1.1.0_220624__bate3.sql', `checksum` = 85360861, `installed_by` = 'bootx', `installed_on` = '2022-07-14 17:40:01', `execution_time` = 724, `success` = 1 WHERE `installed_rank` = 2; - -UPDATE `flyway_schema_history` SET `version` = '1.1.0.220702', `description` = 'bate4', `type` = 'SQL', `script` = 'V1.1.0_220702__bate4.sql', `checksum` = 764266899, `installed_by` = 'bootx', `installed_on` = '2022-07-14 17:40:07', `execution_time` = 5691, `success` = 1 WHERE `installed_rank` = 3; - -UPDATE `flyway_schema_history` SET `version` = '1.1.0.220707', `description` = 'bate4-fix', `type` = 'SQL', `script` = 'V1.1.0_220707__bate4-fix.sql', `checksum` = 1727269960, `installed_by` = 'bootx', `installed_on` = '2022-07-14 17:40:13', `execution_time` = 5991, `success` = 1 WHERE `installed_rank` = 4; - -UPDATE `flyway_schema_history` SET `version` = '1.1.0.220714', `description` = 'bate5', `type` = 'SQL', `script` = 'V1.1.0_220714__bate5.sql', `checksum` = 1029462157, `installed_by` = 'bootx', `installed_on` = '2022-07-14 17:40:17', `execution_time` = 3461, `success` = 1 WHERE `installed_rank` = 5; - -UPDATE `iam_login_type` SET `code` = 'miniApp', `name` = '微信小程序', `type` = 'openId', `system` = b'0', `timeout` = 99999, `captcha` = b'0', `pwd_err_num` = 0, `enable` = b'1', `description` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-25 18:35:33', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-07-16 12:32:26', `version` = 3, `deleted` = 0 WHERE `id` = 1430478946919653376; - -UPDATE `iam_login_type` SET `code` = 'phone', `name` = '手机短信登录', `type` = 'openId', `system` = b'0', `timeout` = 3600, `captcha` = b'0', `pwd_err_num` = 0, `enable` = b'1', `description` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-09-07 15:11:16', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-07-16 12:32:19', `version` = 5, `deleted` = 0 WHERE `id` = 1435138582839009280; - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1551803592828932096, 'admin', 1450821877831254016, '企微机器人', 'WeComRobot', '', b'0', '', b'0', b'0', 'third/wecom/robot/WeComRobotConfigList', NULL, '/third/wecom', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-07-26 13:36:22', 1399985191002447872, '2022-07-26 15:14:26', 2, 0); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1552207982510706688, 'admin', NULL, '开发管理', 'develop', NULL, b'0', 'gold', b'0', b'0', 'RouteView', NULL, '/develop', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-07-27 16:23:16', 1399985191002447872, '2022-07-27 16:39:09', 1, 0); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1552208167664062464, 'admin', 1552207982510706688, '动态表单', 'DynamicForm', NULL, b'0', '', b'0', b'0', 'develop/dynamicform/DynamicFormList', NULL, '/develop/form', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-07-27 16:24:00', 1399985191002447872, '2022-07-27 16:38:05', 2, 0); - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1438061887002759168, `title` = '钉钉', `name` = 'DingTalk', `perm_code` = '', `effect` = NULL, `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/notice/dingTalk', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-09-21 15:27:50', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-09-21 15:27:50', `version` = 0, `deleted` = 1 WHERE `id` = 1440216178722050048; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450822511087271936, `title` = '钉钉机器人', `name` = 'DingTalkRobot', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'third/dingtalk/robot/DingRobotConfigList', `component_name` = NULL, `path` = '/third/dingTalk/robot', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-09-21 15:29:33', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-07-26 13:34:35', `version` = 5, `deleted` = 0 WHERE `id` = 1440216612211757056; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1452569691537256448, `title` = '第三方登录', `name` = 'Social', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'1', `hide_children_in_menu` = b'0', `component` = 'system/social/SocialList', `component_name` = NULL, `path` = '/system/userAuth/social', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-19 22:45:01', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-07-26 13:35:47', `version` = 5, `deleted` = 0 WHERE `id` = 1450473063320526848; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = NULL, `title` = '第三方对接', `name` = 'third', `perm_code` = '', `effect` = b'0', `icon` = 'branches', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/third', `redirect` = '', `sort_no` = 0, `menu_type` = 0, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 21:42:04', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-07-26 13:34:02', `version` = 4, `deleted` = 0 WHERE `id` = 1450819607680991232; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450819607680991232, `title` = '微信', `name` = 'SocialWeChat', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/third/wechat', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 21:50:28', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-07-26 13:35:55', `version` = 2, `deleted` = 0 WHERE `id` = 1450821723027881984; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450819607680991232, `title` = '企业微信', `name` = 'SocialWeCom', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/third/wecom', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 21:51:05', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-07-26 13:35:29', `version` = 3, `deleted` = 0 WHERE `id` = 1450821877831254016; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450819607680991232, `title` = '钉钉', `name` = 'SocialDingTalk', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/third/dingtalk', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 21:53:36', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-07-26 13:34:11', `version` = 2, `deleted` = 0 WHERE `id` = 1450822511087271936; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1438061887002759168, `title` = '微信', `name` = 'NoticeWeChat', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'Dev', `component_name` = NULL, `path` = '/notice/wechat', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 22:14:04', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-06-21 20:53:04', `version` = 1, `deleted` = 1 WHERE `id` = 1450827660459458560; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1552207982510706688, `title` = '文件管理', `name` = 'FIleUpLoad', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'develop/file/FileUploadList', `component_name` = NULL, `path` = '/develop/file', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-02-08 17:42:12', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-07-28 09:16:56', `version` = 2, `deleted` = 0 WHERE `id` = 1490984296616263680; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1552207982510706688, `title` = '代码生成', `name` = 'CodeGen', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'develop/codegen/CodeGenList', `component_name` = NULL, `path` = '/develop/codegen', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-02-19 20:33:04', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-07-27 16:25:05', `version` = 1, `deleted` = 0 WHERE `id` = 1495013564652429312; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450822511087271936, `title` = '钉钉配置', `name` = 'DingTalkConfig', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'1', `hide_children_in_menu` = b'0', `component` = 'third/dingtalk/config/DingTalkConfigList', `component_name` = NULL, `path` = '/third/dingtalk/config', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-04-05 16:54:48', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-07-26 13:34:44', `version` = 3, `deleted` = 0 WHERE `id` = 1511266086400524288; - -DELETE FROM `qrtz_fired_triggers` WHERE `SCHED_NAME` = 'quartzScheduler' AND `ENTRY_ID` = 'NON_CLUSTERED1658990526308'; - -UPDATE `qrtz_triggers` SET `JOB_NAME` = '1546857070483939328', `JOB_GROUP` = 'DEFAULT', `DESCRIPTION` = NULL, `NEXT_FIRE_TIME` = 1658990430000, `PREV_FIRE_TIME` = 1658990425000, `PRIORITY` = 5, `TRIGGER_STATE` = 'WAITING', `TRIGGER_TYPE` = 'CRON', `START_TIME` = 1657634445000, `END_TIME` = 0, `CALENDAR_NAME` = NULL, `MISFIRE_INSTR` = 0, `JOB_DATA` = '' WHERE `SCHED_NAME` = 'quartzScheduler' AND `TRIGGER_NAME` = '1546857070483939328' AND `TRIGGER_GROUP` = 'DEFAULT'; diff --git a/_config/sql/1.1.x/1.1.0-bate/V1.1.0_220822__release.sql b/_config/sql/1.1.x/1.1.0-bate/V1.1.0_220822__release.sql deleted file mode 100644 index ef1bf4e325b7257063ceb4f1bdd79cd49bb598b3..0000000000000000000000000000000000000000 --- a/_config/sql/1.1.x/1.1.0-bate/V1.1.0_220822__release.sql +++ /dev/null @@ -1,150 +0,0 @@ -SET FOREIGN_KEY_CHECKS=0; - -CREATE TABLE `base_dynamic_form` ( - `id` bigint(20) NOT NULL, - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '表单名称', - `code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '表单键名', - `value` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '表单内容', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - `version` int(8) NOT NULL COMMENT '版本', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '动态表单' ROW_FORMAT = Dynamic; - -ALTER TABLE `iam_user_third` ADD COLUMN `we_chat_open_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '微信开放平台id' AFTER `we_chat_id`; - -ALTER TABLE `notice_site_message` ADD COLUMN `receive_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '消息类型' AFTER `sender_time`; - -ALTER TABLE `notice_site_message` ADD COLUMN `send_state` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发布状态' AFTER `receive_type`; - -ALTER TABLE `notice_site_message` ADD COLUMN `efficient_time` datetime(0) NULL DEFAULT NULL COMMENT '截至有效期' AFTER `send_state`; - -ALTER TABLE `notice_site_message` ADD COLUMN `cancel_time` datetime(0) NULL DEFAULT NULL COMMENT '撤回时间' AFTER `efficient_time`; - -ALTER TABLE `notice_site_message` MODIFY COLUMN `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '消息内容' AFTER `title`; - -ALTER TABLE `notice_site_message` DROP COLUMN `receive_id`; - -ALTER TABLE `notice_site_message` DROP COLUMN `receive_name`; - -ALTER TABLE `notice_site_message` DROP COLUMN `have_read`; - -ALTER TABLE `notice_site_message` DROP COLUMN `read_time`; - -CREATE TABLE `notice_site_message_user` ( - `id` bigint(20) NOT NULL COMMENT '主键', - `message_id` bigint(20) NOT NULL COMMENT '消息id', - `receive_id` bigint(20) NOT NULL COMMENT '接收者id', - `have_read` bit(1) NOT NULL COMMENT '已读/未读', - `read_time` datetime(0) NULL DEFAULT NULL COMMENT '已读时间', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `uni_receive_message`(`receive_id`, `message_id`) USING BTREE COMMENT '接收人和消息联合索引', - INDEX `inx_message`(`message_id`) USING BTREE COMMENT '消息索引' -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '消息用户关联' ROW_FORMAT = Dynamic; - -ALTER TABLE `starter_audit_login_log` ADD COLUMN `login_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '登录方式' AFTER `client`; - -CREATE TABLE `starter_wx_menu` ( - `id` bigint(20) NOT NULL COMMENT '主键', - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '名称', - `menu_info` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT '菜单信息', - `remark` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注', - `publish` bit(1) NOT NULL COMMENT '是否发布', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - `version` int(11) NOT NULL COMMENT '版本', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '微信自定义菜单' ROW_FORMAT = Dynamic; - - -INSERT INTO `base_dict`(`id`, `code`, `name`, `group_tag`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1556996322223968256, 'WeChatMediaType', '微信媒体类型', '微信', '微信媒体类型', 1399985191002447872, '2022-08-09 21:30:25', 1399985191002447872, '2022-08-09 21:30:26', 0, 0); - -INSERT INTO `base_dict`(`id`, `code`, `name`, `group_tag`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1561003021674987520, 'SiteMessageReceive', '消息接收类型', '站内信', '站内信接收类型', 1399985191002447872, '2022-08-20 22:51:37', 1399985191002447872, '2022-08-20 22:51:37', 0, 0); - -INSERT INTO `base_dict`(`id`, `code`, `name`, `group_tag`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1561003189111603200, 'SiteMessageState', '消息发布状态', '站内信', '站内信消息发布状态', 1399985191002447872, '2022-08-20 22:52:17', 1399985191002447872, '2022-08-20 22:52:17', 0, 0); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1556996422006460416, 1556996322223968256, 'WeChatMediaType', 'news', '新闻', 0.00, '', 1399985191002447872, '2022-08-09 21:30:49', 1399985191002447872, '2022-08-09 21:30:49', 1, 0); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1556996472661069824, 1556996322223968256, 'WeChatMediaType', 'voice', '语音', 0.00, '', 1399985191002447872, '2022-08-09 21:31:01', 1399985191002447872, '2022-08-09 21:31:01', 0, 0); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1556996501417218048, 1556996322223968256, 'WeChatMediaType', 'image', '图片', 0.00, '', 1399985191002447872, '2022-08-09 21:31:08', 1399985191002447872, '2022-08-09 21:31:08', 0, 0); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1556996529565192192, 1556996322223968256, 'WeChatMediaType', 'video', '视频', 0.00, '', 1399985191002447872, '2022-08-09 21:31:15', 1399985191002447872, '2022-08-09 21:31:15', 0, 0); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1561003235710320640, 1561003189111603200, 'SiteMessageState', 'user', '指定用户', 0.00, '', 1399985191002447872, '2022-08-20 22:52:28', 1399985191002447872, '2022-08-20 22:52:28', 1, 0); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1561003279322693632, 1561003189111603200, 'SiteMessageState', 'all', '全部用户', 0.00, '', 1399985191002447872, '2022-08-20 22:52:38', 1399985191002447872, '2022-08-20 22:52:39', 1, 0); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1561003368762032128, 1561003021674987520, 'SiteMessageReceive', 'user', '指定用户', 0.00, '', 1399985191002447872, '2022-08-20 22:53:00', 1399985191002447872, '2022-08-20 22:53:00', 0, 0); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1561003399778910208, 1561003021674987520, 'SiteMessageReceive', 'all', '全部用户', 0.00, '', 1399985191002447872, '2022-08-20 22:53:07', 1399985191002447872, '2022-08-20 22:53:24', 0, 1); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1561003539772194816, 1561003189111603200, 'SiteMessageState', 'sent', '已发送', 0.00, '', 1399985191002447872, '2022-08-20 22:53:41', 1399985191002447872, '2022-08-20 22:53:41', 0, 0); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1561003575608328192, 1561003189111603200, 'SiteMessageState', 'cancel', '撤销', 0.00, '', 1399985191002447872, '2022-08-20 22:53:49', 1399985191002447872, '2022-08-20 22:53:49', 0, 0); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1561245469535080448, 1561003189111603200, 'SiteMessageState', 'draft', '草稿', 0.00, '', 1399985191002447872, '2022-08-21 14:55:01', 1399985191002447872, '2022-08-21 14:55:01', 0, 0); - -UPDATE `iam_login_type` SET `code` = 'weChat', `name` = '微信登录', `type` = 'openId', `system` = b'0', `timeout` = 5, `captcha` = b'0', `pwd_err_num` = -1, `enable` = b'1', `description` = '', `creator` = 1399985191002447872, `create_time` = '2022-07-02 14:54:53', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-08-05 18:11:13', `version` = 1, `deleted` = 0 WHERE `id` = 1543126042909016064; - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1554720980865380352, 'admin', 1495968302034210816, '消息通知', 'NoticeDemo', NULL, b'0', '', b'0', b'0', 'RouteView', NULL, '/demo/notice', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-03 14:49:02', 1399985191002447872, '2022-08-03 14:49:02', 0, 0); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1554721654336385024, 'admin', 1554720980865380352, '邮件发送', 'EmailDemo', NULL, b'0', '', b'0', b'0', 'demo/notice/email/EmailSender', NULL, '/demo/notice/email', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-03 14:51:42', 1399985191002447872, '2022-08-03 14:51:42', 0, 0); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1554850179754975232, 'admin', 1450821723027881984, '消息模板', 'WeChatTemplate', NULL, b'0', '', b'0', b'0', 'third/wechat/template/WeChatTemplateList', NULL, '/third/wechat/template', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-03 23:22:25', 1399985191002447872, '2022-08-03 23:23:18', 1, 0); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1555835229426368512, 'admin', 1450821723027881984, '自定义菜单', 'WeChatMenu', NULL, b'0', '', b'0', b'0', 'third/wechat/menu/WeChatMenuList', NULL, '/third/wechat/menu', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-06 16:36:39', 1399985191002447872, '2022-08-08 12:14:14', 2, 0); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1556997405528805376, 'admin', 1450821723027881984, '素材管理', 'WeChatMedia', NULL, b'0', '', b'0', b'0', 'third/wechat/media/WeChatMediaList', NULL, '/third/wechat/media', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-09 21:34:44', 1399985191002447872, '2022-08-09 21:34:44', 0, 0); - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = NULL, `title` = '系统管理', `name` = 'system', `perm_code` = '', `effect` = NULL, `icon` = 'desktop', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = '', `path` = '/system', `redirect` = '/system/user', `sort_no` = -99999, `menu_type` = 0, `leaf` = b'0', `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'1', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-27 10:32:53', `last_modifier` = 1399985191002447872, `last_modified_time` = '2021-08-27 10:02:16', `version` = 2, `deleted` = 0 WHERE `id` = 1414596052497092608; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450819607680991232, `title` = '微信', `name` = 'WeChat', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/third/wechat', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 21:50:28', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-08-03 23:23:10', `version` = 3, `deleted` = 0 WHERE `id` = 1450821723027881984; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450819607680991232, `title` = '企业微信', `name` = 'WeCom', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/third/wecom', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 21:51:05', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-08-03 23:22:58', `version` = 4, `deleted` = 0 WHERE `id` = 1450821877831254016; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450819607680991232, `title` = '钉钉', `name` = 'DingTalk', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/third/dingtalk', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-20 21:53:36', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-08-03 23:23:29', `version` = 3, `deleted` = 0 WHERE `id` = 1450822511087271936; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1438061887002759168, `title` = '站内信', `name` = 'SiteMessageSender', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'notice/site/sender/SiteMessageList', `component_name` = NULL, `path` = '/notice/siteMessage', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-06-17 17:33:30', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-08-20 21:12:30', `version` = 2, `deleted` = 0 WHERE `id` = 1537730140522348544; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = NULL, `title` = '个人办公', `name` = 'person', `perm_code` = '', `effect` = b'0', `icon` = 'user', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/person', `redirect` = '', `sort_no` = -99, `menu_type` = 0, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-06-17 17:42:38', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-08-20 22:15:21', `version` = 4, `deleted` = 0 WHERE `id` = 1537732440632524800; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1537732440632524800, `title` = '我的消息', `name` = 'PersonSiteMessage', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'notice/site/receive/SiteMessageList', `component_name` = NULL, `path` = '/person/siteMessage', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-06-17 17:48:03', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-08-17 21:35:17', `version` = 2, `deleted` = 0 WHERE `id` = 1537733801860333568; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1495968302034210816, `title` = '支付演示', `name` = 'DemoPay', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/demo/pay', `redirect` = '', `sort_no` = 9, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-07-12 21:36:13', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-08-03 14:49:16', `version` = 1, `deleted` = 0 WHERE `id` = 1546850918849249280; - -UPDATE `iam_user_expand_info` SET `sex` = 1, `birthday` = '1996-12-01', `avatar` = '1495331905770315776', `last_login_time` = '2022-08-21 11:07:05', `current_login_time` = '2022-08-22 10:26:41', `initial_password` = b'0', `last_change_password_time` = '2022-06-19 21:25:00', `creator` = 1, `create_time` = '2021-06-02 15:04:15', `last_modifier` = 0, `last_modified_time` = '2022-08-22 10:26:41', `version` = 306, `deleted` = 0 WHERE `id` = 1399985191002447872; - -INSERT INTO `notice_site_message`(`id`, `title`, `content`, `sender_id`, `sender_name`, `sender_time`, `receive_type`, `send_state`, `efficient_time`, `cancel_time`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1558781525200130048, '测试站内信', '

sdfsdfsdf
  1. 333
', 0, '未知', '2022-08-14 19:44:11', NULL, 'sent', NULL, NULL, 0, '2022-08-14 19:44:11', 0, '2022-08-14 19:44:11', 0, 0); - -INSERT INTO `notice_site_message`(`id`, `title`, `content`, `sender_id`, `sender_name`, `sender_time`, `receive_type`, `send_state`, `efficient_time`, `cancel_time`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1561363288741085184, '测试消息', '

三扥广丰和扥撒扥撒扥东方

', 1399985191002447872, '小小明', '2022-08-21 22:59:45', 'all', 'draft', '2022-09-20 00:00:00', NULL, 1399985191002447872, '2022-08-21 22:43:11', 1399985191002447872, '2022-08-21 23:23:03', 4, 1); - -INSERT INTO `notice_site_message`(`id`, `title`, `content`, `sender_id`, `sender_name`, `sender_time`, `receive_type`, `send_state`, `efficient_time`, `cancel_time`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1561365894804766720, '测试数据', '

234554通扥广森

', 1399985191002447872, '小小明', '2022-08-21 23:48:55', 'all', 'sent', '2022-09-20 00:00:00', NULL, 1399985191002447872, '2022-08-21 22:53:33', 1399985191002447872, '2022-08-21 23:48:55', 1, 0); - -INSERT INTO `notice_site_message`(`id`, `title`, `content`, `sender_id`, `sender_name`, `sender_time`, `receive_type`, `send_state`, `efficient_time`, `cancel_time`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1561368170558623744, '测试数据', '

234554通扥广森

DFF

撒扥萨芬的

11
33
44
风很高
', 1399985191002447872, '小小明', '2022-08-21 23:33:01', 'all', 'sent', '2022-09-20 00:00:00', NULL, 1399985191002447872, '2022-08-21 23:02:35', 1399985191002447872, '2022-08-21 23:33:01', 7, 0); - -UPDATE `notice_site_message` SET `title` = '测试消息', `content` = '
55
5
5
5
5
5
5
5
5
5
5
5
6等非撒扥森速度扥三扥所
6
8
8
5撒扥森森的
5
5撒扥岁送
8
8
8
', `sender_id` = 1399985191002447872, `sender_name` = '小小明', `sender_time` = '2021-08-08 11:34:11', `receive_type` = 'all', `send_state` = 'cancel', `efficient_time` = NULL, `cancel_time` = '2022-08-21 23:01:16', `creator` = 1399985191002447872, `create_time` = '2021-08-08 11:35:19', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-08-21 23:01:16', `version` = 1, `deleted` = 0 WHERE `id` = 1424212599079161857; - -INSERT INTO `notice_site_message_user`(`id`, `message_id`, `receive_id`, `have_read`, `read_time`, `creator`, `create_time`, `deleted`) VALUES (1558781525422428160, 1558781525200130048, 1399985191002447872, b'1', '2022-08-14 19:47:53', 0, '2022-08-14 19:44:11', 0); - -INSERT INTO `notice_site_message_user`(`id`, `message_id`, `receive_id`, `have_read`, `read_time`, `creator`, `create_time`, `deleted`) VALUES (1559917646856540160, 1424212599079161857, 1399985191002447872, b'1', '2022-08-17 22:58:43', 1399985191002447872, '2022-08-17 22:58:44', 0); - -INSERT INTO `notice_site_message_user`(`id`, `message_id`, `receive_id`, `have_read`, `read_time`, `creator`, `create_time`, `deleted`) VALUES (1561379790089302016, 1561368170558623744, 1399985191002447872, b'1', '2022-08-21 23:48:43', 1399985191002447872, '2022-08-21 23:48:46', 0); - -INSERT INTO `notice_site_message_user`(`id`, `message_id`, `receive_id`, `have_read`, `read_time`, `creator`, `create_time`, `deleted`) VALUES (1561379841968648192, 1561365894804766720, 1399985191002447872, b'1', '2022-08-21 23:48:58', 1399985191002447872, '2022-08-21 23:48:58', 0); - -DELETE FROM `qrtz_fired_triggers` WHERE `SCHED_NAME` = 'quartzScheduler' AND `ENTRY_ID` = 'NON_CLUSTERED1661135985834'; - -UPDATE `qrtz_triggers` SET `JOB_NAME` = '1546857070483939328', `JOB_GROUP` = 'DEFAULT', `DESCRIPTION` = NULL, `NEXT_FIRE_TIME` = 1661135790000, `PREV_FIRE_TIME` = 1661135785000, `PRIORITY` = 5, `TRIGGER_STATE` = 'WAITING', `TRIGGER_TYPE` = 'CRON', `START_TIME` = 1657634445000, `END_TIME` = 0, `CALENDAR_NAME` = NULL, `MISFIRE_INSTR` = 0, `JOB_DATA` = '' WHERE `SCHED_NAME` = 'quartzScheduler' AND `TRIGGER_NAME` = '1546857070483939328' AND `TRIGGER_GROUP` = 'DEFAULT'; - -SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/_config/sql/1.1.x/1.1.0/1.1.0_up_1.1.1.sql b/_config/sql/1.1.x/1.1.0/1.1.0_up_1.1.1.sql deleted file mode 100644 index c74145b2dc485d067d2a3ba9c2fe35c4c43fd346..0000000000000000000000000000000000000000 --- a/_config/sql/1.1.x/1.1.0/1.1.0_up_1.1.1.sql +++ /dev/null @@ -1,121 +0,0 @@ -SET FOREIGN_KEY_CHECKS=0; - -CREATE TABLE `bpm_instance` ( - `id` bigint(20) NOT NULL, - `instance_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '流程实例的id', - `instance_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程标题', - `def_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程定义ID', - `def_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程定义名称', - `start_user_id` bigint(20) NULL DEFAULT NULL COMMENT '发起人', - `start_user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '发起人名称', - `state` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程实例的状态', - `start_time` datetime(0) NULL DEFAULT NULL COMMENT '开始时间', - `end_time` datetime(0) NULL DEFAULT NULL COMMENT '结束时间', - `form_variables` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT '提交的表单值', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', - `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - `version` int(8) NULL DEFAULT NULL COMMENT '版本', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '流程实例扩展' ROW_FORMAT = Dynamic; - -CREATE TABLE `bpm_model` ( - `id` bigint(20) NOT NULL, - `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '名称', - `model_type` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程类型', - `form_id` bigint(20) NULL DEFAULT NULL COMMENT '关联表单', - `publish` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '发布状态', - `enable` bit(1) NULL DEFAULT NULL COMMENT '启用状态', - `deploy_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '部署id', - `def_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程定义id', - `def_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程key', - `def_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程名称', - `def_remark` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程备注', - `main_process` bit(1) NULL DEFAULT NULL COMMENT '是否主流程', - `process_version` int(8) NULL DEFAULT NULL COMMENT '流程版本号', - `model_editor_xml` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT '流程xml', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', - `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - `version` int(8) NULL DEFAULT NULL COMMENT '版本', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '流程模型' ROW_FORMAT = Dynamic; - -CREATE TABLE `bpm_model_task` ( - `id` bigint(20) NOT NULL, - `model_id` bigint(20) NOT NULL COMMENT '关联模型id', - `def_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程定义id', - `def_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程key', - `task_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '任务节点id', - `task_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '任务节点名称', - `multi` bit(1) NOT NULL COMMENT '是否会签', - `form_id` bigint(20) NULL DEFAULT NULL COMMENT '关联表单', - `assign_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '分配类型', - `user_id` bigint(20) NULL DEFAULT NULL COMMENT '分配的用户id', - `user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '分配的用户名称', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', - `version` int(8) NULL DEFAULT NULL COMMENT '版本', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '模型任务节点配置' ROW_FORMAT = Dynamic; - -CREATE TABLE `bpm_task` ( - `id` bigint(20) NOT NULL, - `task_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '任务ID', - `execution_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '任务执行 ID', - `instance_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '流程实例的id', - `instance_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程名称(业务标题)', - `def_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程定义名称', - `task_node_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '任务节点id', - `task_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '任务节点名称', - `state` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程任务的状态', - `start_time` datetime(0) NULL DEFAULT NULL COMMENT '开始时间', - `end_time` datetime(0) NULL DEFAULT NULL COMMENT '结束时间', - `user_id` bigint(20) NULL DEFAULT NULL COMMENT '当前处理人', - `user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '当前处理人', - `start_user_id` bigint(20) NULL DEFAULT NULL COMMENT '发起人', - `start_user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '发起人名称', - `form_variables` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT '提交的表单值', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', - `version` int(8) NULL DEFAULT NULL COMMENT '版本', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '流程任务扩展' ROW_FORMAT = Dynamic; - -INSERT INTO `base_dict`(`id`, `code`, `name`, `group_tag`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1562696107020230656, 'BpmModelPublish', '工作流模型发布状态', '工作流', '工作流模型发布状态', 1399985191002447872, '2022-08-25 14:59:20', 1399985191002447872, '2022-08-25 15:27:55', 0, 1); - -INSERT INTO `base_dict`(`id`, `code`, `name`, `group_tag`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1563083969989423104, 'BpmTaskAssignType', '工作流处理人分配类型', '工作流', '流程任务处理人分配类型', 1399985191002447872, '2022-08-26 16:40:34', 1399985191002447872, '2022-08-26 16:40:53', 0, 1); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1562696390043475968, 1562696107020230656, 'BpmModelPublish', 'published', '已发布', 0.00, '', 1399985191002447872, '2022-08-25 15:00:28', 1399985191002447872, '2022-08-25 15:00:28', 0, 0); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1562696420561231872, 1562696107020230656, 'BpmModelPublish', 'unpublished', '未发布', 0.00, '未上传xml文档', 1399985191002447872, '2022-08-25 15:00:35', 1399985191002447872, '2022-08-25 15:28:09', 0, 1); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1562703450588028928, 1562696107020230656, 'BpmModelPublish', 'unpublishedXml', '未发布(已上传BPMN)', 0.00, '有xml文档', 1399985191002447872, '2022-08-25 15:28:31', 1399985191002447872, '2022-08-25 15:34:45', 0, 1); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1563087300157747200, 1563083969989423104, 'BpmTaskAssignType', 'user', '指定用户', 0.00, '', 1399985191002447872, '2022-08-26 16:53:48', 1399985191002447872, '2022-08-26 16:53:48', 0, 0); - -INSERT INTO `base_dynamic_form`(`id`, `name`, `code`, `value`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1552656018381422592, '测试表单', 'test', '{\"list\":[{\"type\":\"input\",\"label\":\"输入框\",\"options\":{\"type\":\"text\",\"width\":\"100%\",\"defaultValue\":\"\",\"placeholder\":\"请输入\",\"clearable\":true,\"maxLength\":null,\"addonBefore\":\"\",\"addonAfter\":\"\",\"hidden\":false,\"disabled\":false},\"model\":\"aa\",\"key\":\"input_1659059676533\",\"help\":\"测试\",\"rules\":[{\"required\":true,\"message\":\"必填项\"}]},{\"type\":\"textarea\",\"label\":\"文本框\",\"options\":{\"width\":\"100%\",\"minRows\":4,\"maxRows\":6,\"maxLength\":null,\"defaultValue\":\"\",\"clearable\":true,\"hidden\":false,\"disabled\":false,\"placeholder\":\"请输入\"},\"model\":\"bb\",\"key\":\"textarea_1659020414125\",\"help\":\"\",\"rules\":[{\"required\":true,\"message\":\"必填项\"}]},{\"type\":\"slider\",\"label\":\"滑动输入条\",\"options\":{\"width\":\"100%\",\"defaultValue\":34,\"disabled\":false,\"hidden\":false,\"min\":0,\"max\":100,\"step\":1,\"showInput\":false},\"model\":\"cc\",\"key\":\"slider_1659020433092\",\"help\":\"\",\"rules\":[{\"required\":false,\"message\":\"必填项\"}]}],\"config\":{\"layout\":\"horizontal\",\"labelCol\":{\"xs\":4,\"sm\":4,\"md\":4,\"lg\":4,\"xl\":4,\"xxl\":4},\"labelWidth\":100,\"labelLayout\":\"flex\",\"wrapperCol\":{\"xs\":18,\"sm\":18,\"md\":18,\"lg\":18,\"xl\":18,\"xxl\":18},\"hideRequiredMark\":false,\"customStyle\":\"\"}}', '测试动态表单', 1399985191002447872, '2022-07-28 22:03:36', 1399985191002447872, '2022-07-29 09:55:22', 0, 7); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1562460770753544192, 'admin', NULL, '流程管理', 'Bpm', NULL, b'0', 'audit', b'0', b'0', 'RouteView', NULL, '/bpm', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-24 23:24:12', 1399985191002447872, '2022-08-24 23:25:11', 1, 0); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1562461289450536960, 'admin', 1562460770753544192, '流程模型', 'BpmModel', NULL, b'0', '', b'0', b'0', 'bpm/model/BpmModelList', NULL, '/bpm/model', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-24 23:26:15', 1399985191002447872, '2022-08-24 23:26:15', 0, 0); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1562461620766998528, 'admin', 1562460770753544192, '流程表单', 'BpmFrom', NULL, b'0', '', b'0', b'0', 'Dev', NULL, '/bpm/form', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-24 23:27:34', 1399985191002447872, '2022-08-24 23:27:56', 1, 1); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1563092672406859776, 'admin', 1537732440632524800, '我的发起', 'MyApplyList', NULL, b'0', '', b'0', b'0', 'office/myapply/MyApplyList', NULL, '/person/myApply', '', 1, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-26 17:15:09', 1399985191002447872, '2022-08-30 22:46:25', 1, 0); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1564626025579462656, 'admin', 1537732440632524800, '已办任务', 'MyDoneTaskList', NULL, b'0', '', b'0', b'0', 'office/mydone/MyDoneList', NULL, '/person/done', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-30 22:48:09', 1399985191002447872, '2022-08-30 22:48:29', 1, 0); - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1537732440632524800, `title` = '待办任务', `name` = 'MyTodoTaskList', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'office/mytodo/MyTodoList', `component_name` = NULL, `path` = '/person/todo', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-06-17 17:56:11', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-08-30 22:46:47', `version` = 6, `deleted` = 0 WHERE `id` = 1537735851818024960; - - -SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file diff --git a/_config/sql/1.1.x/1.1.1/1.1.1_up_1.1.2.sql b/_config/sql/1.1.x/1.1.1/1.1.1_up_1.1.2.sql deleted file mode 100644 index 65e1d184286e06fcbd711a6229531e2c20e728fb..0000000000000000000000000000000000000000 --- a/_config/sql/1.1.x/1.1.1/1.1.1_up_1.1.2.sql +++ /dev/null @@ -1,75 +0,0 @@ -SET FOREIGN_KEY_CHECKS=0; - -CREATE TABLE `bpm_model_node` ( - `id` bigint(20) NOT NULL, - `model_id` bigint(20) NOT NULL COMMENT '关联模型id', - `def_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程定义id', - `def_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程key', - `node_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '任务节点id', - `node_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '任务节点名称', - `multi` bit(1) NOT NULL COMMENT '是否多任务', - `sequential` bit(1) NOT NULL COMMENT '是否串签', - `reject` bit(1) NOT NULL COMMENT '是否允许驳回', - `back` bit(1) NOT NULL COMMENT '是否允许回退', - `retrieve` bit(1) NOT NULL COMMENT '是否允许取回', - `skip` bit(1) NOT NULL COMMENT '是否跳过当前节点', - `form_id` bigint(20) NULL DEFAULT NULL COMMENT '关联表单', - `assign_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '分配类型', - `assign_raw` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT '分配的原始数据', - `assign_show` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT '分配的数据的展示', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', - `version` int(8) NULL DEFAULT NULL COMMENT '版本', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '模型任务节点配置' ROW_FORMAT = Dynamic; - -ALTER TABLE `bpm_task` ADD COLUMN `node_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '任务节点id' AFTER `def_name`; - -ALTER TABLE `bpm_task` ADD COLUMN `node_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '任务节点名称' AFTER `node_id`; - -ALTER TABLE `bpm_task` ADD COLUMN `reason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '处理意见' AFTER `state`; - -ALTER TABLE `bpm_task` MODIFY COLUMN `state` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '处理结果' AFTER `node_name`; - -ALTER TABLE `bpm_task` DROP COLUMN `task_node_id`; - -ALTER TABLE `bpm_task` DROP COLUMN `task_name`; - -DROP TABLE `bpm_model_task`; - -INSERT INTO `base_dict` VALUES (1567091641298386944, 'BpmTaskState', '流程任务状态', '工作流', '流程任务状态', 1399985191002447872, '2022-09-06 18:05:37', 1399985191002447872, '2022-09-06 18:05:47', 0, 1); - -INSERT INTO `base_dict_item` VALUES (1567091825981980672, 1567091641298386944, 'BpmTaskState', 'running', '处理中', 0.00, '', 1399985191002447872, '2022-09-06 18:06:21', 1399985191002447872, '2022-09-06 18:06:21', 0, 0); - -INSERT INTO `base_dict_item` VALUES (1567091863017684992, 1567091641298386944, 'BpmTaskState', 'pass', '通过', 0.00, '', 1399985191002447872, '2022-09-06 18:06:30', 1399985191002447872, '2022-09-06 18:06:30', 0, 0); - -INSERT INTO `base_dict_item` VALUES (1567091902414782464, 1567091641298386944, 'BpmTaskState', 'reject', '驳回', 0.00, '', 1399985191002447872, '2022-09-06 18:06:39', 1399985191002447872, '2022-09-06 18:06:51', 0, 1); - -INSERT INTO `base_dict_item` VALUES (1567091993569591296, 1567091641298386944, 'BpmTaskState', 'back', '退回', 0.00, '', 1399985191002447872, '2022-09-06 18:07:01', 1399985191002447872, '2022-09-06 18:07:01', 0, 0); - -INSERT INTO `base_dict_item` VALUES (1567092037261656064, 1567091641298386944, 'BpmTaskState', 'retrieve', '取回', 0.00, '', 1399985191002447872, '2022-09-06 18:07:12', 1399985191002447872, '2022-09-06 18:07:22', 0, 1); - -INSERT INTO `base_dict_item` VALUES (1567092124226355200, 1567091641298386944, 'BpmTaskState', 'skip', '跳过', 0.00, '', 1399985191002447872, '2022-09-06 18:07:32', 1399985191002447872, '2022-09-06 18:07:32', 0, 0); - -INSERT INTO `base_dict_item` VALUES (1567163310103564288, 1563083969989423104, 'BpmTaskAssignType', 'userGroup', '用户组', 0.00, '', 1399985191002447872, '2022-09-06 22:50:24', 1399985191002447872, '2022-09-06 22:50:24', 0, 0); - -INSERT INTO `base_dict_item` VALUES (1567163343288897536, 1563083969989423104, 'BpmTaskAssignType', 'role', '角色', 0.00, '', 1399985191002447872, '2022-09-06 22:50:32', 1399985191002447872, '2022-09-06 22:50:32', 0, 0); - -INSERT INTO `base_dict_item` VALUES (1567163380693700608, 1563083969989423104, 'BpmTaskAssignType', 'deptMember', '部门成员', 0.00, '', 1399985191002447872, '2022-09-06 22:50:41', 1399985191002447872, '2022-09-06 22:50:41', 0, 0); - -INSERT INTO `base_dict_item` VALUES (1567163412960481280, 1563083969989423104, 'BpmTaskAssignType', 'deptLeader', '部门的负责人', 0.00, '', 1399985191002447872, '2022-09-06 22:50:49', 1399985191002447872, '2022-09-06 22:50:49', 0, 0); - -INSERT INTO `base_dict_item` VALUES (1567175558888923136, 1563083969989423104, 'BpmTaskAssignType', 'roleGroup', '角色组', 0.00, '', 1399985191002447872, '2022-09-06 23:39:05', 1399985191002447872, '2022-09-06 23:39:05', 0, 0); - -INSERT INTO `base_dict_item` VALUES (1567178994242002944, 1563083969989423104, 'BpmTaskAssignType', 'sponsor', '发起人', 0.00, '', 1399985191002447872, '2022-09-06 23:52:44', 1399985191002447872, '2022-09-06 23:52:44', 0, 0); - -INSERT INTO `base_dict_item` VALUES (1567179143576002560, 1563083969989423104, 'BpmTaskAssignType', 'select', '用户手动选择', 0.00, '', 1399985191002447872, '2022-09-06 23:53:19', 1399985191002447872, '2022-09-07 00:01:22', 0, 1); - -UPDATE `base_dict_item` SET `dict_id` = 1563083969989423104, `dict_code` = 'BpmTaskAssignType', `code` = 'user', `name` = '用户', `sort_no` = 0.00, `remark` = '', `creator` = 1399985191002447872, `create_time` = '2022-08-26 16:53:48', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-09-06 22:50:15', `deleted` = 0, `version` = 1 WHERE `id` = 1563087300157747200; - -INSERT INTO `base_dynamic_form` VALUES (1552656018381422593, '测试表单1', 'test1', '{\"list\":[{\"type\":\"input\",\"label\":\"申请人\",\"options\":{\"type\":\"text\",\"width\":\"100%\",\"defaultValue\":\"\",\"placeholder\":\"请输入\",\"clearable\":true,\"maxLength\":null,\"addonBefore\":\"\",\"addonAfter\":\"\",\"hidden\":false,\"disabled\":false},\"model\":\"apply_by\",\"key\":\"input_1659059676533\",\"help\":\"测试\",\"rules\":[{\"required\":true,\"message\":\"必填项\"}]},{\"type\":\"input\",\"label\":\"请假天数\",\"options\":{\"type\":\"text\",\"width\":\"100%\",\"defaultValue\":\"\",\"placeholder\":\"请输入\",\"clearable\":false,\"maxLength\":null,\"addonBefore\":\"\",\"addonAfter\":\"\",\"hidden\":false,\"disabled\":false},\"model\":\"leave_days\",\"key\":\"input_1662106166142\",\"help\":\"\",\"rules\":[{\"required\":false,\"message\":\"必填项\"}]},{\"type\":\"textarea\",\"label\":\"备注\",\"options\":{\"width\":\"100%\",\"minRows\":4,\"maxRows\":6,\"maxLength\":null,\"defaultValue\":\"\",\"clearable\":true,\"hidden\":false,\"disabled\":false,\"placeholder\":\"请输入\"},\"model\":\"remark\",\"key\":\"textarea_1659020414125\",\"help\":\"\",\"rules\":[{\"required\":true,\"message\":\"必填项\"}]},{\"type\":\"switch\",\"label\":\"开关\",\"options\":{\"defaultValue\":false,\"hidden\":false,\"disabled\":false},\"model\":\"switch_1662108221389\",\"key\":\"switch_1662108221389\",\"help\":\"\",\"rules\":[{\"required\":false,\"message\":\"必填项\"}]},{\"type\":\"slider\",\"label\":\"滑动输入条\",\"options\":{\"width\":\"100%\",\"defaultValue\":34,\"disabled\":false,\"hidden\":false,\"min\":0,\"max\":100,\"step\":1,\"showInput\":false},\"model\":\"cc\",\"key\":\"slider_1659020433092\",\"help\":\"\",\"rules\":[{\"required\":false,\"message\":\"必填项\"}]},{\"type\":\"table\",\"label\":\"表格布局\",\"trs\":[{\"tds\":[{\"colspan\":1,\"rowspan\":1,\"list\":[]},{\"colspan\":1,\"rowspan\":1,\"list\":[]}]},{\"tds\":[{\"colspan\":1,\"rowspan\":1,\"list\":[{\"type\":\"editor\",\"label\":\"富文本\",\"icon\":\"icon-LC_icon_edit_line_1\",\"list\":[],\"options\":{\"height\":300,\"placeholder\":\"请输入\",\"defaultValue\":\"\",\"chinesization\":true,\"hidden\":false,\"disabled\":false,\"showLabel\":false,\"width\":\"100%\"},\"model\":\"editor_1662106288134\",\"key\":\"editor_1662106288134\",\"help\":\"\",\"rules\":[{\"required\":false,\"message\":\"必填项\"}]}]},{\"colspan\":1,\"rowspan\":1,\"list\":[]}]}],\"options\":{\"width\":\"100%\",\"bordered\":true,\"bright\":false,\"small\":true,\"customStyle\":\"\"},\"key\":\"table_1662106283652\"}],\"config\":{\"layout\":\"vertical\",\"labelCol\":{\"xs\":6,\"sm\":6,\"md\":6,\"lg\":6,\"xl\":6,\"xxl\":6},\"labelWidth\":100,\"labelLayout\":\"Grid\",\"wrapperCol\":{\"xs\":18,\"sm\":18,\"md\":18,\"lg\":18,\"xl\":18,\"xxl\":18},\"hideRequiredMark\":false,\"customStyle\":\"\"}}', '测试动态表单', 1399985191002447872, '2022-07-28 22:03:36', 1414143554414059520, '2022-09-02 16:44:01', 0, 12); - - -SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file diff --git a/_config/sql/1.1.x/1.1.2/1.1.2_up_1.1.3.sql b/_config/sql/1.1.x/1.1.2/1.1.2_up_1.1.3.sql deleted file mode 100644 index d9bdc27c5b11b720533c9fa75589443dc65db12e..0000000000000000000000000000000000000000 --- a/_config/sql/1.1.x/1.1.2/1.1.2_up_1.1.3.sql +++ /dev/null @@ -1,55 +0,0 @@ -SET FOREIGN_KEY_CHECKS=0; - -ALTER TABLE `bpm_instance` ADD COLUMN `model_id` bigint(20) NULL DEFAULT NULL COMMENT '模型id' AFTER `instance_name`; - -ALTER TABLE `bpm_model_node` ADD COLUMN `or_sign` bit(1) NULL DEFAULT NULL COMMENT '是否是或签' AFTER `sequential`; - -ALTER TABLE `bpm_model_node` ADD COLUMN `ratio_pass` bit(1) NULL DEFAULT NULL COMMENT '是否比例通过' AFTER `or_sign`; - -ALTER TABLE `bpm_model_node` ADD COLUMN `pass_ratio` int(3) NULL DEFAULT NULL COMMENT '通过比例' AFTER `ratio_pass`; - -ALTER TABLE `bpm_model_node` MODIFY COLUMN `sequential` bit(1) NULL DEFAULT NULL COMMENT '是否串签' AFTER `multi`; - -ALTER TABLE `bpm_task` ADD COLUMN `multi_id` bigint(20) NULL DEFAULT NULL COMMENT '多实例关联id' AFTER `execution_id`; - -ALTER TABLE `bpm_task` ADD COLUMN `result` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '处理结果' AFTER `state`; - -ALTER TABLE `bpm_task` MODIFY COLUMN `state` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '处理状态' AFTER `node_name`; - -ALTER TABLE `bpm_task` MODIFY COLUMN `version` int(8) NOT NULL COMMENT '版本' AFTER `last_modified_time`; - -INSERT INTO `base_dict`(`id`, `code`, `name`, `group_tag`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1570343684024705024, 'BpmTaskResult', '流程任务处理结果', '工作流', '', 1399985191002447872, '2022-09-15 17:28:05', 1399985191002447872, '2022-09-15 17:28:05', 0, 0); - -INSERT INTO `base_dict`(`id`, `code`, `name`, `group_tag`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1570764395519111168, 'BpmInstanceState', '流程实例状态', '工作流', '', 1399985191002447872, '2022-09-16 21:19:50', 1399985191002447872, '2022-09-16 21:19:50', 0, 0); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1570343731634249728, 1570343684024705024, 'BpmTaskResult', 'pass', '通过', 0.00, '', 1399985191002447872, '2022-09-15 17:28:16', 1399985191002447872, '2022-09-15 17:28:16', 0, 0); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1570343761636106240, 1570343684024705024, 'BpmTaskResult', 'notPass', '不通过', 0.00, '', 1399985191002447872, '2022-09-15 17:28:23', 1399985191002447872, '2022-09-15 17:28:23', 0, 0); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1570343788056027136, 1570343684024705024, 'BpmTaskResult', 'abstain', '弃权', 0.00, '', 1399985191002447872, '2022-09-15 17:28:29', 1399985191002447872, '2022-09-15 17:28:29', 0, 0); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1570343826018672640, 1570343684024705024, 'BpmTaskResult', 'reject', '驳回', 0.00, '', 1399985191002447872, '2022-09-15 17:28:38', 1399985191002447872, '2022-09-15 17:28:38', 0, 0); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1570343873737269248, 1570343684024705024, 'BpmTaskResult', 'back', '退回', 0.00, '', 1399985191002447872, '2022-09-15 17:28:50', 1399985191002447872, '2022-09-15 17:28:50', 0, 0); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1570343913918701568, 1570343684024705024, 'BpmTaskResult', 'retrieve', '取回', 0.00, '', 1399985191002447872, '2022-09-15 17:28:59', 1399985191002447872, '2022-09-15 17:28:59', 0, 0); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1570685888076120064, 1570343684024705024, 'BpmTaskResult', 'autoFinish', '自动完成', 0.00, '', 1399985191002447872, '2022-09-16 16:07:52', 1399985191002447872, '2022-09-16 16:08:02', 0, 1); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1570764765255397376, 1570764395519111168, 'BpmInstanceState', 'running', '运行中', 0.00, '', 1399985191002447872, '2022-09-16 21:21:18', 1399985191002447872, '2022-09-16 21:21:18', 0, 0); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1570764802047832064, 1570764395519111168, 'BpmInstanceState', 'finish', '已完成', 0.00, '', 1399985191002447872, '2022-09-16 21:21:27', 1399985191002447872, '2022-09-16 21:21:27', 0, 0); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1570764836319490048, 1570764395519111168, 'BpmInstanceState', 'cancel', '取消', 0.00, '', 1399985191002447872, '2022-09-16 21:21:35', 1399985191002447872, '2022-09-16 21:21:35', 0, 0); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1570784215744585728, 1570343684024705024, 'BpmTaskResult', 'cancel', '取消', 0.00, '', 1399985191002447872, '2022-09-16 22:38:35', 1399985191002447872, '2022-09-16 22:38:35', 0, 0); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1570784331511570432, 1567091641298386944, 'BpmTaskState', 'cancel', '取消', 0.00, '', 1399985191002447872, '2022-09-16 22:39:03', 1399985191002447872, '2022-09-16 22:39:03', 0, 0); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1571023702122766336, 'admin', 1562460770753544192, '未处理任务', 'BpmTodoTask', NULL, b'0', '', b'0', b'0', 'bpm/task/TodoTaskList', NULL, '/bpm/todo', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-09-17 14:30:13', 1399985191002447872, '2022-09-17 14:31:23', 2, 0); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1571023925834358784, 'admin', 1562460770753544192, '已处理任务', 'BpmDoneTask', NULL, b'0', '', b'0', b'0', 'bpm/task/DoneTaskList', NULL, '/bpm/done', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-09-17 14:31:07', 1399985191002447872, '2022-09-17 14:31:07', 0, 0); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1571024250171498496, 'admin', 1562460770753544192, '流程实例', 'BpmInstance', NULL, b'0', '', b'0', b'0', 'bpm/instance/InstanceList', NULL, '/bpm/instance', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-09-17 14:32:24', 1399985191002447872, '2022-09-17 14:32:24', 0, 0); - -SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file diff --git a/_config/sql/1.1.x/1.1.3/1.1.3_up_1.1.4.sql b/_config/sql/1.1.x/1.1.3/1.1.3_up_1.1.4.sql deleted file mode 100644 index 2a24619809a918cb74e3f2e33d8705105661effd..0000000000000000000000000000000000000000 --- a/_config/sql/1.1.x/1.1.3/1.1.3_up_1.1.4.sql +++ /dev/null @@ -1,43 +0,0 @@ -SET FOREIGN_KEY_CHECKS=0; - -CREATE TABLE `base_dynamic_data_source` ( - `id` bigint(20) NOT NULL, - `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '数据源编码', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '数据源名称', - `database_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '数据库类型', - `db_driver` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '驱动类', - `db_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '数据库地址', - `db_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '数据库名称', - `db_username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '用户名', - `db_password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '密码', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '动态数据源管理' ROW_FORMAT = Dynamic; - - - -INSERT INTO `base_dict_item` VALUES (1573665422392098816, 1439961232651034624, 'MessageTemplateCode', '0', '站内信', -11.00, 'SITE', 1399985191002447872, '2022-09-24 21:27:29', 1399985191002447872, '2022-09-24 21:27:39', 0, 1); - -INSERT INTO `iam_perm_menu` VALUES (1573669546890297344, 'admin', 1552207982510706688, '动态数据源', 'DynamicSource', NULL, b'0', '', b'0', b'0', 'develop/dynamicsource/DynamicDataSourceList', NULL, '/develop/source', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-09-24 21:43:52', 1399985191002447872, '2022-09-24 21:43:52', 0, 0); - -INSERT INTO `notice_message_template` VALUES (1573951326893510656, 'BpmTaskCreated', '流程任务创建事件', '流程任务创建事件', 0, '', 1399985191002447872, '2022-09-25 16:23:34', 1399985191002447872, '2022-09-25 16:23:34', 0, 0); - -INSERT INTO `notice_message_template` VALUES (1573951515616219136, 'BpmTaskAssignCreated', '流程任务更改处理人事件(新处理人)', '流程任务更改处理人事件(新处理人)', 0, '', 1399985191002447872, '2022-09-25 16:24:19', 1399985191002447872, '2022-09-25 16:27:09', 1, 0); - -INSERT INTO `notice_message_template` VALUES (1573952505056727040, 'BpmTaskAssignCancel', '流程任务更改处理人事件(原处理人)', '流程任务更改处理人事件(原处理人)', 0, '', 1399985191002447872, '2022-09-25 16:28:14', 1399985191002447872, '2022-09-25 16:28:14', 0, 0); - -INSERT INTO `notice_message_template` VALUES (1573952568654958592, 'BpmTaskCancel', '流程任务取消事件', '流程任务取消事件', 0, '', 1399985191002447872, '2022-09-25 16:28:30', 1399985191002447872, '2022-09-25 16:28:30', 0, 0); - -INSERT INTO `notice_message_template` VALUES (1573952621826150400, 'BpmTaskReject', '流程任务驳回事件', '流程任务驳回事件', 0, '', 1399985191002447872, '2022-09-25 16:28:42', 1399985191002447872, '2022-09-25 16:28:42', 0, 0); - -INSERT INTO `notice_message_template` VALUES (1573952709432578048, 'BpmInstanceCompleted', '流程完成时通知发起人', '流程完成时通知发起人', 0, '', 1399985191002447872, '2022-09-25 16:29:03', 1399985191002447872, '2022-09-25 16:29:03', 0, 0); - -INSERT INTO `notice_message_template` VALUES (1573952762507300864, 'BpmInstanceCancel', '流程取消时通知发起人', '流程取消时通知发起人', 0, '', 1399985191002447872, '2022-09-25 16:29:16', 1399985191002447872, '2022-09-25 16:29:16', 0, 0); - -SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file diff --git a/_config/sql/1.1.x/1.1.4/1.1.4_up_1.1.5.sql b/_config/sql/1.1.x/1.1.4/1.1.4_up_1.1.5.sql deleted file mode 100644 index af13f4fb74589cc01d2fc656a283ea98ccced0a9..0000000000000000000000000000000000000000 --- a/_config/sql/1.1.x/1.1.4/1.1.4_up_1.1.5.sql +++ /dev/null @@ -1,7 +0,0 @@ -SET FOREIGN_KEY_CHECKS = 0; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1431152689832525824, `title` = '审计日志', `name` = 'auditLog', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/system/log', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-25 17:29:09', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-10-07 12:57:05', `version` = 1, `deleted` = 0 WHERE `id` = 1452567897717321728; -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = NULL, `title` = '商品管理', `name` = 'GoodsManager', `perm_code` = NULL, `effect` = b'0', `icon` = 'car', `hidden` = b'1', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/goods', `redirect` = '', `sort_no` = 0, `menu_type` = 0, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-05-10 11:01:40', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-10-07 12:38:50', `version` = 2, `deleted` = 0 WHERE `id` = 1523860792695283712; -INSERT INTO `notice_message_template` VALUES (1580083314274070528, 'BpmTaskBack', '流程任务回退事件', '流程任务驳回事件', 0, '', 1399985191002447872, '2022-10-12 14:29:53', 1399985191002447872, '2022-10-12 14:30:11', 1, 0); - -SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/_config/sql/1.1.x/1.1.5/1.1.5_up_1.1.6.sql b/_config/sql/1.1.x/1.1.5/1.1.5_up_1.1.6.sql deleted file mode 100644 index 85c6f783112f1eadc4f3595965f6ba323068eaa8..0000000000000000000000000000000000000000 --- a/_config/sql/1.1.x/1.1.5/1.1.5_up_1.1.6.sql +++ /dev/null @@ -1,174 +0,0 @@ -SET FOREIGN_KEY_CHECKS = 0; - -UPDATE `base_dict` SET `code` = 'BpmTaskResult', `name` = '流程任务处理结果', `group_tag` = '工作流', `remark` = '流程任务处理结果', `creator` = 1399985191002447872, `create_time` = '2022-09-15 17:28:05', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-10-19 23:13:40', `deleted` = 0, `version` = 1 WHERE `id` = 1570343684024705024; - -UPDATE `base_dict` SET `code` = 'BpmInstanceState', `name` = '流程实例状态', `group_tag` = '工作流', `remark` = '流程实例状态', `creator` = 1399985191002447872, `create_time` = '2022-09-16 21:19:50', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-10-19 23:13:33', `deleted` = 0, `version` = 1 WHERE `id` = 1570764395519111168; - -INSERT INTO `iam_client`(`id`, `code`, `name`, `system`, `enable`, `login_type_ids`, `description`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1580487061605175296, 'adminv3', 'pc管理端(vue3版)', b'0', b'1', '1430430071299207168,1430478946919653376,1435138582839009280,1542091599907115008,1542804450312122368,1543126042909016064', 'vue3版本', 1399985191002447872, '2022-10-13 17:14:14', 1399985191002447872, '2022-10-13 17:14:25', 1, 0); - -UPDATE `iam_login_type` SET `code` = 'password', `name` = '账号密码登陆', `type` = 'password', `system` = b'1', `timeout` = 3600, `captcha` = b'1', `pwd_err_num` = -1, `enable` = b'1', `description` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-25 15:21:20', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-11-02 21:32:48', `version` = 19, `deleted` = 0 WHERE `id` = 1430430071299207168; - -UPDATE `iam_login_type` SET `code` = 'weChat', `name` = '微信登录', `type` = 'openId', `system` = b'0', `timeout` = 5, `captcha` = b'0', `pwd_err_num` = -1, `enable` = b'1', `description` = '', `creator` = 1399985191002447872, `create_time` = '2022-07-02 14:54:53', `last_modifier` = 0, `last_modified_time` = '2022-10-12 22:15:05', `version` = 2, `deleted` = 0 WHERE `id` = 1543126042909016064; - -UPDATE `iam_user_expand_info` SET `sex` = 1, `birthday` = '1996-12-01', `avatar` = '1495331905770315776', `last_login_time` = '2022-10-29 08:44:52', `current_login_time` = '2022-11-02 09:59:06', `initial_password` = b'0', `last_change_password_time` = '2022-06-19 21:25:00', `creator` = 1, `create_time` = '2021-06-02 15:04:15', `last_modifier` = 0, `last_modified_time` = '2022-11-02 09:59:06', `version` = 367, `deleted` = 0 WHERE `id` = 1399985191002447872; - -UPDATE `iam_user_expand_info` SET `sex` = 1, `birthday` = '2022-10-31', `avatar` = '1586953599627546624', `last_login_time` = '2022-11-02 21:32:23', `current_login_time` = '2022-11-02 21:33:21', `initial_password` = b'0', `last_change_password_time` = NULL, `creator` = 1, `create_time` = '2021-07-11 16:44:32', `last_modifier` = 0, `last_modified_time` = '2022-11-02 21:33:21', `version` = 62, `deleted` = 0 WHERE `id` = 1414143554414059520; - -UPDATE `iam_user_expand_info` SET `sex` = 1, `birthday` = NULL, `avatar` = NULL, `last_login_time` = '2022-09-16 16:48:16', `current_login_time` = '2022-09-17 17:20:58', `initial_password` = b'0', `last_change_password_time` = '2022-06-29 00:39:23', `creator` = 1399985191002447872, `create_time` = '2021-09-09 17:14:54', `last_modifier` = 0, `last_modified_time` = '2022-09-17 17:20:58', `version` = 5, `deleted` = 0 WHERE `id` = 1435894470432456704; - -UPDATE `iam_user_info` SET `name` = '小小明1995', `username` = 'xxm1995', `password` = 'f52020dca765fd3943ed40a615dc2c5c', `phone` = '13000000000', `email` = 'xxm1995@foxmail.com', `client_ids` = NULL, `avatar` = NULL, `source` = NULL, `admin` = b'1', `register_time` = '2021-07-11 16:44:31', `status` = 1, `creator` = 1, `create_time` = '2021-07-11 16:44:32', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-10-31 13:30:07', `version` = 5, `deleted` = 0 WHERE `id` = 1414143554414059520; - -UPDATE `iam_user_info` SET `name` = '管理员', `username` = 'admin', `password` = 'f52020dca765fd3943ed40a615dc2c5c', `phone` = '13000001111', `email` = 'admin@qq.com', `client_ids` = '1430430071299207168', `avatar` = '', `source` = NULL, `admin` = b'0', `register_time` = '2021-09-09 17:14:52', `status` = 1, `creator` = 1399985191002447872, `create_time` = '2021-09-09 17:14:54', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-09-16 16:41:51', `version` = 7, `deleted` = 0 WHERE `id` = 1435894470432456704; - - -INSERT INTO `iam_perm_menu` VALUES (1580740450633101312, 'adminv3', NULL, '系统管理', 'System', NULL, b'0', 'ant-design:setting-outlined', b'0', b'0', 'Layout', NULL, '/system', '/system1/client', -99999, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-10-14 10:01:07', 1414143554414059520, '2022-10-18 15:32:09', 4, 0); - -INSERT INTO `iam_perm_menu` VALUES (1580740637841666048, 'adminv3', 1582253306356649984, '终端管理', 'ClientList', NULL, b'0', '', b'0', b'0', '/modules/system/client/ClientList.vue', NULL, '/system/client', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-10-14 10:01:51', 1414143554414059520, '2022-10-18 14:13:27', 5, 0); - -INSERT INTO `iam_perm_menu` VALUES (1580740758629232640, 'adminv3', 1582253306356649984, '登录方式', 'LoginTypeList', NULL, b'0', '', b'0', b'0', '/modules/system/loginType/LoginTypeList.vue', NULL, '/system/loginType', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-10-14 10:02:20', 1414143554414059520, '2022-10-18 14:13:40', 5, 0); - -INSERT INTO `iam_perm_menu` VALUES (1580858583654051840, 'adminv3', 1580740450633101312, '测试Iframe', 'Iframe', NULL, b'0', '', b'0', b'0', 'Iframe', NULL, '/system/Iframe', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-10-14 17:50:32', 1414143554414059520, '2022-10-17 17:46:19', 5, 1); - -INSERT INTO `iam_perm_menu` VALUES (1580917438227075072, 'adminv3', 1580740450633101312, '三极目录', 'hello', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/system1/a', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-10-14 21:44:24', 1399985191002447872, '2022-10-14 23:38:16', 2, 1); - -INSERT INTO `iam_perm_menu` VALUES (1580917571069071360, 'adminv3', 1580917438227075072, '百度', 'baidu', NULL, b'0', '', b'0', b'0', '', NULL, 'https://www.baidu.com/', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-10-14 21:44:56', 1399985191002447872, '2022-10-14 23:37:44', 3, 1); - -INSERT INTO `iam_perm_menu` VALUES (1580928436300337152, 'adminv3', 1580740450633101312, '菜单管理', 'MenuList', NULL, b'0', '', b'0', b'0', '/modules/system/menu/MenuList.vue', NULL, '/system/menu', '', -99, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-10-14 22:28:06', 1399985191002447872, '2022-10-14 22:28:32', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1582249924602580992, 'adminv3', 1580740450633101312, '权限管理', 'Permission', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/system/permission', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 13:59:13', 1414143554414059520, '2022-10-18 13:59:13', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1582253011803262976, 'adminv3', 1580740450633101312, '用户信息', 'UserAuth', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/system/user', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 14:11:30', 1414143554414059520, '2022-10-18 14:11:30', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1582253152903843840, 'adminv3', 1580740450633101312, '系统配置', 'SystemConfig', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/system/config', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 14:12:03', 1414143554414059520, '2022-10-18 14:12:03', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1582253306356649984, 'adminv3', 1580740450633101312, '认证管理', 'Auth', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/system/auth', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 14:12:40', 1414143554414059520, '2022-10-18 14:13:13', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1582274981055909888, 'adminv3', NULL, '个人办公', 'Person', NULL, b'0', 'ant-design:align-right-outlined', b'0', b'0', 'Layout', NULL, '/person', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:38:47', 1414143554414059520, '2022-10-18 15:38:47', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1582275875424129024, 'adminv3', NULL, '系统监控', 'Monitor', NULL, b'0', 'ant-design:monitor-outlined', b'0', b'0', 'Layout', NULL, '/monitor', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:42:21', 1414143554414059520, '2022-10-19 17:29:29', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1582275984849326080, 'adminv3', NULL, '通知管理', 'Notice', NULL, b'0', 'ant-design:message-outlined', b'0', b'0', 'Layout', NULL, '/notice', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:42:47', 1414143554414059520, '2022-10-19 17:30:06', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1582276092038959104, 'adminv3', NULL, '第三方对接', 'Third', NULL, b'0', 'ant-design:api-twotone', b'0', b'0', 'Layout', NULL, '/third', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:43:12', 1414143554414059520, '2022-10-19 17:32:04', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1582276184120709120, 'adminv3', NULL, '支付管理', 'PayManager', NULL, b'0', 'ant-design:pay-circle-outlined', b'0', b'0', 'Layout', NULL, '/payment', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:43:34', 1414143554414059520, '2022-10-19 17:31:46', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1582276341792985088, 'adminv3', NULL, '开发管理', 'Develop', NULL, b'0', 'ant-design:apartment-outlined', b'0', b'0', 'Layout', NULL, '/develop', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:44:12', 1414143554414059520, '2022-10-19 15:24:22', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1582276447602692096, 'adminv3', NULL, '流程管理', 'Bpm', NULL, b'0', 'ant-design:file-protect-outlined', b'0', b'0', 'Layout', NULL, '/bpm', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:44:37', 1414143554414059520, '2022-10-19 17:34:11', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1582276516905177088, 'adminv3', NULL, '功能演示', 'Demo', NULL, b'0', 'ant-design:appstore-twotone', b'0', b'0', 'Layout', NULL, '/demo', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:44:54', 1414143554414059520, '2022-10-19 17:34:26', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1582277076421136384, 'adminv3', 1582249924602580992, '角色管理', 'RoleList', NULL, b'0', '', b'0', b'0', '/modules/system/role/RoleList.vue', NULL, '/system/permission/role', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:47:07', 1414143554414059520, '2022-10-18 15:59:37', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1582301940364308480, 'adminv3', 1582249924602580992, '请求权限管理', 'PermPathList', NULL, b'0', '', b'0', b'0', '/modules/system/path/PermPathList.vue', NULL, '/system/permission/path', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 17:25:55', 1414143554414059520, '2022-10-18 20:41:22', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1582302180999917568, 'adminv3', 1582249924602580992, '数据范围权限', 'DataScopeList', NULL, b'0', '', b'0', b'0', '/modules/system/scope/DataScopeList.vue', NULL, '/system/permission/scope', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 17:26:52', 1414143554414059520, '2022-10-18 17:26:52', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1582302542955769856, 'adminv3', 1582253011803262976, '用户管理', 'UserList', NULL, b'0', '', b'0', b'0', '/modules/system/user/UserList.vue', NULL, '/system/user/info', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 17:28:19', 1414143554414059520, '2022-10-18 17:28:19', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1582302764129808384, 'adminv3', 1582253011803262976, '部门管理', 'DeptList', NULL, b'0', '', b'0', b'0', '/modules/system/dept/DeptList.vue', NULL, '/system/user/dept', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 17:29:11', 1414143554414059520, '2022-10-18 17:32:26', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1582303143110340608, 'adminv3', 1582253152903843840, '数据字典', 'DictList', NULL, b'0', '', b'0', b'0', '/modules/system/translate/DictList.vue', NULL, '/system/config/translate', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 17:30:42', 1414143554414059520, '2022-10-18 17:30:42', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1582303290070364160, 'adminv3', 1582253152903843840, '定时任务', 'QuartzJobList', NULL, b'0', '', b'0', b'0', '/modules/system/quartz/QuartzJobList.vue', NULL, '/system/config/quartz', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 17:31:17', 1414143554414059520, '2022-10-18 17:32:12', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1582303447428067328, 'adminv3', 1582253152903843840, '系统参数', 'SystemParamList', NULL, b'0', '', b'0', b'0', '/modules/system/param/SystemParamList.vue', NULL, '/system/config/param', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 17:31:54', 1414143554414059520, '2022-10-19 23:14:16', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1582632873244172288, 'adminv3', 1582276341792985088, '文件管理', 'FileUploadList', NULL, b'0', '', b'0', b'0', '/modules/develop/file/FileUploadList.vue', NULL, '/develop/file', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-19 15:20:56', 1414143554414059520, '2022-10-19 15:20:56', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1582633196587261952, 'adminv3', 1582276341792985088, '代码生成', 'CodeGenList', NULL, b'0', '', b'0', b'0', '/modules/develop/codegen/CodeGenList.vue', NULL, '/develop/codegen', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-19 15:22:13', 1414143554414059520, '2022-10-19 15:23:17', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1582633307786649600, 'adminv3', 1582276341792985088, '动态表单', 'DynamicFormList', NULL, b'0', '', b'0', b'0', '/modules/develop/dynamicform/DynamicFormList.vue', NULL, '/develop/form', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-19 15:22:39', 1414143554414059520, '2022-10-19 15:22:39', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1582633620321017856, 'adminv3', 1582276341792985088, '动态数据源', 'DynamicDataSourceList', NULL, b'0', '', b'0', b'0', '/modules/develop/dynamicsource/DynamicDataSourceList.vue', NULL, '/develop/source', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-19 15:23:54', 1414143554414059520, '2022-10-19 15:23:54', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1583074308040925184, 'adminv3', 1582275875424129024, '接口文档', 'ApiSwagger', NULL, b'0', '', b'0', b'0', '', NULL, 'http://127.0.0.1:9999/doc.html', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:35:02', 1414143554414059520, '2022-10-20 20:35:02', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1583075229563068416, 'adminv3', 1582275875424129024, '审计日志', 'AuditLog', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/monitor/log', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:38:42', 1414143554414059520, '2022-10-20 20:41:38', 2, 0); - -INSERT INTO `iam_perm_menu` VALUES (1583076217481043968, 'adminv3', 1583075229563068416, '登录日志', 'LoginLogList', NULL, b'0', '', b'0', b'0', '/modules/monitor/login/LoginLogList.vue', NULL, '/monitor/log/login', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:42:37', 1414143554414059520, '2022-10-20 20:43:36', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1583076424935514112, 'adminv3', 1583075229563068416, '操作日志', 'OperateLogList', NULL, b'0', '', b'0', b'0', '/modules/monitor/operate/OperateLogList.vue', NULL, '/monitor/log/operate', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:43:26', 1414143554414059520, '2022-10-20 20:43:26', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1583076670881112064, 'adminv3', 1583075229563068416, '数据版本日志', 'DataVersionLogList', NULL, b'0', '', b'0', b'0', '/modules/monitor/data/DataVersionLogList.vue', NULL, '/monitor/log/data', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:44:25', 1414143554414059520, '2022-10-20 20:44:25', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1583076878956339200, 'adminv3', 1582275875424129024, 'ELK日志', 'ELK', NULL, b'0', '', b'0', b'0', '', NULL, 'http://elk.dev.bootx.cn:5601/app/discover', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:45:15', 1414143554414059520, '2022-10-20 20:45:15', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1583077015434797056, 'adminv3', 1582275875424129024, 'PlumeLog日志', 'PlumeLog', NULL, b'0', '', b'0', b'0', '', NULL, 'http://127.0.0.1:9999/plumelog/#/', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:45:47', 1414143554414059520, '2022-10-20 20:45:47', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1583077198772019200, 'adminv3', 1582275875424129024, '系统信息', 'SystemInfoMonitor', NULL, b'0', '', b'0', b'0', '/modules/monitor/system/SystemInfoMonitor.vue', NULL, '/monitor/sysinfo', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:46:31', 1414143554414059520, '2022-10-20 20:46:31', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1583077360827342848, 'adminv3', 1582275875424129024, 'Redis监控', 'RedisInfoMonitor', NULL, b'0', '', b'0', b'0', '/modules/monitor/redis/RedisInfoMonitor.vue', NULL, '/monitor/redis', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:47:10', 1414143554414059520, '2022-10-20 20:47:10', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584378294652051456, 'adminv3', 1582275984849326080, '邮件配置', 'MailConfigList', NULL, b'0', '', b'0', b'0', '/modules/notice/mail/MailConfigList.vue', NULL, '/notice/notice', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 10:56:36', 1414143554414059520, '2022-10-24 16:14:34', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584378497824137216, 'adminv3', 1582275984849326080, '消息模板', 'MessageTemplateList', NULL, b'0', '', b'0', b'0', '/modules/notice/template/MessageTemplateList.vue', NULL, '/notice/template', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 10:57:25', 1414143554414059520, '2022-10-25 22:14:14', 2, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584378671266996224, 'adminv3', 1582275984849326080, '站内信', 'SiteMessageList', NULL, b'0', '', b'0', b'0', '/modules/notice/site/sender/SiteMessageList.vue', NULL, '/notice/siteMessage', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 10:58:06', 1414143554414059520, '2022-10-24 10:58:06', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584379602188574720, 'adminv3', 1582276092038959104, '微信', 'WeChat', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/third/wechat', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:01:48', 1414143554414059520, '2022-10-24 11:01:48', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584379704122744832, 'adminv3', 1582276092038959104, '企业微信', 'WeCom', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/third/wecom', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:02:12', 1414143554414059520, '2022-10-24 11:02:12', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584380087805091840, 'adminv3', 1582276092038959104, '钉钉', 'DingTalk', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/third/dingtalk', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:03:44', 1414143554414059520, '2022-10-24 11:03:44', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584380527829524480, 'adminv3', 1584379602188574720, '消息模板', 'WechatTemplateList', NULL, b'0', '', b'0', b'0', '/modules/third/wechat/template/WechatTemplateList.vue', NULL, '/third/wechat/template', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:05:29', 1414143554414059520, '2022-10-26 15:58:56', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584380679478779904, 'adminv3', 1584379602188574720, '自定义菜单', 'WechatMenuList', NULL, b'0', '', b'0', b'0', '/modules/third/wechat/menu/WechatMenuList.vue', NULL, '/third/wechat/menu', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:06:05', 1414143554414059520, '2022-10-27 10:15:24', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584380824308097024, 'adminv3', 1584379602188574720, '素材管理', 'WechatMediaList', NULL, b'0', '', b'0', b'0', '/modules/third/wechat/media/WechatMediaList.vue', NULL, '/third/wechat/media', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:06:40', 1414143554414059520, '2022-10-27 16:38:47', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584381134950834176, 'adminv3', 1584379704122744832, '企微机器人', 'WeComRobotConfigList', NULL, b'0', '', b'0', b'0', '/modules/third/wecom/robot/WeComRobotConfigList.vue', NULL, '/third/wecom/robot', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:07:54', 1414143554414059520, '2022-10-24 11:07:54', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584381322184564736, 'adminv3', 1584380087805091840, '钉钉机器人', 'DingRobotConfigList', NULL, b'0', '', b'0', b'0', '/modules/third/dingtalk/robot/DingRobotConfigList.vue', NULL, '/third/dingTalk/robot', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:08:38', 1414143554414059520, '2022-10-24 11:08:38', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584381477986181120, 'adminv3', 1584380087805091840, '钉钉配置', 'DingRobotConfigList', NULL, b'0', '', b'0', b'0', '/modules/third/dingtalk/config/DingTalkConfigList.vue', NULL, '/third/dingtalk/config', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:09:15', 1414143554414059520, '2022-10-24 11:09:15', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584381848238366720, 'adminv3', 1582274981055909888, '我的消息', 'SiteMessageList', NULL, b'0', '', b'0', b'0', '/modules/notice/site/receive/SiteMessageList.vue', NULL, '/person/siteMessage', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:10:44', 1414143554414059520, '2022-10-24 11:10:44', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584381976508571648, 'adminv3', 1582274981055909888, '待办任务', 'MyTodoList', NULL, b'0', '', b'0', b'0', '/modules/office/mytodo/MyTodoList.vue', NULL, '/person/todo', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:11:14', 1414143554414059520, '2022-10-24 11:11:14', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584382091327643648, 'adminv3', 1582274981055909888, '已办任务', 'MyDoneList', NULL, b'0', '', b'0', b'0', '/modules/office/mydone/MyDoneList.vue', NULL, '/person/done', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:11:42', 1414143554414059520, '2022-10-24 11:12:29', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584382258307080192, 'adminv3', 1582274981055909888, '我的发起', 'MyApplyList', NULL, b'0', '', b'0', b'0', '/modules/office/myapply/MyApplyList.vue', NULL, '/person/myApply', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:12:21', 1414143554414059520, '2022-10-24 11:12:21', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584382569381830656, 'adminv3', 1582276184120709120, '支付通道', 'PayChannel', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/payment/channel', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:13:36', 1414143554414059520, '2022-10-24 11:13:36', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584382723186958336, 'adminv3', 1582276184120709120, '支付订单', 'PayOrder', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/payment/order', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:14:12', 1414143554414059520, '2022-10-24 11:14:12', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584382815407120384, 'adminv3', 1582276184120709120, '回调记录', 'PayNotify', NULL, b'0', '', b'0', b'0', '/modules/payment/notify/PayNotifyRecordList', NULL, '/payment/notify', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:14:34', 1414143554414059520, '2022-10-24 11:23:17', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584383492338425856, 'adminv3', 1582276184120709120, '钱包管理', 'Wallet', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/payment/wallet', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:17:16', 1414143554414059520, '2022-10-24 11:17:16', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584383640942616576, 'adminv3', 1582276184120709120, '储值卡', 'Voucher', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/payment/voucher', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:17:51', 1414143554414059520, '2022-10-24 11:17:51', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584383859121922048, 'adminv3', 1584382569381830656, '支付宝', 'AliPayConfigList', NULL, b'0', '', b'0', b'0', '/modules/payment/channel/alipay/AliPayConfigList.vue', NULL, '/payment/channel/alipay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:18:43', 1414143554414059520, '2022-10-24 11:18:43', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584384015338774528, 'adminv3', 1584382569381830656, '微信支付', 'WeChatConfigList', NULL, b'0', '', b'0', b'0', '/modules/payment/channel/wechat/WeChatConfigList.vue', NULL, '/payment/channel/wechat', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:19:20', 1414143554414059520, '2022-10-24 11:19:20', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584384160574939136, 'adminv3', 1584382569381830656, '云闪付', 'WeChatConfigList', NULL, b'0', '', b'0', b'0', '/modules/payment/channel/unionpay/UnionPayConfigList.vue', NULL, '/payment/channel/unionpay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:19:55', 1414143554414059520, '2022-10-24 11:19:55', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584384526511185920, 'adminv3', 1584382723186958336, '支付订单', 'PaymentList', NULL, b'0', '', b'0', b'0', '/modules/payment/order/payment/PaymentList.vue', NULL, '/payment/order/payment', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:21:22', 1414143554414059520, '2022-10-24 11:21:22', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1584384752940687360, 'adminv3', 1584382723186958336, '退款订单', 'ReturnOrder', NULL, b'0', '', b'0', b'0', '/modules/payment/order/refund/RefundRecordList.vue', NULL, '/payment/order/return', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:22:16', 1414143554414059520, '2022-10-24 11:22:16', 0, 0); - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1431152689832525824, `title` = '接口文档', `name` = 'ApiSwagger', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '', `component_name` = NULL, `path` = 'http://127.0.0.1:9999/doc.html', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = b'1', `keep_alive` = b'1', `target_outside` = b'1', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-27 15:15:25', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-10-14 17:47:12', `version` = 18, `deleted` = 0 WHERE `id` = 1431153358157348864; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1452567897717321728, `title` = '登录日志', `name` = 'LoginLog', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'starter/log/LoginLogList', `component_name` = NULL, `path` = '/monitor/log/loginLog', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-09-07 15:31:31', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-10-20 20:38:06', `version` = 6, `deleted` = 0 WHERE `id` = 1435143678721236992; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1452567897717321728, `title` = '操作日志', `name` = 'OperateLog', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'starter/log/OperateLogList', `component_name` = NULL, `path` = '/monitor/log/OperateLog', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-09-08 13:33:04', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-10-20 20:38:12', `version` = 8, `deleted` = 0 WHERE `id` = 1435476255797624832; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1431152689832525824, `title` = '审计日志', `name` = 'auditLog', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'RouteView', `component_name` = NULL, `path` = '/monitor/log', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-10-25 17:29:09', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-10-20 20:37:46', `version` = 2, `deleted` = 0 WHERE `id` = 1452567897717321728; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1452567897717321728, `title` = '数据版本日志', `name` = 'DataVersionLog', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'starter/log/DataVersionLogList', `component_name` = NULL, `path` = '/monitor/log/DataVersionLog', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-01-11 17:51:54', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-10-20 20:38:18', `version` = 1, `deleted` = 0 WHERE `id` = 1480839877352476672; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1537732440632524800, `title` = '我的消息', `name` = 'PersonSiteMessage', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'notice/site/receive/SiteMessageList', `component_name` = NULL, `path` = '/person/siteMessage', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-06-17 17:48:03', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-10-24 11:10:35', `version` = 4, `deleted` = 0 WHERE `id` = 1537733801860333568; - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1450821877831254016, `title` = '企微机器人', `name` = 'WeComRobot', `perm_code` = '', `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = 'third/wecom/robot/WeComRobotConfigList', `component_name` = NULL, `path` = '/third/wecom/robot', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-07-26 13:36:22', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-10-24 11:07:27', `version` = 3, `deleted` = 0 WHERE `id` = 1551803592828932096; - -INSERT INTO `notice_mail_config`(`id`, `code`, `name`, `host`, `port`, `username`, `password`, `sender`, `from_`, `activity`, `security_type`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1554739296333955072, 'fox', 'foxmail邮箱', 'smtp.qq.com', 465, 'sJfAJDDviYlqZ3BtdjMZF8V5jVSYCaMa9DNdVGDbe/s=', '7AtgVwObaO7wrsRpLvKkoo5O+udeEcFP1ONq4gYwOj0=', 'bootx-platform平台', 'xxm1995@foxmail.com', 1, 3, 1399985191002447872, '2022-08-03 16:01:49', 1399985191002447872, '2022-08-03 16:14:55', 0, 8); - -INSERT INTO `notice_mail_config`(`id`, `code`, `name`, `host`, `port`, `username`, `password`, `sender`, `from_`, `activity`, `security_type`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1584814372311744512, '11', '22', '33', 465, 'pwfAgEMJjGLjbVYEcgdXzA==', 'f3zJMwbPGmNRlNXpN5AMyA==', '666', '33333333@foxmail.com', 0, 1, 1414143554414059520, '2022-10-25 15:49:25', 1414143554414059520, '2022-10-25 16:27:12', 0, 10); - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/_config/sql/1.1.x/1.1.6/1.1.6_up_1.1.7.sql b/_config/sql/1.1.x/1.1.6/1.1.6_up_1.1.7.sql deleted file mode 100644 index 730c8bd9090b97f1546a038e43e5f4c31b6937de..0000000000000000000000000000000000000000 --- a/_config/sql/1.1.x/1.1.6/1.1.6_up_1.1.7.sql +++ /dev/null @@ -1 +0,0 @@ -# 无sql更新 \ No newline at end of file diff --git a/_config/sql/1.1.x/1.1.7/1.1.7_up_1.1.8.sql b/_config/sql/1.1.x/1.1.7/1.1.7_up_1.1.8.sql deleted file mode 100644 index 77a607e2c34719bbbd37a01de3ddb1881573a1d0..0000000000000000000000000000000000000000 --- a/_config/sql/1.1.x/1.1.7/1.1.7_up_1.1.8.sql +++ /dev/null @@ -1,89 +0,0 @@ -SET FOREIGN_KEY_CHECKS = 0; - -INSERT INTO `base_dict`(`id`, `code`, `name`, `group_tag`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1589527951317389312, 'DataScopePerm', '数据范围权限', '系统属性', '数据范围权限', 1414143554414059520, '2022-11-07 15:59:30', 1414143554414059520, '2022-11-07 16:00:27', 0, 1); - -INSERT INTO `base_dict_item` VALUES (1589528254477488128, 1589527951317389312, 'DataScopePerm', '7', '所在及下级部门', 0.00, '', 1414143554414059520, '2022-11-07 16:00:43', 1414143554414059520, '2022-11-07 16:00:43', 0, 0); - -INSERT INTO `base_dict_item` VALUES (1589528283539820544, 1589527951317389312, 'DataScopePerm', '6', '所在部门', 0.00, '', 1414143554414059520, '2022-11-07 16:00:49', 1414143554414059520, '2022-11-07 16:00:49', 0, 0); - -INSERT INTO `base_dict_item` VALUES (1589528315672383488, 1589527951317389312, 'DataScopePerm', '5', '全部数据', 0.00, '', 1414143554414059520, '2022-11-07 16:00:57', 1414143554414059520, '2022-11-07 16:00:57', 0, 0); - -INSERT INTO `base_dict_item` VALUES (1589528340267782144, 1589527951317389312, 'DataScopePerm', '4', '部门和用户范围', 0.00, '', 1414143554414059520, '2022-11-07 16:01:03', 1414143554414059520, '2022-11-07 16:01:03', 0, 0); - -INSERT INTO `base_dict_item` VALUES (1589528367228768256, 1589527951317389312, 'DataScopePerm', '3', '部门范围', 0.00, '', 1414143554414059520, '2022-11-07 16:01:09', 1414143554414059520, '2022-11-07 16:01:09', 0, 0); - -INSERT INTO `base_dict_item` VALUES (1589528393292173312, 1589527951317389312, 'DataScopePerm', '2', '用户范围', 0.00, '', 1414143554414059520, '2022-11-07 16:01:16', 1414143554414059520, '2022-11-07 16:01:16', 0, 0); - -INSERT INTO `base_dict_item` VALUES (1589528423956729856, 1589527951317389312, 'DataScopePerm', '1', '自身数据', 0.00, '', 1414143554414059520, '2022-11-07 16:01:23', 1414143554414059520, '2022-11-07 16:01:23', 0, 0); - -DELETE FROM `iam_perm_menu` WHERE `id` = 1476489893513404416; - -DELETE FROM `iam_perm_menu` WHERE `id` = 1478002945936015360; - -DELETE FROM `iam_perm_menu` WHERE `id` = 1478004271512240128; - -INSERT INTO `iam_perm_menu` VALUES (1591689087570378752, 'adminv3', 1582276447602692096, '流程模型', 'BpmModelList', NULL, b'0', '', b'0', b'0', '/modules/bpm/model/BpmModelList.vue', NULL, '/bpm/model', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-13 15:07:05', 1414143554414059520, '2022-11-13 15:07:05', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1591689307427405824, 'adminv3', 1582276447602692096, '未处理任务', 'TodoTaskList', NULL, b'0', '', b'0', b'0', '/modules/bpm/task/TodoTaskList.vue', NULL, '/bpm/todo', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-13 15:07:58', 1414143554414059520, '2022-11-14 22:45:57', 2, 0); - -INSERT INTO `iam_perm_menu` VALUES (1591689479075102720, 'adminv3', 1582276447602692096, '已处理任务', 'BpmDoneTask', NULL, b'0', '', b'0', b'0', '/modules/bpm/task/DoneTaskList.vue', NULL, '/bpm/done', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-13 15:08:39', 1414143554414059520, '2022-11-13 15:14:17', 3, 0); - -INSERT INTO `iam_perm_menu` VALUES (1591690820224778240, 'adminv3', 1582276447602692096, '流程实例', 'BpmInstance', NULL, b'0', '', b'0', b'0', '/modules/bpm/instance/InstanceList.vue', NULL, '/bpm/instance', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-13 15:13:58', 1414143554414059520, '2022-11-13 15:13:58', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1594586131247075328, 'adminv3', 1582275875424129024, 'ELK日志x', 'ELKx', NULL, b'0', '', b'0', b'0', 'Iframe', NULL, '/monitor/elk', 'https://www.antdv.com/components/overview-cn', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-21 14:58:54', 1414143554414059520, '2022-11-21 15:21:35', 6, 0); - -INSERT INTO `iam_perm_menu` VALUES (1595255743081025536, 'adminv3', 1580740450633101312, '菜单管理1', '', NULL, b'0', '', b'0', b'0', '', NULL, 'outside:////system/menu?onlytab=1&__full__', '', -99, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-23 11:19:42', 1414143554414059520, '2022-11-23 21:02:52', 20, 1); - -INSERT INTO `iam_perm_menu` VALUES (1597044371008516096, 'adminv3', NULL, '功能演示', 'Demo', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/demo', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-28 09:47:04', 1414143554414059520, '2022-11-28 09:47:04', 0, 1); - -INSERT INTO `iam_perm_menu` VALUES (1597102799370317824, 'adminv3', 1582276516905177088, '数据相关', 'DemoData', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/demo/data', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-28 13:39:15', 1414143554414059520, '2022-11-28 13:39:15', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1597210969883275264, 'adminv3', 1582276516905177088, '超级查询', 'SuperQueryDemoList', NULL, b'0', '', b'0', b'0', '/modules/demo/query/SuperQueryDemoList.vue', NULL, '/demo/query/super', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-28 20:49:05', 1414143554414059520, '2022-11-28 21:00:14', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1598306560788877312, 'adminv3', 1584383492338425856, '钱包列表', 'WalletList', NULL, b'0', '', b'0', b'0', '/modules/payment/wallet/list/WalletList.vue', NULL, '/payment/wallet/list', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-01 21:22:34', 1414143554414059520, '2022-12-01 21:22:34', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1598306760764903424, 'adminv3', 1584383492338425856, '个人钱包', 'MyWallet', NULL, b'0', '', b'0', b'0', '/modules/payment/wallet/personal/MyWallet.vue', NULL, '/payment/wallet/personal', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-01 21:23:22', 1414143554414059520, '2022-12-01 21:23:22', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1599337250200440832, 'adminv3', NULL, '关于', '', NULL, b'0', 'simple-icons:about-dot-me', b'0', b'0', '', NULL, '/about/index', '', 99, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 17:38:09', 1414143554414059520, '2022-12-04 17:43:32', 3, 0); - -INSERT INTO `iam_perm_menu` VALUES (1599378494880436224, 'adminv3', 1582276516905177088, 'WS演示', '', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/ws', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:22:03', 1414143554414059520, '2022-12-04 20:22:03', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1599378579513102336, 'adminv3', 1582276516905177088, '幂等请求演示', '', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/idempotent', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:22:23', 1414143554414059520, '2022-12-04 20:22:23', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1599378728490586112, 'adminv3', 1582276516905177088, '消息中间件演示', '', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/mq', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:22:59', 1414143554414059520, '2022-12-04 20:23:12', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1599378838519762944, 'adminv3', 1582276516905177088, '富文本编辑', '', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/wangEditor', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:23:25', 1414143554414059520, '2022-12-04 20:23:25', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1599378992811429888, 'adminv3', 1582276516905177088, '消息通知', '', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/demo/notice', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:24:02', 1414143554414059520, '2022-12-04 20:24:37', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1599379197124366336, 'adminv3', 1582276516905177088, '支付演示', '', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/demo/pay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:24:50', 1414143554414059520, '2022-12-04 20:24:50', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1599379348144476160, 'adminv3', 1599379197124366336, '收银台', 'SimpleCashier', NULL, b'0', '', b'0', b'0', '/demo/payment/cashier/SimpleCashier.vue', NULL, '/demo/pay/cashier', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:25:26', 1414143554414059520, '2022-12-05 21:28:10', 1, 0); - -INSERT INTO `iam_perm_menu` VALUES (1599379428784164864, 'adminv3', 1599379197124366336, '组合支付', '', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/pay/combination', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:25:46', 1414143554414059520, '2022-12-04 20:25:46', 0, 0); - -INSERT INTO `iam_perm_menu` VALUES (1599379539232772096, 'adminv3', 1599379197124366336, '支付结算台演示', '', NULL, b'0', '', b'0', b'0', '', NULL, 'outside:///cashier', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:26:12', 1414143554414059520, '2022-12-04 20:26:34', 1, 0); - -UPDATE `iam_perm_menu` SET `client_code` = 'admin', `parent_id` = 1546850918849249280, `title` = '支付结算台演示', `name` = 'CashierDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '', `component_name` = NULL, `path` = '/cashier', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'0', `target_outside` = b'1', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1399985191002447872, `create_time` = '2022-07-07 15:51:26', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-11-23 15:31:08', `version` = 4, `deleted` = 0 WHERE `id` = 1544952211901218816; - -UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1582275875424129024, `title` = '接口文档', `name` = 'ApiSwagger', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '', `component_name` = NULL, `path` = 'http://127.0.0.1:9999/doc.html', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-10-20 20:35:02', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-11-23 13:59:09', `version` = 2, `deleted` = 0 WHERE `id` = 1583074308040925184; - -UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1582275875424129024, `title` = 'ELK日志', `name` = 'ELK', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '', `component_name` = NULL, `path` = 'http://elk.dev.bootx.cn:5601/app/discover', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-10-20 20:45:15', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-11-21 15:04:13', `version` = 2, `deleted` = 0 WHERE `id` = 1583076878956339200; - -UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1584379704122744832, `title` = '企微机器人', `name` = 'WeComRobotConfigList', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '/modules/third/wecom/robot/WecomRobotConfigList.vue', `component_name` = NULL, `path` = '/third/wecom/robot', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-10-24 11:07:54', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-11-12 20:58:25', `version` = 3, `deleted` = 0 WHERE `id` = 1584381134950834176; - -UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1584380087805091840, `title` = '钉钉机器人', `name` = 'DingRobotConfigList', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '/modules/third/dingtalk/robot/DingRobotConfigList.vue', `component_name` = NULL, `path` = '/third/dingTalk/robot', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-10-24 11:08:38', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-11-12 20:58:37', `version` = 6, `deleted` = 0 WHERE `id` = 1584381322184564736; - -UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1584380087805091840, `title` = '钉钉配置', `name` = 'DingRobotConfigList', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'1', `hide_children_in_menu` = b'0', `component` = '/modules/third/dingtalk/config/DingTalkConfigList.vue', `component_name` = NULL, `path` = '/third/dingtalk/config', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-10-24 11:09:15', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-11-11 16:04:47', `version` = 1, `deleted` = 1 WHERE `id` = 1584381477986181120; - -UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1582274981055909888, `title` = '我的消息', `name` = 'SiteMessageListReceive', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '/modules/notice/site/receive/SiteMessageList.vue', `component_name` = NULL, `path` = '/person/siteMessage', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-10-24 11:10:44', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-11-17 09:08:02', `version` = 1, `deleted` = 0 WHERE `id` = 1584381848238366720; - -UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1582276184120709120, `title` = '储值卡', `name` = 'Voucher', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '/modules/payment/voucher/VoucherList.vue', `component_name` = NULL, `path` = '/payment/voucher', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-10-24 11:17:51', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-12-01 22:17:39', `version` = 1, `deleted` = 0 WHERE `id` = 1584383640942616576; - -UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1584382569381830656, `title` = '支付宝', `name` = 'AliPayConfigList', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '/modules/payment/channel/alipay/AlipayConfigList.vue', `component_name` = NULL, `path` = '/payment/channel/alipay', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-10-24 11:18:43', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-11-22 15:20:37', `version` = 1, `deleted` = 0 WHERE `id` = 1584383859121922048; - -UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1584382569381830656, `title` = '微信支付', `name` = 'WeChatConfigList', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '/modules/payment/channel/wechat/WechatPayConfigList.vue', `component_name` = NULL, `path` = '/payment/channel/wechat', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-10-24 11:19:20', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-11-22 22:22:07', `version` = 1, `deleted` = 0 WHERE `id` = 1584384015338774528; - -UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1584382569381830656, `title` = '云闪付', `name` = 'UnionPayConfigList', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '/modules/payment/channel/unionpay/UnionPayConfigList.vue', `component_name` = NULL, `path` = '/payment/channel/unionpay', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-10-24 11:19:55', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-11-22 22:27:32', `version` = 1, `deleted` = 0 WHERE `id` = 1584384160574939136; - -SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/_config/sql/1.1.x/1.1.8/1.1.8_up_1.1.9.sql b/_config/sql/1.1.x/1.1.8/1.1.8_up_1.1.9.sql deleted file mode 100644 index 07159f27916d27cb8599641d6fed9fe985a3abc4..0000000000000000000000000000000000000000 --- a/_config/sql/1.1.x/1.1.8/1.1.8_up_1.1.9.sql +++ /dev/null @@ -1,9 +0,0 @@ -SET FOREIGN_KEY_CHECKS = 0; - -ALTER TABLE `base_dict` ADD COLUMN `enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '启用状态' AFTER `name`; - -ALTER TABLE `base_dict_item` ADD COLUMN `enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '启用状态' AFTER `name`; - -ALTER TABLE `base_param` ADD COLUMN `enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '启用状态' AFTER `type`; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/_config/sql/1.2.0/1.1.9_up_1.2.0.sql b/_config/sql/1.2.0/1.1.9_up_1.2.0.sql deleted file mode 100644 index 1639c2ced6568995e389c53af24002495abc93b4..0000000000000000000000000000000000000000 --- a/_config/sql/1.2.0/1.1.9_up_1.2.0.sql +++ /dev/null @@ -1,7 +0,0 @@ -SET FOREIGN_KEY_CHECKS=0; - -ALTER TABLE `starter_audit_data_version` ADD COLUMN `table_name` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '数据表名称' AFTER `id`; -ALTER TABLE `starter_audit_data_version` ADD COLUMN `change_content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '数据更新内容' AFTER `data_content`; -ALTER TABLE `starter_audit_data_version` MODIFY COLUMN `data_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数据名称' AFTER `table_name`; - -SET FOREIGN_KEY_CHECKS=1; diff --git a/_config/sql/1.2.1/1.2.0_up_1.2.1.sql b/_config/sql/1.2.1/1.2.0_up_1.2.1.sql deleted file mode 100644 index 2b6b3b0e4e0bc845fb436459080c6b1ccdb79e87..0000000000000000000000000000000000000000 --- a/_config/sql/1.2.1/1.2.0_up_1.2.1.sql +++ /dev/null @@ -1,6783 +0,0 @@ -SET FOREIGN_KEY_CHECKS=0; - -CREATE TABLE `base_area` ( - `code` char(6) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, - `name` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '区域名称', - `city_code` char(4) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '0' COMMENT '城市编码', - PRIMARY KEY (`code`) USING BTREE, - INDEX `inx_city_code`(`city_code`) USING BTREE COMMENT '城市' -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '县区表' ROW_FORMAT = DYNAMIC; - -CREATE TABLE `base_city` ( - `code` char(4) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '城市编码', - `name` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '城市名称', - `province_code` char(2) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '0' COMMENT '省份编码', - PRIMARY KEY (`code`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '城市表' ROW_FORMAT = DYNAMIC; - -CREATE TABLE `base_province` ( - `code` char(2) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '省份编码', - `name` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '省份名称', - PRIMARY KEY (`code`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '省份表' ROW_FORMAT = DYNAMIC; - -CREATE TABLE `base_street` ( - `code` char(9) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '编码', - `name` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '街道名称', - `area_code` char(6) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '0' COMMENT '县区编码', - PRIMARY KEY (`code`) USING BTREE, - INDEX `inx_area_code`(`area_code`) USING BTREE COMMENT '县区' -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '街道表' ROW_FORMAT = DYNAMIC; - -CREATE TABLE `base_village` ( - `code` char(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '编码', - `name` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '名称', - `street_code` char(9) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '社区/乡镇编码', - PRIMARY KEY (`code`) USING BTREE, - INDEX `inx_street_code`(`street_code`) USING BTREE COMMENT '所属街道索引' -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '村庄/社区' ROW_FORMAT = DYNAMIC; - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('110101', '东城区', '1101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('110102', '西城区', '1101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('110105', '朝阳区', '1101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('110106', '丰台区', '1101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('110107', '石景山区', '1101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('110108', '海淀区', '1101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('110109', '门头沟区', '1101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('110111', '房山区', '1101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('110112', '通州区', '1101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('110113', '顺义区', '1101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('110114', '昌平区', '1101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('110115', '大兴区', '1101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('110116', '怀柔区', '1101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('110117', '平谷区', '1101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('110118', '密云区', '1101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('110119', '延庆区', '1101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('120101', '和平区', '1201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('120102', '河东区', '1201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('120103', '河西区', '1201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('120104', '南开区', '1201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('120105', '河北区', '1201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('120106', '红桥区', '1201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('120110', '东丽区', '1201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('120111', '西青区', '1201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('120112', '津南区', '1201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('120113', '北辰区', '1201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('120114', '武清区', '1201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('120115', '宝坻区', '1201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('120116', '滨海新区', '1201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('120117', '宁河区', '1201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('120118', '静海区', '1201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('120119', '蓟州区', '1201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130102', '长安区', '1301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130104', '桥西区', '1301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130105', '新华区', '1301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130107', '井陉矿区', '1301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130108', '裕华区', '1301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130109', '藁城区', '1301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130110', '鹿泉区', '1301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130111', '栾城区', '1301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130121', '井陉县', '1301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130123', '正定县', '1301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130125', '行唐县', '1301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130126', '灵寿县', '1301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130127', '高邑县', '1301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130128', '深泽县', '1301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130129', '赞皇县', '1301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130130', '无极县', '1301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130131', '平山县', '1301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130132', '元氏县', '1301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130133', '赵县', '1301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130171', '石家庄高新技术产业开发区', '1301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130172', '石家庄循环化工园区', '1301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130181', '辛集市', '1301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130183', '晋州市', '1301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130184', '新乐市', '1301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130202', '路南区', '1302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130203', '路北区', '1302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130204', '古冶区', '1302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130205', '开平区', '1302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130207', '丰南区', '1302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130208', '丰润区', '1302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130209', '曹妃甸区', '1302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130224', '滦南县', '1302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130225', '乐亭县', '1302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130227', '迁西县', '1302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130229', '玉田县', '1302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130271', '河北唐山芦台经济开发区', '1302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130272', '唐山市汉沽管理区', '1302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130273', '唐山高新技术产业开发区', '1302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130274', '河北唐山海港经济开发区', '1302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130281', '遵化市', '1302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130283', '迁安市', '1302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130284', '滦州市', '1302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130302', '海港区', '1303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130303', '山海关区', '1303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130304', '北戴河区', '1303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130306', '抚宁区', '1303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130321', '青龙满族自治县', '1303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130322', '昌黎县', '1303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130324', '卢龙县', '1303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130371', '秦皇岛市经济技术开发区', '1303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130372', '北戴河新区', '1303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130402', '邯山区', '1304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130403', '丛台区', '1304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130404', '复兴区', '1304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130406', '峰峰矿区', '1304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130407', '肥乡区', '1304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130408', '永年区', '1304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130423', '临漳县', '1304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130424', '成安县', '1304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130425', '大名县', '1304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130426', '涉县', '1304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130427', '磁县', '1304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130430', '邱县', '1304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130431', '鸡泽县', '1304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130432', '广平县', '1304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130433', '馆陶县', '1304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130434', '魏县', '1304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130435', '曲周县', '1304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130471', '邯郸经济技术开发区', '1304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130473', '邯郸冀南新区', '1304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130481', '武安市', '1304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130502', '襄都区', '1305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130503', '信都区', '1305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130505', '任泽区', '1305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130506', '南和区', '1305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130522', '临城县', '1305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130523', '内丘县', '1305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130524', '柏乡县', '1305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130525', '隆尧县', '1305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130528', '宁晋县', '1305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130529', '巨鹿县', '1305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130530', '新河县', '1305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130531', '广宗县', '1305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130532', '平乡县', '1305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130533', '威县', '1305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130534', '清河县', '1305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130535', '临西县', '1305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130571', '河北邢台经济开发区', '1305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130581', '南宫市', '1305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130582', '沙河市', '1305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130602', '竞秀区', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130606', '莲池区', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130607', '满城区', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130608', '清苑区', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130609', '徐水区', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130623', '涞水县', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130624', '阜平县', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130626', '定兴县', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130627', '唐县', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130628', '高阳县', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130629', '容城县', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130630', '涞源县', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130631', '望都县', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130632', '安新县', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130633', '易县', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130634', '曲阳县', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130635', '蠡县', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130636', '顺平县', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130637', '博野县', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130638', '雄县', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130671', '保定高新技术产业开发区', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130672', '保定白沟新城', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130681', '涿州市', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130682', '定州市', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130683', '安国市', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130684', '高碑店市', '1306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130702', '桥东区', '1307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130703', '桥西区', '1307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130705', '宣化区', '1307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130706', '下花园区', '1307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130708', '万全区', '1307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130709', '崇礼区', '1307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130722', '张北县', '1307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130723', '康保县', '1307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130724', '沽源县', '1307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130725', '尚义县', '1307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130726', '蔚县', '1307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130727', '阳原县', '1307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130728', '怀安县', '1307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130730', '怀来县', '1307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130731', '涿鹿县', '1307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130732', '赤城县', '1307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130771', '张家口经济开发区', '1307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130772', '张家口市察北管理区', '1307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130773', '张家口市塞北管理区', '1307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130802', '双桥区', '1308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130803', '双滦区', '1308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130804', '鹰手营子矿区', '1308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130821', '承德县', '1308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130822', '兴隆县', '1308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130824', '滦平县', '1308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130825', '隆化县', '1308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130826', '丰宁满族自治县', '1308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130827', '宽城满族自治县', '1308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130828', '围场满族蒙古族自治县', '1308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130871', '承德高新技术产业开发区', '1308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130881', '平泉市', '1308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130902', '新华区', '1309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130903', '运河区', '1309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130921', '沧县', '1309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130922', '青县', '1309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130923', '东光县', '1309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130924', '海兴县', '1309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130925', '盐山县', '1309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130926', '肃宁县', '1309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130927', '南皮县', '1309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130928', '吴桥县', '1309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130929', '献县', '1309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130930', '孟村回族自治县', '1309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130971', '河北沧州经济开发区', '1309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130972', '沧州高新技术产业开发区', '1309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130973', '沧州渤海新区', '1309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130981', '泊头市', '1309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130982', '任丘市', '1309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130983', '黄骅市', '1309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('130984', '河间市', '1309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('131002', '安次区', '1310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('131003', '广阳区', '1310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('131022', '固安县', '1310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('131023', '永清县', '1310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('131024', '香河县', '1310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('131025', '大城县', '1310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('131026', '文安县', '1310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('131028', '大厂回族自治县', '1310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('131071', '廊坊经济技术开发区', '1310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('131081', '霸州市', '1310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('131082', '三河市', '1310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('131102', '桃城区', '1311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('131103', '冀州区', '1311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('131121', '枣强县', '1311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('131122', '武邑县', '1311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('131123', '武强县', '1311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('131124', '饶阳县', '1311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('131125', '安平县', '1311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('131126', '故城县', '1311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('131127', '景县', '1311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('131128', '阜城县', '1311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('131171', '河北衡水高新技术产业开发区', '1311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('131172', '衡水滨湖新区', '1311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('131182', '深州市', '1311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140105', '小店区', '1401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140106', '迎泽区', '1401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140107', '杏花岭区', '1401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140108', '尖草坪区', '1401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140109', '万柏林区', '1401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140110', '晋源区', '1401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140121', '清徐县', '1401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140122', '阳曲县', '1401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140123', '娄烦县', '1401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140171', '山西转型综合改革示范区', '1401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140181', '古交市', '1401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140212', '新荣区', '1402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140213', '平城区', '1402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140214', '云冈区', '1402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140215', '云州区', '1402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140221', '阳高县', '1402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140222', '天镇县', '1402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140223', '广灵县', '1402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140224', '灵丘县', '1402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140225', '浑源县', '1402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140226', '左云县', '1402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140271', '山西大同经济开发区', '1402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140302', '城区', '1403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140303', '矿区', '1403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140311', '郊区', '1403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140321', '平定县', '1403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140322', '盂县', '1403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140403', '潞州区', '1404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140404', '上党区', '1404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140405', '屯留区', '1404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140406', '潞城区', '1404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140423', '襄垣县', '1404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140425', '平顺县', '1404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140426', '黎城县', '1404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140427', '壶关县', '1404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140428', '长子县', '1404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140429', '武乡县', '1404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140430', '沁县', '1404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140431', '沁源县', '1404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140471', '山西长治高新技术产业园区', '1404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140502', '城区', '1405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140521', '沁水县', '1405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140522', '阳城县', '1405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140524', '陵川县', '1405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140525', '泽州县', '1405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140581', '高平市', '1405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140602', '朔城区', '1406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140603', '平鲁区', '1406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140621', '山阴县', '1406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140622', '应县', '1406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140623', '右玉县', '1406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140671', '山西朔州经济开发区', '1406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140681', '怀仁市', '1406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140702', '榆次区', '1407'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140703', '太谷区', '1407'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140721', '榆社县', '1407'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140722', '左权县', '1407'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140723', '和顺县', '1407'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140724', '昔阳县', '1407'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140725', '寿阳县', '1407'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140727', '祁县', '1407'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140728', '平遥县', '1407'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140729', '灵石县', '1407'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140781', '介休市', '1407'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140802', '盐湖区', '1408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140821', '临猗县', '1408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140822', '万荣县', '1408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140823', '闻喜县', '1408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140824', '稷山县', '1408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140825', '新绛县', '1408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140826', '绛县', '1408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140827', '垣曲县', '1408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140828', '夏县', '1408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140829', '平陆县', '1408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140830', '芮城县', '1408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140881', '永济市', '1408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140882', '河津市', '1408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140902', '忻府区', '1409'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140921', '定襄县', '1409'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140922', '五台县', '1409'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140923', '代县', '1409'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140924', '繁峙县', '1409'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140925', '宁武县', '1409'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140926', '静乐县', '1409'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140927', '神池县', '1409'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140928', '五寨县', '1409'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140929', '岢岚县', '1409'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140930', '河曲县', '1409'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140931', '保德县', '1409'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140932', '偏关县', '1409'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140971', '五台山风景名胜区', '1409'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('140981', '原平市', '1409'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141002', '尧都区', '1410'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141021', '曲沃县', '1410'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141022', '翼城县', '1410'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141023', '襄汾县', '1410'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141024', '洪洞县', '1410'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141025', '古县', '1410'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141026', '安泽县', '1410'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141027', '浮山县', '1410'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141028', '吉县', '1410'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141029', '乡宁县', '1410'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141030', '大宁县', '1410'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141031', '隰县', '1410'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141032', '永和县', '1410'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141033', '蒲县', '1410'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141034', '汾西县', '1410'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141081', '侯马市', '1410'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141082', '霍州市', '1410'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141102', '离石区', '1411'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141121', '文水县', '1411'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141122', '交城县', '1411'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141123', '兴县', '1411'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141124', '临县', '1411'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141125', '柳林县', '1411'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141126', '石楼县', '1411'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141127', '岚县', '1411'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141128', '方山县', '1411'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141129', '中阳县', '1411'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141130', '交口县', '1411'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141181', '孝义市', '1411'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('141182', '汾阳市', '1411'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150102', '新城区', '1501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150103', '回民区', '1501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150104', '玉泉区', '1501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150105', '赛罕区', '1501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150121', '土默特左旗', '1501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150122', '托克托县', '1501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150123', '和林格尔县', '1501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150124', '清水河县', '1501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150125', '武川县', '1501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150172', '呼和浩特经济技术开发区', '1501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150202', '东河区', '1502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150203', '昆都仑区', '1502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150204', '青山区', '1502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150205', '石拐区', '1502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150206', '白云鄂博矿区', '1502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150207', '九原区', '1502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150221', '土默特右旗', '1502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150222', '固阳县', '1502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150223', '达尔罕茂明安联合旗', '1502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150271', '包头稀土高新技术产业开发区', '1502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150302', '海勃湾区', '1503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150303', '海南区', '1503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150304', '乌达区', '1503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150402', '红山区', '1504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150403', '元宝山区', '1504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150404', '松山区', '1504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150421', '阿鲁科尔沁旗', '1504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150422', '巴林左旗', '1504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150423', '巴林右旗', '1504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150424', '林西县', '1504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150425', '克什克腾旗', '1504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150426', '翁牛特旗', '1504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150428', '喀喇沁旗', '1504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150429', '宁城县', '1504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150430', '敖汉旗', '1504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150502', '科尔沁区', '1505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150521', '科尔沁左翼中旗', '1505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150522', '科尔沁左翼后旗', '1505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150523', '开鲁县', '1505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150524', '库伦旗', '1505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150525', '奈曼旗', '1505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150526', '扎鲁特旗', '1505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150571', '通辽经济技术开发区', '1505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150581', '霍林郭勒市', '1505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150602', '东胜区', '1506'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150603', '康巴什区', '1506'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150621', '达拉特旗', '1506'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150622', '准格尔旗', '1506'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150623', '鄂托克前旗', '1506'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150624', '鄂托克旗', '1506'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150625', '杭锦旗', '1506'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150626', '乌审旗', '1506'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150627', '伊金霍洛旗', '1506'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150702', '海拉尔区', '1507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150703', '扎赉诺尔区', '1507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150721', '阿荣旗', '1507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150722', '莫力达瓦达斡尔族自治旗', '1507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150723', '鄂伦春自治旗', '1507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150724', '鄂温克族自治旗', '1507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150725', '陈巴尔虎旗', '1507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150726', '新巴尔虎左旗', '1507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150727', '新巴尔虎右旗', '1507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150781', '满洲里市', '1507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150782', '牙克石市', '1507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150783', '扎兰屯市', '1507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150784', '额尔古纳市', '1507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150785', '根河市', '1507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150802', '临河区', '1508'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150821', '五原县', '1508'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150822', '磴口县', '1508'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150823', '乌拉特前旗', '1508'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150824', '乌拉特中旗', '1508'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150825', '乌拉特后旗', '1508'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150826', '杭锦后旗', '1508'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150902', '集宁区', '1509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150921', '卓资县', '1509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150922', '化德县', '1509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150923', '商都县', '1509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150924', '兴和县', '1509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150925', '凉城县', '1509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150926', '察哈尔右翼前旗', '1509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150927', '察哈尔右翼中旗', '1509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150928', '察哈尔右翼后旗', '1509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150929', '四子王旗', '1509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('150981', '丰镇市', '1509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('152201', '乌兰浩特市', '1522'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('152202', '阿尔山市', '1522'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('152221', '科尔沁右翼前旗', '1522'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('152222', '科尔沁右翼中旗', '1522'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('152223', '扎赉特旗', '1522'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('152224', '突泉县', '1522'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('152501', '二连浩特市', '1525'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('152502', '锡林浩特市', '1525'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('152522', '阿巴嘎旗', '1525'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('152523', '苏尼特左旗', '1525'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('152524', '苏尼特右旗', '1525'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('152525', '东乌珠穆沁旗', '1525'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('152526', '西乌珠穆沁旗', '1525'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('152527', '太仆寺旗', '1525'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('152528', '镶黄旗', '1525'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('152529', '正镶白旗', '1525'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('152530', '正蓝旗', '1525'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('152531', '多伦县', '1525'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('152571', '乌拉盖管委会', '1525'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('152921', '阿拉善左旗', '1529'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('152922', '阿拉善右旗', '1529'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('152923', '额济纳旗', '1529'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('152971', '内蒙古阿拉善高新技术产业开发区', '1529'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210102', '和平区', '2101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210103', '沈河区', '2101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210104', '大东区', '2101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210105', '皇姑区', '2101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210106', '铁西区', '2101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210111', '苏家屯区', '2101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210112', '浑南区', '2101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210113', '沈北新区', '2101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210114', '于洪区', '2101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210115', '辽中区', '2101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210123', '康平县', '2101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210124', '法库县', '2101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210181', '新民市', '2101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210202', '中山区', '2102'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210203', '西岗区', '2102'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210204', '沙河口区', '2102'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210211', '甘井子区', '2102'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210212', '旅顺口区', '2102'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210213', '金州区', '2102'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210214', '普兰店区', '2102'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210224', '长海县', '2102'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210281', '瓦房店市', '2102'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210283', '庄河市', '2102'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210302', '铁东区', '2103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210303', '铁西区', '2103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210304', '立山区', '2103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210311', '千山区', '2103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210321', '台安县', '2103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210323', '岫岩满族自治县', '2103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210381', '海城市', '2103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210402', '新抚区', '2104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210403', '东洲区', '2104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210404', '望花区', '2104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210411', '顺城区', '2104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210421', '抚顺县', '2104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210422', '新宾满族自治县', '2104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210423', '清原满族自治县', '2104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210502', '平山区', '2105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210503', '溪湖区', '2105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210504', '明山区', '2105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210505', '南芬区', '2105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210521', '本溪满族自治县', '2105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210522', '桓仁满族自治县', '2105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210602', '元宝区', '2106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210603', '振兴区', '2106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210604', '振安区', '2106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210624', '宽甸满族自治县', '2106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210681', '东港市', '2106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210682', '凤城市', '2106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210702', '古塔区', '2107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210703', '凌河区', '2107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210711', '太和区', '2107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210726', '黑山县', '2107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210727', '义县', '2107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210781', '凌海市', '2107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210782', '北镇市', '2107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210802', '站前区', '2108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210803', '西市区', '2108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210804', '鲅鱼圈区', '2108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210811', '老边区', '2108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210881', '盖州市', '2108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210882', '大石桥市', '2108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210902', '海州区', '2109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210903', '新邱区', '2109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210904', '太平区', '2109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210905', '清河门区', '2109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210911', '细河区', '2109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210921', '阜新蒙古族自治县', '2109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('210922', '彰武县', '2109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211002', '白塔区', '2110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211003', '文圣区', '2110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211004', '宏伟区', '2110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211005', '弓长岭区', '2110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211011', '太子河区', '2110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211021', '辽阳县', '2110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211081', '灯塔市', '2110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211102', '双台子区', '2111'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211103', '兴隆台区', '2111'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211104', '大洼区', '2111'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211122', '盘山县', '2111'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211202', '银州区', '2112'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211204', '清河区', '2112'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211221', '铁岭县', '2112'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211223', '西丰县', '2112'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211224', '昌图县', '2112'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211281', '调兵山市', '2112'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211282', '开原市', '2112'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211302', '双塔区', '2113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211303', '龙城区', '2113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211321', '朝阳县', '2113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211322', '建平县', '2113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211324', '喀喇沁左翼蒙古族自治县', '2113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211381', '北票市', '2113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211382', '凌源市', '2113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211402', '连山区', '2114'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211403', '龙港区', '2114'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211404', '南票区', '2114'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211421', '绥中县', '2114'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211422', '建昌县', '2114'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('211481', '兴城市', '2114'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220102', '南关区', '2201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220103', '宽城区', '2201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220104', '朝阳区', '2201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220105', '二道区', '2201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220106', '绿园区', '2201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220112', '双阳区', '2201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220113', '九台区', '2201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220122', '农安县', '2201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220171', '长春经济技术开发区', '2201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220172', '长春净月高新技术产业开发区', '2201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220173', '长春高新技术产业开发区', '2201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220174', '长春汽车经济技术开发区', '2201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220182', '榆树市', '2201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220183', '德惠市', '2201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220184', '公主岭市', '2201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220202', '昌邑区', '2202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220203', '龙潭区', '2202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220204', '船营区', '2202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220211', '丰满区', '2202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220221', '永吉县', '2202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220271', '吉林经济开发区', '2202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220272', '吉林高新技术产业开发区', '2202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220273', '吉林中国新加坡食品区', '2202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220281', '蛟河市', '2202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220282', '桦甸市', '2202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220283', '舒兰市', '2202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220284', '磐石市', '2202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220302', '铁西区', '2203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220303', '铁东区', '2203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220322', '梨树县', '2203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220323', '伊通满族自治县', '2203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220382', '双辽市', '2203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220402', '龙山区', '2204'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220403', '西安区', '2204'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220421', '东丰县', '2204'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220422', '东辽县', '2204'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220502', '东昌区', '2205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220503', '二道江区', '2205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220521', '通化县', '2205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220523', '辉南县', '2205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220524', '柳河县', '2205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220581', '梅河口市', '2205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220582', '集安市', '2205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220602', '浑江区', '2206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220605', '江源区', '2206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220621', '抚松县', '2206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220622', '靖宇县', '2206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220623', '长白朝鲜族自治县', '2206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220681', '临江市', '2206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220702', '宁江区', '2207'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220721', '前郭尔罗斯蒙古族自治县', '2207'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220722', '长岭县', '2207'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220723', '乾安县', '2207'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220771', '吉林松原经济开发区', '2207'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220781', '扶余市', '2207'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220802', '洮北区', '2208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220821', '镇赉县', '2208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220822', '通榆县', '2208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220871', '吉林白城经济开发区', '2208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220881', '洮南市', '2208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('220882', '大安市', '2208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('222401', '延吉市', '2224'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('222402', '图们市', '2224'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('222403', '敦化市', '2224'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('222404', '珲春市', '2224'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('222405', '龙井市', '2224'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('222406', '和龙市', '2224'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('222424', '汪清县', '2224'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('222426', '安图县', '2224'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230102', '道里区', '2301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230103', '南岗区', '2301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230104', '道外区', '2301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230108', '平房区', '2301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230109', '松北区', '2301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230110', '香坊区', '2301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230111', '呼兰区', '2301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230112', '阿城区', '2301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230113', '双城区', '2301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230123', '依兰县', '2301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230124', '方正县', '2301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230125', '宾县', '2301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230126', '巴彦县', '2301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230127', '木兰县', '2301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230128', '通河县', '2301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230129', '延寿县', '2301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230183', '尚志市', '2301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230184', '五常市', '2301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230202', '龙沙区', '2302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230203', '建华区', '2302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230204', '铁锋区', '2302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230205', '昂昂溪区', '2302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230206', '富拉尔基区', '2302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230207', '碾子山区', '2302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230208', '梅里斯达斡尔族区', '2302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230221', '龙江县', '2302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230223', '依安县', '2302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230224', '泰来县', '2302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230225', '甘南县', '2302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230227', '富裕县', '2302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230229', '克山县', '2302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230230', '克东县', '2302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230231', '拜泉县', '2302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230281', '讷河市', '2302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230302', '鸡冠区', '2303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230303', '恒山区', '2303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230304', '滴道区', '2303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230305', '梨树区', '2303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230306', '城子河区', '2303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230307', '麻山区', '2303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230321', '鸡东县', '2303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230381', '虎林市', '2303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230382', '密山市', '2303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230402', '向阳区', '2304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230403', '工农区', '2304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230404', '南山区', '2304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230405', '兴安区', '2304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230406', '东山区', '2304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230407', '兴山区', '2304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230421', '萝北县', '2304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230422', '绥滨县', '2304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230502', '尖山区', '2305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230503', '岭东区', '2305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230505', '四方台区', '2305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230506', '宝山区', '2305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230521', '集贤县', '2305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230522', '友谊县', '2305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230523', '宝清县', '2305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230524', '饶河县', '2305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230602', '萨尔图区', '2306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230603', '龙凤区', '2306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230604', '让胡路区', '2306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230605', '红岗区', '2306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230606', '大同区', '2306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230621', '肇州县', '2306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230622', '肇源县', '2306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230623', '林甸县', '2306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230624', '杜尔伯特蒙古族自治县', '2306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230671', '大庆高新技术产业开发区', '2306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230717', '伊美区', '2307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230718', '乌翠区', '2307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230719', '友好区', '2307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230722', '嘉荫县', '2307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230723', '汤旺县', '2307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230724', '丰林县', '2307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230725', '大箐山县', '2307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230726', '南岔县', '2307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230751', '金林区', '2307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230781', '铁力市', '2307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230803', '向阳区', '2308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230804', '前进区', '2308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230805', '东风区', '2308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230811', '郊区', '2308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230822', '桦南县', '2308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230826', '桦川县', '2308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230828', '汤原县', '2308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230881', '同江市', '2308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230882', '富锦市', '2308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230883', '抚远市', '2308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230902', '新兴区', '2309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230903', '桃山区', '2309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230904', '茄子河区', '2309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('230921', '勃利县', '2309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231002', '东安区', '2310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231003', '阳明区', '2310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231004', '爱民区', '2310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231005', '西安区', '2310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231025', '林口县', '2310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231071', '牡丹江经济技术开发区', '2310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231081', '绥芬河市', '2310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231083', '海林市', '2310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231084', '宁安市', '2310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231085', '穆棱市', '2310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231086', '东宁市', '2310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231102', '爱辉区', '2311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231123', '逊克县', '2311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231124', '孙吴县', '2311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231181', '北安市', '2311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231182', '五大连池市', '2311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231183', '嫩江市', '2311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231202', '北林区', '2312'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231221', '望奎县', '2312'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231222', '兰西县', '2312'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231223', '青冈县', '2312'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231224', '庆安县', '2312'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231225', '明水县', '2312'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231226', '绥棱县', '2312'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231281', '安达市', '2312'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231282', '肇东市', '2312'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('231283', '海伦市', '2312'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('232701', '漠河市', '2327'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('232721', '呼玛县', '2327'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('232722', '塔河县', '2327'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('232761', '加格达奇区', '2327'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('232762', '松岭区', '2327'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('232763', '新林区', '2327'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('232764', '呼中区', '2327'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('310101', '黄浦区', '3101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('310104', '徐汇区', '3101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('310105', '长宁区', '3101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('310106', '静安区', '3101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('310107', '普陀区', '3101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('310109', '虹口区', '3101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('310110', '杨浦区', '3101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('310112', '闵行区', '3101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('310113', '宝山区', '3101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('310114', '嘉定区', '3101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('310115', '浦东新区', '3101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('310116', '金山区', '3101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('310117', '松江区', '3101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('310118', '青浦区', '3101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('310120', '奉贤区', '3101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('310151', '崇明区', '3101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320102', '玄武区', '3201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320104', '秦淮区', '3201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320105', '建邺区', '3201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320106', '鼓楼区', '3201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320111', '浦口区', '3201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320113', '栖霞区', '3201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320114', '雨花台区', '3201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320115', '江宁区', '3201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320116', '六合区', '3201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320117', '溧水区', '3201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320118', '高淳区', '3201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320205', '锡山区', '3202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320206', '惠山区', '3202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320211', '滨湖区', '3202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320213', '梁溪区', '3202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320214', '新吴区', '3202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320281', '江阴市', '3202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320282', '宜兴市', '3202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320302', '鼓楼区', '3203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320303', '云龙区', '3203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320305', '贾汪区', '3203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320311', '泉山区', '3203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320312', '铜山区', '3203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320321', '丰县', '3203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320322', '沛县', '3203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320324', '睢宁县', '3203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320371', '徐州经济技术开发区', '3203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320381', '新沂市', '3203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320382', '邳州市', '3203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320402', '天宁区', '3204'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320404', '钟楼区', '3204'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320411', '新北区', '3204'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320412', '武进区', '3204'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320413', '金坛区', '3204'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320481', '溧阳市', '3204'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320505', '虎丘区', '3205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320506', '吴中区', '3205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320507', '相城区', '3205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320508', '姑苏区', '3205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320509', '吴江区', '3205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320571', '苏州工业园区', '3205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320581', '常熟市', '3205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320582', '张家港市', '3205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320583', '昆山市', '3205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320585', '太仓市', '3205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320612', '通州区', '3206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320613', '崇川区', '3206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320614', '海门区', '3206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320623', '如东县', '3206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320671', '南通经济技术开发区', '3206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320681', '启东市', '3206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320682', '如皋市', '3206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320685', '海安市', '3206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320703', '连云区', '3207'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320706', '海州区', '3207'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320707', '赣榆区', '3207'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320722', '东海县', '3207'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320723', '灌云县', '3207'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320724', '灌南县', '3207'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320771', '连云港经济技术开发区', '3207'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320772', '连云港高新技术产业开发区', '3207'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320803', '淮安区', '3208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320804', '淮阴区', '3208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320812', '清江浦区', '3208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320813', '洪泽区', '3208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320826', '涟水县', '3208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320830', '盱眙县', '3208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320831', '金湖县', '3208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320871', '淮安经济技术开发区', '3208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320902', '亭湖区', '3209'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320903', '盐都区', '3209'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320904', '大丰区', '3209'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320921', '响水县', '3209'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320922', '滨海县', '3209'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320923', '阜宁县', '3209'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320924', '射阳县', '3209'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320925', '建湖县', '3209'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320971', '盐城经济技术开发区', '3209'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('320981', '东台市', '3209'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321002', '广陵区', '3210'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321003', '邗江区', '3210'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321012', '江都区', '3210'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321023', '宝应县', '3210'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321071', '扬州经济技术开发区', '3210'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321081', '仪征市', '3210'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321084', '高邮市', '3210'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321102', '京口区', '3211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321111', '润州区', '3211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321112', '丹徒区', '3211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321171', '镇江新区', '3211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321181', '丹阳市', '3211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321182', '扬中市', '3211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321183', '句容市', '3211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321202', '海陵区', '3212'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321203', '高港区', '3212'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321204', '姜堰区', '3212'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321271', '泰州医药高新技术产业开发区', '3212'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321281', '兴化市', '3212'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321282', '靖江市', '3212'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321283', '泰兴市', '3212'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321302', '宿城区', '3213'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321311', '宿豫区', '3213'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321322', '沭阳县', '3213'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321323', '泗阳县', '3213'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321324', '泗洪县', '3213'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('321371', '宿迁经济技术开发区', '3213'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330102', '上城区', '3301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330105', '拱墅区', '3301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330106', '西湖区', '3301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330108', '滨江区', '3301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330109', '萧山区', '3301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330110', '余杭区', '3301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330111', '富阳区', '3301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330112', '临安区', '3301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330113', '临平区', '3301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330114', '钱塘区', '3301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330122', '桐庐县', '3301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330127', '淳安县', '3301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330182', '建德市', '3301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330203', '海曙区', '3302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330205', '江北区', '3302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330206', '北仑区', '3302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330211', '镇海区', '3302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330212', '鄞州区', '3302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330213', '奉化区', '3302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330225', '象山县', '3302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330226', '宁海县', '3302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330281', '余姚市', '3302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330282', '慈溪市', '3302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330302', '鹿城区', '3303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330303', '龙湾区', '3303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330304', '瓯海区', '3303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330305', '洞头区', '3303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330324', '永嘉县', '3303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330326', '平阳县', '3303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330327', '苍南县', '3303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330328', '文成县', '3303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330329', '泰顺县', '3303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330381', '瑞安市', '3303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330382', '乐清市', '3303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330383', '龙港市', '3303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330402', '南湖区', '3304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330411', '秀洲区', '3304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330421', '嘉善县', '3304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330424', '海盐县', '3304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330481', '海宁市', '3304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330482', '平湖市', '3304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330483', '桐乡市', '3304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330502', '吴兴区', '3305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330503', '南浔区', '3305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330521', '德清县', '3305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330522', '长兴县', '3305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330523', '安吉县', '3305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330602', '越城区', '3306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330603', '柯桥区', '3306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330604', '上虞区', '3306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330624', '新昌县', '3306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330681', '诸暨市', '3306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330683', '嵊州市', '3306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330702', '婺城区', '3307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330703', '金东区', '3307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330723', '武义县', '3307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330726', '浦江县', '3307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330727', '磐安县', '3307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330781', '兰溪市', '3307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330782', '义乌市', '3307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330783', '东阳市', '3307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330784', '永康市', '3307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330802', '柯城区', '3308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330803', '衢江区', '3308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330822', '常山县', '3308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330824', '开化县', '3308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330825', '龙游县', '3308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330881', '江山市', '3308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330902', '定海区', '3309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330903', '普陀区', '3309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330921', '岱山县', '3309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('330922', '嵊泗县', '3309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('331002', '椒江区', '3310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('331003', '黄岩区', '3310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('331004', '路桥区', '3310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('331022', '三门县', '3310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('331023', '天台县', '3310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('331024', '仙居县', '3310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('331081', '温岭市', '3310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('331082', '临海市', '3310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('331083', '玉环市', '3310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('331102', '莲都区', '3311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('331121', '青田县', '3311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('331122', '缙云县', '3311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('331123', '遂昌县', '3311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('331124', '松阳县', '3311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('331125', '云和县', '3311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('331126', '庆元县', '3311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('331127', '景宁畲族自治县', '3311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('331181', '龙泉市', '3311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340102', '瑶海区', '3401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340103', '庐阳区', '3401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340104', '蜀山区', '3401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340111', '包河区', '3401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340121', '长丰县', '3401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340122', '肥东县', '3401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340123', '肥西县', '3401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340124', '庐江县', '3401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340171', '合肥高新技术产业开发区', '3401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340172', '合肥经济技术开发区', '3401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340173', '合肥新站高新技术产业开发区', '3401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340181', '巢湖市', '3401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340202', '镜湖区', '3402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340207', '鸠江区', '3402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340209', '弋江区', '3402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340210', '湾沚区', '3402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340212', '繁昌区', '3402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340223', '南陵县', '3402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340271', '芜湖经济技术开发区', '3402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340272', '安徽芜湖三山经济开发区', '3402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340281', '无为市', '3402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340302', '龙子湖区', '3403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340303', '蚌山区', '3403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340304', '禹会区', '3403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340311', '淮上区', '3403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340321', '怀远县', '3403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340322', '五河县', '3403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340323', '固镇县', '3403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340371', '蚌埠市高新技术开发区', '3403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340372', '蚌埠市经济开发区', '3403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340402', '大通区', '3404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340403', '田家庵区', '3404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340404', '谢家集区', '3404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340405', '八公山区', '3404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340406', '潘集区', '3404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340421', '凤台县', '3404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340422', '寿县', '3404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340503', '花山区', '3405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340504', '雨山区', '3405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340506', '博望区', '3405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340521', '当涂县', '3405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340522', '含山县', '3405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340523', '和县', '3405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340602', '杜集区', '3406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340603', '相山区', '3406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340604', '烈山区', '3406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340621', '濉溪县', '3406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340705', '铜官区', '3407'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340706', '义安区', '3407'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340711', '郊区', '3407'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340722', '枞阳县', '3407'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340802', '迎江区', '3408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340803', '大观区', '3408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340811', '宜秀区', '3408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340822', '怀宁县', '3408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340825', '太湖县', '3408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340826', '宿松县', '3408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340827', '望江县', '3408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340828', '岳西县', '3408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340871', '安徽安庆经济开发区', '3408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340881', '桐城市', '3408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('340882', '潜山市', '3408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341002', '屯溪区', '3410'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341003', '黄山区', '3410'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341004', '徽州区', '3410'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341021', '歙县', '3410'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341022', '休宁县', '3410'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341023', '黟县', '3410'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341024', '祁门县', '3410'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341102', '琅琊区', '3411'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341103', '南谯区', '3411'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341122', '来安县', '3411'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341124', '全椒县', '3411'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341125', '定远县', '3411'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341126', '凤阳县', '3411'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341171', '中新苏滁高新技术产业开发区', '3411'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341172', '滁州经济技术开发区', '3411'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341181', '天长市', '3411'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341182', '明光市', '3411'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341202', '颍州区', '3412'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341203', '颍东区', '3412'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341204', '颍泉区', '3412'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341221', '临泉县', '3412'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341222', '太和县', '3412'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341225', '阜南县', '3412'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341226', '颍上县', '3412'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341271', '阜阳合肥现代产业园区', '3412'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341272', '阜阳经济技术开发区', '3412'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341282', '界首市', '3412'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341302', '埇桥区', '3413'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341321', '砀山县', '3413'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341322', '萧县', '3413'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341323', '灵璧县', '3413'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341324', '泗县', '3413'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341371', '宿州马鞍山现代产业园区', '3413'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341372', '宿州经济技术开发区', '3413'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341502', '金安区', '3415'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341503', '裕安区', '3415'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341504', '叶集区', '3415'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341522', '霍邱县', '3415'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341523', '舒城县', '3415'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341524', '金寨县', '3415'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341525', '霍山县', '3415'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341602', '谯城区', '3416'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341621', '涡阳县', '3416'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341622', '蒙城县', '3416'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341623', '利辛县', '3416'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341702', '贵池区', '3417'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341721', '东至县', '3417'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341722', '石台县', '3417'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341723', '青阳县', '3417'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341802', '宣州区', '3418'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341821', '郎溪县', '3418'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341823', '泾县', '3418'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341824', '绩溪县', '3418'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341825', '旌德县', '3418'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341871', '宣城市经济开发区', '3418'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341881', '宁国市', '3418'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('341882', '广德市', '3418'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350102', '鼓楼区', '3501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350103', '台江区', '3501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350104', '仓山区', '3501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350105', '马尾区', '3501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350111', '晋安区', '3501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350112', '长乐区', '3501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350121', '闽侯县', '3501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350122', '连江县', '3501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350123', '罗源县', '3501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350124', '闽清县', '3501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350125', '永泰县', '3501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350128', '平潭县', '3501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350181', '福清市', '3501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350203', '思明区', '3502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350205', '海沧区', '3502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350206', '湖里区', '3502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350211', '集美区', '3502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350212', '同安区', '3502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350213', '翔安区', '3502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350302', '城厢区', '3503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350303', '涵江区', '3503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350304', '荔城区', '3503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350305', '秀屿区', '3503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350322', '仙游县', '3503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350404', '三元区', '3504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350405', '沙县区', '3504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350421', '明溪县', '3504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350423', '清流县', '3504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350424', '宁化县', '3504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350425', '大田县', '3504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350426', '尤溪县', '3504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350428', '将乐县', '3504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350429', '泰宁县', '3504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350430', '建宁县', '3504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350481', '永安市', '3504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350502', '鲤城区', '3505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350503', '丰泽区', '3505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350504', '洛江区', '3505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350505', '泉港区', '3505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350521', '惠安县', '3505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350524', '安溪县', '3505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350525', '永春县', '3505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350526', '德化县', '3505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350527', '金门县', '3505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350581', '石狮市', '3505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350582', '晋江市', '3505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350583', '南安市', '3505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350602', '芗城区', '3506'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350603', '龙文区', '3506'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350604', '龙海区', '3506'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350605', '长泰区', '3506'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350622', '云霄县', '3506'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350623', '漳浦县', '3506'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350624', '诏安县', '3506'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350626', '东山县', '3506'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350627', '南靖县', '3506'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350628', '平和县', '3506'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350629', '华安县', '3506'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350702', '延平区', '3507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350703', '建阳区', '3507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350721', '顺昌县', '3507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350722', '浦城县', '3507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350723', '光泽县', '3507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350724', '松溪县', '3507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350725', '政和县', '3507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350781', '邵武市', '3507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350782', '武夷山市', '3507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350783', '建瓯市', '3507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350802', '新罗区', '3508'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350803', '永定区', '3508'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350821', '长汀县', '3508'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350823', '上杭县', '3508'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350824', '武平县', '3508'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350825', '连城县', '3508'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350881', '漳平市', '3508'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350902', '蕉城区', '3509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350921', '霞浦县', '3509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350922', '古田县', '3509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350923', '屏南县', '3509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350924', '寿宁县', '3509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350925', '周宁县', '3509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350926', '柘荣县', '3509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350981', '福安市', '3509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('350982', '福鼎市', '3509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360102', '东湖区', '3601'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360103', '西湖区', '3601'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360104', '青云谱区', '3601'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360111', '青山湖区', '3601'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360112', '新建区', '3601'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360113', '红谷滩区', '3601'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360121', '南昌县', '3601'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360123', '安义县', '3601'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360124', '进贤县', '3601'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360202', '昌江区', '3602'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360203', '珠山区', '3602'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360222', '浮梁县', '3602'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360281', '乐平市', '3602'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360302', '安源区', '3603'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360313', '湘东区', '3603'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360321', '莲花县', '3603'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360322', '上栗县', '3603'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360323', '芦溪县', '3603'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360402', '濂溪区', '3604'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360403', '浔阳区', '3604'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360404', '柴桑区', '3604'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360423', '武宁县', '3604'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360424', '修水县', '3604'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360425', '永修县', '3604'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360426', '德安县', '3604'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360428', '都昌县', '3604'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360429', '湖口县', '3604'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360430', '彭泽县', '3604'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360481', '瑞昌市', '3604'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360482', '共青城市', '3604'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360483', '庐山市', '3604'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360502', '渝水区', '3605'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360521', '分宜县', '3605'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360602', '月湖区', '3606'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360603', '余江区', '3606'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360681', '贵溪市', '3606'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360702', '章贡区', '3607'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360703', '南康区', '3607'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360704', '赣县区', '3607'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360722', '信丰县', '3607'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360723', '大余县', '3607'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360724', '上犹县', '3607'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360725', '崇义县', '3607'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360726', '安远县', '3607'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360728', '定南县', '3607'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360729', '全南县', '3607'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360730', '宁都县', '3607'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360731', '于都县', '3607'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360732', '兴国县', '3607'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360733', '会昌县', '3607'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360734', '寻乌县', '3607'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360735', '石城县', '3607'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360781', '瑞金市', '3607'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360783', '龙南市', '3607'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360802', '吉州区', '3608'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360803', '青原区', '3608'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360821', '吉安县', '3608'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360822', '吉水县', '3608'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360823', '峡江县', '3608'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360824', '新干县', '3608'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360825', '永丰县', '3608'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360826', '泰和县', '3608'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360827', '遂川县', '3608'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360828', '万安县', '3608'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360829', '安福县', '3608'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360830', '永新县', '3608'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360881', '井冈山市', '3608'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360902', '袁州区', '3609'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360921', '奉新县', '3609'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360922', '万载县', '3609'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360923', '上高县', '3609'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360924', '宜丰县', '3609'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360925', '靖安县', '3609'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360926', '铜鼓县', '3609'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360981', '丰城市', '3609'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360982', '樟树市', '3609'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('360983', '高安市', '3609'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('361002', '临川区', '3610'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('361003', '东乡区', '3610'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('361021', '南城县', '3610'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('361022', '黎川县', '3610'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('361023', '南丰县', '3610'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('361024', '崇仁县', '3610'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('361025', '乐安县', '3610'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('361026', '宜黄县', '3610'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('361027', '金溪县', '3610'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('361028', '资溪县', '3610'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('361030', '广昌县', '3610'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('361102', '信州区', '3611'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('361103', '广丰区', '3611'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('361104', '广信区', '3611'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('361123', '玉山县', '3611'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('361124', '铅山县', '3611'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('361125', '横峰县', '3611'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('361126', '弋阳县', '3611'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('361127', '余干县', '3611'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('361128', '鄱阳县', '3611'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('361129', '万年县', '3611'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('361130', '婺源县', '3611'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('361181', '德兴市', '3611'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370102', '历下区', '3701'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370103', '市中区', '3701'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370104', '槐荫区', '3701'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370105', '天桥区', '3701'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370112', '历城区', '3701'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370113', '长清区', '3701'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370114', '章丘区', '3701'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370115', '济阳区', '3701'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370116', '莱芜区', '3701'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370117', '钢城区', '3701'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370124', '平阴县', '3701'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370126', '商河县', '3701'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370171', '济南高新技术产业开发区', '3701'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370202', '市南区', '3702'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370203', '市北区', '3702'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370211', '黄岛区', '3702'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370212', '崂山区', '3702'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370213', '李沧区', '3702'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370214', '城阳区', '3702'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370215', '即墨区', '3702'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370271', '青岛高新技术产业开发区', '3702'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370281', '胶州市', '3702'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370283', '平度市', '3702'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370285', '莱西市', '3702'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370302', '淄川区', '3703'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370303', '张店区', '3703'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370304', '博山区', '3703'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370305', '临淄区', '3703'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370306', '周村区', '3703'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370321', '桓台县', '3703'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370322', '高青县', '3703'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370323', '沂源县', '3703'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370402', '市中区', '3704'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370403', '薛城区', '3704'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370404', '峄城区', '3704'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370405', '台儿庄区', '3704'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370406', '山亭区', '3704'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370481', '滕州市', '3704'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370502', '东营区', '3705'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370503', '河口区', '3705'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370505', '垦利区', '3705'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370522', '利津县', '3705'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370523', '广饶县', '3705'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370571', '东营经济技术开发区', '3705'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370572', '东营港经济开发区', '3705'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370602', '芝罘区', '3706'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370611', '福山区', '3706'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370612', '牟平区', '3706'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370613', '莱山区', '3706'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370614', '蓬莱区', '3706'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370671', '烟台高新技术产业开发区', '3706'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370672', '烟台经济技术开发区', '3706'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370681', '龙口市', '3706'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370682', '莱阳市', '3706'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370683', '莱州市', '3706'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370685', '招远市', '3706'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370686', '栖霞市', '3706'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370687', '海阳市', '3706'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370702', '潍城区', '3707'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370703', '寒亭区', '3707'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370704', '坊子区', '3707'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370705', '奎文区', '3707'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370724', '临朐县', '3707'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370725', '昌乐县', '3707'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370772', '潍坊滨海经济技术开发区', '3707'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370781', '青州市', '3707'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370782', '诸城市', '3707'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370783', '寿光市', '3707'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370784', '安丘市', '3707'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370785', '高密市', '3707'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370786', '昌邑市', '3707'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370811', '任城区', '3708'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370812', '兖州区', '3708'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370826', '微山县', '3708'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370827', '鱼台县', '3708'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370828', '金乡县', '3708'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370829', '嘉祥县', '3708'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370830', '汶上县', '3708'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370831', '泗水县', '3708'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370832', '梁山县', '3708'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370871', '济宁高新技术产业开发区', '3708'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370881', '曲阜市', '3708'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370883', '邹城市', '3708'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370902', '泰山区', '3709'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370911', '岱岳区', '3709'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370921', '宁阳县', '3709'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370923', '东平县', '3709'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370982', '新泰市', '3709'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('370983', '肥城市', '3709'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371002', '环翠区', '3710'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371003', '文登区', '3710'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371071', '威海火炬高技术产业开发区', '3710'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371072', '威海经济技术开发区', '3710'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371073', '威海临港经济技术开发区', '3710'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371082', '荣成市', '3710'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371083', '乳山市', '3710'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371102', '东港区', '3711'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371103', '岚山区', '3711'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371121', '五莲县', '3711'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371122', '莒县', '3711'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371171', '日照经济技术开发区', '3711'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371302', '兰山区', '3713'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371311', '罗庄区', '3713'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371312', '河东区', '3713'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371321', '沂南县', '3713'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371322', '郯城县', '3713'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371323', '沂水县', '3713'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371324', '兰陵县', '3713'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371325', '费县', '3713'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371326', '平邑县', '3713'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371327', '莒南县', '3713'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371328', '蒙阴县', '3713'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371329', '临沭县', '3713'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371371', '临沂高新技术产业开发区', '3713'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371402', '德城区', '3714'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371403', '陵城区', '3714'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371422', '宁津县', '3714'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371423', '庆云县', '3714'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371424', '临邑县', '3714'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371425', '齐河县', '3714'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371426', '平原县', '3714'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371427', '夏津县', '3714'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371428', '武城县', '3714'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371471', '德州天衢新区', '3714'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371481', '乐陵市', '3714'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371482', '禹城市', '3714'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371502', '东昌府区', '3715'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371503', '茌平区', '3715'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371521', '阳谷县', '3715'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371522', '莘县', '3715'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371524', '东阿县', '3715'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371525', '冠县', '3715'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371526', '高唐县', '3715'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371581', '临清市', '3715'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371602', '滨城区', '3716'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371603', '沾化区', '3716'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371621', '惠民县', '3716'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371622', '阳信县', '3716'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371623', '无棣县', '3716'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371625', '博兴县', '3716'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371681', '邹平市', '3716'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371702', '牡丹区', '3717'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371703', '定陶区', '3717'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371721', '曹县', '3717'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371722', '单县', '3717'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371723', '成武县', '3717'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371724', '巨野县', '3717'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371725', '郓城县', '3717'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371726', '鄄城县', '3717'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371728', '东明县', '3717'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371771', '菏泽经济技术开发区', '3717'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('371772', '菏泽高新技术开发区', '3717'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410102', '中原区', '4101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410103', '二七区', '4101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410104', '管城回族区', '4101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410105', '金水区', '4101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410106', '上街区', '4101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410108', '惠济区', '4101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410122', '中牟县', '4101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410171', '郑州经济技术开发区', '4101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410172', '郑州高新技术产业开发区', '4101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410173', '郑州航空港经济综合实验区', '4101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410181', '巩义市', '4101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410182', '荥阳市', '4101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410183', '新密市', '4101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410184', '新郑市', '4101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410185', '登封市', '4101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410202', '龙亭区', '4102'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410203', '顺河回族区', '4102'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410204', '鼓楼区', '4102'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410205', '禹王台区', '4102'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410212', '祥符区', '4102'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410221', '杞县', '4102'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410222', '通许县', '4102'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410223', '尉氏县', '4102'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410225', '兰考县', '4102'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410302', '老城区', '4103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410303', '西工区', '4103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410304', '瀍河回族区', '4103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410305', '涧西区', '4103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410307', '偃师区', '4103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410308', '孟津区', '4103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410311', '洛龙区', '4103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410323', '新安县', '4103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410324', '栾川县', '4103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410325', '嵩县', '4103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410326', '汝阳县', '4103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410327', '宜阳县', '4103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410328', '洛宁县', '4103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410329', '伊川县', '4103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410371', '洛阳高新技术产业开发区', '4103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410402', '新华区', '4104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410403', '卫东区', '4104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410404', '石龙区', '4104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410411', '湛河区', '4104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410421', '宝丰县', '4104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410422', '叶县', '4104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410423', '鲁山县', '4104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410425', '郏县', '4104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410471', '平顶山高新技术产业开发区', '4104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410472', '平顶山市城乡一体化示范区', '4104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410481', '舞钢市', '4104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410482', '汝州市', '4104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410502', '文峰区', '4105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410503', '北关区', '4105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410505', '殷都区', '4105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410506', '龙安区', '4105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410522', '安阳县', '4105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410523', '汤阴县', '4105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410526', '滑县', '4105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410527', '内黄县', '4105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410571', '安阳高新技术产业开发区', '4105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410581', '林州市', '4105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410602', '鹤山区', '4106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410603', '山城区', '4106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410611', '淇滨区', '4106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410621', '浚县', '4106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410622', '淇县', '4106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410671', '鹤壁经济技术开发区', '4106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410702', '红旗区', '4107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410703', '卫滨区', '4107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410704', '凤泉区', '4107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410711', '牧野区', '4107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410721', '新乡县', '4107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410724', '获嘉县', '4107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410725', '原阳县', '4107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410726', '延津县', '4107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410727', '封丘县', '4107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410771', '新乡高新技术产业开发区', '4107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410772', '新乡经济技术开发区', '4107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410773', '新乡市平原城乡一体化示范区', '4107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410781', '卫辉市', '4107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410782', '辉县市', '4107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410783', '长垣市', '4107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410802', '解放区', '4108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410803', '中站区', '4108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410804', '马村区', '4108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410811', '山阳区', '4108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410821', '修武县', '4108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410822', '博爱县', '4108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410823', '武陟县', '4108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410825', '温县', '4108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410871', '焦作城乡一体化示范区', '4108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410882', '沁阳市', '4108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410883', '孟州市', '4108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410902', '华龙区', '4109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410922', '清丰县', '4109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410923', '南乐县', '4109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410926', '范县', '4109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410927', '台前县', '4109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410928', '濮阳县', '4109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410971', '河南濮阳工业园区', '4109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('410972', '濮阳经济技术开发区', '4109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411002', '魏都区', '4110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411003', '建安区', '4110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411024', '鄢陵县', '4110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411025', '襄城县', '4110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411071', '许昌经济技术开发区', '4110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411081', '禹州市', '4110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411082', '长葛市', '4110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411102', '源汇区', '4111'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411103', '郾城区', '4111'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411104', '召陵区', '4111'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411121', '舞阳县', '4111'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411122', '临颍县', '4111'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411171', '漯河经济技术开发区', '4111'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411202', '湖滨区', '4112'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411203', '陕州区', '4112'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411221', '渑池县', '4112'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411224', '卢氏县', '4112'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411271', '河南三门峡经济开发区', '4112'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411281', '义马市', '4112'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411282', '灵宝市', '4112'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411302', '宛城区', '4113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411303', '卧龙区', '4113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411321', '南召县', '4113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411322', '方城县', '4113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411323', '西峡县', '4113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411324', '镇平县', '4113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411325', '内乡县', '4113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411326', '淅川县', '4113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411327', '社旗县', '4113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411328', '唐河县', '4113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411329', '新野县', '4113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411330', '桐柏县', '4113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411371', '南阳高新技术产业开发区', '4113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411372', '南阳市城乡一体化示范区', '4113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411381', '邓州市', '4113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411402', '梁园区', '4114'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411403', '睢阳区', '4114'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411421', '民权县', '4114'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411422', '睢县', '4114'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411423', '宁陵县', '4114'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411424', '柘城县', '4114'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411425', '虞城县', '4114'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411426', '夏邑县', '4114'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411471', '豫东综合物流产业聚集区', '4114'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411472', '河南商丘经济开发区', '4114'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411481', '永城市', '4114'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411502', '浉河区', '4115'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411503', '平桥区', '4115'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411521', '罗山县', '4115'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411522', '光山县', '4115'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411523', '新县', '4115'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411524', '商城县', '4115'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411525', '固始县', '4115'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411526', '潢川县', '4115'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411527', '淮滨县', '4115'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411528', '息县', '4115'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411571', '信阳高新技术产业开发区', '4115'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411602', '川汇区', '4116'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411603', '淮阳区', '4116'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411621', '扶沟县', '4116'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411622', '西华县', '4116'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411623', '商水县', '4116'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411624', '沈丘县', '4116'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411625', '郸城县', '4116'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411627', '太康县', '4116'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411628', '鹿邑县', '4116'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411671', '河南周口经济开发区', '4116'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411681', '项城市', '4116'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411702', '驿城区', '4117'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411721', '西平县', '4117'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411722', '上蔡县', '4117'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411723', '平舆县', '4117'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411724', '正阳县', '4117'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411725', '确山县', '4117'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411726', '泌阳县', '4117'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411727', '汝南县', '4117'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411728', '遂平县', '4117'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411729', '新蔡县', '4117'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('411771', '河南驻马店经济开发区', '4117'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('419001', '济源市', '4190'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420102', '江岸区', '4201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420103', '江汉区', '4201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420104', '硚口区', '4201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420105', '汉阳区', '4201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420106', '武昌区', '4201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420107', '青山区', '4201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420111', '洪山区', '4201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420112', '东西湖区', '4201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420113', '汉南区', '4201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420114', '蔡甸区', '4201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420115', '江夏区', '4201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420116', '黄陂区', '4201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420117', '新洲区', '4201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420202', '黄石港区', '4202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420203', '西塞山区', '4202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420204', '下陆区', '4202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420205', '铁山区', '4202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420222', '阳新县', '4202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420281', '大冶市', '4202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420302', '茅箭区', '4203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420303', '张湾区', '4203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420304', '郧阳区', '4203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420322', '郧西县', '4203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420323', '竹山县', '4203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420324', '竹溪县', '4203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420325', '房县', '4203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420381', '丹江口市', '4203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420502', '西陵区', '4205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420503', '伍家岗区', '4205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420504', '点军区', '4205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420505', '猇亭区', '4205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420506', '夷陵区', '4205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420525', '远安县', '4205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420526', '兴山县', '4205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420527', '秭归县', '4205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420528', '长阳土家族自治县', '4205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420529', '五峰土家族自治县', '4205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420581', '宜都市', '4205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420582', '当阳市', '4205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420583', '枝江市', '4205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420602', '襄城区', '4206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420606', '樊城区', '4206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420607', '襄州区', '4206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420624', '南漳县', '4206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420625', '谷城县', '4206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420626', '保康县', '4206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420682', '老河口市', '4206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420683', '枣阳市', '4206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420684', '宜城市', '4206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420702', '梁子湖区', '4207'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420703', '华容区', '4207'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420704', '鄂城区', '4207'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420802', '东宝区', '4208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420804', '掇刀区', '4208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420822', '沙洋县', '4208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420881', '钟祥市', '4208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420882', '京山市', '4208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420902', '孝南区', '4209'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420921', '孝昌县', '4209'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420922', '大悟县', '4209'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420923', '云梦县', '4209'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420981', '应城市', '4209'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420982', '安陆市', '4209'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('420984', '汉川市', '4209'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421002', '沙市区', '4210'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421003', '荆州区', '4210'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421022', '公安县', '4210'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421024', '江陵县', '4210'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421071', '荆州经济技术开发区', '4210'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421081', '石首市', '4210'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421083', '洪湖市', '4210'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421087', '松滋市', '4210'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421088', '监利市', '4210'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421102', '黄州区', '4211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421121', '团风县', '4211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421122', '红安县', '4211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421123', '罗田县', '4211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421124', '英山县', '4211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421125', '浠水县', '4211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421126', '蕲春县', '4211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421127', '黄梅县', '4211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421171', '龙感湖管理区', '4211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421181', '麻城市', '4211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421182', '武穴市', '4211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421202', '咸安区', '4212'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421221', '嘉鱼县', '4212'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421222', '通城县', '4212'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421223', '崇阳县', '4212'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421224', '通山县', '4212'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421281', '赤壁市', '4212'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421303', '曾都区', '4213'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421321', '随县', '4213'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('421381', '广水市', '4213'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('422801', '恩施市', '4228'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('422802', '利川市', '4228'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('422822', '建始县', '4228'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('422823', '巴东县', '4228'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('422825', '宣恩县', '4228'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('422826', '咸丰县', '4228'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('422827', '来凤县', '4228'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('422828', '鹤峰县', '4228'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('429004', '仙桃市', '4290'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('429005', '潜江市', '4290'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('429006', '天门市', '4290'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('429021', '神农架林区', '4290'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430102', '芙蓉区', '4301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430103', '天心区', '4301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430104', '岳麓区', '4301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430105', '开福区', '4301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430111', '雨花区', '4301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430112', '望城区', '4301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430121', '长沙县', '4301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430181', '浏阳市', '4301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430182', '宁乡市', '4301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430202', '荷塘区', '4302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430203', '芦淞区', '4302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430204', '石峰区', '4302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430211', '天元区', '4302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430212', '渌口区', '4302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430223', '攸县', '4302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430224', '茶陵县', '4302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430225', '炎陵县', '4302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430281', '醴陵市', '4302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430302', '雨湖区', '4303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430304', '岳塘区', '4303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430321', '湘潭县', '4303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430371', '湖南湘潭高新技术产业园区', '4303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430372', '湘潭昭山示范区', '4303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430373', '湘潭九华示范区', '4303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430381', '湘乡市', '4303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430382', '韶山市', '4303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430405', '珠晖区', '4304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430406', '雁峰区', '4304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430407', '石鼓区', '4304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430408', '蒸湘区', '4304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430412', '南岳区', '4304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430421', '衡阳县', '4304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430422', '衡南县', '4304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430423', '衡山县', '4304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430424', '衡东县', '4304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430426', '祁东县', '4304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430471', '衡阳综合保税区', '4304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430472', '湖南衡阳高新技术产业园区', '4304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430473', '湖南衡阳松木经济开发区', '4304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430481', '耒阳市', '4304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430482', '常宁市', '4304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430502', '双清区', '4305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430503', '大祥区', '4305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430511', '北塔区', '4305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430522', '新邵县', '4305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430523', '邵阳县', '4305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430524', '隆回县', '4305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430525', '洞口县', '4305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430527', '绥宁县', '4305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430528', '新宁县', '4305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430529', '城步苗族自治县', '4305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430581', '武冈市', '4305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430582', '邵东市', '4305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430602', '岳阳楼区', '4306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430603', '云溪区', '4306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430611', '君山区', '4306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430621', '岳阳县', '4306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430623', '华容县', '4306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430624', '湘阴县', '4306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430626', '平江县', '4306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430671', '岳阳市屈原管理区', '4306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430681', '汨罗市', '4306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430682', '临湘市', '4306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430702', '武陵区', '4307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430703', '鼎城区', '4307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430721', '安乡县', '4307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430722', '汉寿县', '4307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430723', '澧县', '4307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430724', '临澧县', '4307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430725', '桃源县', '4307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430726', '石门县', '4307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430771', '常德市西洞庭管理区', '4307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430781', '津市市', '4307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430802', '永定区', '4308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430811', '武陵源区', '4308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430821', '慈利县', '4308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430822', '桑植县', '4308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430902', '资阳区', '4309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430903', '赫山区', '4309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430921', '南县', '4309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430922', '桃江县', '4309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430923', '安化县', '4309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430971', '益阳市大通湖管理区', '4309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430972', '湖南益阳高新技术产业园区', '4309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('430981', '沅江市', '4309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431002', '北湖区', '4310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431003', '苏仙区', '4310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431021', '桂阳县', '4310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431022', '宜章县', '4310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431023', '永兴县', '4310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431024', '嘉禾县', '4310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431025', '临武县', '4310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431026', '汝城县', '4310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431027', '桂东县', '4310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431028', '安仁县', '4310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431081', '资兴市', '4310'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431102', '零陵区', '4311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431103', '冷水滩区', '4311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431122', '东安县', '4311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431123', '双牌县', '4311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431124', '道县', '4311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431125', '江永县', '4311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431126', '宁远县', '4311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431127', '蓝山县', '4311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431128', '新田县', '4311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431129', '江华瑶族自治县', '4311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431171', '永州经济技术开发区', '4311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431173', '永州市回龙圩管理区', '4311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431181', '祁阳市', '4311'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431202', '鹤城区', '4312'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431221', '中方县', '4312'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431222', '沅陵县', '4312'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431223', '辰溪县', '4312'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431224', '溆浦县', '4312'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431225', '会同县', '4312'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431226', '麻阳苗族自治县', '4312'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431227', '新晃侗族自治县', '4312'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431228', '芷江侗族自治县', '4312'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431229', '靖州苗族侗族自治县', '4312'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431230', '通道侗族自治县', '4312'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431271', '怀化市洪江管理区', '4312'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431281', '洪江市', '4312'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431302', '娄星区', '4313'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431321', '双峰县', '4313'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431322', '新化县', '4313'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431381', '冷水江市', '4313'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('431382', '涟源市', '4313'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('433101', '吉首市', '4331'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('433122', '泸溪县', '4331'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('433123', '凤凰县', '4331'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('433124', '花垣县', '4331'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('433125', '保靖县', '4331'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('433126', '古丈县', '4331'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('433127', '永顺县', '4331'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('433130', '龙山县', '4331'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440103', '荔湾区', '4401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440104', '越秀区', '4401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440105', '海珠区', '4401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440106', '天河区', '4401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440111', '白云区', '4401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440112', '黄埔区', '4401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440113', '番禺区', '4401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440114', '花都区', '4401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440115', '南沙区', '4401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440117', '从化区', '4401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440118', '增城区', '4401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440203', '武江区', '4402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440204', '浈江区', '4402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440205', '曲江区', '4402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440222', '始兴县', '4402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440224', '仁化县', '4402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440229', '翁源县', '4402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440232', '乳源瑶族自治县', '4402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440233', '新丰县', '4402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440281', '乐昌市', '4402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440282', '南雄市', '4402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440303', '罗湖区', '4403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440304', '福田区', '4403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440305', '南山区', '4403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440306', '宝安区', '4403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440307', '龙岗区', '4403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440308', '盐田区', '4403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440309', '龙华区', '4403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440310', '坪山区', '4403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440311', '光明区', '4403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440402', '香洲区', '4404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440403', '斗门区', '4404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440404', '金湾区', '4404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440507', '龙湖区', '4405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440511', '金平区', '4405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440512', '濠江区', '4405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440513', '潮阳区', '4405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440514', '潮南区', '4405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440515', '澄海区', '4405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440523', '南澳县', '4405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440604', '禅城区', '4406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440605', '南海区', '4406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440606', '顺德区', '4406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440607', '三水区', '4406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440608', '高明区', '4406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440703', '蓬江区', '4407'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440704', '江海区', '4407'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440705', '新会区', '4407'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440781', '台山市', '4407'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440783', '开平市', '4407'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440784', '鹤山市', '4407'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440785', '恩平市', '4407'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440802', '赤坎区', '4408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440803', '霞山区', '4408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440804', '坡头区', '4408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440811', '麻章区', '4408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440823', '遂溪县', '4408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440825', '徐闻县', '4408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440881', '廉江市', '4408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440882', '雷州市', '4408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440883', '吴川市', '4408'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440902', '茂南区', '4409'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440904', '电白区', '4409'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440981', '高州市', '4409'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440982', '化州市', '4409'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('440983', '信宜市', '4409'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441202', '端州区', '4412'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441203', '鼎湖区', '4412'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441204', '高要区', '4412'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441223', '广宁县', '4412'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441224', '怀集县', '4412'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441225', '封开县', '4412'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441226', '德庆县', '4412'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441284', '四会市', '4412'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441302', '惠城区', '4413'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441303', '惠阳区', '4413'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441322', '博罗县', '4413'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441323', '惠东县', '4413'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441324', '龙门县', '4413'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441402', '梅江区', '4414'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441403', '梅县区', '4414'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441422', '大埔县', '4414'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441423', '丰顺县', '4414'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441424', '五华县', '4414'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441426', '平远县', '4414'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441427', '蕉岭县', '4414'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441481', '兴宁市', '4414'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441502', '城区', '4415'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441521', '海丰县', '4415'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441523', '陆河县', '4415'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441581', '陆丰市', '4415'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441602', '源城区', '4416'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441621', '紫金县', '4416'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441622', '龙川县', '4416'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441623', '连平县', '4416'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441624', '和平县', '4416'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441625', '东源县', '4416'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441702', '江城区', '4417'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441704', '阳东区', '4417'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441721', '阳西县', '4417'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441781', '阳春市', '4417'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441802', '清城区', '4418'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441803', '清新区', '4418'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441821', '佛冈县', '4418'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441823', '阳山县', '4418'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441825', '连山壮族瑶族自治县', '4418'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441826', '连南瑶族自治县', '4418'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441881', '英德市', '4418'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441882', '连州市', '4418'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('441900', '东莞市', '4419'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('442000', '中山市', '4420'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('445102', '湘桥区', '4451'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('445103', '潮安区', '4451'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('445122', '饶平县', '4451'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('445202', '榕城区', '4452'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('445203', '揭东区', '4452'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('445222', '揭西县', '4452'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('445224', '惠来县', '4452'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('445281', '普宁市', '4452'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('445302', '云城区', '4453'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('445303', '云安区', '4453'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('445321', '新兴县', '4453'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('445322', '郁南县', '4453'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('445381', '罗定市', '4453'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450102', '兴宁区', '4501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450103', '青秀区', '4501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450105', '江南区', '4501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450107', '西乡塘区', '4501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450108', '良庆区', '4501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450109', '邕宁区', '4501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450110', '武鸣区', '4501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450123', '隆安县', '4501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450124', '马山县', '4501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450125', '上林县', '4501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450126', '宾阳县', '4501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450181', '横州市', '4501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450202', '城中区', '4502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450203', '鱼峰区', '4502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450204', '柳南区', '4502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450205', '柳北区', '4502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450206', '柳江区', '4502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450222', '柳城县', '4502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450223', '鹿寨县', '4502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450224', '融安县', '4502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450225', '融水苗族自治县', '4502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450226', '三江侗族自治县', '4502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450302', '秀峰区', '4503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450303', '叠彩区', '4503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450304', '象山区', '4503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450305', '七星区', '4503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450311', '雁山区', '4503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450312', '临桂区', '4503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450321', '阳朔县', '4503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450323', '灵川县', '4503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450324', '全州县', '4503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450325', '兴安县', '4503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450326', '永福县', '4503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450327', '灌阳县', '4503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450328', '龙胜各族自治县', '4503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450329', '资源县', '4503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450330', '平乐县', '4503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450332', '恭城瑶族自治县', '4503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450381', '荔浦市', '4503'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450403', '万秀区', '4504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450405', '长洲区', '4504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450406', '龙圩区', '4504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450421', '苍梧县', '4504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450422', '藤县', '4504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450423', '蒙山县', '4504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450481', '岑溪市', '4504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450502', '海城区', '4505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450503', '银海区', '4505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450512', '铁山港区', '4505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450521', '合浦县', '4505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450602', '港口区', '4506'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450603', '防城区', '4506'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450621', '上思县', '4506'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450681', '东兴市', '4506'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450702', '钦南区', '4507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450703', '钦北区', '4507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450721', '灵山县', '4507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450722', '浦北县', '4507'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450802', '港北区', '4508'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450803', '港南区', '4508'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450804', '覃塘区', '4508'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450821', '平南县', '4508'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450881', '桂平市', '4508'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450902', '玉州区', '4509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450903', '福绵区', '4509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450921', '容县', '4509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450922', '陆川县', '4509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450923', '博白县', '4509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450924', '兴业县', '4509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('450981', '北流市', '4509'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451002', '右江区', '4510'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451003', '田阳区', '4510'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451022', '田东县', '4510'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451024', '德保县', '4510'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451026', '那坡县', '4510'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451027', '凌云县', '4510'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451028', '乐业县', '4510'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451029', '田林县', '4510'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451030', '西林县', '4510'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451031', '隆林各族自治县', '4510'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451081', '靖西市', '4510'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451082', '平果市', '4510'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451102', '八步区', '4511'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451103', '平桂区', '4511'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451121', '昭平县', '4511'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451122', '钟山县', '4511'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451123', '富川瑶族自治县', '4511'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451202', '金城江区', '4512'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451203', '宜州区', '4512'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451221', '南丹县', '4512'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451222', '天峨县', '4512'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451223', '凤山县', '4512'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451224', '东兰县', '4512'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451225', '罗城仫佬族自治县', '4512'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451226', '环江毛南族自治县', '4512'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451227', '巴马瑶族自治县', '4512'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451228', '都安瑶族自治县', '4512'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451229', '大化瑶族自治县', '4512'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451302', '兴宾区', '4513'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451321', '忻城县', '4513'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451322', '象州县', '4513'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451323', '武宣县', '4513'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451324', '金秀瑶族自治县', '4513'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451381', '合山市', '4513'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451402', '江州区', '4514'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451421', '扶绥县', '4514'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451422', '宁明县', '4514'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451423', '龙州县', '4514'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451424', '大新县', '4514'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451425', '天等县', '4514'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('451481', '凭祥市', '4514'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('460105', '秀英区', '4601'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('460106', '龙华区', '4601'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('460107', '琼山区', '4601'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('460108', '美兰区', '4601'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('460202', '海棠区', '4602'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('460203', '吉阳区', '4602'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('460204', '天涯区', '4602'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('460205', '崖州区', '4602'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('460321', '西沙群岛', '4603'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('460322', '南沙群岛', '4603'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('460323', '中沙群岛的岛礁及其海域', '4603'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('460400', '儋州市', '4604'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('469001', '五指山市', '4690'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('469002', '琼海市', '4690'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('469005', '文昌市', '4690'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('469006', '万宁市', '4690'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('469007', '东方市', '4690'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('469021', '定安县', '4690'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('469022', '屯昌县', '4690'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('469023', '澄迈县', '4690'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('469024', '临高县', '4690'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('469025', '白沙黎族自治县', '4690'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('469026', '昌江黎族自治县', '4690'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('469027', '乐东黎族自治县', '4690'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('469028', '陵水黎族自治县', '4690'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('469029', '保亭黎族苗族自治县', '4690'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('469030', '琼中黎族苗族自治县', '4690'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500101', '万州区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500102', '涪陵区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500103', '渝中区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500104', '大渡口区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500105', '江北区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500106', '沙坪坝区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500107', '九龙坡区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500108', '南岸区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500109', '北碚区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500110', '綦江区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500111', '大足区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500112', '渝北区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500113', '巴南区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500114', '黔江区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500115', '长寿区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500116', '江津区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500117', '合川区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500118', '永川区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500119', '南川区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500120', '璧山区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500151', '铜梁区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500152', '潼南区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500153', '荣昌区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500154', '开州区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500155', '梁平区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500156', '武隆区', '5001'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500229', '城口县', '5002'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500230', '丰都县', '5002'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500231', '垫江县', '5002'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500233', '忠县', '5002'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500235', '云阳县', '5002'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500236', '奉节县', '5002'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500237', '巫山县', '5002'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500238', '巫溪县', '5002'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500240', '石柱土家族自治县', '5002'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500241', '秀山土家族苗族自治县', '5002'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500242', '酉阳土家族苗族自治县', '5002'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('500243', '彭水苗族土家族自治县', '5002'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510104', '锦江区', '5101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510105', '青羊区', '5101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510106', '金牛区', '5101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510107', '武侯区', '5101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510108', '成华区', '5101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510112', '龙泉驿区', '5101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510113', '青白江区', '5101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510114', '新都区', '5101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510115', '温江区', '5101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510116', '双流区', '5101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510117', '郫都区', '5101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510118', '新津区', '5101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510121', '金堂县', '5101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510129', '大邑县', '5101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510131', '蒲江县', '5101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510181', '都江堰市', '5101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510182', '彭州市', '5101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510183', '邛崃市', '5101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510184', '崇州市', '5101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510185', '简阳市', '5101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510302', '自流井区', '5103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510303', '贡井区', '5103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510304', '大安区', '5103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510311', '沿滩区', '5103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510321', '荣县', '5103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510322', '富顺县', '5103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510402', '东区', '5104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510403', '西区', '5104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510411', '仁和区', '5104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510421', '米易县', '5104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510422', '盐边县', '5104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510502', '江阳区', '5105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510503', '纳溪区', '5105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510504', '龙马潭区', '5105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510521', '泸县', '5105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510522', '合江县', '5105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510524', '叙永县', '5105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510525', '古蔺县', '5105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510603', '旌阳区', '5106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510604', '罗江区', '5106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510623', '中江县', '5106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510681', '广汉市', '5106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510682', '什邡市', '5106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510683', '绵竹市', '5106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510703', '涪城区', '5107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510704', '游仙区', '5107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510705', '安州区', '5107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510722', '三台县', '5107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510723', '盐亭县', '5107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510725', '梓潼县', '5107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510726', '北川羌族自治县', '5107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510727', '平武县', '5107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510781', '江油市', '5107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510802', '利州区', '5108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510811', '昭化区', '5108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510812', '朝天区', '5108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510821', '旺苍县', '5108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510822', '青川县', '5108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510823', '剑阁县', '5108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510824', '苍溪县', '5108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510903', '船山区', '5109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510904', '安居区', '5109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510921', '蓬溪县', '5109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510923', '大英县', '5109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('510981', '射洪市', '5109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511002', '市中区', '5110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511011', '东兴区', '5110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511024', '威远县', '5110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511025', '资中县', '5110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511083', '隆昌市', '5110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511102', '市中区', '5111'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511111', '沙湾区', '5111'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511112', '五通桥区', '5111'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511113', '金口河区', '5111'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511123', '犍为县', '5111'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511124', '井研县', '5111'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511126', '夹江县', '5111'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511129', '沐川县', '5111'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511132', '峨边彝族自治县', '5111'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511133', '马边彝族自治县', '5111'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511181', '峨眉山市', '5111'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511302', '顺庆区', '5113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511303', '高坪区', '5113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511304', '嘉陵区', '5113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511321', '南部县', '5113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511322', '营山县', '5113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511323', '蓬安县', '5113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511324', '仪陇县', '5113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511325', '西充县', '5113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511381', '阆中市', '5113'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511402', '东坡区', '5114'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511403', '彭山区', '5114'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511421', '仁寿县', '5114'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511423', '洪雅县', '5114'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511424', '丹棱县', '5114'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511425', '青神县', '5114'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511502', '翠屏区', '5115'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511503', '南溪区', '5115'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511504', '叙州区', '5115'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511523', '江安县', '5115'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511524', '长宁县', '5115'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511525', '高县', '5115'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511526', '珙县', '5115'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511527', '筠连县', '5115'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511528', '兴文县', '5115'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511529', '屏山县', '5115'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511602', '广安区', '5116'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511603', '前锋区', '5116'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511621', '岳池县', '5116'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511622', '武胜县', '5116'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511623', '邻水县', '5116'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511681', '华蓥市', '5116'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511702', '通川区', '5117'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511703', '达川区', '5117'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511722', '宣汉县', '5117'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511723', '开江县', '5117'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511724', '大竹县', '5117'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511725', '渠县', '5117'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511781', '万源市', '5117'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511802', '雨城区', '5118'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511803', '名山区', '5118'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511822', '荥经县', '5118'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511823', '汉源县', '5118'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511824', '石棉县', '5118'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511825', '天全县', '5118'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511826', '芦山县', '5118'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511827', '宝兴县', '5118'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511902', '巴州区', '5119'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511903', '恩阳区', '5119'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511921', '通江县', '5119'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511922', '南江县', '5119'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('511923', '平昌县', '5119'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('512002', '雁江区', '5120'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('512021', '安岳县', '5120'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('512022', '乐至县', '5120'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513201', '马尔康市', '5132'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513221', '汶川县', '5132'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513222', '理县', '5132'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513223', '茂县', '5132'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513224', '松潘县', '5132'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513225', '九寨沟县', '5132'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513226', '金川县', '5132'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513227', '小金县', '5132'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513228', '黑水县', '5132'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513230', '壤塘县', '5132'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513231', '阿坝县', '5132'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513232', '若尔盖县', '5132'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513233', '红原县', '5132'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513301', '康定市', '5133'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513322', '泸定县', '5133'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513323', '丹巴县', '5133'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513324', '九龙县', '5133'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513325', '雅江县', '5133'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513326', '道孚县', '5133'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513327', '炉霍县', '5133'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513328', '甘孜县', '5133'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513329', '新龙县', '5133'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513330', '德格县', '5133'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513331', '白玉县', '5133'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513332', '石渠县', '5133'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513333', '色达县', '5133'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513334', '理塘县', '5133'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513335', '巴塘县', '5133'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513336', '乡城县', '5133'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513337', '稻城县', '5133'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513338', '得荣县', '5133'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513401', '西昌市', '5134'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513402', '会理市', '5134'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513422', '木里藏族自治县', '5134'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513423', '盐源县', '5134'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513424', '德昌县', '5134'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513426', '会东县', '5134'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513427', '宁南县', '5134'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513428', '普格县', '5134'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513429', '布拖县', '5134'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513430', '金阳县', '5134'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513431', '昭觉县', '5134'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513432', '喜德县', '5134'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513433', '冕宁县', '5134'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513434', '越西县', '5134'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513435', '甘洛县', '5134'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513436', '美姑县', '5134'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('513437', '雷波县', '5134'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520102', '南明区', '5201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520103', '云岩区', '5201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520111', '花溪区', '5201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520112', '乌当区', '5201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520113', '白云区', '5201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520115', '观山湖区', '5201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520121', '开阳县', '5201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520122', '息烽县', '5201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520123', '修文县', '5201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520181', '清镇市', '5201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520201', '钟山区', '5202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520203', '六枝特区', '5202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520204', '水城区', '5202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520281', '盘州市', '5202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520302', '红花岗区', '5203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520303', '汇川区', '5203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520304', '播州区', '5203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520322', '桐梓县', '5203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520323', '绥阳县', '5203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520324', '正安县', '5203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520325', '道真仡佬族苗族自治县', '5203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520326', '务川仡佬族苗族自治县', '5203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520327', '凤冈县', '5203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520328', '湄潭县', '5203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520329', '余庆县', '5203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520330', '习水县', '5203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520381', '赤水市', '5203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520382', '仁怀市', '5203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520402', '西秀区', '5204'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520403', '平坝区', '5204'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520422', '普定县', '5204'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520423', '镇宁布依族苗族自治县', '5204'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520424', '关岭布依族苗族自治县', '5204'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520425', '紫云苗族布依族自治县', '5204'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520502', '七星关区', '5205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520521', '大方县', '5205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520523', '金沙县', '5205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520524', '织金县', '5205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520525', '纳雍县', '5205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520526', '威宁彝族回族苗族自治县', '5205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520527', '赫章县', '5205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520581', '黔西市', '5205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520602', '碧江区', '5206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520603', '万山区', '5206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520621', '江口县', '5206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520622', '玉屏侗族自治县', '5206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520623', '石阡县', '5206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520624', '思南县', '5206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520625', '印江土家族苗族自治县', '5206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520626', '德江县', '5206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520627', '沿河土家族自治县', '5206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('520628', '松桃苗族自治县', '5206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522301', '兴义市', '5223'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522302', '兴仁市', '5223'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522323', '普安县', '5223'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522324', '晴隆县', '5223'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522325', '贞丰县', '5223'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522326', '望谟县', '5223'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522327', '册亨县', '5223'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522328', '安龙县', '5223'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522601', '凯里市', '5226'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522622', '黄平县', '5226'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522623', '施秉县', '5226'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522624', '三穗县', '5226'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522625', '镇远县', '5226'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522626', '岑巩县', '5226'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522627', '天柱县', '5226'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522628', '锦屏县', '5226'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522629', '剑河县', '5226'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522630', '台江县', '5226'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522631', '黎平县', '5226'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522632', '榕江县', '5226'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522633', '从江县', '5226'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522634', '雷山县', '5226'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522635', '麻江县', '5226'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522636', '丹寨县', '5226'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522701', '都匀市', '5227'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522702', '福泉市', '5227'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522722', '荔波县', '5227'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522723', '贵定县', '5227'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522725', '瓮安县', '5227'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522726', '独山县', '5227'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522727', '平塘县', '5227'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522728', '罗甸县', '5227'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522729', '长顺县', '5227'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522730', '龙里县', '5227'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522731', '惠水县', '5227'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('522732', '三都水族自治县', '5227'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530102', '五华区', '5301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530103', '盘龙区', '5301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530111', '官渡区', '5301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530112', '西山区', '5301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530113', '东川区', '5301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530114', '呈贡区', '5301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530115', '晋宁区', '5301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530124', '富民县', '5301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530125', '宜良县', '5301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530126', '石林彝族自治县', '5301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530127', '嵩明县', '5301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530128', '禄劝彝族苗族自治县', '5301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530129', '寻甸回族彝族自治县', '5301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530181', '安宁市', '5301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530302', '麒麟区', '5303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530303', '沾益区', '5303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530304', '马龙区', '5303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530322', '陆良县', '5303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530323', '师宗县', '5303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530324', '罗平县', '5303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530325', '富源县', '5303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530326', '会泽县', '5303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530381', '宣威市', '5303'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530402', '红塔区', '5304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530403', '江川区', '5304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530423', '通海县', '5304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530424', '华宁县', '5304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530425', '易门县', '5304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530426', '峨山彝族自治县', '5304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530427', '新平彝族傣族自治县', '5304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530428', '元江哈尼族彝族傣族自治县', '5304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530481', '澄江市', '5304'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530502', '隆阳区', '5305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530521', '施甸县', '5305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530523', '龙陵县', '5305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530524', '昌宁县', '5305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530581', '腾冲市', '5305'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530602', '昭阳区', '5306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530621', '鲁甸县', '5306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530622', '巧家县', '5306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530623', '盐津县', '5306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530624', '大关县', '5306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530625', '永善县', '5306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530626', '绥江县', '5306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530627', '镇雄县', '5306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530628', '彝良县', '5306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530629', '威信县', '5306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530681', '水富市', '5306'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530702', '古城区', '5307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530721', '玉龙纳西族自治县', '5307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530722', '永胜县', '5307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530723', '华坪县', '5307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530724', '宁蒗彝族自治县', '5307'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530802', '思茅区', '5308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530821', '宁洱哈尼族彝族自治县', '5308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530822', '墨江哈尼族自治县', '5308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530823', '景东彝族自治县', '5308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530824', '景谷傣族彝族自治县', '5308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530825', '镇沅彝族哈尼族拉祜族自治县', '5308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530826', '江城哈尼族彝族自治县', '5308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530827', '孟连傣族拉祜族佤族自治县', '5308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530828', '澜沧拉祜族自治县', '5308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530829', '西盟佤族自治县', '5308'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530902', '临翔区', '5309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530921', '凤庆县', '5309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530922', '云县', '5309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530923', '永德县', '5309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530924', '镇康县', '5309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530925', '双江拉祜族佤族布朗族傣族自治县', '5309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530926', '耿马傣族佤族自治县', '5309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('530927', '沧源佤族自治县', '5309'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532301', '楚雄市', '5323'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532302', '禄丰市', '5323'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532322', '双柏县', '5323'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532323', '牟定县', '5323'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532324', '南华县', '5323'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532325', '姚安县', '5323'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532326', '大姚县', '5323'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532327', '永仁县', '5323'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532328', '元谋县', '5323'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532329', '武定县', '5323'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532501', '个旧市', '5325'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532502', '开远市', '5325'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532503', '蒙自市', '5325'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532504', '弥勒市', '5325'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532523', '屏边苗族自治县', '5325'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532524', '建水县', '5325'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532525', '石屏县', '5325'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532527', '泸西县', '5325'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532528', '元阳县', '5325'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532529', '红河县', '5325'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532530', '金平苗族瑶族傣族自治县', '5325'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532531', '绿春县', '5325'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532532', '河口瑶族自治县', '5325'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532601', '文山市', '5326'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532622', '砚山县', '5326'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532623', '西畴县', '5326'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532624', '麻栗坡县', '5326'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532625', '马关县', '5326'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532626', '丘北县', '5326'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532627', '广南县', '5326'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532628', '富宁县', '5326'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532801', '景洪市', '5328'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532822', '勐海县', '5328'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532823', '勐腊县', '5328'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532901', '大理市', '5329'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532922', '漾濞彝族自治县', '5329'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532923', '祥云县', '5329'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532924', '宾川县', '5329'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532925', '弥渡县', '5329'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532926', '南涧彝族自治县', '5329'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532927', '巍山彝族回族自治县', '5329'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532928', '永平县', '5329'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532929', '云龙县', '5329'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532930', '洱源县', '5329'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532931', '剑川县', '5329'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('532932', '鹤庆县', '5329'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('533102', '瑞丽市', '5331'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('533103', '芒市', '5331'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('533122', '梁河县', '5331'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('533123', '盈江县', '5331'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('533124', '陇川县', '5331'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('533301', '泸水市', '5333'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('533323', '福贡县', '5333'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('533324', '贡山独龙族怒族自治县', '5333'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('533325', '兰坪白族普米族自治县', '5333'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('533401', '香格里拉市', '5334'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('533422', '德钦县', '5334'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('533423', '维西傈僳族自治县', '5334'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540102', '城关区', '5401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540103', '堆龙德庆区', '5401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540104', '达孜区', '5401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540121', '林周县', '5401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540122', '当雄县', '5401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540123', '尼木县', '5401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540124', '曲水县', '5401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540127', '墨竹工卡县', '5401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540171', '格尔木藏青工业园区', '5401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540172', '拉萨经济技术开发区', '5401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540173', '西藏文化旅游创意园区', '5401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540174', '达孜工业园区', '5401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540202', '桑珠孜区', '5402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540221', '南木林县', '5402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540222', '江孜县', '5402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540223', '定日县', '5402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540224', '萨迦县', '5402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540225', '拉孜县', '5402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540226', '昂仁县', '5402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540227', '谢通门县', '5402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540228', '白朗县', '5402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540229', '仁布县', '5402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540230', '康马县', '5402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540231', '定结县', '5402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540232', '仲巴县', '5402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540233', '亚东县', '5402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540234', '吉隆县', '5402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540235', '聂拉木县', '5402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540236', '萨嘎县', '5402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540237', '岗巴县', '5402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540302', '卡若区', '5403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540321', '江达县', '5403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540322', '贡觉县', '5403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540323', '类乌齐县', '5403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540324', '丁青县', '5403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540325', '察雅县', '5403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540326', '八宿县', '5403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540327', '左贡县', '5403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540328', '芒康县', '5403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540329', '洛隆县', '5403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540330', '边坝县', '5403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540402', '巴宜区', '5404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540421', '工布江达县', '5404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540422', '米林县', '5404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540423', '墨脱县', '5404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540424', '波密县', '5404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540425', '察隅县', '5404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540426', '朗县', '5404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540502', '乃东区', '5405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540521', '扎囊县', '5405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540522', '贡嘎县', '5405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540523', '桑日县', '5405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540524', '琼结县', '5405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540525', '曲松县', '5405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540526', '措美县', '5405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540527', '洛扎县', '5405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540528', '加查县', '5405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540529', '隆子县', '5405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540530', '错那县', '5405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540531', '浪卡子县', '5405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540602', '色尼区', '5406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540621', '嘉黎县', '5406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540622', '比如县', '5406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540623', '聂荣县', '5406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540624', '安多县', '5406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540625', '申扎县', '5406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540626', '索县', '5406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540627', '班戈县', '5406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540628', '巴青县', '5406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540629', '尼玛县', '5406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('540630', '双湖县', '5406'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('542521', '普兰县', '5425'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('542522', '札达县', '5425'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('542523', '噶尔县', '5425'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('542524', '日土县', '5425'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('542525', '革吉县', '5425'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('542526', '改则县', '5425'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('542527', '措勤县', '5425'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610102', '新城区', '6101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610103', '碑林区', '6101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610104', '莲湖区', '6101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610111', '灞桥区', '6101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610112', '未央区', '6101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610113', '雁塔区', '6101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610114', '阎良区', '6101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610115', '临潼区', '6101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610116', '长安区', '6101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610117', '高陵区', '6101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610118', '鄠邑区', '6101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610122', '蓝田县', '6101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610124', '周至县', '6101'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610202', '王益区', '6102'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610203', '印台区', '6102'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610204', '耀州区', '6102'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610222', '宜君县', '6102'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610302', '渭滨区', '6103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610303', '金台区', '6103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610304', '陈仓区', '6103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610305', '凤翔区', '6103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610323', '岐山县', '6103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610324', '扶风县', '6103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610326', '眉县', '6103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610327', '陇县', '6103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610328', '千阳县', '6103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610329', '麟游县', '6103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610330', '凤县', '6103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610331', '太白县', '6103'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610402', '秦都区', '6104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610403', '杨陵区', '6104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610404', '渭城区', '6104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610422', '三原县', '6104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610423', '泾阳县', '6104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610424', '乾县', '6104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610425', '礼泉县', '6104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610426', '永寿县', '6104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610428', '长武县', '6104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610429', '旬邑县', '6104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610430', '淳化县', '6104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610431', '武功县', '6104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610481', '兴平市', '6104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610482', '彬州市', '6104'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610502', '临渭区', '6105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610503', '华州区', '6105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610522', '潼关县', '6105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610523', '大荔县', '6105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610524', '合阳县', '6105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610525', '澄城县', '6105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610526', '蒲城县', '6105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610527', '白水县', '6105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610528', '富平县', '6105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610581', '韩城市', '6105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610582', '华阴市', '6105'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610602', '宝塔区', '6106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610603', '安塞区', '6106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610621', '延长县', '6106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610622', '延川县', '6106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610625', '志丹县', '6106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610626', '吴起县', '6106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610627', '甘泉县', '6106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610628', '富县', '6106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610629', '洛川县', '6106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610630', '宜川县', '6106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610631', '黄龙县', '6106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610632', '黄陵县', '6106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610681', '子长市', '6106'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610702', '汉台区', '6107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610703', '南郑区', '6107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610722', '城固县', '6107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610723', '洋县', '6107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610724', '西乡县', '6107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610725', '勉县', '6107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610726', '宁强县', '6107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610727', '略阳县', '6107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610728', '镇巴县', '6107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610729', '留坝县', '6107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610730', '佛坪县', '6107'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610802', '榆阳区', '6108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610803', '横山区', '6108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610822', '府谷县', '6108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610824', '靖边县', '6108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610825', '定边县', '6108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610826', '绥德县', '6108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610827', '米脂县', '6108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610828', '佳县', '6108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610829', '吴堡县', '6108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610830', '清涧县', '6108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610831', '子洲县', '6108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610881', '神木市', '6108'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610902', '汉滨区', '6109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610921', '汉阴县', '6109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610922', '石泉县', '6109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610923', '宁陕县', '6109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610924', '紫阳县', '6109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610925', '岚皋县', '6109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610926', '平利县', '6109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610927', '镇坪县', '6109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610929', '白河县', '6109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('610981', '旬阳市', '6109'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('611002', '商州区', '6110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('611021', '洛南县', '6110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('611022', '丹凤县', '6110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('611023', '商南县', '6110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('611024', '山阳县', '6110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('611025', '镇安县', '6110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('611026', '柞水县', '6110'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620102', '城关区', '6201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620103', '七里河区', '6201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620104', '西固区', '6201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620105', '安宁区', '6201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620111', '红古区', '6201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620121', '永登县', '6201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620122', '皋兰县', '6201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620123', '榆中县', '6201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620171', '兰州新区', '6201'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620201', '嘉峪关市', '6202'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620302', '金川区', '6203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620321', '永昌县', '6203'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620402', '白银区', '6204'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620403', '平川区', '6204'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620421', '靖远县', '6204'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620422', '会宁县', '6204'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620423', '景泰县', '6204'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620502', '秦州区', '6205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620503', '麦积区', '6205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620521', '清水县', '6205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620522', '秦安县', '6205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620523', '甘谷县', '6205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620524', '武山县', '6205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620525', '张家川回族自治县', '6205'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620602', '凉州区', '6206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620621', '民勤县', '6206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620622', '古浪县', '6206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620623', '天祝藏族自治县', '6206'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620702', '甘州区', '6207'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620721', '肃南裕固族自治县', '6207'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620722', '民乐县', '6207'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620723', '临泽县', '6207'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620724', '高台县', '6207'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620725', '山丹县', '6207'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620802', '崆峒区', '6208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620821', '泾川县', '6208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620822', '灵台县', '6208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620823', '崇信县', '6208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620825', '庄浪县', '6208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620826', '静宁县', '6208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620881', '华亭市', '6208'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620902', '肃州区', '6209'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620921', '金塔县', '6209'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620922', '瓜州县', '6209'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620923', '肃北蒙古族自治县', '6209'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620924', '阿克塞哈萨克族自治县', '6209'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620981', '玉门市', '6209'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('620982', '敦煌市', '6209'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('621002', '西峰区', '6210'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('621021', '庆城县', '6210'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('621022', '环县', '6210'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('621023', '华池县', '6210'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('621024', '合水县', '6210'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('621025', '正宁县', '6210'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('621026', '宁县', '6210'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('621027', '镇原县', '6210'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('621102', '安定区', '6211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('621121', '通渭县', '6211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('621122', '陇西县', '6211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('621123', '渭源县', '6211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('621124', '临洮县', '6211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('621125', '漳县', '6211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('621126', '岷县', '6211'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('621202', '武都区', '6212'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('621221', '成县', '6212'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('621222', '文县', '6212'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('621223', '宕昌县', '6212'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('621224', '康县', '6212'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('621225', '西和县', '6212'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('621226', '礼县', '6212'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('621227', '徽县', '6212'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('621228', '两当县', '6212'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('622901', '临夏市', '6229'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('622921', '临夏县', '6229'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('622922', '康乐县', '6229'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('622923', '永靖县', '6229'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('622924', '广河县', '6229'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('622925', '和政县', '6229'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('622926', '东乡族自治县', '6229'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('622927', '积石山保安族东乡族撒拉族自治县', '6229'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('623001', '合作市', '6230'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('623021', '临潭县', '6230'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('623022', '卓尼县', '6230'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('623023', '舟曲县', '6230'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('623024', '迭部县', '6230'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('623025', '玛曲县', '6230'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('623026', '碌曲县', '6230'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('623027', '夏河县', '6230'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('630102', '城东区', '6301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('630103', '城中区', '6301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('630104', '城西区', '6301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('630105', '城北区', '6301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('630106', '湟中区', '6301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('630121', '大通回族土族自治县', '6301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('630123', '湟源县', '6301'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('630202', '乐都区', '6302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('630203', '平安区', '6302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('630222', '民和回族土族自治县', '6302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('630223', '互助土族自治县', '6302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('630224', '化隆回族自治县', '6302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('630225', '循化撒拉族自治县', '6302'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632221', '门源回族自治县', '6322'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632222', '祁连县', '6322'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632223', '海晏县', '6322'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632224', '刚察县', '6322'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632301', '同仁市', '6323'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632322', '尖扎县', '6323'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632323', '泽库县', '6323'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632324', '河南蒙古族自治县', '6323'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632521', '共和县', '6325'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632522', '同德县', '6325'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632523', '贵德县', '6325'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632524', '兴海县', '6325'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632525', '贵南县', '6325'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632621', '玛沁县', '6326'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632622', '班玛县', '6326'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632623', '甘德县', '6326'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632624', '达日县', '6326'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632625', '久治县', '6326'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632626', '玛多县', '6326'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632701', '玉树市', '6327'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632722', '杂多县', '6327'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632723', '称多县', '6327'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632724', '治多县', '6327'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632725', '囊谦县', '6327'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632726', '曲麻莱县', '6327'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632801', '格尔木市', '6328'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632802', '德令哈市', '6328'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632803', '茫崖市', '6328'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632821', '乌兰县', '6328'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632822', '都兰县', '6328'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632823', '天峻县', '6328'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('632857', '大柴旦行政委员会', '6328'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('640104', '兴庆区', '6401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('640105', '西夏区', '6401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('640106', '金凤区', '6401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('640121', '永宁县', '6401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('640122', '贺兰县', '6401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('640181', '灵武市', '6401'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('640202', '大武口区', '6402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('640205', '惠农区', '6402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('640221', '平罗县', '6402'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('640302', '利通区', '6403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('640303', '红寺堡区', '6403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('640323', '盐池县', '6403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('640324', '同心县', '6403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('640381', '青铜峡市', '6403'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('640402', '原州区', '6404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('640422', '西吉县', '6404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('640423', '隆德县', '6404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('640424', '泾源县', '6404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('640425', '彭阳县', '6404'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('640502', '沙坡头区', '6405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('640521', '中宁县', '6405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('640522', '海原县', '6405'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('650102', '天山区', '6501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('650103', '沙依巴克区', '6501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('650104', '新市区', '6501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('650105', '水磨沟区', '6501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('650106', '头屯河区', '6501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('650107', '达坂城区', '6501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('650109', '米东区', '6501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('650121', '乌鲁木齐县', '6501'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('650202', '独山子区', '6502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('650203', '克拉玛依区', '6502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('650204', '白碱滩区', '6502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('650205', '乌尔禾区', '6502'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('650402', '高昌区', '6504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('650421', '鄯善县', '6504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('650422', '托克逊县', '6504'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('650502', '伊州区', '6505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('650521', '巴里坤哈萨克自治县', '6505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('650522', '伊吾县', '6505'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652301', '昌吉市', '6523'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652302', '阜康市', '6523'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652323', '呼图壁县', '6523'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652324', '玛纳斯县', '6523'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652325', '奇台县', '6523'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652327', '吉木萨尔县', '6523'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652328', '木垒哈萨克自治县', '6523'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652701', '博乐市', '6527'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652702', '阿拉山口市', '6527'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652722', '精河县', '6527'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652723', '温泉县', '6527'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652801', '库尔勒市', '6528'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652822', '轮台县', '6528'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652823', '尉犁县', '6528'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652824', '若羌县', '6528'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652825', '且末县', '6528'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652826', '焉耆回族自治县', '6528'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652827', '和静县', '6528'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652828', '和硕县', '6528'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652829', '博湖县', '6528'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652871', '库尔勒经济技术开发区', '6528'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652901', '阿克苏市', '6529'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652902', '库车市', '6529'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652922', '温宿县', '6529'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652924', '沙雅县', '6529'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652925', '新和县', '6529'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652926', '拜城县', '6529'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652927', '乌什县', '6529'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652928', '阿瓦提县', '6529'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('652929', '柯坪县', '6529'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('653001', '阿图什市', '6530'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('653022', '阿克陶县', '6530'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('653023', '阿合奇县', '6530'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('653024', '乌恰县', '6530'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('653101', '喀什市', '6531'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('653121', '疏附县', '6531'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('653122', '疏勒县', '6531'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('653123', '英吉沙县', '6531'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('653124', '泽普县', '6531'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('653125', '莎车县', '6531'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('653126', '叶城县', '6531'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('653127', '麦盖提县', '6531'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('653128', '岳普湖县', '6531'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('653129', '伽师县', '6531'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('653130', '巴楚县', '6531'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('653131', '塔什库尔干塔吉克自治县', '6531'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('653201', '和田市', '6532'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('653221', '和田县', '6532'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('653222', '墨玉县', '6532'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('653223', '皮山县', '6532'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('653224', '洛浦县', '6532'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('653225', '策勒县', '6532'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('653226', '于田县', '6532'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('653227', '民丰县', '6532'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654002', '伊宁市', '6540'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654003', '奎屯市', '6540'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654004', '霍尔果斯市', '6540'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654021', '伊宁县', '6540'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654022', '察布查尔锡伯自治县', '6540'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654023', '霍城县', '6540'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654024', '巩留县', '6540'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654025', '新源县', '6540'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654026', '昭苏县', '6540'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654027', '特克斯县', '6540'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654028', '尼勒克县', '6540'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654201', '塔城市', '6542'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654202', '乌苏市', '6542'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654203', '沙湾市', '6542'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654221', '额敏县', '6542'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654224', '托里县', '6542'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654225', '裕民县', '6542'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654226', '和布克赛尔蒙古自治县', '6542'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654301', '阿勒泰市', '6543'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654321', '布尔津县', '6543'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654322', '富蕴县', '6543'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654323', '福海县', '6543'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654324', '哈巴河县', '6543'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654325', '青河县', '6543'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('654326', '吉木乃县', '6543'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('659001', '石河子市', '6590'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('659002', '阿拉尔市', '6590'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('659003', '图木舒克市', '6590'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('659004', '五家渠市', '6590'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('659005', '北屯市', '6590'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('659006', '铁门关市', '6590'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('659007', '双河市', '6590'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('659008', '可克达拉市', '6590'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('659009', '昆玉市', '6590'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('659010', '胡杨河市', '6590'); - -INSERT INTO `base_area`(`code`, `name`, `city_code`) VALUES ('659011', '新星市', '6590'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1101', '市辖区', '11'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1201', '市辖区', '12'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1301', '石家庄市', '13'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1302', '唐山市', '13'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1303', '秦皇岛市', '13'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1304', '邯郸市', '13'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1305', '邢台市', '13'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1306', '保定市', '13'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1307', '张家口市', '13'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1308', '承德市', '13'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1309', '沧州市', '13'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1310', '廊坊市', '13'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1311', '衡水市', '13'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1401', '太原市', '14'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1402', '大同市', '14'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1403', '阳泉市', '14'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1404', '长治市', '14'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1405', '晋城市', '14'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1406', '朔州市', '14'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1407', '晋中市', '14'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1408', '运城市', '14'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1409', '忻州市', '14'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1410', '临汾市', '14'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1411', '吕梁市', '14'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1501', '呼和浩特市', '15'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1502', '包头市', '15'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1503', '乌海市', '15'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1504', '赤峰市', '15'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1505', '通辽市', '15'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1506', '鄂尔多斯市', '15'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1507', '呼伦贝尔市', '15'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1508', '巴彦淖尔市', '15'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1509', '乌兰察布市', '15'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1522', '兴安盟', '15'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1525', '锡林郭勒盟', '15'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('1529', '阿拉善盟', '15'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2101', '沈阳市', '21'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2102', '大连市', '21'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2103', '鞍山市', '21'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2104', '抚顺市', '21'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2105', '本溪市', '21'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2106', '丹东市', '21'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2107', '锦州市', '21'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2108', '营口市', '21'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2109', '阜新市', '21'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2110', '辽阳市', '21'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2111', '盘锦市', '21'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2112', '铁岭市', '21'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2113', '朝阳市', '21'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2114', '葫芦岛市', '21'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2201', '长春市', '22'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2202', '吉林市', '22'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2203', '四平市', '22'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2204', '辽源市', '22'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2205', '通化市', '22'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2206', '白山市', '22'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2207', '松原市', '22'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2208', '白城市', '22'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2224', '延边朝鲜族自治州', '22'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2301', '哈尔滨市', '23'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2302', '齐齐哈尔市', '23'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2303', '鸡西市', '23'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2304', '鹤岗市', '23'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2305', '双鸭山市', '23'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2306', '大庆市', '23'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2307', '伊春市', '23'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2308', '佳木斯市', '23'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2309', '七台河市', '23'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2310', '牡丹江市', '23'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2311', '黑河市', '23'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2312', '绥化市', '23'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('2327', '大兴安岭地区', '23'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3101', '市辖区', '31'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3201', '南京市', '32'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3202', '无锡市', '32'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3203', '徐州市', '32'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3204', '常州市', '32'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3205', '苏州市', '32'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3206', '南通市', '32'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3207', '连云港市', '32'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3208', '淮安市', '32'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3209', '盐城市', '32'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3210', '扬州市', '32'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3211', '镇江市', '32'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3212', '泰州市', '32'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3213', '宿迁市', '32'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3301', '杭州市', '33'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3302', '宁波市', '33'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3303', '温州市', '33'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3304', '嘉兴市', '33'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3305', '湖州市', '33'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3306', '绍兴市', '33'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3307', '金华市', '33'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3308', '衢州市', '33'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3309', '舟山市', '33'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3310', '台州市', '33'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3311', '丽水市', '33'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3401', '合肥市', '34'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3402', '芜湖市', '34'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3403', '蚌埠市', '34'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3404', '淮南市', '34'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3405', '马鞍山市', '34'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3406', '淮北市', '34'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3407', '铜陵市', '34'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3408', '安庆市', '34'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3410', '黄山市', '34'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3411', '滁州市', '34'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3412', '阜阳市', '34'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3413', '宿州市', '34'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3415', '六安市', '34'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3416', '亳州市', '34'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3417', '池州市', '34'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3418', '宣城市', '34'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3501', '福州市', '35'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3502', '厦门市', '35'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3503', '莆田市', '35'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3504', '三明市', '35'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3505', '泉州市', '35'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3506', '漳州市', '35'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3507', '南平市', '35'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3508', '龙岩市', '35'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3509', '宁德市', '35'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3601', '南昌市', '36'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3602', '景德镇市', '36'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3603', '萍乡市', '36'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3604', '九江市', '36'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3605', '新余市', '36'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3606', '鹰潭市', '36'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3607', '赣州市', '36'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3608', '吉安市', '36'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3609', '宜春市', '36'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3610', '抚州市', '36'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3611', '上饶市', '36'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3701', '济南市', '37'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3702', '青岛市', '37'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3703', '淄博市', '37'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3704', '枣庄市', '37'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3705', '东营市', '37'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3706', '烟台市', '37'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3707', '潍坊市', '37'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3708', '济宁市', '37'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3709', '泰安市', '37'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3710', '威海市', '37'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3711', '日照市', '37'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3713', '临沂市', '37'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3714', '德州市', '37'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3715', '聊城市', '37'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3716', '滨州市', '37'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('3717', '菏泽市', '37'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4101', '郑州市', '41'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4102', '开封市', '41'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4103', '洛阳市', '41'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4104', '平顶山市', '41'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4105', '安阳市', '41'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4106', '鹤壁市', '41'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4107', '新乡市', '41'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4108', '焦作市', '41'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4109', '濮阳市', '41'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4110', '许昌市', '41'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4111', '漯河市', '41'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4112', '三门峡市', '41'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4113', '南阳市', '41'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4114', '商丘市', '41'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4115', '信阳市', '41'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4116', '周口市', '41'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4117', '驻马店市', '41'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4190', '省直辖县级行政区划', '41'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4201', '武汉市', '42'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4202', '黄石市', '42'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4203', '十堰市', '42'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4205', '宜昌市', '42'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4206', '襄阳市', '42'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4207', '鄂州市', '42'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4208', '荆门市', '42'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4209', '孝感市', '42'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4210', '荆州市', '42'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4211', '黄冈市', '42'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4212', '咸宁市', '42'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4213', '随州市', '42'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4228', '恩施土家族苗族自治州', '42'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4290', '省直辖县级行政区划', '42'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4301', '长沙市', '43'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4302', '株洲市', '43'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4303', '湘潭市', '43'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4304', '衡阳市', '43'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4305', '邵阳市', '43'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4306', '岳阳市', '43'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4307', '常德市', '43'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4308', '张家界市', '43'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4309', '益阳市', '43'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4310', '郴州市', '43'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4311', '永州市', '43'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4312', '怀化市', '43'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4313', '娄底市', '43'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4331', '湘西土家族苗族自治州', '43'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4401', '广州市', '44'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4402', '韶关市', '44'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4403', '深圳市', '44'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4404', '珠海市', '44'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4405', '汕头市', '44'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4406', '佛山市', '44'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4407', '江门市', '44'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4408', '湛江市', '44'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4409', '茂名市', '44'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4412', '肇庆市', '44'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4413', '惠州市', '44'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4414', '梅州市', '44'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4415', '汕尾市', '44'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4416', '河源市', '44'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4417', '阳江市', '44'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4418', '清远市', '44'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4419', '东莞市', '44'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4420', '中山市', '44'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4451', '潮州市', '44'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4452', '揭阳市', '44'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4453', '云浮市', '44'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4501', '南宁市', '45'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4502', '柳州市', '45'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4503', '桂林市', '45'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4504', '梧州市', '45'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4505', '北海市', '45'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4506', '防城港市', '45'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4507', '钦州市', '45'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4508', '贵港市', '45'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4509', '玉林市', '45'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4510', '百色市', '45'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4511', '贺州市', '45'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4512', '河池市', '45'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4513', '来宾市', '45'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4514', '崇左市', '45'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4601', '海口市', '46'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4602', '三亚市', '46'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4603', '三沙市', '46'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4604', '儋州市', '46'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('4690', '省直辖县级行政区划', '46'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5001', '市辖区', '50'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5002', '县', '50'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5101', '成都市', '51'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5103', '自贡市', '51'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5104', '攀枝花市', '51'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5105', '泸州市', '51'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5106', '德阳市', '51'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5107', '绵阳市', '51'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5108', '广元市', '51'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5109', '遂宁市', '51'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5110', '内江市', '51'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5111', '乐山市', '51'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5113', '南充市', '51'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5114', '眉山市', '51'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5115', '宜宾市', '51'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5116', '广安市', '51'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5117', '达州市', '51'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5118', '雅安市', '51'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5119', '巴中市', '51'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5120', '资阳市', '51'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5132', '阿坝藏族羌族自治州', '51'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5133', '甘孜藏族自治州', '51'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5134', '凉山彝族自治州', '51'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5201', '贵阳市', '52'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5202', '六盘水市', '52'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5203', '遵义市', '52'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5204', '安顺市', '52'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5205', '毕节市', '52'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5206', '铜仁市', '52'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5223', '黔西南布依族苗族自治州', '52'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5226', '黔东南苗族侗族自治州', '52'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5227', '黔南布依族苗族自治州', '52'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5301', '昆明市', '53'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5303', '曲靖市', '53'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5304', '玉溪市', '53'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5305', '保山市', '53'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5306', '昭通市', '53'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5307', '丽江市', '53'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5308', '普洱市', '53'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5309', '临沧市', '53'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5323', '楚雄彝族自治州', '53'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5325', '红河哈尼族彝族自治州', '53'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5326', '文山壮族苗族自治州', '53'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5328', '西双版纳傣族自治州', '53'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5329', '大理白族自治州', '53'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5331', '德宏傣族景颇族自治州', '53'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5333', '怒江傈僳族自治州', '53'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5334', '迪庆藏族自治州', '53'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5401', '拉萨市', '54'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5402', '日喀则市', '54'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5403', '昌都市', '54'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5404', '林芝市', '54'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5405', '山南市', '54'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5406', '那曲市', '54'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('5425', '阿里地区', '54'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6101', '西安市', '61'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6102', '铜川市', '61'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6103', '宝鸡市', '61'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6104', '咸阳市', '61'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6105', '渭南市', '61'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6106', '延安市', '61'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6107', '汉中市', '61'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6108', '榆林市', '61'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6109', '安康市', '61'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6110', '商洛市', '61'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6201', '兰州市', '62'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6202', '嘉峪关市', '62'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6203', '金昌市', '62'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6204', '白银市', '62'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6205', '天水市', '62'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6206', '武威市', '62'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6207', '张掖市', '62'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6208', '平凉市', '62'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6209', '酒泉市', '62'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6210', '庆阳市', '62'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6211', '定西市', '62'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6212', '陇南市', '62'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6229', '临夏回族自治州', '62'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6230', '甘南藏族自治州', '62'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6301', '西宁市', '63'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6302', '海东市', '63'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6322', '海北藏族自治州', '63'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6323', '黄南藏族自治州', '63'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6325', '海南藏族自治州', '63'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6326', '果洛藏族自治州', '63'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6327', '玉树藏族自治州', '63'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6328', '海西蒙古族藏族自治州', '63'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6401', '银川市', '64'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6402', '石嘴山市', '64'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6403', '吴忠市', '64'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6404', '固原市', '64'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6405', '中卫市', '64'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6501', '乌鲁木齐市', '65'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6502', '克拉玛依市', '65'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6504', '吐鲁番市', '65'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6505', '哈密市', '65'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6523', '昌吉回族自治州', '65'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6527', '博尔塔拉蒙古自治州', '65'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6528', '巴音郭楞蒙古自治州', '65'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6529', '阿克苏地区', '65'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6530', '克孜勒苏柯尔克孜自治州', '65'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6531', '喀什地区', '65'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6532', '和田地区', '65'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6540', '伊犁哈萨克自治州', '65'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6542', '塔城地区', '65'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6543', '阿勒泰地区', '65'); - -INSERT INTO `base_city`(`code`, `name`, `province_code`) VALUES ('6590', '自治区直辖县级行政区划', '65'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('11', '北京市'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('12', '天津市'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('13', '河北省'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('14', '山西省'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('15', '内蒙古自治区'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('21', '辽宁省'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('22', '吉林省'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('23', '黑龙江省'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('31', '上海市'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('32', '江苏省'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('33', '浙江省'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('34', '安徽省'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('35', '福建省'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('36', '江西省'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('37', '山东省'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('41', '河南省'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('42', '湖北省'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('43', '湖南省'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('44', '广东省'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('45', '广西壮族自治区'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('46', '海南省'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('50', '重庆市'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('51', '四川省'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('52', '贵州省'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('53', '云南省'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('54', '西藏自治区'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('61', '陕西省'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('62', '甘肃省'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('63', '青海省'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('64', '宁夏回族自治区'); - -INSERT INTO `base_province`(`code`, `name`) VALUES ('65', '新疆维吾尔自治区'); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1589495250199760896, 'adminv3', 1580740450633101312, '22', NULL, '11', b'1', NULL, b'0', b'0', NULL, NULL, NULL, NULL, 0, 2, NULL, b'0', b'0', b'0', b'0', '', 1414143554414059520, '2022-11-07 13:49:34', 1414143554414059520, '2022-11-07 13:49:34', 0, 0); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1617513861605191680, 'admin', 1414596052497092608, '123', NULL, '123', b'0', NULL, b'0', b'0', NULL, NULL, NULL, NULL, 0, 2, NULL, b'0', b'0', b'0', b'0', '', 1399985191002447872, '2023-01-23 21:25:31', 1399985191002447872, '2023-01-23 21:56:34', 3, 0); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1617847577158324224, 'adminv3', 1597102799370317824, '数据权限', 'DataPermDemoList', NULL, b'0', '', b'0', b'0', '/modules/demo/data/perm/DataPermDemoList.vue', NULL, '/demo/data/perm', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-01-24 19:31:35', 1414143554414059520, '2023-01-24 20:06:04', 2, 0); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1617847653746315264, 'adminv3', 1597102799370317824, '加密解密', 'DataEncryptDemoList', NULL, b'0', '', b'0', b'0', '/modules/demo/data/encrypt/DataEncryptDemoList.vue', NULL, '/demo/data/encrypt', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-01-24 19:31:53', 1414143554414059520, '2023-01-24 20:05:45', 1, 0); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1617847747375763456, 'adminv3', 1597102799370317824, '数据脱敏', 'DataSensitiveDemoList', NULL, b'0', '', b'0', b'0', '/modules/demo/data/sensitive/DataSensitiveDemoList.vue', NULL, '/demo/data/sensitive', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-01-24 19:32:16', 1414143554414059520, '2023-01-24 20:06:58', 1, 0); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1621150743447965696, 'admin', 1495968302034210816, '省市区联动', 'ChinaRegionDemo', NULL, b'0', '', b'0', b'0', 'demo/chinaregion/ChinaRegionDemo', NULL, '/demo/chinaregion', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2023-02-02 22:17:11', 1399985191002447872, '2023-02-08 09:43:39', 1, 0); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1623156857846034432, 'adminv3', 1582276516905177088, '省市区联动', 'ChinaRegionDemo', NULL, b'0', '', b'0', b'0', '/modules/demo/chinaregion/ChinaRegionDemo', NULL, '/demo/chinaregion', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-02-08 11:08:46', 1414143554414059520, '2023-02-08 11:08:46', 0, 0); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1623325795944439808, 'adminv3', 1599378992811429888, '邮件通知', '', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/notice', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-02-08 22:20:04', 1414143554414059520, '2023-02-08 22:20:04', 0, 0); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1623494586215579648, 'admin', 1552207982510706688, '行政区划', 'ChinaRegion', NULL, b'0', '', b'1', b'0', 'develop/region/ChinaRegionList', NULL, '/develop/region', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2023-02-09 09:30:47', 1399985191002447872, '2023-02-09 17:50:05', 1, 0); - -UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1582276516905177088, `title` = 'WS演示', `name` = 'WebsocketDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '/modules/demo/ws/WebsocketDemo', `component_name` = NULL, `path` = '/demo/ws', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-12-04 20:22:03', `last_modifier` = 1414143554414059520, `last_modified_time` = '2023-02-08 12:17:58', `version` = 1, `deleted` = 0 WHERE `id` = 1599378494880436224; - -UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1582276516905177088, `title` = '幂等请求演示', `name` = 'IdempotentDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '/modules/demo/idempotent/IdempotentDemo', `component_name` = NULL, `path` = '/demo/idempotent', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-12-04 20:22:23', `last_modifier` = 1414143554414059520, `last_modified_time` = '2023-02-08 11:46:00', `version` = 3, `deleted` = 0 WHERE `id` = 1599378579513102336; - -UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1582276516905177088, `title` = '消息中间件演示', `name` = 'MqDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '/modules/demo/mq/MqDemo', `component_name` = NULL, `path` = '/demo/mq', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-12-04 20:22:59', `last_modifier` = 1414143554414059520, `last_modified_time` = '2023-02-08 22:09:04', `version` = 2, `deleted` = 0 WHERE `id` = 1599378728490586112; - -UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1582276516905177088, `title` = '富文本编辑', `name` = 'WangEditorDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '/modules/demo/wangeditor/WangEditorDemo.vue', `component_name` = NULL, `path` = '/demo/wangEditor', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-12-04 20:23:25', `last_modifier` = 1414143554414059520, `last_modified_time` = '2023-02-10 09:05:16', `version` = 1, `deleted` = 0 WHERE `id` = 1599378838519762944; - -UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1599379197124366336, `title` = '组合支付', `name` = 'CombinationCashier', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '/demo/payment/cashier/CombinationCashier.vue', `component_name` = NULL, `path` = '/demo/pay/combination', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2022-12-04 20:25:46', `last_modifier` = 1414143554414059520, `last_modified_time` = '2022-12-08 22:32:55', `version` = 1, `deleted` = 0 WHERE `id` = 1599379428784164864; - - -SET FOREIGN_KEY_CHECKS=1; diff --git a/_config/sql/1.2.2/1.2.1_up_1.2.2.sql b/_config/sql/1.2.2/1.2.1_up_1.2.2.sql deleted file mode 100644 index a264264f5bffa5ee62dd915c11eca1a4508fd6cd..0000000000000000000000000000000000000000 --- a/_config/sql/1.2.2/1.2.1_up_1.2.2.sql +++ /dev/null @@ -1,106 +0,0 @@ -SET FOREIGN_KEY_CHECKS=0; - -CREATE TABLE `report_project_info` ( - `id` bigint(20) NOT NULL COMMENT '主键', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '项目名称', - `state` int(11) NULL DEFAULT NULL COMMENT '发布状态', - `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '报表内容', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '乐观锁', - `deleted` bit(1) NOT NULL COMMENT '删除标志', - `index_image` bigint(20) NULL DEFAULT NULL COMMENT '预览图片id', - `edit` bit(1) NULL DEFAULT NULL COMMENT '是否在编辑中', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '自定义大屏信息' ROW_FORMAT = Dynamic; - -CREATE TABLE `report_project_info_publish` ( - `id` bigint(20) NOT NULL COMMENT '主键', - `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '报表内容', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '乐观锁', - `deleted` bit(1) NOT NULL COMMENT '删除标志', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '自定义大屏发布信息' ROW_FORMAT = Dynamic; - -DROP TABLE `goods_brand`; - -DROP TABLE `goods_category`; - -DROP TABLE `goods_category_brand`; - -DROP TABLE `goods_category_parameter`; - -DROP TABLE `goods_category_parameter_group`; - -DROP TABLE `goods_category_specification`; - -DROP TABLE `goods_goods`; - -DROP TABLE `goods_goods_packing`; - -DROP TABLE `goods_goods_sku`; - -DROP TABLE `goods_goods_sku_attr`; - -DROP TABLE `goods_goods_sku_packing`; - -DROP TABLE `goods_specification`; - -DROP TABLE `order_order`; - -DROP TABLE `order_order_billing`; - -DROP TABLE `order_order_detail`; - -DROP TABLE `order_order_item_billing`; - -DROP TABLE `order_order_strategy_mapping`; - -DROP TABLE `sales_activity`; - -DROP TABLE `sales_check_rule`; - -DROP TABLE `sales_coupon`; - -DROP TABLE `sales_coupon_template`; - -DROP TABLE `sales_match_rule`; - -DROP TABLE `sales_strategy`; - -DROP TABLE `sales_strategy_check_rule`; - -DROP TABLE `sales_strategy_config`; - -DROP TABLE `sales_strategy_config_value`; - -DROP TABLE `sales_strategy_register`; - -SET FOREIGN_KEY_CHECKS = 0; - -INSERT INTO `iam_client`(`id`, `code`, `name`, `system`, `enable`, `login_type_ids`, `description`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1626840094767714304, 'GoView', '可视化平台', b'0', b'1', '1430430071299207168', '', 1414143554414059520, '2023-02-18 15:04:38', 1414143554414059520, '2023-02-18 15:04:38', 0, 0); - -INSERT INTO `iam_login_type`(`id`, `code`, `name`, `type`, `system`, `timeout`, `captcha`, `pwd_err_num`, `enable`, `description`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1626845524617203712, 'passwordGoView', '可视化平台登录', 'password', b'0', 3600, b'0', -1, b'1', '', 1414143554414059520, '2023-02-18 15:26:13', 1414143554414059520, '2023-02-18 15:26:13', 0, 0); - -UPDATE `iam_login_type` SET `code` = 'password', `name` = '账号密码登陆', `type` = 'password', `system` = b'1', `timeout` = 3600, `captcha` = b'0', `pwd_err_num` = -1, `enable` = b'1', `description` = NULL, `creator` = 1399985191002447872, `create_time` = '2021-08-25 15:21:20', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-11-03 22:24:53', `version` = 20, `deleted` = 0 WHERE `id` = 1430430071299207168; - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1631946120891707392, 'admin', 1552207982510706688, '可视化大屏', 'ProjectInfoList', NULL, b'0', '', b'0', b'0', 'develop/report/ProjectInfoList', NULL, '/develop/report', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2023-03-04 17:14:10', 1399985191002447872, '2023-03-04 17:14:10', 0, 0); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1629039360928075776, 'adminv3', 1582276341792985088, '可视化大屏', 'ProjectInfoList', NULL, b'0', '', b'0', b'0', '/modules/develop/report/ProjectInfoList', NULL, '/develop/report', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-02-24 16:43:44', 1414143554414059520, '2023-02-24 16:44:17', 1, 0); - -UPDATE `iam_perm_menu` SET `client_code` = 'adminv3', `parent_id` = 1599378992811429888, `title` = '邮件通知', `name` = 'EmailSenderDemo', `perm_code` = NULL, `effect` = b'0', `icon` = '', `hidden` = b'0', `hide_children_in_menu` = b'0', `component` = '/modules/demo/notice/email/EmailSenderDemo.vue', `component_name` = NULL, `path` = '/demo/notice/email', `redirect` = '', `sort_no` = 0, `menu_type` = 1, `leaf` = NULL, `keep_alive` = b'1', `target_outside` = b'0', `hidden_header_content` = b'0', `admin` = b'0', `remark` = NULL, `creator` = 1414143554414059520, `create_time` = '2023-02-08 22:20:04', `last_modifier` = 1414143554414059520, `last_modified_time` = '2023-02-20 10:38:55', `version` = 1, `deleted` = 0 WHERE `id` = 1623325795944439808; - -UPDATE `iam_user_info` SET `name` = '小小明', `username` = 'xxm', `password` = 'f52020dca765fd3943ed40a615dc2c5c', `phone` = '133****3333', `email` = 'x******@outlook.com', `client_ids` = '1430430071299207168,1430430071299207169,1626840094767714304,1580487061605175296', `avatar` = NULL, `source` = NULL, `admin` = b'1', `register_time` = '2021-06-02 15:04:12', `status` = 1, `creator` = 1, `create_time` = '2021-06-02 15:04:15', `last_modifier` = 1414143554414059520, `last_modified_time` = '2023-02-18 15:08:42', `version` = 55, `deleted` = 0 WHERE `id` = 1399985191002447872; - -UPDATE `iam_user_info` SET `name` = '小小明1995', `username` = 'xxm1995', `password` = 'f52020dca765fd3943ed40a615dc2c5c', `phone` = '130****0000', `email` = 'x******@foxmail.com', `client_ids` = '1430430071299207168,1580487061605175296,1430430071299207169,1626840094767714304', `avatar` = NULL, `source` = NULL, `admin` = b'1', `register_time` = '2021-07-11 16:44:31', `status` = 1, `creator` = 1, `create_time` = '2021-07-11 16:44:32', `last_modifier` = 1414143554414059520, `last_modified_time` = '2023-02-18 15:08:48', `version` = 9, `deleted` = 0 WHERE `id` = 1414143554414059520; - -SET FOREIGN_KEY_CHECKS = 1; - -SET FOREIGN_KEY_CHECKS=1; diff --git a/_config/sql/1.2.3/1.2.2_up_1.2.3.sql b/_config/sql/1.2.3/1.2.2_up_1.2.3.sql deleted file mode 100644 index 16cfd37f6a419a5d75193d8b958d32ec78d05082..0000000000000000000000000000000000000000 --- a/_config/sql/1.2.3/1.2.2_up_1.2.3.sql +++ /dev/null @@ -1,36 +0,0 @@ -SET FOREIGN_KEY_CHECKS=0; - -CREATE TABLE `notice_sms_channel_config` ( - `id` bigint(20) NOT NULL COMMENT '主键', - `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '渠道编码', - `signature` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '短信签名', - `api_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '短信ApiKey', - `api_secret` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '短信Api秘钥', - `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '回调地址', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '乐观锁', - `deleted` bit(1) NOT NULL COMMENT '删除标志', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '短信渠道配置' ROW_FORMAT = Dynamic; - -INSERT INTO `base_dict`(`id`, `code`, `name`, `enable`, `group_tag`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1633393287952257024, 'DatabaseType', '数据库类型', b'1', '开发', '数据库类型', 1414143554414059520, '2023-03-08 17:04:41', 1414143554414059520, '2023-03-08 17:04:41', 0, 0); - -UPDATE `base_dict` SET `code` = 'DataScopePerm', `name` = '数据范围权限', `enable` = b'1', `group_tag` = '系统属性', `remark` = '数据范围权限', `creator` = 1414143554414059520, `create_time` = '2022-11-07 15:59:30', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-12-09 22:09:25', `deleted` = 0, `version` = 3 WHERE `id` = 1589527951317389312; - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `enable`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1633403429028536320, 1633393287952257024, 'DatabaseType', 'mysql', 'MySQL', b'1', 1.00, '', 1414143554414059520, '2023-03-08 17:44:59', 1414143554414059520, '2023-03-08 17:44:59', 0, 0); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `enable`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1633403459470794752, 1633393287952257024, 'DatabaseType', 'oracle', 'Oracle', b'1', 2.00, '', 1414143554414059520, '2023-03-08 17:45:07', 1414143554414059520, '2023-03-08 17:45:07', 0, 0); - -INSERT INTO `base_dict_item`(`id`, `dict_id`, `dict_code`, `code`, `name`, `enable`, `sort_no`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `deleted`, `version`) VALUES (1633403498695925760, 1633393287952257024, 'DatabaseType', 'mssql', 'SQLServer', b'1', 3.00, '', 1414143554414059520, '2023-03-08 17:45:16', 1414143554414059520, '2023-03-08 17:45:16', 0, 0); - -UPDATE `base_dict_item` SET `dict_id` = 1570764395519111168, `dict_code` = 'BpmInstanceState', `code` = 'running', `name` = '运行中', `enable` = b'1', `sort_no` = 0.00, `remark` = '', `creator` = 1399985191002447872, `create_time` = '2022-09-16 21:21:18', `last_modifier` = 1399985191002447872, `last_modified_time` = '2022-12-09 22:15:46', `deleted` = 0, `version` = 2 WHERE `id` = 1570764765255397376; - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1635274568758435840, 'adminv3', 1582276341792985088, 'SQL查询语句', 'QuerySqlList', NULL, b'0', '', b'0', b'0', '/modules/develop/query/QuerySqlList', NULL, '/develop/querySql', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-03-13 21:40:14', 1414143554414059520, '2023-03-13 21:43:05', 2, 0); - -INSERT INTO `iam_perm_menu`(`id`, `client_code`, `parent_id`, `title`, `name`, `perm_code`, `effect`, `icon`, `hidden`, `hide_children_in_menu`, `component`, `component_name`, `path`, `redirect`, `sort_no`, `menu_type`, `leaf`, `keep_alive`, `target_outside`, `hidden_header_content`, `admin`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1635895711235022848, 'adminv3', 1582276447602692096, '流程设计器', 'ProcessDesign', NULL, b'0', '', b'0', b'0', '/modules/bpm/design/ProcessDesign.vue', NULL, '/bpm/design', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-03-15 14:48:26', 1414143554414059520, '2023-03-15 14:48:26', 0, 0); - - -SET FOREIGN_KEY_CHECKS=1; diff --git a/_config/sql/bootx-platform.sql b/_config/sql/bootx-platform.sql index c444b4d1ea47bbb784f3be812d3430601b8ce95e..c126cf17c0d313f211e71c9b8ab7fbd32056d31b 100644 --- a/_config/sql/bootx-platform.sql +++ b/_config/sql/bootx-platform.sql @@ -9,7 +9,7 @@ Target Server Version : 50735 File Encoding : 65001 - Date: 11/04/2023 09:16:10 + Date: 10/05/2023 09:31:59 */ SET NAMES utf8mb4; @@ -4275,18 +4275,6 @@ INSERT INTO `iam_perm_menu` VALUES (1450819607680991232, 'admin', NULL, '第三 INSERT INTO `iam_perm_menu` VALUES (1450821723027881984, 'admin', 1450819607680991232, '微信', 'WeChat', '', b'0', '', b'0', b'0', 'RouteView', NULL, '/third/wechat', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 21:50:28', 1399985191002447872, '2022-08-03 23:23:10', 3, 0); INSERT INTO `iam_perm_menu` VALUES (1450821877831254016, 'admin', 1450819607680991232, '企业微信', 'WeCom', '', b'0', '', b'0', b'0', 'RouteView', NULL, '/third/wecom', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 21:51:05', 1399985191002447872, '2022-08-03 23:22:58', 4, 0); INSERT INTO `iam_perm_menu` VALUES (1450822511087271936, 'admin', 1450819607680991232, '钉钉', 'DingTalk', '', b'0', '', b'0', b'0', 'RouteView', NULL, '/third/dingtalk', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 21:53:36', 1399985191002447872, '2022-08-03 23:23:29', 3, 0); -INSERT INTO `iam_perm_menu` VALUES (1450822842995130368, 'admin', NULL, '支付管理', 'PayManager', '', NULL, 'pay-circle', b'0', b'0', 'RouteView', NULL, '/payment', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 21:54:55', 1399985191002447872, '2021-10-20 21:54:55', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1450823960236081152, 'admin', 1450822842995130368, '支付通道', 'PayChannel', '', NULL, '', b'0', b'0', 'RouteView', NULL, '/payment/channel', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 21:59:22', 1399985191002447872, '2021-10-20 21:59:22', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1450824117849636864, 'admin', 1450823960236081152, '支付宝', 'AliPayConfig', '', NULL, '', b'0', b'0', 'payment/channel/alipay/AliPayConfigList', NULL, '/payment/channel/alipay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 21:59:59', 1399985191002447872, '2021-10-20 21:59:59', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1450824319868289024, 'admin', 1450823960236081152, '微信支付', 'WeChatPayConfig', '', NULL, '', b'0', b'0', 'payment/channel/wechat/WeChatConfigList', NULL, '/payment/channel/wechat', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:00:48', 1399985191002447872, '2021-10-20 22:00:48', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1450824637876224000, 'admin', 1450823960236081152, '云闪付', 'UnionPayConfig', '', b'0', '', b'0', b'0', 'payment/channel/unionpay/UnionPayConfigList', NULL, '/payment/channel/unionpay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:02:03', 1399985191002447872, '2022-03-04 16:12:13', 3, 0); -INSERT INTO `iam_perm_menu` VALUES (1450824875198332928, 'admin', 1450823960236081152, '现金支付', 'CashPayConfig', '', b'0', '', b'1', b'0', '', NULL, '/payment/channel/cash', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:03:00', 1399985191002447872, '2022-03-04 16:12:08', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1450825488577544192, 'admin', 1546850918849249280, '收银台', 'PayCashier', '', b'0', '', b'0', b'0', 'payment/cashier/Cashier', NULL, '/demo/pay/cashier', '', -1, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:05:26', 1399985191002447872, '2022-07-12 21:37:22', 3, 0); -INSERT INTO `iam_perm_menu` VALUES (1450825615857893376, 'admin', 1450822842995130368, '订单管理', 'PayOrder', '', NULL, '', b'0', b'0', 'RouteView', NULL, '/payment/order', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:05:57', 1399985191002447872, '2021-10-20 22:05:57', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1450825819436826624, 'admin', 1450822842995130368, '回调记录', 'PayNotify', '', NULL, '', b'0', b'0', 'payment/notify/PayNotifyRecordList', NULL, '/payment/notify', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:06:45', 1399985191002447872, '2021-10-20 22:06:45', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1450826890318135296, 'admin', 1450825615857893376, '支付订单', 'PaymentOrder', '', b'0', '', b'0', b'0', 'payment/order/payment/PaymentList', NULL, '/payment/order/payment', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:11:00', 1399985191002447872, '2022-02-25 15:17:07', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1450827159626006528, 'admin', 1450825615857893376, '退款订单', 'ReturnOrder', '', b'0', '', b'0', b'0', 'payment/order/refund/RefundRecordList', NULL, '/payment/order/return', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:12:05', 1399985191002447872, '2022-03-04 15:44:06', 4, 0); -INSERT INTO `iam_perm_menu` VALUES (1450827308515409920, 'admin', 1450825615857893376, '转账订单', 'TransferOrder', '', b'0', '', b'1', b'0', 'payment/order/transfer/TransferList', NULL, '/payment/order/transfer', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:12:40', 1399985191002447872, '2022-03-04 15:33:31', 3, 0); INSERT INTO `iam_perm_menu` VALUES (1450827660459458560, 'admin', 1438061887002759168, '微信', 'NoticeWeChat', '', b'0', '', b'0', b'0', 'Dev', NULL, '/notice/wechat', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:14:04', 1399985191002447872, '2022-06-21 20:53:04', 1, 1); INSERT INTO `iam_perm_menu` VALUES (1452567897717321728, 'admin', 1431152689832525824, '审计日志', 'auditLog', '', b'0', '', b'0', b'0', 'RouteView', NULL, '/monitor/log', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-25 17:29:09', 1399985191002447872, '2022-10-20 20:37:46', 2, 0); INSERT INTO `iam_perm_menu` VALUES (1452569339987472384, 'admin', 1414596052497092608, '权限管理', 'permission', '', NULL, '', b'0', b'0', 'RouteView', NULL, '/system/permission', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-25 17:34:53', 1399985191002447872, '2021-10-25 17:34:53', 2, 0); @@ -4300,24 +4288,12 @@ INSERT INTO `iam_perm_menu` VALUES (1495013564652429312, 'admin', 15522079825107 INSERT INTO `iam_perm_menu` VALUES (1495968302034210816, 'admin', NULL, '功能演示', 'Demo', NULL, b'0', 'block', b'0', b'0', 'RouteView', NULL, '/demo', '', 99, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-02-22 11:46:52', 1399985191002447872, '2022-05-10 11:02:05', 3, 0); INSERT INTO `iam_perm_menu` VALUES (1495969099987963904, 'admin', 1495968302034210816, '数据相关', 'DemoData', NULL, b'0', '', b'0', b'0', 'RouteView', NULL, '/demo/data', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-02-22 11:50:02', 1399985191002447872, '2022-03-24 16:27:46', 4, 0); INSERT INTO `iam_perm_menu` VALUES (1496020308992143360, 'admin', 1495968302034210816, '超级查询', 'SuperQueryDemo', NULL, b'0', '', b'0', b'0', 'demo/query/SuperQueryDemoList', NULL, '/demo/query/super', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-02-22 15:13:31', 1399985191002447872, '2022-05-27 17:34:41', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1501740492360962048, 'admin', 1450822842995130368, '钱包管理', 'Wallet', NULL, b'0', '', b'0', b'0', 'RouteView', NULL, '/payment/wallet', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-10 10:03:29', 1399985191002447872, '2022-03-10 10:04:53', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1501742229142556672, 'admin', 1501740492360962048, '钱包列表', 'WalletList', NULL, b'0', '', b'0', b'0', 'payment/wallet/list/WalletList', NULL, '/payment/wallet/list', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-10 10:10:23', 1399985191002447872, '2022-03-10 17:06:19', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1501742417378725888, 'admin', 1501740492360962048, '个人钱包', 'PersonalWallet', NULL, b'0', '', b'0', b'0', 'payment/wallet/list/WalletList', NULL, '/payment/wallet/personal', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-10 10:11:08', 1399985191002447872, '2022-03-10 17:06:10', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1501847310319972352, 'admin', 1546850918849249280, '组合支付', 'CombinationCashier', NULL, b'0', '', b'0', b'0', 'payment/combination/CombinationCashier', NULL, '/demo/pay/combination', '', -0.5, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-10 17:07:56', 1399985191002447872, '2022-07-12 21:37:59', 4, 0); -INSERT INTO `iam_perm_menu` VALUES (1502926397176242176, 'admin', 1450822842995130368, '储值卡', 'Voucher', NULL, b'0', '', b'0', b'0', 'payment/voucher/VoucherList', NULL, '/payment/voucher', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-13 16:35:51', 1399985191002447872, '2022-03-14 19:39:45', 2, 0); INSERT INTO `iam_perm_menu` VALUES (1506910599819165696, 'admin', 1495969099987963904, '数据权限', 'DataPermDemoList', NULL, b'0', '', b'0', b'0', 'demo/data/perm/DataPermDemoList', NULL, '/demo/data/perm', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-24 16:27:39', 1399985191002447872, '2022-03-24 16:28:56', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1506910885463851008, 'admin', 1495969099987963904, '加密解密', 'DataEncryptDemo', NULL, b'0', '', b'0', b'0', 'demo/data/encrypt/DataEncryptDemoList', NULL, '/demo/data/encrypt', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-24 16:28:47', 1399985191002447872, '2022-03-24 16:28:47', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1506911113394913280, 'admin', 1495969099987963904, '数据脱敏', 'DataSensitiveDemo', NULL, b'0', '', b'0', b'0', 'demo/data/sensitive/DataSensitiveDemoList', NULL, '/demo/data/sensitive', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-24 16:29:41', 1399985191002447872, '2022-03-24 17:16:03', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1507998458886197248, 'admin', 1495968302034210816, 'WS演示', 'WebsocketDemo', NULL, b'0', '', b'0', b'0', 'demo/ws/WebsocketDemo', NULL, '/demo/ws', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-27 16:30:25', 1399985191002447872, '2022-03-27 16:30:25', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1509488473583562752, 'admin', 1495968302034210816, '幂等请求演示', 'IdempotentDemo', NULL, b'0', '', b'0', b'0', 'demo/idempotent/Idempotent', NULL, '/demo/idempotent', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-31 19:11:12', 1399985191002447872, '2022-05-27 17:35:00', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1511266086400524288, 'admin', 1450822511087271936, '钉钉配置', 'DingTalkConfig', NULL, b'0', '', b'1', b'0', 'third/dingtalk/config/DingTalkConfigList', NULL, '/third/dingtalk/config', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-04-05 16:54:48', 1399985191002447872, '2022-07-26 13:34:44', 3, 0); -INSERT INTO `iam_perm_menu` VALUES (1523860792695283712, 'admin', NULL, '商品管理', 'GoodsManager', NULL, b'0', 'car', b'1', b'0', 'RouteView', NULL, '/goods', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-10 11:01:40', 1399985191002447872, '2022-10-07 12:38:50', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1523941932282114048, 'admin', 1523860792695283712, '类目管理', 'CategoryManager', NULL, b'0', '', b'0', b'0', 'RouteView', NULL, '/goods/category', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-10 16:24:05', 1399985191002447872, '2022-05-10 16:24:17', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1523942130555252736, 'admin', 1523941932282114048, '类目', 'Category', NULL, b'0', '', b'0', b'0', 'goods/category/CategoryList', NULL, '/goods/category/category', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-10 16:24:52', 1399985191002447872, '2022-05-10 16:25:23', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1524044195818278912, 'admin', 1523941932282114048, '品牌', 'Brand', NULL, b'0', '', b'0', b'0', 'goods/brand/BrandList', NULL, '/goods/category/brand', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-10 23:10:26', 1399985191002447872, '2022-05-10 23:14:20', 4, 0); -INSERT INTO `iam_perm_menu` VALUES (1524044395823665152, 'admin', 1523941932282114048, '规格', 'SpecificationList', NULL, b'0', '', b'0', b'0', 'goods/spec/SpecificationList', NULL, '/goods/category/spec', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-10 23:11:14', 1399985191002447872, '2022-05-10 23:13:51', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1524044678314233856, 'admin', 1523941932282114048, '参数组', 'ParameterGroup', NULL, b'0', '', b'1', b'0', 'goods/parameter/ParameterGroupList', NULL, '/goods/category/parameter', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-10 23:12:21', 1399985191002447872, '2022-05-12 20:30:23', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1525472571967860736, 'admin', 1523860792695283712, '商品', 'Goods', '', b'0', '', b'0', b'0', 'goods/goods/GoodsList', NULL, '/goods/goods', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-14 21:46:18', 1399985191002447872, '2022-05-14 21:46:18', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1530120084482084864, 'admin', 1495968302034210816, '消息中间件演示', 'MQDemo', NULL, b'0', '', b'0', b'0', 'demo/mq/MqDemo', NULL, '/demo/mq', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-27 17:33:51', 1399985191002447872, '2022-05-31 15:12:15', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1530120684645044224, 'admin', 1530120084482084864, 'MQTT消息', 'MqttDemo', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/mq/mqtt', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-27 17:36:14', 1399985191002447872, '2022-05-27 17:36:14', 0, 1); INSERT INTO `iam_perm_menu` VALUES (1530120821144473600, 'admin', 1530120084482084864, 'RabbitMQ', 'RabbitDemo', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/mq/rabbit', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-27 17:36:47', 1399985191002447872, '2022-05-27 17:36:47', 0, 1); @@ -4326,14 +4302,9 @@ INSERT INTO `iam_perm_menu` VALUES (1534008203006652416, 'admin', 14311526898325 INSERT INTO `iam_perm_menu` VALUES (1535451167008436224, 'admin', 1431152689832525824, '系统信息', 'SysInfo', NULL, b'0', '', b'0', b'0', 'starter/monitor/SystemInfoMonitor', NULL, '/monitor/sysinfo', '', 0, 1, NULL, b'0', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-11 10:37:40', 1399985191002447872, '2022-06-13 13:07:46', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1535965936371085312, 'admin', 1431152689832525824, 'Redis监控', 'RedisInfoMonitor', NULL, b'0', '', b'0', b'0', 'starter/monitor/RedisInfoMonitor', NULL, '/monitor/redis', '', 0, 1, NULL, b'0', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-12 20:43:11', 1399985191002447872, '2022-06-13 13:07:38', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1537730140522348544, 'admin', 1438061887002759168, '站内信', 'SiteMessageSender', '', b'0', '', b'0', b'0', 'notice/site/sender/SiteMessageList', NULL, '/notice/siteMessage', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-17 17:33:30', 1399985191002447872, '2022-08-20 21:12:30', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1537732440632524800, 'admin', NULL, '个人办公', 'person', '', b'0', 'user', b'0', b'0', 'RouteView', NULL, '/person', '', -99, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-17 17:42:38', 1399985191002447872, '2022-08-20 22:15:21', 4, 0); -INSERT INTO `iam_perm_menu` VALUES (1537733801860333568, 'admin', 1537732440632524800, '我的消息', 'PersonSiteMessage', NULL, b'0', '', b'0', b'0', 'notice/site/receive/SiteMessageList', NULL, '/person/siteMessage', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-17 17:48:03', 1399985191002447872, '2022-10-24 11:10:35', 4, 0); -INSERT INTO `iam_perm_menu` VALUES (1537735851818024960, 'admin', 1537732440632524800, '待办任务', 'MyTodoTaskList', NULL, b'0', '', b'0', b'0', 'office/mytodo/MyTodoList', NULL, '/person/todo', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-17 17:56:11', 1399985191002447872, '2022-08-30 22:46:47', 6, 0); INSERT INTO `iam_perm_menu` VALUES (1538160478872625152, 'admin', 1495968302034210816, '富文本编辑', 'WangEditorDemo', NULL, b'0', '', b'0', b'0', 'demo/wangeditor/WangEditorDemo', NULL, '/demo/wangEditor', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-18 22:03:30', 1399985191002447872, '2022-06-18 22:03:31', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1541355214204030976, 'admin', 1541427353886859264, '认证终端', 'Client', '', b'0', '', b'0', b'0', 'system/client/ClientList', NULL, '/system/config/client', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-08-27 10:37:08', 1399985191002447872, '2022-07-05 21:17:45', 3, 0); INSERT INTO `iam_perm_menu` VALUES (1541427353886859264, 'admin', 1414596052497092608, '认证管理', 'Auth', '', b'0', '', b'0', b'0', 'RouteView', NULL, '/system/auth', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-27 22:24:54', 1399985191002447872, '2022-06-27 22:24:54', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1544952211901218816, 'admin', 1546850918849249280, '支付结算台演示', 'CashierDemo', NULL, b'0', '', b'0', b'0', '', NULL, '/cashier', '', 0, 1, NULL, b'0', b'1', b'0', b'0', NULL, 1399985191002447872, '2022-07-07 15:51:26', 1399985191002447872, '2022-11-23 15:31:08', 4, 0); -INSERT INTO `iam_perm_menu` VALUES (1546850918849249280, 'admin', 1495968302034210816, '支付演示', 'DemoPay', NULL, b'0', '', b'0', b'0', 'RouteView', NULL, '/demo/pay', '', 9, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-07-12 21:36:13', 1399985191002447872, '2022-08-03 14:49:16', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1551803592828932096, 'admin', 1450821877831254016, '企微机器人', 'WeComRobot', '', b'0', '', b'0', b'0', 'third/wecom/robot/WeComRobotConfigList', NULL, '/third/wecom/robot', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-07-26 13:36:22', 1399985191002447872, '2022-10-24 11:07:27', 3, 0); INSERT INTO `iam_perm_menu` VALUES (1552207982510706688, 'admin', NULL, '开发管理', 'develop', NULL, b'0', 'gold', b'0', b'0', 'RouteView', NULL, '/develop', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-07-27 16:23:16', 1399985191002447872, '2022-07-27 16:39:09', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1552208167664062464, 'admin', 1552207982510706688, '动态表单', 'DynamicForm', NULL, b'0', '', b'0', b'0', 'develop/dynamicform/DynamicFormList', NULL, '/develop/form', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-07-27 16:24:00', 1399985191002447872, '2022-07-27 16:38:05', 2, 0); @@ -4342,14 +4313,6 @@ INSERT INTO `iam_perm_menu` VALUES (1554721654336385024, 'admin', 15547209808653 INSERT INTO `iam_perm_menu` VALUES (1554850179754975232, 'admin', 1450821723027881984, '消息模板', 'WeChatTemplate', NULL, b'0', '', b'0', b'0', 'third/wechat/template/WeChatTemplateList', NULL, '/third/wechat/template', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-03 23:22:25', 1399985191002447872, '2022-08-03 23:23:18', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1555835229426368512, 'admin', 1450821723027881984, '自定义菜单', 'WeChatMenu', NULL, b'0', '', b'0', b'0', 'third/wechat/menu/WeChatMenuList', NULL, '/third/wechat/menu', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-06 16:36:39', 1399985191002447872, '2022-08-08 12:14:14', 2, 0); INSERT INTO `iam_perm_menu` VALUES (1556997405528805376, 'admin', 1450821723027881984, '素材管理', 'WeChatMedia', NULL, b'0', '', b'0', b'0', 'third/wechat/media/WeChatMediaList', NULL, '/third/wechat/media', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-09 21:34:44', 1399985191002447872, '2022-08-09 21:34:44', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1562460770753544192, 'admin', NULL, '流程管理', 'Bpm', NULL, b'0', 'audit', b'0', b'0', 'RouteView', NULL, '/bpm', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-24 23:24:12', 1399985191002447872, '2022-08-24 23:25:11', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1562461289450536960, 'admin', 1562460770753544192, '流程模型', 'BpmModel', NULL, b'0', '', b'0', b'0', 'bpm/model/BpmModelList', NULL, '/bpm/model', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-24 23:26:15', 1399985191002447872, '2022-08-24 23:26:15', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1562461620766998528, 'admin', 1562460770753544192, '流程表单', 'BpmFrom', NULL, b'0', '', b'0', b'0', 'Dev', NULL, '/bpm/form', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-24 23:27:34', 1399985191002447872, '2022-08-24 23:27:56', 1, 1); -INSERT INTO `iam_perm_menu` VALUES (1563092672406859776, 'admin', 1537732440632524800, '我的发起', 'MyApplyList', NULL, b'0', '', b'0', b'0', 'office/myapply/MyApplyList', NULL, '/person/myApply', '', 1, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-26 17:15:09', 1399985191002447872, '2022-08-30 22:46:25', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1564626025579462656, 'admin', 1537732440632524800, '已办任务', 'MyDoneTaskList', NULL, b'0', '', b'0', b'0', 'office/mydone/MyDoneList', NULL, '/person/done', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-30 22:48:09', 1399985191002447872, '2022-08-30 22:48:29', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1571023702122766336, 'admin', 1562460770753544192, '未处理任务', 'BpmTodoTask', NULL, b'0', '', b'0', b'0', 'bpm/task/TodoTaskList', NULL, '/bpm/todo', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-09-17 14:30:13', 1399985191002447872, '2022-09-17 14:31:23', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1571023925834358784, 'admin', 1562460770753544192, '已处理任务', 'BpmDoneTask', NULL, b'0', '', b'0', b'0', 'bpm/task/DoneTaskList', NULL, '/bpm/done', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-09-17 14:31:07', 1399985191002447872, '2022-09-17 14:31:07', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1571024250171498496, 'admin', 1562460770753544192, '流程实例', 'BpmInstance', NULL, b'0', '', b'0', b'0', 'bpm/instance/InstanceList', NULL, '/bpm/instance', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-09-17 14:32:24', 1399985191002447872, '2022-09-17 14:32:24', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1573669546890297344, 'admin', 1552207982510706688, '动态数据源', 'DynamicSource', NULL, b'0', '', b'0', b'0', 'develop/dynamicsource/DynamicDataSourceList', NULL, '/develop/source', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-09-24 21:43:52', 1399985191002447872, '2022-09-24 21:43:52', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1580740450633101312, 'adminv3', NULL, '系统管理', 'System', NULL, b'0', 'ant-design:setting-outlined', b'0', b'0', 'Layout', NULL, '/system', '/system1/client', -99999, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-10-14 10:01:07', 1414143554414059520, '2022-10-18 15:32:09', 4, 0); INSERT INTO `iam_perm_menu` VALUES (1580740637841666048, 'adminv3', 1582253306356649984, '终端管理', 'ClientList', NULL, b'0', '', b'0', b'0', '/modules/system/client/ClientList.vue', NULL, '/system/client', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-10-14 10:01:51', 1414143554414059520, '2022-10-18 14:13:27', 5, 0); @@ -4362,13 +4325,10 @@ INSERT INTO `iam_perm_menu` VALUES (1582249924602580992, 'adminv3', 158074045063 INSERT INTO `iam_perm_menu` VALUES (1582253011803262976, 'adminv3', 1580740450633101312, '用户信息', 'UserAuth', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/system/user', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 14:11:30', 1414143554414059520, '2022-10-18 14:11:30', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1582253152903843840, 'adminv3', 1580740450633101312, '系统配置', 'SystemConfig', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/system/config', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 14:12:03', 1414143554414059520, '2022-10-18 14:12:03', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1582253306356649984, 'adminv3', 1580740450633101312, '认证管理', 'Auth', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/system/auth', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 14:12:40', 1414143554414059520, '2022-10-18 14:13:13', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1582274981055909888, 'adminv3', NULL, '个人办公', 'Person', NULL, b'0', 'ant-design:align-right-outlined', b'0', b'0', 'Layout', NULL, '/person', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:38:47', 1414143554414059520, '2022-10-18 15:38:47', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1582275875424129024, 'adminv3', NULL, '系统监控', 'Monitor', NULL, b'0', 'ant-design:monitor-outlined', b'0', b'0', 'Layout', NULL, '/monitor', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:42:21', 1414143554414059520, '2022-10-19 17:29:29', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1582275984849326080, 'adminv3', NULL, '通知管理', 'Notice', NULL, b'0', 'ant-design:message-outlined', b'0', b'0', 'Layout', NULL, '/notice', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:42:47', 1414143554414059520, '2022-10-19 17:30:06', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1582276092038959104, 'adminv3', NULL, '第三方对接', 'Third', NULL, b'0', 'ant-design:api-twotone', b'0', b'0', 'Layout', NULL, '/third', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:43:12', 1414143554414059520, '2022-10-19 17:32:04', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1582276184120709120, 'adminv3', NULL, '支付管理', 'PayManager', NULL, b'0', 'ant-design:pay-circle-outlined', b'0', b'0', 'Layout', NULL, '/payment', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:43:34', 1414143554414059520, '2022-10-19 17:31:46', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1582276341792985088, 'adminv3', NULL, '开发管理', 'Develop', NULL, b'0', 'ant-design:apartment-outlined', b'0', b'0', 'Layout', NULL, '/develop', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:44:12', 1414143554414059520, '2022-10-19 15:24:22', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1582276447602692096, 'adminv3', NULL, '流程管理', 'Bpm', NULL, b'0', 'ant-design:file-protect-outlined', b'0', b'0', 'Layout', NULL, '/bpm', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:44:37', 1414143554414059520, '2022-10-19 17:34:11', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1582276516905177088, 'adminv3', NULL, '功能演示', 'Demo', NULL, b'0', 'ant-design:appstore-twotone', b'0', b'0', 'Layout', NULL, '/demo', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:44:54', 1414143554414059520, '2022-10-19 17:34:26', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1582277076421136384, 'adminv3', 1582249924602580992, '角色管理', 'RoleList', NULL, b'0', '', b'0', b'0', '/modules/system/role/RoleList.vue', NULL, '/system/permission/role', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:47:07', 1414143554414059520, '2022-10-18 15:59:37', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1582301940364308480, 'adminv3', 1582249924602580992, '请求权限管理', 'PermPathList', NULL, b'0', '', b'0', b'0', '/modules/system/path/PermPathList.vue', NULL, '/system/permission/path', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 17:25:55', 1414143554414059520, '2022-10-18 20:41:22', 1, 0); @@ -4403,43 +4363,14 @@ INSERT INTO `iam_perm_menu` VALUES (1584380824308097024, 'adminv3', 158437960218 INSERT INTO `iam_perm_menu` VALUES (1584381134950834176, 'adminv3', 1584379704122744832, '企微机器人', 'WeComRobotConfigList', NULL, b'0', '', b'0', b'0', '/modules/third/wecom/robot/WecomRobotConfigList.vue', NULL, '/third/wecom/robot', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:07:54', 1414143554414059520, '2022-11-12 20:58:25', 3, 0); INSERT INTO `iam_perm_menu` VALUES (1584381322184564736, 'adminv3', 1584380087805091840, '钉钉机器人', 'DingRobotConfigList', NULL, b'0', '', b'0', b'0', '/modules/third/dingtalk/robot/DingRobotConfigList.vue', NULL, '/third/dingTalk/robot', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:08:38', 1414143554414059520, '2022-11-12 20:58:37', 6, 0); INSERT INTO `iam_perm_menu` VALUES (1584381477986181120, 'adminv3', 1584380087805091840, '钉钉配置', 'DingRobotConfigList', NULL, b'0', '', b'1', b'0', '/modules/third/dingtalk/config/DingTalkConfigList.vue', NULL, '/third/dingtalk/config', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:09:15', 1414143554414059520, '2022-11-11 16:04:47', 1, 1); -INSERT INTO `iam_perm_menu` VALUES (1584381848238366720, 'adminv3', 1582274981055909888, '我的消息', 'SiteMessageListReceive', NULL, b'0', '', b'0', b'0', '/modules/notice/site/receive/SiteMessageList.vue', NULL, '/person/siteMessage', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:10:44', 1414143554414059520, '2022-11-17 09:08:02', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1584381976508571648, 'adminv3', 1582274981055909888, '待办任务', 'MyTodoList', NULL, b'0', '', b'0', b'0', '/modules/office/mytodo/MyTodoList.vue', NULL, '/person/todo', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:11:14', 1414143554414059520, '2022-10-24 11:11:14', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1584382091327643648, 'adminv3', 1582274981055909888, '已办任务', 'MyDoneList', NULL, b'0', '', b'0', b'0', '/modules/office/mydone/MyDoneList.vue', NULL, '/person/done', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:11:42', 1414143554414059520, '2022-10-24 11:12:29', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1584382258307080192, 'adminv3', 1582274981055909888, '我的发起', 'MyApplyList', NULL, b'0', '', b'0', b'0', '/modules/office/myapply/MyApplyList.vue', NULL, '/person/myApply', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:12:21', 1414143554414059520, '2022-10-24 11:12:21', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1584382569381830656, 'adminv3', 1582276184120709120, '支付通道', 'PayChannel', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/payment/channel', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:13:36', 1414143554414059520, '2022-10-24 11:13:36', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1584382723186958336, 'adminv3', 1582276184120709120, '支付订单', 'PayOrder', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/payment/order', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:14:12', 1414143554414059520, '2022-10-24 11:14:12', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1584382815407120384, 'adminv3', 1582276184120709120, '回调记录', 'PayNotify', NULL, b'0', '', b'0', b'0', '/modules/payment/notify/PayNotifyRecordList', NULL, '/payment/notify', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:14:34', 1414143554414059520, '2022-10-24 11:23:17', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1584383492338425856, 'adminv3', 1582276184120709120, '钱包管理', 'Wallet', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/payment/wallet', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:17:16', 1414143554414059520, '2022-10-24 11:17:16', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1584383640942616576, 'adminv3', 1582276184120709120, '储值卡', 'Voucher', NULL, b'0', '', b'0', b'0', '/modules/payment/voucher/VoucherList.vue', NULL, '/payment/voucher', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:17:51', 1414143554414059520, '2022-12-01 22:17:39', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1584383859121922048, 'adminv3', 1584382569381830656, '支付宝', 'AliPayConfigList', NULL, b'0', '', b'0', b'0', '/modules/payment/channel/alipay/AlipayConfigList.vue', NULL, '/payment/channel/alipay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:18:43', 1414143554414059520, '2022-11-22 15:20:37', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1584384015338774528, 'adminv3', 1584382569381830656, '微信支付', 'WeChatConfigList', NULL, b'0', '', b'0', b'0', '/modules/payment/channel/wechat/WechatPayConfigList.vue', NULL, '/payment/channel/wechat', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:19:20', 1414143554414059520, '2022-11-22 22:22:07', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1584384160574939136, 'adminv3', 1584382569381830656, '云闪付', 'UnionPayConfigList', NULL, b'0', '', b'0', b'0', '/modules/payment/channel/unionpay/UnionPayConfigList.vue', NULL, '/payment/channel/unionpay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:19:55', 1414143554414059520, '2022-11-22 22:27:32', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1584384526511185920, 'adminv3', 1584382723186958336, '支付订单', 'PaymentList', NULL, b'0', '', b'0', b'0', '/modules/payment/order/payment/PaymentList.vue', NULL, '/payment/order/payment', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:21:22', 1414143554414059520, '2022-10-24 11:21:22', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1584384752940687360, 'adminv3', 1584382723186958336, '退款订单', 'ReturnOrder', NULL, b'0', '', b'0', b'0', '/modules/payment/order/refund/RefundRecordList.vue', NULL, '/payment/order/return', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:22:16', 1414143554414059520, '2022-10-24 11:22:16', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1589495250199760896, 'adminv3', 1580740450633101312, '22', NULL, '11', b'1', NULL, b'0', b'0', NULL, NULL, NULL, NULL, 0, 2, NULL, b'0', b'0', b'0', b'0', '', 1414143554414059520, '2022-11-07 13:49:34', 1414143554414059520, '2022-11-07 13:49:34', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1591689087570378752, 'adminv3', 1582276447602692096, '流程模型', 'BpmModelList', NULL, b'0', '', b'0', b'0', '/modules/bpm/model/BpmModelList.vue', NULL, '/bpm/model', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-13 15:07:05', 1414143554414059520, '2022-11-13 15:07:05', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1591689307427405824, 'adminv3', 1582276447602692096, '未处理任务', 'TodoTaskList', NULL, b'0', '', b'0', b'0', '/modules/bpm/task/TodoTaskList.vue', NULL, '/bpm/todo', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-13 15:07:58', 1414143554414059520, '2022-11-14 22:45:57', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1591689479075102720, 'adminv3', 1582276447602692096, '已处理任务', 'BpmDoneTask', NULL, b'0', '', b'0', b'0', '/modules/bpm/task/DoneTaskList.vue', NULL, '/bpm/done', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-13 15:08:39', 1414143554414059520, '2022-11-13 15:14:17', 3, 0); -INSERT INTO `iam_perm_menu` VALUES (1591690820224778240, 'adminv3', 1582276447602692096, '流程实例', 'BpmInstance', NULL, b'0', '', b'0', b'0', '/modules/bpm/instance/InstanceList.vue', NULL, '/bpm/instance', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-13 15:13:58', 1414143554414059520, '2022-11-13 15:13:58', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1594586131247075328, 'adminv3', 1582275875424129024, 'ELK日志x', 'ELKx', NULL, b'0', '', b'0', b'0', 'Iframe', NULL, '/monitor/elk', 'https://www.antdv.com/components/overview-cn', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-21 14:58:54', 1414143554414059520, '2022-11-21 15:21:35', 6, 0); -INSERT INTO `iam_perm_menu` VALUES (1595255743081025536, 'adminv3', 1580740450633101312, '菜单管理1', '', NULL, b'0', '', b'0', b'0', '', NULL, 'outside:////system/menu?onlytab=1&__full__', '', -99, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-23 11:19:42', 1414143554414059520, '2022-11-23 21:02:52', 20, 1); INSERT INTO `iam_perm_menu` VALUES (1597044371008516096, 'adminv3', NULL, '功能演示', 'Demo', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/demo', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-28 09:47:04', 1414143554414059520, '2022-11-28 09:47:04', 0, 1); INSERT INTO `iam_perm_menu` VALUES (1597102799370317824, 'adminv3', 1582276516905177088, '数据相关', 'DemoData', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/demo/data', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-28 13:39:15', 1414143554414059520, '2022-11-28 13:39:15', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1597210969883275264, 'adminv3', 1582276516905177088, '超级查询', 'SuperQueryDemoList', NULL, b'0', '', b'0', b'0', '/modules/demo/query/SuperQueryDemoList.vue', NULL, '/demo/query/super', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-28 20:49:05', 1414143554414059520, '2022-11-28 21:00:14', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1598306560788877312, 'adminv3', 1584383492338425856, '钱包列表', 'WalletList', NULL, b'0', '', b'0', b'0', '/modules/payment/wallet/list/WalletList.vue', NULL, '/payment/wallet/list', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-01 21:22:34', 1414143554414059520, '2022-12-01 21:22:34', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1598306760764903424, 'adminv3', 1584383492338425856, '个人钱包', 'MyWallet', NULL, b'0', '', b'0', b'0', '/modules/payment/wallet/personal/MyWallet.vue', NULL, '/payment/wallet/personal', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-01 21:23:22', 1414143554414059520, '2022-12-01 21:23:22', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1599337250200440832, 'adminv3', NULL, '关于', '', NULL, b'0', 'simple-icons:about-dot-me', b'0', b'0', '', NULL, '/about/index', '', 99, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 17:38:09', 1414143554414059520, '2022-12-04 17:43:32', 3, 0); INSERT INTO `iam_perm_menu` VALUES (1599378494880436224, 'adminv3', 1582276516905177088, 'WS演示', 'WebsocketDemo', NULL, b'0', '', b'0', b'0', '/modules/demo/ws/WebsocketDemo', NULL, '/demo/ws', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:22:03', 1414143554414059520, '2023-02-08 12:17:58', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1599378579513102336, 'adminv3', 1582276516905177088, '幂等请求演示', 'IdempotentDemo', NULL, b'0', '', b'0', b'0', '/modules/demo/idempotent/IdempotentDemo', NULL, '/demo/idempotent', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:22:23', 1414143554414059520, '2023-02-08 11:46:00', 3, 0); INSERT INTO `iam_perm_menu` VALUES (1599378728490586112, 'adminv3', 1582276516905177088, '消息中间件演示', 'MqDemo', NULL, b'0', '', b'0', b'0', '/modules/demo/mq/MqDemo', NULL, '/demo/mq', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:22:59', 1414143554414059520, '2023-02-08 22:09:04', 2, 0); INSERT INTO `iam_perm_menu` VALUES (1599378838519762944, 'adminv3', 1582276516905177088, '富文本编辑', 'WangEditorDemo', NULL, b'0', '', b'0', b'0', '/modules/demo/wangeditor/WangEditorDemo.vue', NULL, '/demo/wangEditor', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:23:25', 1414143554414059520, '2023-02-10 09:05:16', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1599378992811429888, 'adminv3', 1582276516905177088, '消息通知', '', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/demo/notice', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:24:02', 1414143554414059520, '2022-12-04 20:24:37', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1599379197124366336, 'adminv3', 1582276516905177088, '支付演示', '', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/demo/pay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:24:50', 1414143554414059520, '2022-12-04 20:24:50', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1599379348144476160, 'adminv3', 1599379197124366336, '收银台', 'SimpleCashier', NULL, b'0', '', b'0', b'0', '/demo/payment/cashier/SimpleCashier.vue', NULL, '/demo/pay/cashier', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:25:26', 1414143554414059520, '2022-12-05 21:28:10', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1599379428784164864, 'adminv3', 1599379197124366336, '组合支付', 'CombinationCashier', NULL, b'0', '', b'0', b'0', '/demo/payment/cashier/CombinationCashier.vue', NULL, '/demo/pay/combination', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:25:46', 1414143554414059520, '2022-12-08 22:32:55', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1599379539232772096, 'adminv3', 1599379197124366336, '支付结算台演示', '', NULL, b'0', '', b'0', b'0', '', NULL, 'outside:///cashier', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:26:12', 1414143554414059520, '2022-12-04 20:26:34', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1617513861605191680, 'admin', 1414596052497092608, '123', NULL, '123', b'0', NULL, b'0', b'0', NULL, NULL, NULL, NULL, 0, 2, NULL, b'0', b'0', b'0', b'0', '', 1399985191002447872, '2023-01-23 21:25:31', 1399985191002447872, '2023-01-23 21:56:34', 3, 0); INSERT INTO `iam_perm_menu` VALUES (1617847577158324224, 'adminv3', 1597102799370317824, '数据权限', 'DataPermDemoList', NULL, b'0', '', b'0', b'0', '/modules/demo/data/perm/DataPermDemoList.vue', NULL, '/demo/data/perm', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-01-24 19:31:35', 1414143554414059520, '2023-01-24 20:06:04', 2, 0); INSERT INTO `iam_perm_menu` VALUES (1617847653746315264, 'adminv3', 1597102799370317824, '加密解密', 'DataEncryptDemoList', NULL, b'0', '', b'0', b'0', '/modules/demo/data/encrypt/DataEncryptDemoList.vue', NULL, '/demo/data/encrypt', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-01-24 19:31:53', 1414143554414059520, '2023-01-24 20:05:45', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1617847747375763456, 'adminv3', 1597102799370317824, '数据脱敏', 'DataSensitiveDemoList', NULL, b'0', '', b'0', b'0', '/modules/demo/data/sensitive/DataSensitiveDemoList.vue', NULL, '/demo/data/sensitive', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-01-24 19:32:16', 1414143554414059520, '2023-01-24 20:06:58', 1, 0); @@ -4450,7 +4381,6 @@ INSERT INTO `iam_perm_menu` VALUES (1623494586215579648, 'admin', 15522079825107 INSERT INTO `iam_perm_menu` VALUES (1629039360928075776, 'adminv3', 1582276341792985088, '可视化大屏', 'ProjectInfoList', NULL, b'0', '', b'0', b'0', '/modules/develop/report/ProjectInfoList', NULL, '/develop/report', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-02-24 16:43:44', 1414143554414059520, '2023-02-24 16:44:17', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1631946120891707392, 'admin', 1552207982510706688, '可视化大屏', 'ProjectInfoList', NULL, b'0', '', b'0', b'0', 'develop/report/ProjectInfoList', NULL, '/develop/report', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2023-03-04 17:14:10', 1399985191002447872, '2023-03-04 17:14:10', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1635274568758435840, 'adminv3', 1582276341792985088, 'SQL查询语句', 'QuerySqlList', NULL, b'0', '', b'0', b'0', '/modules/develop/query/QuerySqlList', NULL, '/develop/querySql', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-03-13 21:40:14', 1414143554414059520, '2023-03-13 21:43:05', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1635895711235022848, 'adminv3', 1582276447602692096, '流程设计器', 'ProcessDesign', NULL, b'0', '', b'0', b'0', '/modules/bpm/design/ProcessDesign.vue', NULL, '/bpm/design', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-03-15 14:48:26', 1414143554414059520, '2023-03-15 14:48:26', 0, 0); -- ---------------------------- -- Table structure for iam_perm_path @@ -5403,7 +5333,6 @@ CREATE TABLE `qrtz_cron_triggers` ( -- ---------------------------- -- Records of qrtz_cron_triggers -- ---------------------------- -INSERT INTO `qrtz_cron_triggers` VALUES ('quartzScheduler', '1546857070483939328', 'DEFAULT', '0/5 * * * * ? *', 'Asia/Shanghai'); -- ---------------------------- -- Table structure for qrtz_fired_triggers @@ -5435,7 +5364,6 @@ CREATE TABLE `qrtz_fired_triggers` ( -- ---------------------------- -- Records of qrtz_fired_triggers -- ---------------------------- -INSERT INTO `qrtz_fired_triggers` VALUES ('quartzScheduler', 'NON_CLUSTERED1663741439856', '1546857070483939328', 'DEFAULT', 'NON_CLUSTERED', 1663741920988, 1663741925000, 5, 'ACQUIRED', NULL, NULL, '0', '0'); -- ---------------------------- -- Table structure for qrtz_job_details @@ -5460,7 +5388,6 @@ CREATE TABLE `qrtz_job_details` ( -- ---------------------------- -- Records of qrtz_job_details -- ---------------------------- -INSERT INTO `qrtz_job_details` VALUES ('quartzScheduler', '1546857070483939328', 'DEFAULT', NULL, 'cn.bootx.payment.task.PayExpiredTimeTask', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C77080000001000000001740009706172616D65746572707800); -- ---------------------------- -- Table structure for qrtz_locks @@ -5475,8 +5402,6 @@ CREATE TABLE `qrtz_locks` ( -- ---------------------------- -- Records of qrtz_locks -- ---------------------------- -INSERT INTO `qrtz_locks` VALUES ('quartzScheduler', 'STATE_ACCESS'); -INSERT INTO `qrtz_locks` VALUES ('quartzScheduler', 'TRIGGER_ACCESS'); -- ---------------------------- -- Table structure for qrtz_paused_trigger_grps @@ -5507,7 +5432,6 @@ CREATE TABLE `qrtz_scheduler_state` ( -- ---------------------------- -- Records of qrtz_scheduler_state -- ---------------------------- -INSERT INTO `qrtz_scheduler_state` VALUES ('quartzScheduler', 'xxm1638448483700', 1638451157328, 10000); -- ---------------------------- -- Table structure for qrtz_simple_triggers @@ -5595,7 +5519,6 @@ CREATE TABLE `qrtz_triggers` ( -- ---------------------------- -- Records of qrtz_triggers -- ---------------------------- -INSERT INTO `qrtz_triggers` VALUES ('quartzScheduler', '1546857070483939328', 'DEFAULT', '1546857070483939328', 'DEFAULT', NULL, 1663741925000, 1663741920000, 5, 'ACQUIRED', 'CRON', 1657634445000, 0, NULL, 0, ''); -- ---------------------------- -- Table structure for report_project_info @@ -5775,15 +5698,6 @@ CREATE TABLE `starter_file_upload_info` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '上传文件信息' ROW_FORMAT = DYNAMIC; --- ---------------------------- --- Records of starter_file_upload_info --- ---------------------------- -INSERT INTO `starter_file_upload_info` VALUES (1495330622946631680, NULL, 'blob', 'jpg', 'jpg', 68, '62120ac9efeec06e2275fc52', 1399985191002447872, '2022-02-20 17:32:57'); -INSERT INTO `starter_file_upload_info` VALUES (1495331213525606400, NULL, 'blob', 'jpg', 'jpg', 68, '62120b55efeec06e2275fc54', 1399985191002447872, '2022-02-20 17:35:28'); -INSERT INTO `starter_file_upload_info` VALUES (1495331812178616320, NULL, 'blob', 'jpg', 'jpg', 74, '62120be4efeec06e2275fc56', 1399985191002447872, '2022-02-20 17:37:43'); -INSERT INTO `starter_file_upload_info` VALUES (1495331905770315776, NULL, 'blob', 'jpg', 'jpg', 76, '62120bfaefeec06e2275fc58', 1399985191002447872, '2022-02-20 17:38:03'); -INSERT INTO `starter_file_upload_info` VALUES (1530065639127871488, NULL, 'blob', 'jpg', 'jpg', 83, '6290684abf0e90583f414dcf', 1414143554414059520, '2022-05-27 13:57:31'); - -- ---------------------------- -- Table structure for starter_quartz_job -- ---------------------------- diff --git a/_doc/ChangeLog.md b/_doc/ChangeLog.md index 3019dd02ba418f2c4b4e2195599bd44938e375ec..8e0a153cff9cc49c14a429812fefd5f2c1dbc259 100644 --- a/_doc/ChangeLog.md +++ b/_doc/ChangeLog.md @@ -1,4 +1,19 @@ # CHANGELOG + +## [v1.3.0] 一号线-园博园 +**项目主要更新** +- 重构: 拆分支付模块为`dax-pay`子项目 +- 重构: 拆分工作流模块为`bpmn-plus`子项目 +- 重构: 项目包名称统一为cn.bootx.platform +- 重构: 项目改造为支持发布到maven +- 重构: 优化子模块依赖关系，适应子项目引入依赖 + +**Vue3更新** +- 设为主版本，功能默认使用Vue版进行实现 + +**Vue2更新** +- 非核心模块的功能，后续可能不再做实现。 + ## [v1.2.3] 一号线-创新谷 **项目主要更新** - 新增: 预定义SQL查询管理 diff --git a/bootx-common-core/pom.xml b/bootx-common-core/pom.xml index 7ae2b087ac8aa9c5210b9673a1faf87e2d316beb..36d12932c83730a17cdfe899ac76f39e96b0a8f2 100644 --- a/bootx-common-core/pom.xml +++ b/bootx-common-core/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> cn.bootx.platform - bootx-platform - 1.2.3 + bootx-platform-parent + 1.3.0 4.0.0 @@ -16,6 +16,7 @@ org.projectlombok lombok + provided diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/actable/Column.java b/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/actable/Column.java deleted file mode 100644 index ca5f6fea735c42a8f9e30c3b0dedf50020a55712..0000000000000000000000000000000000000000 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/actable/Column.java +++ /dev/null @@ -1,90 +0,0 @@ -package cn.bootx.common.core.annotation.actable; - -import cn.bootx.common.core.code.actable.MySqlFieldType; - -import java.lang.annotation.*; - -/** - * 建表的必备注解 - * - * @author sunchenbin, Spet - * @version 2019/07/06 - */ -@Target(ElementType.FIELD) -@Retention(RetentionPolicy.RUNTIME) -@Documented -public @interface Column { - - /** - * 字段名 - * @return 字段名：不填默认使用属性名作为表字段名 - */ - String value() default ""; - - /** - * 字段名 - * @return 字段名：不填默认使用属性名作为表字段名 - */ - String name() default ""; - - /** - * 数据库字段排序, 数字小的在前面,大的在后面 - */ - int order() default 0; - - /** - * 字段类型：不填默认使用属性的数据类型进行转换，转换失败的字段不会添加 - * 仅支持cn.bootx.common.actable.constants.MySqlTypeConstant中的枚举数据类型 - * 不填默认转换类：cn.bootx.common.actable.command.JavaToMysqlType - * @return 字段类型 - */ - MySqlFieldType type() default MySqlFieldType.DEFAULT; - - /** - * 字段长度，默认是255 - * @return 默认字段长度，默认是255 - */ - int length() default 255; - - /** - * 小数点长度，默认是0 - * @return 小数点长度，默认是0 - */ - int decimalLength() default 0; - - /** - * 是否为可以为null，true是可以，false是不可以，默认为true - * @return 是否为可以为null，true是可以，false是不可以，默认为true - */ - boolean isNull() default true; - - /** - * 是否是主键，默认false - * @return 是否是主键，默认false - */ - boolean isKey() default false; - - /** - * 是否自动递增，默认false，只有主键才能使用 - * @return 是否自动递增，默认false - */ - boolean isAutoIncrement() default false; - - /** - * 默认值，默认为null - * @return 默认值 - */ - String defaultValue() default "DEFAULT"; - - /** - * 数据表字段备注 - * @return 默认值，默认为空 - */ - String comment() default ""; - - /** - * 是否排除该字段, 默认不排除 - */ - boolean ignore() default false; - -} diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/actable/EnableTimeSuffix.java b/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/actable/EnableTimeSuffix.java deleted file mode 100644 index 49b956ba48a9e2ff172e05f520eb64d66507ae70..0000000000000000000000000000000000000000 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/actable/EnableTimeSuffix.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.bootx.common.core.annotation.actable; - -import cn.hutool.core.date.DatePattern; - -import java.lang.annotation.*; - -/** - * 表名时间后缀 - * - * @author Elphen - * @version 2021年03月11日 上午11:17:37 - */ -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -@Documented -public @interface EnableTimeSuffix { - - /** - * 开启时间后缀 - */ - boolean value() default true; - - /** - * 时间后缀格式
- * 使用常量类 {@link DatePattern} - */ - String pattern() default DatePattern.SIMPLE_MONTH_PATTERN; - -} diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/actable/IgnoreUpdate.java b/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/actable/IgnoreUpdate.java deleted file mode 100644 index b74870bd046041fd17172940f1c08a6372dfe9a1..0000000000000000000000000000000000000000 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/actable/IgnoreUpdate.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.bootx.common.core.annotation.actable; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * 作者：guoyzh 时间：2021/5/6 9:43 功能：忽略字段更新 - */ -// 该注解用于方法声明 -@Target(ElementType.FIELD) -// VM将在运行期也保留注释，因此可以通过反射机制读取注解的信息 -@Retention(RetentionPolicy.RUNTIME) -// 将此注解包含在javadoc中 -@Documented -public @interface IgnoreUpdate { - - // 是否忽略对当前字段的更新操作 - boolean value() default true; - -} diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/actable/Index.java b/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/actable/Index.java deleted file mode 100644 index 073e557b6534d4f96c61f4449464473c09a5d82e..0000000000000000000000000000000000000000 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/actable/Index.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.bootx.common.core.annotation.actable; - -import java.lang.annotation.*; - -/** - * 设置字段索引 - * - * @author sunchenbin - * @version 2019年6月14日 下午6:12:48 - */ -@Target(ElementType.FIELD) -@Retention(RetentionPolicy.RUNTIME) -@Documented -public @interface Index { - - /** - * 索引的名字，不设置默认为{actable_idx_当前标记字段名@Column的name} - *

- * 如果设置了名字例如union_name,系统会默认在名字前加actable_idx_前缀，也就是actable_idx_union_name - * @return - */ - String value() default ""; - - /** - * 要建立索引的字段名，不设置默认为当前标记字段名@Column的name - *

- * 可设置多个建立联合索引{"login_mobile","login_name"} - * @return - */ - String[] columns() default {}; - -} diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/actable/IsNativeDefValue.java b/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/actable/IsNativeDefValue.java deleted file mode 100644 index 3f1e70c1945be90f552dde77b3aa0a3aa6f1d28e..0000000000000000000000000000000000000000 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/actable/IsNativeDefValue.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.bootx.common.core.annotation.actable; - -import java.lang.annotation.*; - -/** - * 开启默认值原生模式 原生模式介绍：默认是false表示非原生，此时value只支持字符串形式，会将value值以字符串的形式设置到字段的默认值，例如value="aa" - * 即sql为 DEFAULT "aa" 如果设置true，此时如果value="CURRENT_TIMESTAMP"，即sql为 DEFAULT - * CURRENT_TIMESTAMP - * - * @author sunchenbin - * @version 2020年5月26日 下午6:13:15 - */ -// 该注解用于方法声明 -@Target(ElementType.FIELD) -// VM将在运行期也保留注释，因此可以通过反射机制读取注解的信息 -@Retention(RetentionPolicy.RUNTIME) -// 将此注解包含在javadoc中 -@Documented -public @interface IsNativeDefValue { - - /** - * 开启默认值原生模式 - * 原生模式介绍：默认是false表示非原生，此时value只支持字符串形式，会将value值以字符串的形式设置到字段的默认值，例如value="aa" 即sql为 - * DEFAULT "aa" 如果设置true，此时如果默认值为="CURRENT_TIMESTAMP"，即sql为 DEFAULT CURRENT_TIMESTAMP - * @return - */ - boolean value() default true; - -} diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/actable/Table.java b/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/actable/Table.java deleted file mode 100644 index 4979f444c044c7f05c262aaeff37de9a017b9f33..0000000000000000000000000000000000000000 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/actable/Table.java +++ /dev/null @@ -1,61 +0,0 @@ -package cn.bootx.common.core.annotation.actable; - -import cn.bootx.common.core.code.actable.MySqlCharset; -import cn.bootx.common.core.code.actable.MySqlEngine; - -import java.lang.annotation.*; - -/** - * 创建表时的表名 - * - * @author sunchenbin - * @version 2016年6月23日 下午6:13:37 - */ -// 表示注解加在接口、类、枚举等 -@Target(ElementType.TYPE) -// VM将在运行期也保留注释，因此可以通过反射机制读取注解的信息 -@Retention(RetentionPolicy.RUNTIME) -// 将此注解包含在javadoc中 -@Documented -public @interface Table { - - /** - * 表名 - * @return 表名 - */ - String name() default ""; - - /** - * 表名 - * @return 表名 - */ - String value() default ""; - - /** - * 表注释，也可以使用@TableComment注解代替 - */ - String comment() default ""; - - /** - * 表字符集，也可以使用@TableCharset注解代替 - * 仅支持cn.bootx.common.actable.constants.MySqlCharsetConstant中的枚举字符集 - */ - MySqlCharset charset() default MySqlCharset.UTF8MB4; - - /** - * 表引擎，也可以使用@TableEngine注解代替 - * 仅支持cn.bootx.common.actable.constants.MySqlEngineConstant中的存储引擎枚举 - */ - MySqlEngine engine() default MySqlEngine.InnoDB; - - /** - * 是否开启simple模式配置，开启后字段不写注解@Column也可以采用默认的驼峰转换法创建字段 - */ - boolean isSimple() default true; - - /** - * 需要排除的属性名，排除掉的属性不参与建表, 静态字段默认会被排除 - */ - String[] excludeFields() default {}; - -} diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/actable/Unique.java b/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/actable/Unique.java deleted file mode 100644 index 8c04d8c9e130e1e02d88a72ccc60fbbba5ced465..0000000000000000000000000000000000000000 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/actable/Unique.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.bootx.common.core.annotation.actable; - -import java.lang.annotation.*; - -/** - * 设置字段唯一约束 - * - * @author sunchenbin - * @version 2019年6月14日 下午6:12:48 - */ -@Target(ElementType.FIELD) -@Retention(RetentionPolicy.RUNTIME) -@Documented -public @interface Unique { - - /** - * 唯一约束的名字，不设置默认为{actable_uni_当前标记字段名@Column的name} - *

- * 如果设置了名字例如union_name,系统会默认在名字前加auni_前缀，也就是uni_union_name - */ - String value() default ""; - - /** - * 唯一约束的字段名，不设置默认为当前标记字段名@Column的name - *

- * 可设置多个建立联合唯一{"login_mobile","login_name"} - */ - String[] columns() default {}; - -} diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/code/actable/DatabaseType.java b/bootx-common-core/src/main/java/cn/bootx/common/core/code/actable/DatabaseType.java deleted file mode 100644 index e1cc69d5af3ba06124d612e6ff51d92a71bb1323..0000000000000000000000000000000000000000 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/code/actable/DatabaseType.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.bootx.common.core.code.actable; - -/** - * 数据库类型 - * - * @author xxm - * @date 2023/1/16 - */ -public enum DatabaseType { - - MYSQL, ORACLE, SQLSERVER, POSTGRESQL; - -} diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/code/actable/MySqlCharset.java b/bootx-common-core/src/main/java/cn/bootx/common/core/code/actable/MySqlCharset.java deleted file mode 100644 index 6f98677c6d24ef03561250a6ce54f23a3b92edb8..0000000000000000000000000000000000000000 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/code/actable/MySqlCharset.java +++ /dev/null @@ -1,12 +0,0 @@ -package cn.bootx.common.core.code.actable; - -/** - * mysql支持的字符集 - */ -public enum MySqlCharset { - - DEFAULT, ARMSCII8, ASCII, BIG5, BINARY, CP850, CP852, CP866, CP932, CP1250, CP1251, CP1256, CP1257, DEC8, EUCJPMS, - EUCKR, GB2312, GBK, GEOSTD8, GREEK, HEBREW, HP8, KEYBCS2, KOI8R, KOI8U, LATIN1, LATIN2, LATIN5, LATIN7, MACCE, - MACROMAN, SJIS, SWE7, TIS620, UCS2, UJIS, UTF8, UTF8MB4, UTF16, UTF32; - -} diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/code/actable/MySqlEngine.java b/bootx-common-core/src/main/java/cn/bootx/common/core/code/actable/MySqlEngine.java deleted file mode 100644 index f82e4d0b1c46c76f5997b948e2c9c18fe49ea79f..0000000000000000000000000000000000000000 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/code/actable/MySqlEngine.java +++ /dev/null @@ -1,10 +0,0 @@ -package cn.bootx.common.core.code.actable; - -/** - * mysql支持的引擎 - */ -public enum MySqlEngine { - - DEFAULT, ARCHIVE, BLACKHOLE, CSV, InnoDB, MEMORY, MRG_MYISAM, MyISAM, PERFORMANCE_SCHEMA; - -} diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/code/actable/MySqlFieldType.java b/bootx-common-core/src/main/java/cn/bootx/common/core/code/actable/MySqlFieldType.java deleted file mode 100644 index 964b9ad1c19ebc0d34f9b6f8593746e57b9de4c7..0000000000000000000000000000000000000000 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/code/actable/MySqlFieldType.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.bootx.common.core.code.actable; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 用于配置Mysql数据库中类型，并且该类型需要设置几个长度 这里配置多少个类型决定了，创建表能使用多少类型 例如：varchar(1) decimal(5,2) - * datetime - * - * @author sunchenbin - * @version 2016年6月23日 下午5:59:33 - */ -@Getter -@AllArgsConstructor -public enum MySqlFieldType { - - DEFAULT(null, null, null), INT(1, 11, null), VARCHAR(1, 255, null), BINARY(1, 1, null), CHAR(1, 255, null), - BIGINT(1, 20, null), BIT(1, 1, null), TINYINT(1, 4, null), SMALLINT(1, 6, null), MEDIUMINT(1, 9, null), - DECIMAL(2, 10, 2), DOUBLE(2, 10, 0), TEXT(0, null, null), MEDIUMTEXT(0, null, null), LONGTEXT(0, null, null), - DATETIME(0, null, null), TIMESTAMP(0, null, null), DATE(0, null, null), TIME(0, null, null), FLOAT(2, 10, 0), - YEAR(0, null, null), BLOB(0, null, null), LONGBLOB(0, null, null), MEDIUMBLOB(0, null, null), - TINYTEXT(0, null, null), TINYBLOB(0, null, null), JSON(0, null, null); - - private final Integer lengthCount; - - private final Integer lengthDefault; - - private final Integer decimalLengthDefault; - -} diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/BigField.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/BigField.java similarity index 82% rename from bootx-common-core/src/main/java/cn/bootx/common/core/annotation/BigField.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/BigField.java index 508100ad15f7e4c648e1863c81333271712a070f..802e8a50021bd922725be7e827bdfee3631c12b9 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/BigField.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/BigField.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.annotation; +package cn.bootx.platform.common.core.annotation; import java.lang.annotation.*; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/CountTime.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/CountTime.java similarity index 82% rename from bootx-common-core/src/main/java/cn/bootx/common/core/annotation/CountTime.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/CountTime.java index 8d47c51e9da947d64bf96710274c189f2cf7033b..dca870e4826135e397bc9691b69c40af65f5aee1 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/CountTime.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/CountTime.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.annotation; +package cn.bootx.platform.common.core.annotation; import java.lang.annotation.*; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/DataVersionLog.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/DataVersionLog.java similarity index 85% rename from bootx-common-core/src/main/java/cn/bootx/common/core/annotation/DataVersionLog.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/DataVersionLog.java index abbae66822e5a6bc3a38799304e0ebd0221ab8f2..5f6a8cb5ba37106b2e335041e2b7865803959958 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/DataVersionLog.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/DataVersionLog.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.annotation; +package cn.bootx.platform.common.core.annotation; import java.lang.annotation.*; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/EncryptionField.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/EncryptionField.java similarity index 83% rename from bootx-common-core/src/main/java/cn/bootx/common/core/annotation/EncryptionField.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/EncryptionField.java index 2c7534d96403f25da63a65ce26dd42d1c68db4d4..7b29b65baa0dea6df45aa14717d1c23042916c10 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/EncryptionField.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/EncryptionField.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.annotation; +package cn.bootx.platform.common.core.annotation; import java.lang.annotation.*; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/Idempotent.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Idempotent.java similarity index 93% rename from bootx-common-core/src/main/java/cn/bootx/common/core/annotation/Idempotent.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Idempotent.java index 480c54daeccf664435a070026d95c81960085b8b..088d33a0204ed3bc00fff035fabb04f96cfec70d 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/Idempotent.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Idempotent.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.annotation; +package cn.bootx.platform.common.core.annotation; import java.lang.annotation.*; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/IgnoreAuth.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/IgnoreAuth.java similarity index 90% rename from bootx-common-core/src/main/java/cn/bootx/common/core/annotation/IgnoreAuth.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/IgnoreAuth.java index 7a0ad09b2f33d3af8a2848ff08f325b6c7d7e508..f47b1c740ffdb477ee42a3c359c27e8daa105baf 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/IgnoreAuth.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/IgnoreAuth.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.annotation; +package cn.bootx.platform.common.core.annotation; import java.lang.annotation.*; @@ -23,4 +23,4 @@ public @interface IgnoreAuth { */ boolean login() default false; -} \ No newline at end of file +} diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/JobLog.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/JobLog.java similarity index 88% rename from bootx-common-core/src/main/java/cn/bootx/common/core/annotation/JobLog.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/JobLog.java index c27d3277405c0668498af8fe69837ae234ae19ed..11d40fce2bd05df7e3f944ba4e5ababb5207f2d6 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/JobLog.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/JobLog.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.annotation; +package cn.bootx.platform.common.core.annotation; import java.lang.annotation.*; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/NestedPermission.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/NestedPermission.java similarity index 92% rename from bootx-common-core/src/main/java/cn/bootx/common/core/annotation/NestedPermission.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/NestedPermission.java index ae31815f1b3953d2bac16efc4226611a9e65e434..27eb4a994e02d6b51762f4270b5d096744052b52 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/NestedPermission.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/NestedPermission.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.annotation; +package cn.bootx.platform.common.core.annotation; import java.lang.annotation.*; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/OperateLog.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/OperateLog.java similarity index 96% rename from bootx-common-core/src/main/java/cn/bootx/common/core/annotation/OperateLog.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/OperateLog.java index e2f079c79a9ac710990d9c87236bb987efbf7965..e65caec7ec43755dabd920734013fe8001941246 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/OperateLog.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/OperateLog.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.annotation; +package cn.bootx.platform.common.core.annotation; import java.lang.annotation.*; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/OperateLogs.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/OperateLogs.java similarity index 86% rename from bootx-common-core/src/main/java/cn/bootx/common/core/annotation/OperateLogs.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/OperateLogs.java index ba1c05c310a44ff99b26099296cb69a80ba0bb7c..fa3cd2ab0f3b146fe7fb9197184ea6ace84ab242 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/OperateLogs.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/OperateLogs.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.annotation; +package cn.bootx.platform.common.core.annotation; import java.lang.annotation.*; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/PermCode.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/PermCode.java similarity index 92% rename from bootx-common-core/src/main/java/cn/bootx/common/core/annotation/PermCode.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/PermCode.java index 0fe2ff1274e41b562470ad7fdeacec6678b5cedc..e3b0bd74360093f64325181c0f1b4ca011b77aa1 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/PermCode.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/PermCode.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.annotation; +package cn.bootx.platform.common.core.annotation; import java.lang.annotation.*; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/Permission.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Permission.java similarity index 92% rename from bootx-common-core/src/main/java/cn/bootx/common/core/annotation/Permission.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Permission.java index 4a57e202f29edbd30b89e826333fd6cc808d4ddc..a8aefb35faefdcd199adf13e278a1c2832e93157 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/Permission.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Permission.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.annotation; +package cn.bootx.platform.common.core.annotation; import java.lang.annotation.*; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/QueryParam.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/QueryParam.java similarity index 97% rename from bootx-common-core/src/main/java/cn/bootx/common/core/annotation/QueryParam.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/QueryParam.java index f5fd530628d3df64dca4312444d03d7545d9d11c..dd6f0629d0ae53ef326c48fb6e593b5144f73f11 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/QueryParam.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/QueryParam.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.annotation; +package cn.bootx.platform.common.core.annotation; import java.lang.annotation.*; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/TableFieldConvert.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TableFieldConvert.java similarity index 87% rename from bootx-common-core/src/main/java/cn/bootx/common/core/annotation/TableFieldConvert.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TableFieldConvert.java index ebedc7187ce8be505c1c5ead18b97107d0b58ff5..d4ba56d677f48134a95e440888a2a9557ebc30c9 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/TableFieldConvert.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TableFieldConvert.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.annotation; +package cn.bootx.platform.common.core.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/TableFieldConvertModel.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TableFieldConvertModel.java similarity index 90% rename from bootx-common-core/src/main/java/cn/bootx/common/core/annotation/TableFieldConvertModel.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TableFieldConvertModel.java index e0cb37d174c6fb4b85a41253b3c619beb33d20f6..b6b69b3c319837449856f531929965a27e977d0b 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/TableFieldConvertModel.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TableFieldConvertModel.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.annotation; +package cn.bootx.platform.common.core.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/Translate.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Translate.java similarity index 93% rename from bootx-common-core/src/main/java/cn/bootx/common/core/annotation/Translate.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Translate.java index 339680bcb6f5607ad7f8c5120b0008b6c72c35ea..c01a8706c25f984326c915453eb47ad48f078a12 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/Translate.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Translate.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.annotation; +package cn.bootx.platform.common.core.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/TranslationResult.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TranslationResult.java similarity index 96% rename from bootx-common-core/src/main/java/cn/bootx/common/core/annotation/TranslationResult.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TranslationResult.java index 54ed0f472686ea4dc8dd073bae5f9e22fccb800e..1d032191e2f1cb0dc984d780632dc9ec7cc2cad3 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/annotation/TranslationResult.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TranslationResult.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.annotation; +package cn.bootx.platform.common.core.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/code/CommonCode.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/CommonCode.java similarity index 97% rename from bootx-common-core/src/main/java/cn/bootx/common/core/code/CommonCode.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/CommonCode.java index b817e0800581dacc92d363071180c9cebb3ece2e..1ada0c4c557c9921e1527c4e25154dc86d321f66 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/code/CommonCode.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/CommonCode.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.code; +package cn.bootx.platform.common.core.code; /** * 公共常量 diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/code/CommonErrorCode.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/CommonErrorCode.java similarity index 95% rename from bootx-common-core/src/main/java/cn/bootx/common/core/code/CommonErrorCode.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/CommonErrorCode.java index cbc1373fc34d95afd0db038d25a793a8f20abc94..5d515d4bfc9a22b75d1acc712f60274398562722 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/code/CommonErrorCode.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/CommonErrorCode.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.code; +package cn.bootx.platform.common.core.code; /** * 公用错误码常量 10001-10100 diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/code/ServletCode.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/ServletCode.java similarity index 85% rename from bootx-common-core/src/main/java/cn/bootx/common/core/code/ServletCode.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/ServletCode.java index 323ebef7d02ca18ac67b4e5065e2a575d82675b0..e685b26596b4b008bcfdedbd0be5f82c8255aeff 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/code/ServletCode.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/ServletCode.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.code; +package cn.bootx.platform.common.core.code; /** * Servlet常量 diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/code/WebHeaderCode.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/WebHeaderCode.java similarity index 96% rename from bootx-common-core/src/main/java/cn/bootx/common/core/code/WebHeaderCode.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/WebHeaderCode.java index eab7d52210b4e352feeec6f6a6656747a2ab6ef8..53dc5d011cd44207eb69c348e63b0bf48e19b5a0 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/code/WebHeaderCode.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/WebHeaderCode.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.code; +package cn.bootx.platform.common.core.code; /** * web请求头常量 diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/entity/UserDetail.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/entity/UserDetail.java similarity index 94% rename from bootx-common-core/src/main/java/cn/bootx/common/core/entity/UserDetail.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/entity/UserDetail.java index a17a35e006faa985b4c35cf44cd0e458caa2be98..4e6c649f3b411006819f75413ccf965f0137f1be 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/entity/UserDetail.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/entity/UserDetail.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.entity; +package cn.bootx.platform.common.core.entity; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Getter; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/exception/BizException.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/BizException.java similarity index 81% rename from bootx-common-core/src/main/java/cn/bootx/common/core/exception/BizException.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/BizException.java index fc5d379f69c9fd3266795ec7697d3f09dcd8a28b..09c657083fe471d91b16a40ebd9468b3a76bac0d 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/exception/BizException.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/BizException.java @@ -1,6 +1,6 @@ -package cn.bootx.common.core.exception; +package cn.bootx.platform.common.core.exception; -import cn.bootx.common.core.code.CommonCode; +import cn.bootx.platform.common.core.code.CommonCode; import java.io.Serializable; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/exception/DangerSqlException.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/DangerSqlException.java similarity index 69% rename from bootx-common-core/src/main/java/cn/bootx/common/core/exception/DangerSqlException.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/DangerSqlException.java index 110747ff91375343a4372442585f4aafec9a4166..ceee61b96e31d22f2b5adb26f9dcc4e091c3cb72 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/exception/DangerSqlException.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/DangerSqlException.java @@ -1,6 +1,6 @@ -package cn.bootx.common.core.exception; +package cn.bootx.platform.common.core.exception; -import static cn.bootx.common.core.code.CommonErrorCode.DANGER_SQL; +import static cn.bootx.platform.common.core.code.CommonErrorCode.DANGER_SQL; /** * SQL相关异常 diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/exception/DataNotExistException.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/DataNotExistException.java similarity index 70% rename from bootx-common-core/src/main/java/cn/bootx/common/core/exception/DataNotExistException.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/DataNotExistException.java index a3e2fd7be63510ce2f4e81f49eb40614cefc6a83..472ccfb8c1f0cade32f31fbb1129a8767d72faed 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/exception/DataNotExistException.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/DataNotExistException.java @@ -1,6 +1,6 @@ -package cn.bootx.common.core.exception; +package cn.bootx.platform.common.core.exception; -import static cn.bootx.common.core.code.CommonErrorCode.DATA_NOT_EXIST; +import static cn.bootx.platform.common.core.code.CommonErrorCode.DATA_NOT_EXIST; /** * 数据不存在异常 diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/exception/ErrorCodeRuntimeException.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/ErrorCodeRuntimeException.java similarity index 92% rename from bootx-common-core/src/main/java/cn/bootx/common/core/exception/ErrorCodeRuntimeException.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/ErrorCodeRuntimeException.java index 21b627e60eb7a8babd62e10cb289c227076b4f44..4173fb360ab95dd661680ba7b077ddb735aff500 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/exception/ErrorCodeRuntimeException.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/ErrorCodeRuntimeException.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.exception; +package cn.bootx.platform.common.core.exception; import java.io.Serializable; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/exception/FatalException.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/FatalException.java similarity index 81% rename from bootx-common-core/src/main/java/cn/bootx/common/core/exception/FatalException.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/FatalException.java index 5fec4a9de0883d5ca957977e5e993f4c756cdf8a..4205285155d835a829aed9d6e5734e646a0d9758 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/exception/FatalException.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/FatalException.java @@ -1,8 +1,8 @@ -package cn.bootx.common.core.exception; +package cn.bootx.platform.common.core.exception; import java.io.Serializable; -import static cn.bootx.common.core.code.CommonErrorCode.SYSTEM_ERROR; +import static cn.bootx.platform.common.core.code.CommonErrorCode.SYSTEM_ERROR; /** * 致命异常基类 diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/exception/OptimisticLockException.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/OptimisticLockException.java similarity index 74% rename from bootx-common-core/src/main/java/cn/bootx/common/core/exception/OptimisticLockException.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/OptimisticLockException.java index 416f1aa6c4c3dccd485d50d12a76adad44ccf0d3..f696bd417c279271c63020a5801fcbc76cd67a73 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/exception/OptimisticLockException.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/OptimisticLockException.java @@ -1,8 +1,8 @@ -package cn.bootx.common.core.exception; +package cn.bootx.platform.common.core.exception; import java.io.Serializable; -import static cn.bootx.common.core.code.CommonErrorCode.DATA_OUT_OF_DATE; +import static cn.bootx.platform.common.core.code.CommonErrorCode.DATA_OUT_OF_DATE; /** * 乐观锁异常 diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/exception/RepetitiveOperationException.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/RepetitiveOperationException.java similarity index 77% rename from bootx-common-core/src/main/java/cn/bootx/common/core/exception/RepetitiveOperationException.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/RepetitiveOperationException.java index 5c864cfc24e9b6267511defbdbaaa15b1d7ce4ab..e4c9a242a341e22313836df5824f9ad18af582f6 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/exception/RepetitiveOperationException.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/RepetitiveOperationException.java @@ -1,8 +1,8 @@ -package cn.bootx.common.core.exception; +package cn.bootx.platform.common.core.exception; import java.io.Serializable; -import static cn.bootx.common.core.code.CommonErrorCode.REPETITIVE_OPERATION_ERROR; +import static cn.bootx.platform.common.core.code.CommonErrorCode.REPETITIVE_OPERATION_ERROR; /** * 重复操作异常 diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/exception/SystemException.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/SystemException.java similarity index 88% rename from bootx-common-core/src/main/java/cn/bootx/common/core/exception/SystemException.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/SystemException.java index a8de6d6b927649d65c81b4f7bc1e4efaf550a0c1..539e80fa7a4ddeefb0f1d634d37f225da5ac13d0 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/exception/SystemException.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/SystemException.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.exception; +package cn.bootx.platform.common.core.exception; import java.io.Serializable; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/exception/UnSupportOperateException.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/UnSupportOperateException.java similarity index 75% rename from bootx-common-core/src/main/java/cn/bootx/common/core/exception/UnSupportOperateException.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/UnSupportOperateException.java index 461ece47a00ec4d4c7acfc7d03ee12a0ed45e75e..7a6040daf7c11d51349ed932c107df6a75dd279a 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/exception/UnSupportOperateException.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/UnSupportOperateException.java @@ -1,8 +1,8 @@ -package cn.bootx.common.core.exception; +package cn.bootx.platform.common.core.exception; import java.io.Serializable; -import static cn.bootx.common.core.code.CommonErrorCode.UN_SUPPORTED_OPERATE; +import static cn.bootx.platform.common.core.code.CommonErrorCode.UN_SUPPORTED_OPERATE; /** * 不支持的操作异常 diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/exception/UnSupportReadException.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/UnSupportReadException.java similarity index 74% rename from bootx-common-core/src/main/java/cn/bootx/common/core/exception/UnSupportReadException.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/UnSupportReadException.java index 54993a93ce3146dd5359c2641f4afab8157324b7..e9b60f4b2fe0dc8dd55dd2025e2965abb8da762c 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/exception/UnSupportReadException.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/UnSupportReadException.java @@ -1,8 +1,8 @@ -package cn.bootx.common.core.exception; +package cn.bootx.platform.common.core.exception; import java.io.Serializable; -import static cn.bootx.common.core.code.CommonErrorCode.UN_SUPPORTED_READ; +import static cn.bootx.platform.common.core.code.CommonErrorCode.UN_SUPPORTED_READ; /** * 不支持的读取操作 diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/exception/ValidationFailedException.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/ValidationFailedException.java similarity index 76% rename from bootx-common-core/src/main/java/cn/bootx/common/core/exception/ValidationFailedException.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/ValidationFailedException.java index 9072df8bca93b8312ad963c6ab7a0ac6180278c3..b7509d62b09d113d2cbac0a9bab35851ccfa9167 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/exception/ValidationFailedException.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/ValidationFailedException.java @@ -1,8 +1,8 @@ -package cn.bootx.common.core.exception; +package cn.bootx.platform.common.core.exception; import java.io.Serializable; -import static cn.bootx.common.core.code.CommonErrorCode.VALIDATE_PARAMETERS_ERROR; +import static cn.bootx.platform.common.core.code.CommonErrorCode.VALIDATE_PARAMETERS_ERROR; /** * 验证失败异常 diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/function/CollectorsFunction.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/CollectorsFunction.java similarity index 89% rename from bootx-common-core/src/main/java/cn/bootx/common/core/function/CollectorsFunction.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/CollectorsFunction.java index 41c9d60f84dfc2b7bd9ba59cf8d3501a71c73257..57c43ad5edb30d95aa12c2d397ac5c54b3ddbfa1 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/function/CollectorsFunction.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/CollectorsFunction.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.function; +package cn.bootx.platform.common.core.function; /** * stream流处理时进行Collectors时的函数 diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/function/EntityBaseFunction.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/EntityBaseFunction.java similarity index 76% rename from bootx-common-core/src/main/java/cn/bootx/common/core/function/EntityBaseFunction.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/EntityBaseFunction.java index 7ab8e1c7a174bd3c96b36e272960469816c7f1df..096696e50bbda06c81ef6eb830f6a479532783ee 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/function/EntityBaseFunction.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/EntityBaseFunction.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.function; +package cn.bootx.platform.common.core.function; /** * entity基础方法 diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/function/ParamService.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/ParamService.java similarity index 80% rename from bootx-common-core/src/main/java/cn/bootx/common/core/function/ParamService.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/ParamService.java index 171ad12617e7e7b90dd4fbba317c19853373766e..f6f87bf439b80c654ed53ac2464530b30f2a9a3b 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/function/ParamService.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/ParamService.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.function; +package cn.bootx.platform.common.core.function; /** * 参数获取服务(必须有实现类) diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/function/SystemKeyValueService.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/SystemKeyValueService.java similarity index 81% rename from bootx-common-core/src/main/java/cn/bootx/common/core/function/SystemKeyValueService.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/SystemKeyValueService.java index 434f0f5ae228c3c027433e4ea6819e4cd053757f..2af97e339061b2bdbdfa6ad799bc0c7711510b65 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/function/SystemKeyValueService.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/SystemKeyValueService.java @@ -1,6 +1,6 @@ -package cn.bootx.common.core.function; +package cn.bootx.platform.common.core.function; -import cn.bootx.common.core.rest.dto.KeyValue; +import cn.bootx.platform.common.core.rest.dto.KeyValue; import java.util.List; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/function/UserDetailService.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/UserDetailService.java similarity index 68% rename from bootx-common-core/src/main/java/cn/bootx/common/core/function/UserDetailService.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/UserDetailService.java index 39c1eaacdb2c8b3a3ce86f0a4cd18baded3faea5..a445f36321446ffb0c88d42fda94044b183f4760 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/function/UserDetailService.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/UserDetailService.java @@ -1,6 +1,6 @@ -package cn.bootx.common.core.function; +package cn.bootx.platform.common.core.function; -import cn.bootx.common.core.entity.UserDetail; +import cn.bootx.platform.common.core.entity.UserDetail; import java.util.Optional; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/rest/ErrorResult.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/ErrorResult.java similarity index 92% rename from bootx-common-core/src/main/java/cn/bootx/common/core/rest/ErrorResult.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/ErrorResult.java index 1900fa5a229be7de51d0b1f34df43bfaab2f076a..1a967b941efc04a67573458e0a8a08c3590ec7a4 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/rest/ErrorResult.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/ErrorResult.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.rest; +package cn.bootx.platform.common.core.rest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/rest/PageResult.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/PageResult.java similarity index 96% rename from bootx-common-core/src/main/java/cn/bootx/common/core/rest/PageResult.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/PageResult.java index c86c0a2733adadd057b25514312db1c33ac90dbb..a0041423e50d948daf390e4f3e95fce4c8b2c401 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/rest/PageResult.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/PageResult.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.rest; +package cn.bootx.platform.common.core.rest; import java.io.Serializable; import java.util.Collections; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/rest/Res.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/Res.java similarity index 85% rename from bootx-common-core/src/main/java/cn/bootx/common/core/rest/Res.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/Res.java index fef5e714a1a6a6b98b53ff94ca2d813511dac191..671811377447aa6ab3f7bb7ec31ca21b08039c4c 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/rest/Res.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/Res.java @@ -1,7 +1,7 @@ -package cn.bootx.common.core.rest; +package cn.bootx.platform.common.core.rest; -import static cn.bootx.common.core.code.CommonCode.FAIL_CODE; -import static cn.bootx.common.core.code.CommonCode.SUCCESS_CODE; +import static cn.bootx.platform.common.core.code.CommonCode.FAIL_CODE; +import static cn.bootx.platform.common.core.code.CommonCode.SUCCESS_CODE; /** * 返回工具类 diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/rest/ResResult.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/ResResult.java similarity index 89% rename from bootx-common-core/src/main/java/cn/bootx/common/core/rest/ResResult.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/ResResult.java index b6b046fa570d154796eb979e6d010c0aea9200e9..234b3cd0b67b6cd75d358845bd5033c8e95d77e9 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/rest/ResResult.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/ResResult.java @@ -1,6 +1,6 @@ -package cn.bootx.common.core.rest; +package cn.bootx.platform.common.core.rest; -import cn.bootx.common.core.code.CommonCode; +import cn.bootx.platform.common.core.code.CommonCode; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/rest/dto/BaseDto.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/BaseDto.java similarity index 93% rename from bootx-common-core/src/main/java/cn/bootx/common/core/rest/dto/BaseDto.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/BaseDto.java index dee8e5e6fd836cdd7e5effddbf2982f6ca6919c0..dfaa3728a256eb755cc5dee5fbdce669ff0edf54 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/rest/dto/BaseDto.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/BaseDto.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.rest.dto; +package cn.bootx.platform.common.core.rest.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/rest/dto/KeyValue.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/KeyValue.java similarity index 92% rename from bootx-common-core/src/main/java/cn/bootx/common/core/rest/dto/KeyValue.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/KeyValue.java index b113a2e02dc0768a56900a109a36b90d69fd33bc..de37396db693ff80b1effb81d13735b2c2da78c6 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/rest/dto/KeyValue.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/KeyValue.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.rest.dto; +package cn.bootx.platform.common.core.rest.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/rest/dto/LabelValue.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/LabelValue.java similarity index 93% rename from bootx-common-core/src/main/java/cn/bootx/common/core/rest/dto/LabelValue.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/LabelValue.java index 21000a072e7b5845cf90ac6d4a4ebc48e511d3f3..d620f85816d6f4aa688b568f88d7ad742c4c92e8 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/rest/dto/LabelValue.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/LabelValue.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.rest.dto; +package cn.bootx.platform.common.core.rest.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/rest/param/OrderParam.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/param/OrderParam.java similarity index 88% rename from bootx-common-core/src/main/java/cn/bootx/common/core/rest/param/OrderParam.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/param/OrderParam.java index e5ea2d72882738552bd9219824812f09b4d145e7..4a99f188fea3e9f1f276af4292f9a4c89218f307 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/rest/param/OrderParam.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/param/OrderParam.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.rest.param; +package cn.bootx.platform.common.core.rest.param; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/rest/param/PageParam.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/param/PageParam.java similarity index 95% rename from bootx-common-core/src/main/java/cn/bootx/common/core/rest/param/PageParam.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/param/PageParam.java index 6b5ffd9fc52d429d02340594ca18e4d544c8d087..7b459a3ef2a477093cd022b0fb3632d5b1651443 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/rest/param/PageParam.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/param/PageParam.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.rest.param; +package cn.bootx.platform.common.core.rest.param; import cn.hutool.core.util.PageUtil; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/util/BigDecimalUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/BigDecimalUtil.java similarity index 99% rename from bootx-common-core/src/main/java/cn/bootx/common/core/util/BigDecimalUtil.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/BigDecimalUtil.java index 566d510469137868790cc59a8fd6717761348493..b5faead015f8726fd013603a7545fb5705334569 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/util/BigDecimalUtil.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/BigDecimalUtil.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.util; +package cn.bootx.platform.common.core.util; import lombok.experimental.UtilityClass; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/util/CertUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CertUtil.java similarity index 94% rename from bootx-common-core/src/main/java/cn/bootx/common/core/util/CertUtil.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CertUtil.java index c25a58080b1e71cede9c122b1a1582334fa9796b..c3a49524d85d8ac5e65ad8844c80331b023849e1 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/util/CertUtil.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CertUtil.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.util; +package cn.bootx.platform.common.core.util; import cn.hutool.core.codec.Base64Encoder; import lombok.SneakyThrows; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/util/CollUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CollUtil.java similarity index 92% rename from bootx-common-core/src/main/java/cn/bootx/common/core/util/CollUtil.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CollUtil.java index 42e4b65482fb25b35ffa99dab5ef7bb6e7b4f692..3083c67f97e1ffb0b5379e0d92fd577c665ece61 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/util/CollUtil.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CollUtil.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.util; +package cn.bootx.platform.common.core.util; import lombok.experimental.UtilityClass; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/util/FileUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/FileUtil.java similarity index 96% rename from bootx-common-core/src/main/java/cn/bootx/common/core/util/FileUtil.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/FileUtil.java index 66d5880f128bc8ec0f2de597f4bbe1d6bab8b72e..2352e94ba6175c3175db80b022f26c1b79cbfe4a 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/util/FileUtil.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/FileUtil.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.util; +package cn.bootx.platform.common.core.util; import lombok.SneakyThrows; import lombok.experimental.UtilityClass; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/util/LocalDateTimeUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/LocalDateTimeUtil.java similarity index 98% rename from bootx-common-core/src/main/java/cn/bootx/common/core/util/LocalDateTimeUtil.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/LocalDateTimeUtil.java index 04a4fe818e158ee33d898b72f26429a893f48685..f34eb982e30364debc64a51638050a78deff6eb1 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/util/LocalDateTimeUtil.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/LocalDateTimeUtil.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.util; +package cn.bootx.platform.common.core.util; import lombok.experimental.UtilityClass; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/util/RegexUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/RegexUtil.java similarity index 94% rename from bootx-common-core/src/main/java/cn/bootx/common/core/util/RegexUtil.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/RegexUtil.java index 31da4bc5a30df4f8c161efa265e3d77cc174977a..c3b5dba8cd0a68e64b1b18c0f09c4016e512cc38 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/util/RegexUtil.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/RegexUtil.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.util; +package cn.bootx.platform.common.core.util; import lombok.experimental.UtilityClass; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/util/ResultConvertUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/ResultConvertUtil.java similarity index 90% rename from bootx-common-core/src/main/java/cn/bootx/common/core/util/ResultConvertUtil.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/ResultConvertUtil.java index 22aef1c973595893a1b16a11d56c4dab08e7c9f5..3a39113e53c77945982d50ec73a49fb8a9b2d7c6 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/util/ResultConvertUtil.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/ResultConvertUtil.java @@ -1,6 +1,6 @@ -package cn.bootx.common.core.util; +package cn.bootx.platform.common.core.util; -import cn.bootx.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.core.function.EntityBaseFunction; import lombok.experimental.UtilityClass; import java.util.List; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/util/SqlInjectionUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/SqlInjectionUtil.java similarity index 97% rename from bootx-common-core/src/main/java/cn/bootx/common/core/util/SqlInjectionUtil.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/SqlInjectionUtil.java index a04c3ec01cc90fb46af5223cfd68480d5041eb16..4671b6f2a15abd2f0cae450c9b111cc011c26db2 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/util/SqlInjectionUtil.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/SqlInjectionUtil.java @@ -1,6 +1,6 @@ -package cn.bootx.common.core.util; +package cn.bootx.platform.common.core.util; -import cn.bootx.common.core.exception.DangerSqlException; +import cn.bootx.platform.common.core.exception.DangerSqlException; import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/util/TreeBuildUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/TreeBuildUtil.java similarity index 97% rename from bootx-common-core/src/main/java/cn/bootx/common/core/util/TreeBuildUtil.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/TreeBuildUtil.java index 23ba9efa235d672024570b05141db081c5b1aa04..3f85cd3bb0d06e4a16788d6938f35114356e6db6 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/util/TreeBuildUtil.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/TreeBuildUtil.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.util; +package cn.bootx.platform.common.core.util; import cn.hutool.core.collection.CollectionUtil; import lombok.experimental.UtilityClass; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/util/ValidationUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/ValidationUtil.java similarity index 93% rename from bootx-common-core/src/main/java/cn/bootx/common/core/util/ValidationUtil.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/ValidationUtil.java index 9c0b573ee3a5c9c728d9ffa63be6e675d5b8e17b..bdff34ac4f7f1d84aa494ed172c2200027596c9b 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/util/ValidationUtil.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/ValidationUtil.java @@ -1,6 +1,6 @@ -package cn.bootx.common.core.util; +package cn.bootx.platform.common.core.util; -import cn.bootx.common.core.exception.ValidationFailedException; +import cn.bootx.platform.common.core.exception.ValidationFailedException; import lombok.experimental.UtilityClass; import javax.validation.ConstraintViolation; diff --git a/bootx-common-core/src/main/java/cn/bootx/common/core/validation/ValidationGroup.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/validation/ValidationGroup.java similarity index 89% rename from bootx-common-core/src/main/java/cn/bootx/common/core/validation/ValidationGroup.java rename to bootx-common-core/src/main/java/cn/bootx/platform/common/core/validation/ValidationGroup.java index 4af7b34375f0b9d25f30802da55cd4e4189df3fa..0c46e92cfef31e5e47da461449077c999529b8a0 100644 --- a/bootx-common-core/src/main/java/cn/bootx/common/core/validation/ValidationGroup.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/validation/ValidationGroup.java @@ -1,4 +1,4 @@ -package cn.bootx.common.core.validation; +package cn.bootx.platform.common.core.validation; /** * 校验分组 diff --git a/bootx-common-starters/common-starter-audit-log/pom.xml b/bootx-common-starters/common-starter-audit-log/pom.xml index 867c238a88fd032dc00bb355c81fbb82b867dbda..9420b6f1bcf7af4f8e1ba43b612a5e931c4aa81f 100644 --- a/bootx-common-starters/common-starter-audit-log/pom.xml +++ b/bootx-common-starters/common-starter-audit-log/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.2.3 + 1.3.0 4.0.0 @@ -38,6 +38,13 @@ common-mybatis-plus true + + + org.lionsoul + ip2region + ${ip2region.version} + + diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/AuditLogAutoConfiguration.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/AuditLogAutoConfiguration.java similarity index 93% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/AuditLogAutoConfiguration.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/AuditLogAutoConfiguration.java index 70ceb22366f87fb1d4bcd0adac554e9d056df587..64fbbc76bc79b6c2bf708a85e5efb43090c21a46 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/AuditLogAutoConfiguration.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/AuditLogAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.audit.log; +package cn.bootx.platform.starter.audit.log; import org.apache.ibatis.annotations.Mapper; import org.mybatis.spring.annotation.MapperScan; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/configuration/DataVersionConfiguration.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/configuration/DataVersionConfiguration.java similarity index 69% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/configuration/DataVersionConfiguration.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/configuration/DataVersionConfiguration.java index 4d24dc55fac4155fcc1c88684bfb35b68ebf3d67..4778e7658c524790fb056467933a1515b7fbc0e7 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/configuration/DataVersionConfiguration.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/configuration/DataVersionConfiguration.java @@ -1,7 +1,7 @@ -package cn.bootx.starter.audit.log.configuration; +package cn.bootx.platform.starter.audit.log.configuration; -import cn.bootx.common.mybatisplus.interceptor.MpInterceptor; -import cn.bootx.common.mybatisplus.extension.DataChangeRecorderInnerInterceptor; +import cn.bootx.platform.common.mybatisplus.interceptor.MpInterceptor; +import cn.bootx.platform.common.mybatisplus.extension.DataChangeRecorderInnerInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/controller/DataVersionLogController.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/DataVersionLogController.java similarity index 69% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/controller/DataVersionLogController.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/DataVersionLogController.java index 62f38d68cac6c7ebdc89e72cbcd5d00436078f3c..7960ce4e88bf210713861229ce232cec4ea13691 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/controller/DataVersionLogController.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/DataVersionLogController.java @@ -1,12 +1,12 @@ -package cn.bootx.starter.audit.log.controller; +package cn.bootx.platform.starter.audit.log.controller; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.audit.log.dto.DataVersionLogDto; -import cn.bootx.starter.audit.log.param.DataVersionLogParam; -import cn.bootx.starter.audit.log.service.DataVersionLogService; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.starter.audit.log.dto.DataVersionLogDto; +import cn.bootx.platform.starter.audit.log.param.DataVersionLogParam; +import cn.bootx.platform.starter.audit.log.service.DataVersionLogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/controller/LoginLogController.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/LoginLogController.java similarity index 69% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/controller/LoginLogController.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/LoginLogController.java index 9aa6187840a28c967dedc621e5658361b1aa4774..414558980a9adb54a87ccef0bff29a6a65ed2690 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/controller/LoginLogController.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/LoginLogController.java @@ -1,12 +1,12 @@ -package cn.bootx.starter.audit.log.controller; +package cn.bootx.platform.starter.audit.log.controller; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.audit.log.dto.LoginLogDto; -import cn.bootx.starter.audit.log.param.LoginLogParam; -import cn.bootx.starter.audit.log.service.LoginLogService; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.starter.audit.log.dto.LoginLogDto; +import cn.bootx.platform.starter.audit.log.param.LoginLogParam; +import cn.bootx.platform.starter.audit.log.service.LoginLogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/controller/OperateLogController.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/OperateLogController.java similarity index 70% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/controller/OperateLogController.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/OperateLogController.java index 443a458dc92c016a42bd46c040220ebb775c04f7..c7af9edcebebced45e7278f2024982064dfea13e 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/controller/OperateLogController.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/OperateLogController.java @@ -1,12 +1,12 @@ -package cn.bootx.starter.audit.log.controller; +package cn.bootx.platform.starter.audit.log.controller; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.audit.log.dto.OperateLogDto; -import cn.bootx.starter.audit.log.param.OperateLogParam; -import cn.bootx.starter.audit.log.service.OperateLogService; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.starter.audit.log.dto.OperateLogDto; +import cn.bootx.platform.starter.audit.log.param.OperateLogParam; +import cn.bootx.platform.starter.audit.log.service.OperateLogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/convert/LogConvert.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/convert/LogConvert.java similarity index 43% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/convert/LogConvert.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/convert/LogConvert.java index 4e65ece6be5b5f116d059f92d154c90ef8fb557b..7dc4f40d3f43b9e6c42ee0dd56a5151198955782 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/convert/LogConvert.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/convert/LogConvert.java @@ -1,13 +1,13 @@ -package cn.bootx.starter.audit.log.core.db.convert; - -import cn.bootx.starter.audit.log.core.db.entity.DataVersionLogDb; -import cn.bootx.starter.audit.log.core.db.entity.LoginLogDb; -import cn.bootx.starter.audit.log.core.db.entity.OperateLogDb; -import cn.bootx.starter.audit.log.dto.DataVersionLogDto; -import cn.bootx.starter.audit.log.dto.LoginLogDto; -import cn.bootx.starter.audit.log.dto.OperateLogDto; -import cn.bootx.starter.audit.log.param.LoginLogParam; -import cn.bootx.starter.audit.log.param.OperateLogParam; +package cn.bootx.platform.starter.audit.log.core.db.convert; + +import cn.bootx.platform.starter.audit.log.param.LoginLogParam; +import cn.bootx.platform.starter.audit.log.param.OperateLogParam; +import cn.bootx.platform.starter.audit.log.core.db.entity.DataVersionLogDb; +import cn.bootx.platform.starter.audit.log.core.db.entity.LoginLogDb; +import cn.bootx.platform.starter.audit.log.core.db.entity.OperateLogDb; +import cn.bootx.platform.starter.audit.log.dto.DataVersionLogDto; +import cn.bootx.platform.starter.audit.log.dto.LoginLogDto; +import cn.bootx.platform.starter.audit.log.dto.OperateLogDto; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/dao/DataVersionLogDbManager.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/DataVersionLogDbManager.java similarity index 80% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/dao/DataVersionLogDbManager.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/DataVersionLogDbManager.java index 73934e8830abd0cfc18d7160c094a0a5827b1ee2..4e3a33e82d9a6b97f9100a66db4ab1c8c659344d 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/dao/DataVersionLogDbManager.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/DataVersionLogDbManager.java @@ -1,10 +1,10 @@ -package cn.bootx.starter.audit.log.core.db.dao; +package cn.bootx.platform.starter.audit.log.core.db.dao; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.starter.audit.log.core.db.entity.DataVersionLogDb; -import cn.bootx.starter.audit.log.param.DataVersionLogParam; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.starter.audit.log.core.db.entity.DataVersionLogDb; +import cn.bootx.platform.starter.audit.log.param.DataVersionLogParam; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/dao/DataVersionLogDbMapper.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/DataVersionLogDbMapper.java similarity index 80% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/dao/DataVersionLogDbMapper.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/DataVersionLogDbMapper.java index 9f2aa68535e72dd9e58e0bf47c2e41bbb08c08cc..1172d05f08286918989393489adb948e71a13865 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/dao/DataVersionLogDbMapper.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/DataVersionLogDbMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.audit.log.core.db.dao; +package cn.bootx.platform.starter.audit.log.core.db.dao; -import cn.bootx.starter.audit.log.core.db.entity.DataVersionLogDb; +import cn.bootx.platform.starter.audit.log.core.db.entity.DataVersionLogDb; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/dao/LoginLogDbManager.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/LoginLogDbManager.java similarity index 74% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/dao/LoginLogDbManager.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/LoginLogDbManager.java index 74145e3dfab19c3fdb0c781a46bb2d0010ba82dc..f482fa79dd3661091a134caf9dab270c8e87682c 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/dao/LoginLogDbManager.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/LoginLogDbManager.java @@ -1,10 +1,10 @@ -package cn.bootx.starter.audit.log.core.db.dao; +package cn.bootx.platform.starter.audit.log.core.db.dao; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.starter.audit.log.core.db.entity.LoginLogDb; -import cn.bootx.starter.audit.log.param.LoginLogParam; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.starter.audit.log.core.db.entity.LoginLogDb; +import cn.bootx.platform.starter.audit.log.param.LoginLogParam; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/dao/LoginLogDbMapper.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/LoginLogDbMapper.java similarity index 65% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/dao/LoginLogDbMapper.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/LoginLogDbMapper.java index 9a431d7cf4fdd9febe1422f0a7a4f7326fc549d5..17325885aeb244ffd7107c03e04cfa39c4f7060f 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/dao/LoginLogDbMapper.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/LoginLogDbMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.audit.log.core.db.dao; +package cn.bootx.platform.starter.audit.log.core.db.dao; -import cn.bootx.starter.audit.log.core.db.entity.LoginLogDb; +import cn.bootx.platform.starter.audit.log.core.db.entity.LoginLogDb; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/dao/OperateLogDbManager.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/OperateLogDbManager.java similarity index 75% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/dao/OperateLogDbManager.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/OperateLogDbManager.java index de0ca184f3b602f2fccd7d15b6d9fccc3ac67312..3522ad31a017fe5b7da6b8a4933ef99dd628731a 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/dao/OperateLogDbManager.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/OperateLogDbManager.java @@ -1,10 +1,10 @@ -package cn.bootx.starter.audit.log.core.db.dao; +package cn.bootx.platform.starter.audit.log.core.db.dao; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.starter.audit.log.core.db.entity.OperateLogDb; -import cn.bootx.starter.audit.log.param.OperateLogParam; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.starter.audit.log.core.db.entity.OperateLogDb; +import cn.bootx.platform.starter.audit.log.param.OperateLogParam; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/dao/OperateLogDbMapper.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/OperateLogDbMapper.java similarity index 58% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/dao/OperateLogDbMapper.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/OperateLogDbMapper.java index 169b8a266c3f5d074d892e9b1f563096867fff7f..ad6ea45d4b569025cf5efe411be9efe2c0443686 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/dao/OperateLogDbMapper.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/OperateLogDbMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.audit.log.core.db.dao; +package cn.bootx.platform.starter.audit.log.core.db.dao; -import cn.bootx.starter.audit.log.core.db.entity.OperateLogDb; +import cn.bootx.platform.starter.audit.log.core.db.entity.OperateLogDb; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/entity/DataVersionLogDb.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/DataVersionLogDb.java similarity index 79% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/entity/DataVersionLogDb.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/DataVersionLogDb.java index 314d961c600af83f15f58b45df3f99c4a1c44dec..57387b6614ea2e60321dbaeb4ffc53a6a9b40610 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/entity/DataVersionLogDb.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/DataVersionLogDb.java @@ -1,9 +1,9 @@ -package cn.bootx.starter.audit.log.core.db.entity; +package cn.bootx.platform.starter.audit.log.core.db.entity; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.starter.audit.log.core.db.convert.LogConvert; -import cn.bootx.starter.audit.log.dto.DataVersionLogDto; +import cn.bootx.platform.starter.audit.log.core.db.convert.LogConvert; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.starter.audit.log.dto.DataVersionLogDto; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/entity/LoginLogDb.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/LoginLogDb.java similarity index 78% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/entity/LoginLogDb.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/LoginLogDb.java index 1ce64c3dcb72d2c431cc88a67ae98dec3bfb28da..74628f4bd8da897b6f663fff660c76acf580bfbd 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/entity/LoginLogDb.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/LoginLogDb.java @@ -1,9 +1,9 @@ -package cn.bootx.starter.audit.log.core.db.entity; +package cn.bootx.platform.starter.audit.log.core.db.entity; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.starter.audit.log.core.db.convert.LogConvert; -import cn.bootx.starter.audit.log.dto.LoginLogDto; +import cn.bootx.platform.starter.audit.log.core.db.convert.LogConvert; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.starter.audit.log.dto.LoginLogDto; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/entity/OperateLogDb.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/OperateLogDb.java similarity index 80% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/entity/OperateLogDb.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/OperateLogDb.java index dcc08b520520267028a02b14f195cf78f2571e71..fa453e98b18f93bb4ebb2daec00fa1c00aefa521 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/entity/OperateLogDb.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/OperateLogDb.java @@ -1,9 +1,9 @@ -package cn.bootx.starter.audit.log.core.db.entity; +package cn.bootx.platform.starter.audit.log.core.db.entity; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.starter.audit.log.core.db.convert.LogConvert; -import cn.bootx.starter.audit.log.dto.OperateLogDto; +import cn.bootx.platform.starter.audit.log.core.db.convert.LogConvert; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.starter.audit.log.dto.OperateLogDto; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/service/DataVersionLogDbService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/DataVersionLogDbService.java similarity index 74% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/service/DataVersionLogDbService.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/DataVersionLogDbService.java index cdc9b264da854641ef4f3d372058be096db484f4..683fdd278a3163e89508117c7867411856857b5a 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/service/DataVersionLogDbService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/DataVersionLogDbService.java @@ -1,16 +1,16 @@ -package cn.bootx.starter.audit.log.core.db.service; +package cn.bootx.platform.starter.audit.log.core.db.service; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.jackson.util.JacksonUtil; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.starter.audit.log.core.db.dao.DataVersionLogDbManager; -import cn.bootx.starter.audit.log.core.db.entity.DataVersionLogDb; -import cn.bootx.starter.audit.log.dto.DataVersionLogDto; -import cn.bootx.starter.audit.log.param.DataVersionLogParam; -import cn.bootx.starter.audit.log.service.DataVersionLogService; -import cn.bootx.starter.auth.util.SecurityUtil; +import cn.bootx.platform.starter.audit.log.param.DataVersionLogParam; +import cn.bootx.platform.starter.audit.log.service.DataVersionLogService; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.jackson.util.JacksonUtil; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.starter.audit.log.core.db.dao.DataVersionLogDbManager; +import cn.bootx.platform.starter.audit.log.core.db.entity.DataVersionLogDb; +import cn.bootx.platform.starter.audit.log.dto.DataVersionLogDto; +import cn.bootx.platform.starter.auth.util.SecurityUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/service/LoginLogDbService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/LoginLogDbService.java similarity index 64% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/service/LoginLogDbService.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/LoginLogDbService.java index 98fc23f5cddeac98549042cfd5521c8197fe1240..86e2c8b1ca88adc72d49e4333bfd629a4396e65b 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/service/LoginLogDbService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/LoginLogDbService.java @@ -1,15 +1,15 @@ -package cn.bootx.starter.audit.log.core.db.service; +package cn.bootx.platform.starter.audit.log.core.db.service; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.starter.audit.log.core.db.convert.LogConvert; -import cn.bootx.starter.audit.log.core.db.dao.LoginLogDbManager; -import cn.bootx.starter.audit.log.core.db.entity.LoginLogDb; -import cn.bootx.starter.audit.log.dto.LoginLogDto; -import cn.bootx.starter.audit.log.param.LoginLogParam; -import cn.bootx.starter.audit.log.service.LoginLogService; +import cn.bootx.platform.starter.audit.log.param.LoginLogParam; +import cn.bootx.platform.starter.audit.log.service.LoginLogService; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.starter.audit.log.core.db.convert.LogConvert; +import cn.bootx.platform.starter.audit.log.core.db.dao.LoginLogDbManager; +import cn.bootx.platform.starter.audit.log.core.db.entity.LoginLogDb; +import cn.bootx.platform.starter.audit.log.dto.LoginLogDto; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/service/OperateLogDbService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/OperateLogDbService.java similarity index 65% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/service/OperateLogDbService.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/OperateLogDbService.java index 3475c67e6a0c63fc4f563e026be11e18e44b86ba..7977129ea940884142fdded4f3f895d55cbc7f5c 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/db/service/OperateLogDbService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/OperateLogDbService.java @@ -1,15 +1,15 @@ -package cn.bootx.starter.audit.log.core.db.service; +package cn.bootx.platform.starter.audit.log.core.db.service; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.starter.audit.log.core.db.convert.LogConvert; -import cn.bootx.starter.audit.log.core.db.dao.OperateLogDbManager; -import cn.bootx.starter.audit.log.core.db.entity.OperateLogDb; -import cn.bootx.starter.audit.log.dto.OperateLogDto; -import cn.bootx.starter.audit.log.param.OperateLogParam; -import cn.bootx.starter.audit.log.service.OperateLogService; +import cn.bootx.platform.starter.audit.log.param.OperateLogParam; +import cn.bootx.platform.starter.audit.log.service.OperateLogService; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.starter.audit.log.core.db.convert.LogConvert; +import cn.bootx.platform.starter.audit.log.core.db.dao.OperateLogDbManager; +import cn.bootx.platform.starter.audit.log.core.db.entity.OperateLogDb; +import cn.bootx.platform.starter.audit.log.dto.OperateLogDto; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/convert/LogConvert.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/convert/LogConvert.java similarity index 43% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/convert/LogConvert.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/convert/LogConvert.java index 10a7deddac0d0eb36e056e5bcde0a23825bc274b..192c7451017b094e8f42d2c79842d05fde4a81b9 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/convert/LogConvert.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/convert/LogConvert.java @@ -1,13 +1,13 @@ -package cn.bootx.starter.audit.log.core.mongo.convert; - -import cn.bootx.starter.audit.log.core.mongo.entity.DataVersionLogMongo; -import cn.bootx.starter.audit.log.core.mongo.entity.LoginLogMongo; -import cn.bootx.starter.audit.log.core.mongo.entity.OperateLogMongo; -import cn.bootx.starter.audit.log.dto.DataVersionLogDto; -import cn.bootx.starter.audit.log.dto.LoginLogDto; -import cn.bootx.starter.audit.log.dto.OperateLogDto; -import cn.bootx.starter.audit.log.param.LoginLogParam; -import cn.bootx.starter.audit.log.param.OperateLogParam; +package cn.bootx.platform.starter.audit.log.core.mongo.convert; + +import cn.bootx.platform.starter.audit.log.param.LoginLogParam; +import cn.bootx.platform.starter.audit.log.param.OperateLogParam; +import cn.bootx.platform.starter.audit.log.core.mongo.entity.DataVersionLogMongo; +import cn.bootx.platform.starter.audit.log.core.mongo.entity.LoginLogMongo; +import cn.bootx.platform.starter.audit.log.core.mongo.entity.OperateLogMongo; +import cn.bootx.platform.starter.audit.log.dto.DataVersionLogDto; +import cn.bootx.platform.starter.audit.log.dto.LoginLogDto; +import cn.bootx.platform.starter.audit.log.dto.OperateLogDto; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/dao/DataVersionLogMongoRepository.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/DataVersionLogMongoRepository.java similarity index 63% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/dao/DataVersionLogMongoRepository.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/DataVersionLogMongoRepository.java index a5cd648a313e3210e160753282c74872564e93b1..06ee8466a2141d23d7ed5c57eb9f7cc145051025 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/dao/DataVersionLogMongoRepository.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/DataVersionLogMongoRepository.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.audit.log.core.mongo.dao; +package cn.bootx.platform.starter.audit.log.core.mongo.dao; -import cn.bootx.starter.audit.log.core.mongo.entity.DataVersionLogMongo; +import cn.bootx.platform.starter.audit.log.core.mongo.entity.DataVersionLogMongo; import org.springframework.data.mongodb.repository.MongoRepository; /** diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/dao/LoginLogMongoRepository.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/LoginLogMongoRepository.java similarity index 62% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/dao/LoginLogMongoRepository.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/LoginLogMongoRepository.java index 68b6abc887b66f19a6352814d4fcb641de117c91..b94ef8703c2b70b294be08239f9d8fa97a594c64 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/dao/LoginLogMongoRepository.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/LoginLogMongoRepository.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.audit.log.core.mongo.dao; +package cn.bootx.platform.starter.audit.log.core.mongo.dao; -import cn.bootx.starter.audit.log.core.mongo.entity.LoginLogMongo; +import cn.bootx.platform.starter.audit.log.core.mongo.entity.LoginLogMongo; import org.springframework.data.mongodb.repository.MongoRepository; /** diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/dao/OperateLogMongoRepository.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/OperateLogMongoRepository.java similarity index 62% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/dao/OperateLogMongoRepository.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/OperateLogMongoRepository.java index e35785d13c665dc84d50472933eb13b1880383af..6fb08c594bdb905ac81d62f9c97840d2ec86e9d1 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/dao/OperateLogMongoRepository.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/OperateLogMongoRepository.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.audit.log.core.mongo.dao; +package cn.bootx.platform.starter.audit.log.core.mongo.dao; -import cn.bootx.starter.audit.log.core.mongo.entity.OperateLogMongo; +import cn.bootx.platform.starter.audit.log.core.mongo.entity.OperateLogMongo; import org.springframework.data.mongodb.repository.MongoRepository; /** diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/entity/DataVersionLogMongo.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/DataVersionLogMongo.java similarity index 82% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/entity/DataVersionLogMongo.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/DataVersionLogMongo.java index d0568f5fca8c875d9ea6286db6bfce43692c47ad..b9da40666ec0ee8f52cbf758cde6fd47f0c6547f 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/entity/DataVersionLogMongo.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/DataVersionLogMongo.java @@ -1,8 +1,8 @@ -package cn.bootx.starter.audit.log.core.mongo.entity; +package cn.bootx.platform.starter.audit.log.core.mongo.entity; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.starter.audit.log.core.mongo.convert.LogConvert; -import cn.bootx.starter.audit.log.dto.DataVersionLogDto; +import cn.bootx.platform.starter.audit.log.core.mongo.convert.LogConvert; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.starter.audit.log.dto.DataVersionLogDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/entity/LoginLogMongo.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/LoginLogMongo.java similarity index 81% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/entity/LoginLogMongo.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/LoginLogMongo.java index b345d3a30839c7408de15740fae957eb42f8184f..2d461d381a41f70221542cedc024bc8cde036f60 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/entity/LoginLogMongo.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/LoginLogMongo.java @@ -1,8 +1,8 @@ -package cn.bootx.starter.audit.log.core.mongo.entity; +package cn.bootx.platform.starter.audit.log.core.mongo.entity; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.starter.audit.log.core.mongo.convert.LogConvert; -import cn.bootx.starter.audit.log.dto.LoginLogDto; +import cn.bootx.platform.starter.audit.log.core.mongo.convert.LogConvert; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.starter.audit.log.dto.LoginLogDto; import lombok.Data; import lombok.experimental.Accessors; import org.springframework.data.annotation.Id; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/entity/OperateLogMongo.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/OperateLogMongo.java similarity index 83% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/entity/OperateLogMongo.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/OperateLogMongo.java index 85e552509eb37a7049404ce2704c001b701f93c5..ecd3d716766221c429a9761a69733ebc062d3b1a 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/entity/OperateLogMongo.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/OperateLogMongo.java @@ -1,8 +1,8 @@ -package cn.bootx.starter.audit.log.core.mongo.entity; +package cn.bootx.platform.starter.audit.log.core.mongo.entity; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.starter.audit.log.core.mongo.convert.LogConvert; -import cn.bootx.starter.audit.log.dto.OperateLogDto; +import cn.bootx.platform.starter.audit.log.core.mongo.convert.LogConvert; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.starter.audit.log.dto.OperateLogDto; import lombok.Data; import lombok.experimental.Accessors; import org.springframework.data.annotation.Id; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/service/DataVersionLogMongoService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/DataVersionLogMongoService.java similarity index 83% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/service/DataVersionLogMongoService.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/DataVersionLogMongoService.java index 49cd169634138102ffceb79a9a4b5b5038551e0b..943b58f741aad736eae281a1322d4c700d61e5ec 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/service/DataVersionLogMongoService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/DataVersionLogMongoService.java @@ -1,16 +1,16 @@ -package cn.bootx.starter.audit.log.core.mongo.service; +package cn.bootx.platform.starter.audit.log.core.mongo.service; -import cn.bootx.common.core.code.CommonCode; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.jackson.util.JacksonUtil; -import cn.bootx.starter.audit.log.core.mongo.dao.DataVersionLogMongoRepository; -import cn.bootx.starter.audit.log.core.mongo.entity.DataVersionLogMongo; -import cn.bootx.starter.audit.log.dto.DataVersionLogDto; -import cn.bootx.starter.audit.log.param.DataVersionLogParam; -import cn.bootx.starter.audit.log.service.DataVersionLogService; -import cn.bootx.starter.auth.util.SecurityUtil; +import cn.bootx.platform.starter.audit.log.param.DataVersionLogParam; +import cn.bootx.platform.starter.audit.log.service.DataVersionLogService; +import cn.bootx.platform.common.core.code.CommonCode; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.jackson.util.JacksonUtil; +import cn.bootx.platform.starter.audit.log.core.mongo.dao.DataVersionLogMongoRepository; +import cn.bootx.platform.starter.audit.log.core.mongo.entity.DataVersionLogMongo; +import cn.bootx.platform.starter.audit.log.dto.DataVersionLogDto; +import cn.bootx.platform.starter.auth.util.SecurityUtil; import cn.hutool.core.util.IdUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/service/LoginLogMongoService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/LoginLogMongoService.java similarity index 74% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/service/LoginLogMongoService.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/LoginLogMongoService.java index 15f5e54da61d6e7bccbedfa1ebb729a31f83af76..cfd59eab57726001a5ba55fc7a2e5428e7b4feb3 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/service/LoginLogMongoService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/LoginLogMongoService.java @@ -1,15 +1,15 @@ -package cn.bootx.starter.audit.log.core.mongo.service; +package cn.bootx.platform.starter.audit.log.core.mongo.service; -import cn.bootx.common.core.code.CommonCode; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.audit.log.core.mongo.convert.LogConvert; -import cn.bootx.starter.audit.log.core.mongo.dao.LoginLogMongoRepository; -import cn.bootx.starter.audit.log.core.mongo.entity.LoginLogMongo; -import cn.bootx.starter.audit.log.dto.LoginLogDto; -import cn.bootx.starter.audit.log.param.LoginLogParam; -import cn.bootx.starter.audit.log.service.LoginLogService; +import cn.bootx.platform.starter.audit.log.param.LoginLogParam; +import cn.bootx.platform.starter.audit.log.service.LoginLogService; +import cn.bootx.platform.common.core.code.CommonCode; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.starter.audit.log.core.mongo.convert.LogConvert; +import cn.bootx.platform.starter.audit.log.core.mongo.dao.LoginLogMongoRepository; +import cn.bootx.platform.starter.audit.log.core.mongo.entity.LoginLogMongo; +import cn.bootx.platform.starter.audit.log.dto.LoginLogDto; import cn.hutool.core.util.IdUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/service/OperateLogMongoService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/OperateLogMongoService.java similarity index 75% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/service/OperateLogMongoService.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/OperateLogMongoService.java index 48366a5efa1f0425d656cd9a109841bd2cb47678..db2529620bbd07b0ff07c6e319f9a32d97bdaf13 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/core/mongo/service/OperateLogMongoService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/OperateLogMongoService.java @@ -1,15 +1,15 @@ -package cn.bootx.starter.audit.log.core.mongo.service; +package cn.bootx.platform.starter.audit.log.core.mongo.service; -import cn.bootx.common.core.code.CommonCode; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.audit.log.core.mongo.convert.LogConvert; -import cn.bootx.starter.audit.log.core.mongo.dao.OperateLogMongoRepository; -import cn.bootx.starter.audit.log.core.mongo.entity.OperateLogMongo; -import cn.bootx.starter.audit.log.dto.OperateLogDto; -import cn.bootx.starter.audit.log.param.OperateLogParam; -import cn.bootx.starter.audit.log.service.OperateLogService; +import cn.bootx.platform.starter.audit.log.param.OperateLogParam; +import cn.bootx.platform.starter.audit.log.service.OperateLogService; +import cn.bootx.platform.common.core.code.CommonCode; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.starter.audit.log.core.mongo.convert.LogConvert; +import cn.bootx.platform.starter.audit.log.core.mongo.dao.OperateLogMongoRepository; +import cn.bootx.platform.starter.audit.log.core.mongo.entity.OperateLogMongo; +import cn.bootx.platform.starter.audit.log.dto.OperateLogDto; import cn.hutool.core.util.IdUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/dto/DataVersionLogDto.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/DataVersionLogDto.java similarity index 95% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/dto/DataVersionLogDto.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/DataVersionLogDto.java index 45fbd2c7a566b97049378e2c6d358f5a52f50e98..cb098453ade26677ddd266e76bd7ee7a939fdab7 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/dto/DataVersionLogDto.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/DataVersionLogDto.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.audit.log.dto; +package cn.bootx.platform.starter.audit.log.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/dto/LoginLogDto.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/LoginLogDto.java similarity index 96% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/dto/LoginLogDto.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/LoginLogDto.java index 14473f937946db9a6aefa71b3c3d7026ee9e8a15..c5b24ebbc55d2ae34821dc2ddf3d7281dd4d8c2d 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/dto/LoginLogDto.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/LoginLogDto.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.audit.log.dto; +package cn.bootx.platform.starter.audit.log.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/dto/OperateLogDto.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/OperateLogDto.java similarity index 93% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/dto/OperateLogDto.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/OperateLogDto.java index f7df4e446a51eefa3a1639df33fce02a8fa58c60..8f23f82ff21a80622611765eeb6931a2ca9d3cf7 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/dto/OperateLogDto.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/OperateLogDto.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.audit.log.dto; +package cn.bootx.platform.starter.audit.log.dto; -import cn.bootx.common.core.rest.dto.BaseDto; +import cn.bootx.platform.common.core.rest.dto.BaseDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/handler/DataVersionRecordHandler.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/handler/DataVersionRecordHandler.java similarity index 87% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/handler/DataVersionRecordHandler.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/handler/DataVersionRecordHandler.java index 62908b41bf605456062cd906deac8d404779765f..c908c1fc4ec179f6a51cff210c9b73d28af71289 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/handler/DataVersionRecordHandler.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/handler/DataVersionRecordHandler.java @@ -1,10 +1,10 @@ -package cn.bootx.starter.audit.log.handler; +package cn.bootx.platform.starter.audit.log.handler; -import cn.bootx.common.core.annotation.DataVersionLog; -import cn.bootx.common.mybatisplus.extension.DataChangeRecorderInnerInterceptor; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.starter.audit.log.param.DataVersionLogParam; -import cn.bootx.starter.audit.log.service.DataVersionLogService; +import cn.bootx.platform.starter.audit.log.service.DataVersionLogService; +import cn.bootx.platform.common.core.annotation.DataVersionLog; +import cn.bootx.platform.common.mybatisplus.extension.DataChangeRecorderInnerInterceptor; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.starter.audit.log.param.DataVersionLogParam; import com.baomidou.mybatisplus.core.metadata.TableInfo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/handler/OperateLogAspectHandler.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/handler/OperateLogAspectHandler.java similarity index 58% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/handler/OperateLogAspectHandler.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/handler/OperateLogAspectHandler.java index 81bead8bebced68c1b2c7e3aa4649fa3ec67751c..eafcc1b854525c315298aa4b52d5c644bf5b5953 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/handler/OperateLogAspectHandler.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/handler/OperateLogAspectHandler.java @@ -1,16 +1,17 @@ -package cn.bootx.starter.audit.log.handler; +package cn.bootx.platform.starter.audit.log.handler; -import cn.bootx.common.core.annotation.OperateLog; -import cn.bootx.common.core.annotation.OperateLogs; -import cn.bootx.common.core.code.ServletCode; -import cn.bootx.common.core.entity.UserDetail; -import cn.bootx.common.headerholder.HeaderHolder; -import cn.bootx.common.jackson.util.JacksonUtil; -import cn.bootx.common.spring.util.AopUtil; -import cn.bootx.common.spring.util.WebServletUtil; -import cn.bootx.starter.audit.log.param.OperateLogParam; -import cn.bootx.starter.audit.log.service.OperateLogService; -import cn.bootx.starter.auth.util.SecurityUtil; +import cn.bootx.platform.common.headerholder.HeaderHolder; +import cn.bootx.platform.starter.audit.log.service.OperateLogService; +import cn.bootx.platform.common.core.annotation.OperateLog; +import cn.bootx.platform.common.core.annotation.OperateLogs; +import cn.bootx.platform.common.core.code.ServletCode; +import cn.bootx.platform.common.core.entity.UserDetail; +import cn.bootx.platform.common.jackson.util.JacksonUtil; +import cn.bootx.platform.common.spring.util.AopUtil; +import cn.bootx.platform.common.spring.util.WebServletUtil; +import cn.bootx.platform.starter.audit.log.ip2region.IpToRegionService; +import cn.bootx.platform.starter.audit.log.param.OperateLogParam; +import cn.bootx.platform.starter.auth.util.SecurityUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.DesensitizedUtil; @@ -43,11 +44,12 @@ import java.util.Optional; public class OperateLogAspectHandler { private final OperateLogService operateLogService; + private final IpToRegionService ipToRegionService; /** * 配置织入点 */ - @Pointcut("@annotation(cn.bootx.common.core.annotation.OperateLog) || @annotation(cn.bootx.common.core.annotation.OperateLogs)") + @Pointcut("@annotation(cn.bootx.platform.common.core.annotation.OperateLog) || @annotation(cn.bootx.platform.common.core.annotation.OperateLogs)") public void logPointCut() { } @@ -75,8 +77,14 @@ public class OperateLogAspectHandler { if (CollUtil.isEmpty(logs)) { return; } - // 基础信息 - String ip = Optional.ofNullable(WebServletUtil.getRequest()).map(ServletUtil::getClientIP).orElse("未知"); + // ip信息 + String ip = "未知"; + String location = "未知"; + Optional ipOpt = Optional.ofNullable(WebServletUtil.getRequest()).map(ServletUtil::getClientIP); + if (ipOpt.isPresent()){ + ip = ipOpt.get(); + location = ipToRegionService.getRegionStrByIp(ip); + } Optional currentUser = SecurityUtil.getCurrentUser(); // 设置方法名称 String className = joinPoint.getTarget().getClass().getName(); @@ -84,15 +92,16 @@ public class OperateLogAspectHandler { for (OperateLog log : logs) { OperateLogParam operateLog = new OperateLogParam().setTitle(log.title()) - .setOperateId(currentUser.map(UserDetail::getId).orElse(DesensitizedUtil.userId())) - .setUsername(currentUser.map(UserDetail::getUsername).orElse("未知")) - .setBusinessType(log.businessType().name().toLowerCase(Locale.ROOT)) - .setOperateUrl(HeaderHolder.getHeader(ServletCode.REQUEST_URI)) - .setMethod(className + "#" + methodName) - .setRequestMethod(HeaderHolder.getHeader(ServletCode.METHOD)) - .setSuccess(true) - .setOperateIp(ip) - .setOperateTime(LocalDateTime.now()); + .setOperateId(currentUser.map(UserDetail::getId).orElse(DesensitizedUtil.userId())) + .setUsername(currentUser.map(UserDetail::getUsername).orElse("未知")) + .setBusinessType(log.businessType().name().toLowerCase(Locale.ROOT)) + .setOperateUrl(HeaderHolder.getHeader(ServletCode.REQUEST_URI)) + .setMethod(className + "#" + methodName) + .setRequestMethod(HeaderHolder.getHeader(ServletCode.METHOD)) + .setSuccess(true) + .setOperateIp(ip) + .setOperateLocation(location) + .setOperateTime(LocalDateTime.now()); // 异常流 if (Objects.nonNull(e)) { @@ -119,9 +128,9 @@ public class OperateLogAspectHandler { */ private List getMethodAnnotation(JoinPoint joinPoint) { List operateLogs = Optional.ofNullable(AopUtil.getMethodAnnotation(joinPoint, OperateLogs.class)) - .map(OperateLogs::value) - .map(ListUtil::of) - .orElse(null); + .map(OperateLogs::value) + .map(ListUtil::of) + .orElse(null); if (CollUtil.isEmpty(operateLogs)) { operateLogs = ListUtil.of(AopUtil.getMethodAnnotation(joinPoint, OperateLog.class)); } diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpRegion.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpRegion.java new file mode 100644 index 0000000000000000000000000000000000000000..316ae289475e1bd185600e16d944282a7037085e --- /dev/null +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpRegion.java @@ -0,0 +1,76 @@ +package cn.bootx.platform.starter.audit.log.ip2region; + +import cn.bootx.platform.common.core.util.CollUtil; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.Arrays; +import java.util.List; + +/** + * IP对应地址区域信息 + * @author xxm + * @date 2023/4/13 + */ +@Data +@Accessors(chain = true) +public class IpRegion { + private static final List BIG_CHINA = Arrays.asList("香港","澳门","台湾"); + private static final List PROVINCE_LEVEL_CITY = Arrays.asList("北京","上海","重庆","天津"); + + /** 国家 */ + private String country; + + /** 区域 */ + private String region; + + /** 省份 */ + private String province; + + /** 城市 */ + private String city; + + /** ISP */ + private String isp; + + + /** 是否内网地址 */ + public boolean isInnerIp(){ + return "内网IP".equals(isp); + } + + /** 是否国内地址 */ + public boolean isChinaIp(){ + return "中国".equals(country); + } + + /** 是否国内直辖市 */ + public boolean isProvinceLevel(){ + return "中国".equals(country)&& + PROVINCE_LEVEL_CITY.contains(province); + } + + /** 是否港澳台 */ + public boolean isBigChina(){ + return "中国".equals(country)&& + BIG_CHINA.contains(province); + } + + /** + * 国家|区域|省份|城市|ISP + */ + public static IpRegion init(List ipInfo){ + IpRegion ipRegion = new IpRegion(); + if (CollUtil.isEmpty(ipInfo)){ + return ipRegion; + } + ipRegion.country = ipInfo.get(0); + ipRegion.region = ipInfo.get(1); + ipRegion.province = ipInfo.get(2); + ipRegion.city = ipInfo.get(3); + ipRegion.isp = ipInfo.get(4); + + return ipRegion; + + } +} diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpToRegionService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpToRegionService.java new file mode 100644 index 0000000000000000000000000000000000000000..9cc5416d38f411161da939019d3da95ae799fcc6 --- /dev/null +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpToRegionService.java @@ -0,0 +1,157 @@ +package cn.bootx.platform.starter.audit.log.ip2region; + +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.starter.audit.log.properties.AuditLogProperties; +import cn.hutool.core.lang.PatternPool; +import cn.hutool.core.util.StrUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.lionsoul.ip2region.xdb.Searcher; +import org.springframework.stereotype.Service; + +import java.io.IOException; +import java.util.List; +import java.util.Objects; +import java.util.regex.Matcher; + +/** + * + * @author xxm + * @date 2023/4/13 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class IpToRegionService { + /** VectorIndex 缓存 */ + private static byte[] XDB_INDEX; + /** 整个 xdb 文件缓存 */ + private static byte[] XDB_BUFF; + /** 参数配置 */ + private final AuditLogProperties auditLogProperties; + + /** + * 获取文件查询方式 + */ + private Searcher getSearcherByFile(){ + try { + return Searcher.newWithFileOnly(auditLogProperties.getIp2region().getFilePath()); + } catch (IOException e) { + return null; + } + } + + /** + * VectorIndex 索引 + */ + private Searcher getSearcherByIndex(){ + try { + String filePath = auditLogProperties.getIp2region() + .getFilePath(); + if (Objects.isNull(XDB_INDEX)) { + XDB_INDEX = Searcher.loadVectorIndexFromFile(filePath); + } + return Searcher.newWithVectorIndex(filePath, XDB_INDEX); + } catch (IOException e) { + return null; + } + } + + /** + * 缓存整个 xdb 数据 + */ + private Searcher getSearcherByCache(){ + try { + if (Objects.isNull(XDB_BUFF)) { + String filePath = auditLogProperties.getIp2region() + .getFilePath(); + XDB_BUFF = Searcher.loadContentFromFile(filePath); + } + return Searcher.newWithBuffer(XDB_BUFF); + } catch (IOException e) { + return null; + } + } + + /** + * 根据IP获得地址信息 + */ + public IpRegion getRegionByIp(String ip){ + // 判断IP是否合法 + Matcher matcher = PatternPool.IPV4.matcher(ip); + if (!matcher.matches()) { + throw new BizException("IP非法"); + } + + // 根据类型获取 Searcher 对象 + Searcher searcher; + switch (auditLogProperties.getIp2region() + .getSearchType()) { + case FILE: + searcher = getSearcherByFile(); + break; + case VECTOR_INDEX: + searcher = getSearcherByIndex(); + break; + case CACHE: + searcher = getSearcherByCache(); + break; + default: + throw new BizException("IP地址查询方式不合法"); + } + // 无法进行查询 + if (Objects.isNull(searcher)){ + return null; + } + + try { + // 城市Id|国家|区域|省份|城市|ISP + String search = searcher.search(ip); + List ipInfo = StrUtil.split(search, "|"); + return IpRegion.init(ipInfo); + } catch (Exception e) { + throw new BizException("IP查询失败"); + } finally { + try { + searcher.close(); + } catch (IOException e) { + // 这句不会执行, finally中try无效 + throw new BizException("IP查询器关闭失败"); + } + } + } + + /** + * 获取默认格式的地址文本 + */ + public String getRegionStrByIp(String ip){ + String location; + // ip信息 + IpRegion region = this.getRegionByIp(ip); + // 未查询到 + if (Objects.isNull(region)){ + location = "未知"; + } + // 中国 港澳台 + if (region.isBigChina()){ + location = StrUtil.format("{}/{}/{}",region.getCountry(),region.getProvince(),region.getIsp()); + } + // 中国 直辖市 + else if (region.isProvinceLevel()){ + location = StrUtil.format("{}/{}",region.getProvince(),region.getIsp()); + } + // 普通中国城市 + else if (region.isChinaIp()){ + location = StrUtil.format("{}/{}/{}",region.getProvince(),region.getCity(),region.getIsp()); + } + // 内网 + else if (region.isInnerIp()){ + location = "内网地址"; + } + // 国外 + else { + location = StrUtil.format("{}/{}",region.getCountry(),region.getIsp()); + } + return location.replaceAll("/0",""); + } +} diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/param/DataVersionLogParam.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/DataVersionLogParam.java similarity index 93% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/param/DataVersionLogParam.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/DataVersionLogParam.java index bbefc90dc11db023be620cd8df0d199a9c9b692a..5ebbaabb259174d39607bc58790ca596989ad539 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/param/DataVersionLogParam.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/DataVersionLogParam.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.audit.log.param; +package cn.bootx.platform.starter.audit.log.param; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/param/LoginLogParam.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/LoginLogParam.java similarity index 95% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/param/LoginLogParam.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/LoginLogParam.java index 33d86de434952998da250081740e0db01093c556..e2ff6aff3a07ae804b0fbf6f74558379693ef7a4 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/param/LoginLogParam.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/LoginLogParam.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.audit.log.param; +package cn.bootx.platform.starter.audit.log.param; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/param/OperateLogParam.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/OperateLogParam.java similarity index 96% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/param/OperateLogParam.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/OperateLogParam.java index 899e64d977ce9dac07196801c26bcad8cc7fc9f2..7fae648bfae07ca22d2ed411303e0c59e9afab48 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/param/OperateLogParam.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/OperateLogParam.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.audit.log.param; +package cn.bootx.platform.starter.audit.log.param; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/properties/AuditLogProperties.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/properties/AuditLogProperties.java similarity index 41% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/properties/AuditLogProperties.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/properties/AuditLogProperties.java index de1063630c5ed1aeb93c8fa8bbb0c94f089fd11d..7eda363b84daf5dd2a8f45b4332d75030113a575 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/properties/AuditLogProperties.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/properties/AuditLogProperties.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.audit.log.properties; +package cn.bootx.platform.starter.audit.log.properties; import lombok.Getter; import lombok.Setter; @@ -15,11 +15,28 @@ import org.springframework.boot.context.properties.ConfigurationProperties; @ConfigurationProperties(prefix = "bootx.starter.audit-log") public class AuditLogProperties { + /** + * ip地址库配置 + */ + private Ip2region ip2region = new Ip2region(); + /** * 存储方式, 默认为数据库 */ private Store store = Store.JDBC; + /** + * Ip地址库配置 + */ + @Getter + @Setter + public static class Ip2region{ + /** ip2region.xdb 数据文件所在路径 */ + private String filePath; + /** 查询模式, 默认为缓存 VectorIndex 索引 */ + private Ip2regionSearch searchType = Ip2regionSearch.VECTOR_INDEX; + } + /** * 存储类型 */ @@ -31,5 +48,16 @@ public class AuditLogProperties { MONGO } + /** + * Ip2region查询类型 + */ + public enum Ip2regionSearch { + /** 完全基于文件的查询(不推荐) */ + FILE, + /** 缓存 VectorIndex 索引 */ + VECTOR_INDEX, + /** 缓存整个 xdb 数据 */ + CACHE + } } diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/service/DataVersionLogService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/DataVersionLogService.java similarity index 61% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/service/DataVersionLogService.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/DataVersionLogService.java index 61e9415f841d4eb9005f71c5a077f419eca5ff56..e9eba4f2e762b72062f6809b937f55a782b025b5 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/service/DataVersionLogService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/DataVersionLogService.java @@ -1,10 +1,10 @@ -package cn.bootx.starter.audit.log.service; +package cn.bootx.platform.starter.audit.log.service; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.audit.log.dto.DataVersionLogDto; -import cn.bootx.starter.audit.log.param.DataVersionLogParam; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.starter.audit.log.dto.DataVersionLogDto; +import cn.bootx.platform.starter.audit.log.param.DataVersionLogParam; import org.springframework.scheduling.annotation.Async; /** diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/service/LoginLogService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/LoginLogService.java similarity index 62% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/service/LoginLogService.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/LoginLogService.java index 9cf76cc0714a8d99e67281172c5d1fedbf835431..3a24746d41357e152ffdbee82f9a6567f2b3a31f 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/service/LoginLogService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/LoginLogService.java @@ -1,9 +1,9 @@ -package cn.bootx.starter.audit.log.service; +package cn.bootx.platform.starter.audit.log.service; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.audit.log.dto.LoginLogDto; -import cn.bootx.starter.audit.log.param.LoginLogParam; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.starter.audit.log.dto.LoginLogDto; +import cn.bootx.platform.starter.audit.log.param.LoginLogParam; import org.springframework.scheduling.annotation.Async; /** diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/service/OperateLogService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/OperateLogService.java similarity index 63% rename from bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/service/OperateLogService.java rename to bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/OperateLogService.java index 5510d4e773d341c4417866b349a95ba2d0cbe731..9392b2a54faf9993168dc0ed9b63d19deb0eb0d1 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/starter/audit/log/service/OperateLogService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/OperateLogService.java @@ -1,9 +1,9 @@ -package cn.bootx.starter.audit.log.service; +package cn.bootx.platform.starter.audit.log.service; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.audit.log.dto.OperateLogDto; -import cn.bootx.starter.audit.log.param.OperateLogParam; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.starter.audit.log.dto.OperateLogDto; +import cn.bootx.platform.starter.audit.log.param.OperateLogParam; import org.springframework.scheduling.annotation.Async; /** diff --git a/bootx-common-starters/common-starter-audit-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-common-starters/common-starter-audit-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 5d23f9dfef4e21a37d6f2875d49f569161ce6795..b39412fd25316460b180bed167757fd59f5ee63d 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-common-starters/common-starter-audit-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.starter.audit.log.AuditLogAutoConfiguration +cn.bootx.platform.starter.audit.log.AuditLogAutoConfiguration diff --git a/bootx-common-starters/common-starter-auth/pom.xml b/bootx-common-starters/common-starter-auth/pom.xml index 30163069a88c1221b5985bcde6aa662199072f22..ee0987b19e424c99a6316fcc0de46810530d4c2f 100644 --- a/bootx-common-starters/common-starter-auth/pom.xml +++ b/bootx-common-starters/common-starter-auth/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-common-starters - 1.2.3 + 1.3.0 4.0.0 common-starter-auth diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/AuthAutoConfiguration.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/AuthAutoConfiguration.java similarity index 90% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/AuthAutoConfiguration.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/AuthAutoConfiguration.java index 789c3e86b3968b795d876adeb0eaab296beb2f9a..6759a6357eed50c5b30a2929e653738bd7c41f8f 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/AuthAutoConfiguration.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/AuthAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.auth; +package cn.bootx.platform.starter.auth; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.ConfigurationPropertiesScan; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/authentication/AbstractAuthentication.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/AbstractAuthentication.java similarity index 81% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/authentication/AbstractAuthentication.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/AbstractAuthentication.java index 04cdb99eef9ea28cd8745f22ce6ecbfa05a6c92e..b49e61df463c1f8617da54c8cc4407aa44d1e26b 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/authentication/AbstractAuthentication.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/AbstractAuthentication.java @@ -1,11 +1,11 @@ -package cn.bootx.starter.auth.authentication; +package cn.bootx.platform.starter.auth.authentication; -import cn.bootx.common.core.entity.UserDetail; -import cn.bootx.starter.auth.configuration.AuthProperties; -import cn.bootx.starter.auth.entity.AuthClient; -import cn.bootx.starter.auth.entity.AuthInfoResult; -import cn.bootx.starter.auth.entity.LoginAuthContext; -import cn.bootx.starter.auth.exception.LoginFailureException; +import cn.bootx.platform.common.core.entity.UserDetail; +import cn.bootx.platform.starter.auth.configuration.AuthProperties; +import cn.bootx.platform.starter.auth.entity.AuthClient; +import cn.bootx.platform.starter.auth.entity.AuthInfoResult; +import cn.bootx.platform.starter.auth.entity.LoginAuthContext; +import cn.bootx.platform.starter.auth.exception.LoginFailureException; import javax.validation.constraints.NotNull; import java.util.Objects; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/authentication/GetAuthClientService.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/GetAuthClientService.java similarity index 65% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/authentication/GetAuthClientService.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/GetAuthClientService.java index 33e04d7a0e9412acf38fbad28b1c74d7fb59eba5..982e2f857152ace64c41f41f8d47629f7b4023b3 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/authentication/GetAuthClientService.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/GetAuthClientService.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.auth.authentication; +package cn.bootx.platform.starter.auth.authentication; -import cn.bootx.starter.auth.entity.AuthClient; +import cn.bootx.platform.starter.auth.entity.AuthClient; /** * 获取认证终端 diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/authentication/GetAuthLoginTypeService.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/GetAuthLoginTypeService.java similarity index 68% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/authentication/GetAuthLoginTypeService.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/GetAuthLoginTypeService.java index 386d868c082afd613e7aa4af17288705d2e06746..47d6eb88c5f822e32bba1545f66f63ff27bac998 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/authentication/GetAuthLoginTypeService.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/GetAuthLoginTypeService.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.auth.authentication; +package cn.bootx.platform.starter.auth.authentication; -import cn.bootx.starter.auth.entity.AuthLoginType; +import cn.bootx.platform.starter.auth.entity.AuthLoginType; /** * 获取认证登录方式对象服务 diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/authentication/OpenIdAuthentication.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/OpenIdAuthentication.java similarity index 88% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/authentication/OpenIdAuthentication.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/OpenIdAuthentication.java index 7c63fa8c0f9a731b9d344f4c092a865c9b517c87..6d72ba283da8c0eebf918f6dde524c2b7aee6c36 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/authentication/OpenIdAuthentication.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/OpenIdAuthentication.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.auth.authentication; +package cn.bootx.platform.starter.auth.authentication; -import cn.bootx.starter.auth.entity.ThirdAuthCode; +import cn.bootx.platform.starter.auth.entity.ThirdAuthCode; import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthUser; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/authentication/RouterCheck.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/RouterCheck.java similarity index 82% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/authentication/RouterCheck.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/RouterCheck.java index 01e2ec861a9b594e44a72579d97cacf78a8fb40f..a64c26476227ab5b8f3b96c4e5b74c6992e48e25 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/authentication/RouterCheck.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/RouterCheck.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.auth.authentication; +package cn.bootx.platform.starter.auth.authentication; /** * 路由拦截检查 diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/authentication/UsernamePasswordAuthentication.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/UsernamePasswordAuthentication.java similarity index 71% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/authentication/UsernamePasswordAuthentication.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/UsernamePasswordAuthentication.java index f73b392281f62121e258b50e0988553412c984d3..4dcd6116ae280cf2552d13f10df421c03d9a324a 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/authentication/UsernamePasswordAuthentication.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/UsernamePasswordAuthentication.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.auth.authentication; +package cn.bootx.platform.starter.auth.authentication; -import cn.bootx.starter.auth.code.AuthLoginTypeCode; +import cn.bootx.platform.starter.auth.code.AuthLoginTypeCode; /** * 用户密码认证方式 diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/cache/SessionCacheFilter.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/cache/SessionCacheFilter.java similarity index 96% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/cache/SessionCacheFilter.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/cache/SessionCacheFilter.java index 466d8b572f294655fc9bfd6b2d92fb07eb3559b3..ef502cec92515c818897807590aa384a04596629 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/cache/SessionCacheFilter.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/cache/SessionCacheFilter.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.auth.cache; +package cn.bootx.platform.starter.auth.cache; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/cache/SessionCacheLocal.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/cache/SessionCacheLocal.java similarity index 85% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/cache/SessionCacheLocal.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/cache/SessionCacheLocal.java index d44a683ddf8507788e1644394195c3281830851c..4e3103271f85893ab727443ad85fcfd8bec67eba 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/cache/SessionCacheLocal.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/cache/SessionCacheLocal.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.auth.cache; +package cn.bootx.platform.starter.auth.cache; -import cn.bootx.common.core.entity.UserDetail; +import cn.bootx.platform.common.core.entity.UserDetail; import com.alibaba.ttl.TransmittableThreadLocal; /** diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/code/AuthLoginTypeCode.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/code/AuthLoginTypeCode.java similarity index 95% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/code/AuthLoginTypeCode.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/code/AuthLoginTypeCode.java index 02384d7153a5cffcf345dfff40d63bbc1ddfdcf0..db3421d034b10ddc632ddbd02a04ae159fa2e6c4 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/code/AuthLoginTypeCode.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/code/AuthLoginTypeCode.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.auth.code; +package cn.bootx.platform.starter.auth.code; /** * 认证录方式 diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/configuration/AuthProperties.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/configuration/AuthProperties.java similarity index 97% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/configuration/AuthProperties.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/configuration/AuthProperties.java index f7e73e7ab9348192b2fb70a78bf22d004734e039..e85b6c6f17e24c408b58bb68c51c651fbe262473 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/configuration/AuthProperties.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/configuration/AuthProperties.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.auth.configuration; +package cn.bootx.platform.starter.auth.configuration; import lombok.Data; import lombok.Getter; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/configuration/SaTokenConfigure.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/configuration/SaTokenConfigure.java similarity index 92% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/configuration/SaTokenConfigure.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/configuration/SaTokenConfigure.java index e6c7d34274ba2c6aefeda4a1e4f635f7b7b32da9..b1ea5c40c06141e67dc8a57b973fa1283b83361d 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/configuration/SaTokenConfigure.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/configuration/SaTokenConfigure.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.auth.configuration; +package cn.bootx.platform.starter.auth.configuration; -import cn.bootx.starter.auth.handler.SaRouteHandler; +import cn.bootx.platform.starter.auth.handler.SaRouteHandler; import cn.dev33.satoken.interceptor.SaInterceptor; import cn.dev33.satoken.router.SaRouter; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/controller/OnlineUserController.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/controller/OnlineUserController.java similarity index 75% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/controller/OnlineUserController.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/controller/OnlineUserController.java index 8f0f8244d9dd866b37b17140820073075da67fca..d52a3123769dfd8f6413bd772e53026ac7c08430 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/controller/OnlineUserController.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/controller/OnlineUserController.java @@ -1,11 +1,11 @@ -package cn.bootx.starter.auth.controller; +package cn.bootx.platform.starter.auth.controller; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.auth.online.OnlineUserDto; -import cn.bootx.starter.auth.online.OnlineUserService; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.starter.auth.online.OnlineUserDto; +import cn.bootx.platform.starter.auth.online.OnlineUserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/endpoint/TokenEndpoint.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/endpoint/TokenEndpoint.java similarity index 87% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/endpoint/TokenEndpoint.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/endpoint/TokenEndpoint.java index 3a4ac4fc9a04bda0d31187c55df28e1c7d78f1d5..4dabbd3cc4ecfd6c2606622d80bd13a90423eeb7 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/endpoint/TokenEndpoint.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/endpoint/TokenEndpoint.java @@ -1,7 +1,7 @@ -package cn.bootx.starter.auth.endpoint; +package cn.bootx.platform.starter.auth.endpoint; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/endpoint/TokenService.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/endpoint/TokenService.java similarity index 83% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/endpoint/TokenService.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/endpoint/TokenService.java index fafdbddad209fce09571547f0264861ef27b1e69..d11426f530802489d0d51c232182c53c8f626728 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/endpoint/TokenService.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/endpoint/TokenService.java @@ -1,21 +1,21 @@ -package cn.bootx.starter.auth.endpoint; - -import cn.bootx.common.core.code.CommonCode; -import cn.bootx.common.core.entity.UserDetail; -import cn.bootx.common.core.util.CollUtil; -import cn.bootx.starter.auth.authentication.AbstractAuthentication; -import cn.bootx.starter.auth.authentication.GetAuthClientService; -import cn.bootx.starter.auth.authentication.GetAuthLoginTypeService; -import cn.bootx.starter.auth.configuration.AuthProperties; -import cn.bootx.starter.auth.entity.AuthClient; -import cn.bootx.starter.auth.entity.AuthInfoResult; -import cn.bootx.starter.auth.entity.AuthLoginType; -import cn.bootx.starter.auth.entity.LoginAuthContext; -import cn.bootx.starter.auth.exception.ClientNotEnableException; -import cn.bootx.starter.auth.exception.LoginFailureException; -import cn.bootx.starter.auth.handler.LoginFailureHandler; -import cn.bootx.starter.auth.handler.LoginSuccessHandler; -import cn.bootx.starter.auth.util.SecurityUtil; +package cn.bootx.platform.starter.auth.endpoint; + +import cn.bootx.platform.starter.auth.authentication.AbstractAuthentication; +import cn.bootx.platform.starter.auth.authentication.GetAuthClientService; +import cn.bootx.platform.starter.auth.authentication.GetAuthLoginTypeService; +import cn.bootx.platform.starter.auth.configuration.AuthProperties; +import cn.bootx.platform.starter.auth.exception.ClientNotEnableException; +import cn.bootx.platform.starter.auth.exception.LoginFailureException; +import cn.bootx.platform.common.core.code.CommonCode; +import cn.bootx.platform.common.core.entity.UserDetail; +import cn.bootx.platform.common.core.util.CollUtil; +import cn.bootx.platform.starter.auth.entity.AuthClient; +import cn.bootx.platform.starter.auth.entity.AuthInfoResult; +import cn.bootx.platform.starter.auth.entity.AuthLoginType; +import cn.bootx.platform.starter.auth.entity.LoginAuthContext; +import cn.bootx.platform.starter.auth.handler.LoginFailureHandler; +import cn.bootx.platform.starter.auth.handler.LoginSuccessHandler; +import cn.bootx.platform.starter.auth.util.SecurityUtil; import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/entity/AuthClient.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthClient.java similarity index 91% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/entity/AuthClient.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthClient.java index 8a8b9e510cfe28085d3f306138bb042b98511624..ccfc98576bfc51990320872b6adbba64b112a5f5 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/entity/AuthClient.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthClient.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.auth.entity; +package cn.bootx.platform.starter.auth.entity; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/entity/AuthInfoResult.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthInfoResult.java similarity index 82% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/entity/AuthInfoResult.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthInfoResult.java index 4fa60a36435d967ff5df45a8d37fb29642bf6eba..c982ab18f0aeae09ff50a339207ca6c2d9ae5f76 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/entity/AuthInfoResult.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthInfoResult.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.auth.entity; +package cn.bootx.platform.starter.auth.entity; -import cn.bootx.common.core.entity.UserDetail; +import cn.bootx.platform.common.core.entity.UserDetail; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/entity/AuthLoginType.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthLoginType.java similarity index 92% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/entity/AuthLoginType.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthLoginType.java index 9d6d065666f00bebb5047f9add3659a75947d995..2f4ac9c387df5031ec13b0cd2e3a299ecf749616 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/entity/AuthLoginType.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthLoginType.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.auth.entity; +package cn.bootx.platform.starter.auth.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/entity/LoginAuthContext.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/LoginAuthContext.java similarity index 83% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/entity/LoginAuthContext.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/LoginAuthContext.java index 2c5d07042e670841aac8c41af9fdaf50dd764966..ad61b904836429b079f653ca207efebca18a18a0 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/entity/LoginAuthContext.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/LoginAuthContext.java @@ -1,7 +1,7 @@ -package cn.bootx.starter.auth.entity; +package cn.bootx.platform.starter.auth.entity; -import cn.bootx.common.core.entity.UserDetail; -import cn.bootx.starter.auth.configuration.AuthProperties; +import cn.bootx.platform.starter.auth.configuration.AuthProperties; +import cn.bootx.platform.common.core.entity.UserDetail; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/entity/ThirdAuthCode.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/ThirdAuthCode.java similarity index 90% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/entity/ThirdAuthCode.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/ThirdAuthCode.java index e78e6db9c86ed130092ecffa80c9420b217aa642..2a0bd7f796e35ebe65ee16f98e1cc4ad34412ba3 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/entity/ThirdAuthCode.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/ThirdAuthCode.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.auth.entity; +package cn.bootx.platform.starter.auth.entity; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/ApplicationNotEnableException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ApplicationNotEnableException.java similarity index 67% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/ApplicationNotEnableException.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ApplicationNotEnableException.java index 087fa7a9800080e7ff3ea6b54c15a813d8b727aa..5dc68d3cbac3c5533206355170b386e05e9c89da 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/ApplicationNotEnableException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ApplicationNotEnableException.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.auth.exception; +package cn.bootx.platform.starter.auth.exception; -import cn.bootx.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.BizException; /** * 应用被停用 diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/ApplicationNotFoundException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ApplicationNotFoundException.java similarity index 67% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/ApplicationNotFoundException.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ApplicationNotFoundException.java index ff3264f5ad0d264a619faf89924aad76b0781c52..fa2f8cf0a2cdfdb84c2bfe5ec0407342dcf41611 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/ApplicationNotFoundException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ApplicationNotFoundException.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.auth.exception; +package cn.bootx.platform.starter.auth.exception; -import cn.bootx.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.BizException; /** * 应用不存在 diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/ClientNotEnableException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ClientNotEnableException.java similarity index 67% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/ClientNotEnableException.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ClientNotEnableException.java index 98586cb89e9311e140596873640af69f4ed4102d..6042c1679849be56c3e18c34118f33a7d02032ee 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/ClientNotEnableException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ClientNotEnableException.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.auth.exception; +package cn.bootx.platform.starter.auth.exception; -import cn.bootx.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.BizException; /** * 终端方式被停用 diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/ClientNotFoundException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ClientNotFoundException.java similarity index 66% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/ClientNotFoundException.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ClientNotFoundException.java index 601a6ddcb4e44eba0a98d249499023b0127bf19a..95dc627b6d7c34992288cdb834e05c8670497242 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/ClientNotFoundException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ClientNotFoundException.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.auth.exception; +package cn.bootx.platform.starter.auth.exception; -import cn.bootx.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.BizException; /** * 终端不存在 diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/LoginFailureException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/LoginFailureException.java similarity index 80% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/LoginFailureException.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/LoginFailureException.java index 35dab5b446eb795d1142b8c1788513bf7a40731c..cf1dd9de28996850e26eefe6d599121ba6bb0581 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/LoginFailureException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/LoginFailureException.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.auth.exception; +package cn.bootx.platform.starter.auth.exception; -import cn.bootx.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.BizException; import lombok.Getter; /** diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/LonginTypeNotFoundException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/LonginTypeNotFoundException.java similarity index 68% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/LonginTypeNotFoundException.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/LonginTypeNotFoundException.java index ba3dc86a56e4987638de5257b8db4d690a5ec81a..af90a7fe2c0279c2212655f7f96867e3d2634a76 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/LonginTypeNotFoundException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/LonginTypeNotFoundException.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.auth.exception; +package cn.bootx.platform.starter.auth.exception; -import cn.bootx.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.BizException; /** * 登录方式不存在 diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/NotLoginException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/NotLoginException.java similarity index 60% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/NotLoginException.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/NotLoginException.java index 4c6d1c8bb9a1f3491a5f4f4c72f22aaf60bce651..11cb667e4db63feac3bb46b3e3f7f71221b7c4bf 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/NotLoginException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/NotLoginException.java @@ -1,8 +1,8 @@ -package cn.bootx.starter.auth.exception; +package cn.bootx.platform.starter.auth.exception; -import cn.bootx.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.BizException; -import static cn.bootx.common.core.code.CommonErrorCode.AUTHENTICATION_FAIL; +import static cn.bootx.platform.common.core.code.CommonErrorCode.AUTHENTICATION_FAIL; /** * 未登录异常 diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/RouterCheckException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/RouterCheckException.java similarity index 66% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/RouterCheckException.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/RouterCheckException.java index 13779e7b7d807228f0a258345fe5c57138f576af..62461c3b4b775c1cc9cac89a177e7750025b7906 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/RouterCheckException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/RouterCheckException.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.auth.exception; +package cn.bootx.platform.starter.auth.exception; -import cn.bootx.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.BizException; /** * 路径检查异常 diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/UserNotFoundException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/UserNotFoundException.java similarity index 86% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/UserNotFoundException.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/UserNotFoundException.java index d3df4bf47c6be6ed32acf1ef378761e455761475..bea39bf03fe230cca7c0f2320398be30deaae18d 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/exception/UserNotFoundException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/UserNotFoundException.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.auth.exception; +package cn.bootx.platform.starter.auth.exception; /** * 用户未找到异常 diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/handler/LoginFailureHandler.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginFailureHandler.java similarity index 72% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/handler/LoginFailureHandler.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginFailureHandler.java index f48b84adc649d5d39ef7fe1d266aa36200a6649a..018eea25f71fe957e2cf41f9f430cdf2d025a295 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/handler/LoginFailureHandler.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginFailureHandler.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.auth.handler; +package cn.bootx.platform.starter.auth.handler; -import cn.bootx.starter.auth.exception.LoginFailureException; +import cn.bootx.platform.starter.auth.exception.LoginFailureException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/handler/LoginSuccessHandler.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginSuccessHandler.java similarity index 74% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/handler/LoginSuccessHandler.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginSuccessHandler.java index afc432a256da5be73a7ef6be321082ef8d128a7d..13134dc11908f1f4729d2870e341a5921873d37d 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/handler/LoginSuccessHandler.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginSuccessHandler.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.auth.handler; +package cn.bootx.platform.starter.auth.handler; -import cn.bootx.starter.auth.entity.AuthInfoResult; +import cn.bootx.platform.starter.auth.entity.AuthInfoResult; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/handler/OpenIdAuthenticationHandler.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/OpenIdAuthenticationHandler.java similarity index 73% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/handler/OpenIdAuthenticationHandler.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/OpenIdAuthenticationHandler.java index 63091723b5649692e50d40ac05122b4d51644567..b555dbe7d4a765d7224ee5dec1aa2b6caf1e3e22 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/handler/OpenIdAuthenticationHandler.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/OpenIdAuthenticationHandler.java @@ -1,9 +1,9 @@ -package cn.bootx.starter.auth.handler; +package cn.bootx.platform.starter.auth.handler; -import cn.bootx.starter.auth.authentication.OpenIdAuthentication; -import cn.bootx.starter.auth.entity.AuthInfoResult; -import cn.bootx.starter.auth.entity.LoginAuthContext; -import cn.bootx.starter.auth.exception.LoginFailureException; +import cn.bootx.platform.starter.auth.authentication.OpenIdAuthentication; +import cn.bootx.platform.starter.auth.exception.LoginFailureException; +import cn.bootx.platform.starter.auth.entity.AuthInfoResult; +import cn.bootx.platform.starter.auth.entity.LoginAuthContext; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/handler/SaExceptionHandler.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/SaExceptionHandler.java similarity index 80% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/handler/SaExceptionHandler.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/SaExceptionHandler.java index 606775b42374f5e5cced180e610f1a58a6007e63..e09155432ed776cc7aabea3cf63400d47c994250 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/handler/SaExceptionHandler.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/SaExceptionHandler.java @@ -1,8 +1,8 @@ -package cn.bootx.starter.auth.handler; +package cn.bootx.platform.starter.auth.handler; -import cn.bootx.common.core.code.CommonCode; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; +import cn.bootx.platform.common.core.code.CommonCode; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; import cn.dev33.satoken.exception.SaTokenException; import lombok.extern.slf4j.Slf4j; import org.springframework.core.Ordered; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/handler/SaRouteHandler.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/SaRouteHandler.java similarity index 82% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/handler/SaRouteHandler.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/SaRouteHandler.java index 9001819e147218b93b7cfafc5e289543a938d035..1be1e57d8518b10671f46d6c8638a5f44f82c9ab 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/handler/SaRouteHandler.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/SaRouteHandler.java @@ -1,8 +1,8 @@ -package cn.bootx.starter.auth.handler; +package cn.bootx.platform.starter.auth.handler; -import cn.bootx.common.spring.util.WebServletUtil; -import cn.bootx.starter.auth.authentication.RouterCheck; -import cn.bootx.starter.auth.exception.RouterCheckException; +import cn.bootx.platform.starter.auth.authentication.RouterCheck; +import cn.bootx.platform.starter.auth.exception.RouterCheckException; +import cn.bootx.platform.common.spring.util.WebServletUtil; import cn.dev33.satoken.fun.SaFunction; import cn.dev33.satoken.router.SaRouter; import lombok.RequiredArgsConstructor; @@ -48,4 +48,4 @@ public class SaRouteHandler implements InitializingBean { }; } -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/impl/IgnoreAdminUserRouterCheck.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/impl/IgnoreAdminUserRouterCheck.java similarity index 69% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/impl/IgnoreAdminUserRouterCheck.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/impl/IgnoreAdminUserRouterCheck.java index 2a1d1809047ababe8aa886176d26daa9fb475695..30c386a302ed10cae28cc33661c35c79cd47b9e5 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/impl/IgnoreAdminUserRouterCheck.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/impl/IgnoreAdminUserRouterCheck.java @@ -1,9 +1,9 @@ -package cn.bootx.starter.auth.impl; +package cn.bootx.platform.starter.auth.impl; -import cn.bootx.common.core.entity.UserDetail; -import cn.bootx.starter.auth.authentication.RouterCheck; -import cn.bootx.starter.auth.configuration.AuthProperties; -import cn.bootx.starter.auth.util.SecurityUtil; +import cn.bootx.platform.common.core.entity.UserDetail; +import cn.bootx.platform.starter.auth.authentication.RouterCheck; +import cn.bootx.platform.starter.auth.configuration.AuthProperties; +import cn.bootx.platform.starter.auth.util.SecurityUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/impl/IgnoreAnnotationRouterCheck.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/impl/IgnoreAnnotationRouterCheck.java similarity index 88% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/impl/IgnoreAnnotationRouterCheck.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/impl/IgnoreAnnotationRouterCheck.java index 169d6400d17137a07768340d506687421ca17603..a3ee55760c4007feee30f5ce3ccc544822f1434d 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/impl/IgnoreAnnotationRouterCheck.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/impl/IgnoreAnnotationRouterCheck.java @@ -1,8 +1,8 @@ -package cn.bootx.starter.auth.impl; +package cn.bootx.platform.starter.auth.impl; -import cn.bootx.common.core.annotation.IgnoreAuth; -import cn.bootx.starter.auth.authentication.RouterCheck; -import cn.bootx.starter.auth.util.SecurityUtil; +import cn.bootx.platform.common.core.annotation.IgnoreAuth; +import cn.bootx.platform.starter.auth.authentication.RouterCheck; +import cn.bootx.platform.starter.auth.util.SecurityUtil; import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/online/OnlineUserDto.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/online/OnlineUserDto.java similarity index 95% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/online/OnlineUserDto.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/online/OnlineUserDto.java index cdfdea37ade9684d8420c60e6dba62d71186be91..a0602895c725770bae15c746e248cee2ba24d568 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/online/OnlineUserDto.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/online/OnlineUserDto.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.auth.online; +package cn.bootx.platform.starter.auth.online; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/online/OnlineUserService.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/online/OnlineUserService.java similarity index 87% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/online/OnlineUserService.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/online/OnlineUserService.java index 42dba9fe86ea956cc4998698aabd609d7bb293e9..d8bd5927b86046b4547666c41e795e5f9674a3a6 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/online/OnlineUserService.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/online/OnlineUserService.java @@ -1,12 +1,12 @@ -package cn.bootx.starter.auth.online; +package cn.bootx.platform.starter.auth.online; -import cn.bootx.common.core.annotation.OperateLog; -import cn.bootx.common.core.code.CommonCode; -import cn.bootx.common.core.entity.UserDetail; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.core.util.LocalDateTimeUtil; +import cn.bootx.platform.common.core.annotation.OperateLog; +import cn.bootx.platform.common.core.code.CommonCode; +import cn.bootx.platform.common.core.entity.UserDetail; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.LocalDateTimeUtil; import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.stp.StpUtil; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/redis/SaTokenDaoRedis.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/redis/SaTokenDaoRedis.java similarity index 99% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/redis/SaTokenDaoRedis.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/redis/SaTokenDaoRedis.java index 04f3386a8b0fb88e48b32afa38deac0085e13262..cd80299620b074e19bba3e8bc0eb07f74c2418e7 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/redis/SaTokenDaoRedis.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/redis/SaTokenDaoRedis.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.auth.redis; +package cn.bootx.platform.starter.auth.redis; import cn.dev33.satoken.dao.SaTokenDao; import cn.dev33.satoken.util.SaFoxUtil; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/redis/SaTokenRedisConfiguration.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/redis/SaTokenRedisConfiguration.java similarity index 98% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/redis/SaTokenRedisConfiguration.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/redis/SaTokenRedisConfiguration.java index fbe8051813511dcef2a9d8c64a0a22f430bf6102..b0152beb0ff2ceca9e913a505c23e6f87668bb60 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/redis/SaTokenRedisConfiguration.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/redis/SaTokenRedisConfiguration.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.auth.redis; +package cn.bootx.platform.starter.auth.redis; -import cn.bootx.common.core.exception.FatalException; +import cn.bootx.platform.common.core.exception.FatalException; import cn.dev33.satoken.dao.SaTokenDao; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/redis/SaTokenRedisProperties.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/redis/SaTokenRedisProperties.java similarity index 94% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/redis/SaTokenRedisProperties.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/redis/SaTokenRedisProperties.java index dff83371ced8812cfbc113bbf72d938cc549b6a4..b01f03b0687562ab752f863da0e4c8fb5dd4bd94 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/redis/SaTokenRedisProperties.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/redis/SaTokenRedisProperties.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.auth.redis; +package cn.bootx.platform.starter.auth.redis; import org.springframework.boot.autoconfigure.data.redis.RedisProperties; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/util/PasswordEncoder.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/util/PasswordEncoder.java similarity index 92% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/util/PasswordEncoder.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/util/PasswordEncoder.java index a9552dfcab3b67920084f271e75cb559517f543a..27c36a05be410e64fd62e166d2b9c6e56cd851a0 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/util/PasswordEncoder.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/util/PasswordEncoder.java @@ -1,14 +1,12 @@ -package cn.bootx.starter.auth.util; +package cn.bootx.platform.starter.auth.util; -import cn.bootx.starter.auth.configuration.AuthProperties; +import cn.bootx.platform.starter.auth.configuration.AuthProperties; import cn.dev33.satoken.secure.SaSecureUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; -import java.util.Objects; - /** * 密码编码器 * diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/util/SecurityUtil.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/util/SecurityUtil.java similarity index 89% rename from bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/util/SecurityUtil.java rename to bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/util/SecurityUtil.java index 724833933a4453c875f12d1084c79fc6aa42361b..44475eede1828aea3780adb2adb50e91e5ba81a0 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/starter/auth/util/SecurityUtil.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/util/SecurityUtil.java @@ -1,9 +1,9 @@ -package cn.bootx.starter.auth.util; +package cn.bootx.platform.starter.auth.util; -import cn.bootx.common.core.code.CommonCode; -import cn.bootx.common.core.entity.UserDetail; -import cn.bootx.starter.auth.cache.SessionCacheLocal; -import cn.bootx.starter.auth.exception.NotLoginException; +import cn.bootx.platform.common.core.code.CommonCode; +import cn.bootx.platform.common.core.entity.UserDetail; +import cn.bootx.platform.starter.auth.cache.SessionCacheLocal; +import cn.bootx.platform.starter.auth.exception.NotLoginException; import cn.dev33.satoken.exception.SaTokenException; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.util.DesensitizedUtil; diff --git a/bootx-common-starters/common-starter-auth/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-common-starters/common-starter-auth/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index f6366a5f734c77e05b96f9bde8987c05701d5931..4684eaf2ddb8b28ef4f5cbc989f678dcf3b7e006 100644 --- a/bootx-common-starters/common-starter-auth/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-common-starters/common-starter-auth/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.starter.auth.AuthAutoConfiguration +cn.bootx.platform.starter.auth.AuthAutoConfiguration diff --git a/bootx-common-starters/common-starter-code-gen/pom.xml b/bootx-common-starters/common-starter-code-gen/pom.xml index abec4d99df02d34c56d1075db4561d880d515828..45307869281defb0603e6dfc8ac10641970ec2a2 100644 --- a/bootx-common-starters/common-starter-code-gen/pom.xml +++ b/bootx-common-starters/common-starter-code-gen/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-common-starters - 1.2.3 + 1.3.0 4.0.0 diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/CodeGenAutoConfiguration.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/CodeGenAutoConfiguration.java similarity index 90% rename from bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/CodeGenAutoConfiguration.java rename to bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/CodeGenAutoConfiguration.java index 4c92f53c6ac48b7579e4762e4a306abff0ea8e37..97bb0a36cbdbac42fa61ca00e5d980e76c1844b3 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/CodeGenAutoConfiguration.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/CodeGenAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.code.gen; +package cn.bootx.platform.starter.code.gen; import org.apache.ibatis.annotations.Mapper; import org.mybatis.spring.annotation.MapperScan; diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/code/CodeGenColumnTypeEnum.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenColumnTypeEnum.java similarity index 94% rename from bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/code/CodeGenColumnTypeEnum.java rename to bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenColumnTypeEnum.java index d22491968ab36c164f7c9f25a8766b6feac7a392..71e13345094c66b50d09e2d7b6b3ccc496c7df92 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/code/CodeGenColumnTypeEnum.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenColumnTypeEnum.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.code.gen.code; +package cn.bootx.platform.starter.code.gen.code; -import cn.bootx.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.BizException; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/code/CodeGenTemplateVmEnum.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenTemplateVmEnum.java similarity index 94% rename from bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/code/CodeGenTemplateVmEnum.java rename to bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenTemplateVmEnum.java index 2beec1cde7276320e13e0974ab94acd6eab97a52..e7fc5172cc565d6a429f8a8ae2a6fe4fbd56fe8a 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/code/CodeGenTemplateVmEnum.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenTemplateVmEnum.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.code.gen.code; +package cn.bootx.platform.starter.code.gen.code; -import cn.bootx.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.BizException; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/controller/CodeGeneratorController.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/CodeGeneratorController.java similarity index 74% rename from bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/controller/CodeGeneratorController.java rename to bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/CodeGeneratorController.java index 75eda63323e18c43c35f9d89b7956ee3316183eb..5128e98bbe677e97a51839512c364b849e6be851 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/controller/CodeGeneratorController.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/CodeGeneratorController.java @@ -1,11 +1,11 @@ -package cn.bootx.starter.code.gen.controller; - -import cn.bootx.common.core.function.SystemKeyValueService; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.starter.code.gen.dto.CodeGenPreview; -import cn.bootx.starter.code.gen.param.CodeGenParam; -import cn.bootx.starter.code.gen.service.CodeGeneratorService; +package cn.bootx.platform.starter.code.gen.controller; + +import cn.bootx.platform.common.core.function.SystemKeyValueService; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.starter.code.gen.dto.CodeGenPreview; +import cn.bootx.platform.starter.code.gen.param.CodeGenParam; +import cn.bootx.platform.starter.code.gen.service.CodeGeneratorService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/controller/DatabaseTableController.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java similarity index 80% rename from bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/controller/DatabaseTableController.java rename to bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java index 38702e6230b9bdba457d4a341fe46c4270fa22ba..c1b31fce64362072f12eae017e7f6a43adb49d0d 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/controller/DatabaseTableController.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java @@ -1,12 +1,12 @@ -package cn.bootx.starter.code.gen.controller; +package cn.bootx.platform.starter.code.gen.controller; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.code.gen.dto.TableGenParamDto; -import cn.bootx.starter.code.gen.entity.DatabaseColumn; -import cn.bootx.starter.code.gen.entity.DatabaseTable; -import cn.bootx.starter.code.gen.service.DatabaseTableService; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.starter.code.gen.dto.TableGenParamDto; +import cn.bootx.platform.starter.code.gen.entity.DatabaseColumn; +import cn.bootx.platform.starter.code.gen.entity.DatabaseTable; +import cn.bootx.platform.starter.code.gen.service.DatabaseTableService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/dao/DatabaseTableMapper.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dao/DatabaseTableMapper.java similarity index 91% rename from bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/dao/DatabaseTableMapper.java rename to bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dao/DatabaseTableMapper.java index 9dadfd78fbb8fc38090bae26e760cf79a9d933ff..1e25a34f6f3a3c0971897976fa92fe08289f443c 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/dao/DatabaseTableMapper.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dao/DatabaseTableMapper.java @@ -1,7 +1,7 @@ -package cn.bootx.starter.code.gen.dao; +package cn.bootx.platform.starter.code.gen.dao; -import cn.bootx.starter.code.gen.entity.DatabaseColumn; -import cn.bootx.starter.code.gen.entity.DatabaseTable; +import cn.bootx.platform.starter.code.gen.entity.DatabaseColumn; +import cn.bootx.platform.starter.code.gen.entity.DatabaseTable; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/domain/CodeGenData.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/domain/CodeGenData.java similarity index 97% rename from bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/domain/CodeGenData.java rename to bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/domain/CodeGenData.java index b0c7fd052833ae0e87aa2c042852731806465ca3..9e5a955b9ffbc507b3d9360b24a436016d1d4302 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/domain/CodeGenData.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/domain/CodeGenData.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.code.gen.domain; +package cn.bootx.platform.starter.code.gen.domain; import cn.hutool.core.date.DateUtil; import lombok.Data; diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/dto/CodeGenPreview.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dto/CodeGenPreview.java similarity index 89% rename from bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/dto/CodeGenPreview.java rename to bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dto/CodeGenPreview.java index b597718f9d5fd782cdedef3a5ba9504c3673c176..1ba3d3b6394e856be9a927077057fb25d406703f 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/dto/CodeGenPreview.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dto/CodeGenPreview.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.code.gen.dto; +package cn.bootx.platform.starter.code.gen.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/dto/TableGenParamDto.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dto/TableGenParamDto.java similarity index 90% rename from bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/dto/TableGenParamDto.java rename to bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dto/TableGenParamDto.java index 6ea2fdfe35cd27f347f3ccba2255dd3ea4d3179d..f67d14bd0ef42a19073204dc82391975ae178526 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/dto/TableGenParamDto.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dto/TableGenParamDto.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.code.gen.dto; +package cn.bootx.platform.starter.code.gen.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/entity/CodeGenConfig.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/CodeGenConfig.java similarity index 84% rename from bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/entity/CodeGenConfig.java rename to bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/CodeGenConfig.java index 69f911cdee6bb93a0ca5dfc61c7bbde57728678e..8249c3bb36487cf110b56e283f7c6070255e7d3e 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/entity/CodeGenConfig.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/CodeGenConfig.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.code.gen.entity; +package cn.bootx.platform.starter.code.gen.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/entity/DatabaseColumn.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/DatabaseColumn.java similarity index 88% rename from bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/entity/DatabaseColumn.java rename to bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/DatabaseColumn.java index 4c9f44bad6d7861b08bb40cc1390f3ddd8513b9b..6ca69190e7588c56d22a8044ce4b8db05a9628c7 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/entity/DatabaseColumn.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/DatabaseColumn.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.code.gen.entity; +package cn.bootx.platform.starter.code.gen.entity; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/entity/DatabaseTable.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/DatabaseTable.java similarity index 90% rename from bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/entity/DatabaseTable.java rename to bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/DatabaseTable.java index ed0d0f76f74e3ae3644ef3f1f92f431713a2bb9f..a12b2e4893d82719a3d24fcb6f8548f96f2bc592 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/entity/DatabaseTable.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/DatabaseTable.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.code.gen.entity; +package cn.bootx.platform.starter.code.gen.entity; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/param/CodeGenParam.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/param/CodeGenParam.java similarity index 96% rename from bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/param/CodeGenParam.java rename to bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/param/CodeGenParam.java index 4e53d1893ad2fd9864f6f7debd7b5886a8a9e10d..04d30480b82317144024051048993eb8bb094a27 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/param/CodeGenParam.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/param/CodeGenParam.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.code.gen.param; +package cn.bootx.platform.starter.code.gen.param; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/service/CodeGeneratorService.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/CodeGeneratorService.java similarity index 90% rename from bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/service/CodeGeneratorService.java rename to bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/CodeGeneratorService.java index 31b8f2adf783e183e64ad46113459782be700de6..f8a3110572033e62c3149484bc5d447fcd2e4380 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/service/CodeGeneratorService.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/CodeGeneratorService.java @@ -1,15 +1,15 @@ -package cn.bootx.starter.code.gen.service; +package cn.bootx.platform.starter.code.gen.service; -import cn.bootx.common.core.code.CommonCode; -import cn.bootx.starter.code.gen.code.CodeGenColumnTypeEnum; -import cn.bootx.starter.code.gen.code.CodeGenTemplateVmEnum; -import cn.bootx.starter.code.gen.domain.CodeGenData; -import cn.bootx.starter.code.gen.domain.CodeGenData.CodeGenColumnData; -import cn.bootx.starter.code.gen.dto.CodeGenPreview; -import cn.bootx.starter.code.gen.entity.DatabaseColumn; -import cn.bootx.starter.code.gen.entity.DatabaseTable; -import cn.bootx.starter.code.gen.param.CodeGenParam; -import cn.bootx.starter.code.gen.util.CodeGenUtil; +import cn.bootx.platform.common.core.code.CommonCode; +import cn.bootx.platform.starter.code.gen.code.CodeGenColumnTypeEnum; +import cn.bootx.platform.starter.code.gen.code.CodeGenTemplateVmEnum; +import cn.bootx.platform.starter.code.gen.domain.CodeGenData; +import cn.bootx.platform.starter.code.gen.domain.CodeGenData.CodeGenColumnData; +import cn.bootx.platform.starter.code.gen.dto.CodeGenPreview; +import cn.bootx.platform.starter.code.gen.entity.DatabaseColumn; +import cn.bootx.platform.starter.code.gen.entity.DatabaseTable; +import cn.bootx.platform.starter.code.gen.param.CodeGenParam; +import cn.bootx.platform.starter.code.gen.util.CodeGenUtil; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.text.NamingCase; diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/service/DatabaseTableService.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java similarity index 79% rename from bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/service/DatabaseTableService.java rename to bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java index 8716ba81842ec062da9b2c565dc159040666bbab..67e405739f0aa03b204825837b01039cba1d93fe 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/service/DatabaseTableService.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java @@ -1,13 +1,13 @@ -package cn.bootx.starter.code.gen.service; +package cn.bootx.platform.starter.code.gen.service; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.starter.code.gen.dao.DatabaseTableMapper; -import cn.bootx.starter.code.gen.dto.TableGenParamDto; -import cn.bootx.starter.code.gen.entity.DatabaseColumn; -import cn.bootx.starter.code.gen.entity.DatabaseTable; -import cn.bootx.starter.code.gen.util.CodeGenUtil; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.starter.code.gen.dao.DatabaseTableMapper; +import cn.bootx.platform.starter.code.gen.dto.TableGenParamDto; +import cn.bootx.platform.starter.code.gen.entity.DatabaseColumn; +import cn.bootx.platform.starter.code.gen.entity.DatabaseTable; +import cn.bootx.platform.starter.code.gen.util.CodeGenUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/util/CodeGenUtil.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/util/CodeGenUtil.java similarity index 89% rename from bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/util/CodeGenUtil.java rename to bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/util/CodeGenUtil.java index 8af64e7b7b48c1916e27e2d1938fe0bd7049bff9..d8e83e90b9e48bc53500ac3d196c48cfdeaa9681 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/starter/code/gen/util/CodeGenUtil.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/util/CodeGenUtil.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.code.gen.util; +package cn.bootx.platform.starter.code.gen.util; import cn.hutool.core.text.NamingCase; import lombok.experimental.UtilityClass; diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-common-starters/common-starter-code-gen/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 5ec8c6a7cd6cfe6e8c776b6d194cd8d8f0292e42..db9980d90b7f79ca75b3457dda5c1cf942d1f6a9 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.starter.code.gen.CodeGenAutoConfiguration +cn.bootx.platform.starter.code.gen.CodeGenAutoConfiguration diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/controller.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/controller.java.vm index 333f775bc434ec4d4abeeb417e4850c3e0c02d7a..e9d8e53477afb1614588dcc5cb32cf2da4583579 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/controller.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/controller.java.vm @@ -1,9 +1,9 @@ package ${controllerPack}; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; import ${corePack}.service.${entityUpName}Service; import ${dtoPack}.${entityUpName}Dto; import ${paramPack}.${entityUpName}Param; @@ -64,4 +64,4 @@ public class ${entityUpName}Controller { public ResResult> page(PageParam pageParam, ${entityUpName}Param ${entityLowName}Param){ return Res.ok(${entityLowName}Service.page(pageParam,${entityLowName}Param)); } -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/dto.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/dto.java.vm index fa6a09a730c2b34a0d3bd09266980445a7772906..6440e3bc7dbaf837a795ad76d43c1633b1a3a20f 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/dto.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/dto.java.vm @@ -1,10 +1,6 @@ package ${dtoPack}; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.time.LocalDate; - -import cn.bootx.common.core.rest.dto.BaseDto; +import cn.bootx.platform.common.core.rest.dto.BaseDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -26,4 +22,4 @@ public class ${entityUpName}Dto extends BaseDto { private $column.javaType $column.name; #end -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/entity.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/entity.java.vm index 0e53fbc721a7a452759df8ac22c51a383798bde8..d05ef1ff3775b369f68d9c75e7c4ab13ad293f6c 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/entity.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/entity.java.vm @@ -1,12 +1,6 @@ package ${corePack}.entity; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.time.LocalDate; -import java.time.LocalTime; - -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.${baseClass}; + ${baseClass}; import com.baomidou.mybatisplus.annotation.TableName; import ${dtoPack}.${entityUpName}Dto; import ${paramPack}.${entityUpName}Param; diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/manager.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/manager.java.vm index f254b1a7b8b65c42d5fd2effd35fb5c864357143..59bb001d145243d22c7ffc4be4647e483097f21c 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/manager.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/manager.java.vm @@ -1,19 +1,16 @@ package ${corePack}.dao; -import cn.bootx.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import ${paramPack}.${entityUpName}Param; import ${corePack}.entity.${entityUpName}; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; -import java.util.Optional; - /** * ${comments} * @author ${author} @@ -33,4 +30,4 @@ public class ${entityUpName}Manager extends BaseManager<${entityUpName}Mapper, $ .orderByDesc(MpIdEntity::getId) .page(mpPage); } -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/service.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/service.java.vm index 6c564c77fd7ae7ad15f4a31d4366fe2fbb9de837..2788ee082d9f5211b605cc2713f4678e06547d71 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/service.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/service.java.vm @@ -1,16 +1,15 @@ package ${corePack}.service; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.core.util.ResultConvertUtil; -import cn.bootx.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.ResultConvertUtil; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; import ${dtoPack}.${entityUpName}Dto; import ${paramPack}.${entityUpName}Param; import ${corePack}.convert.${entityUpName}Convert; import ${corePack}.entity.${entityUpName}; import ${corePack}.dao.${entityUpName}Manager; -import org.springframework.stereotype.Service; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -72,4 +71,4 @@ public class ${entityUpName}Service { public void delete(Long id){ ${entityLowName}Manager.deleteById(id); } -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-data-perm/pom.xml b/bootx-common-starters/common-starter-data-perm/pom.xml index e20e1c6c0557b1449a2a483706ba2f412a1f19e3..1077065962492f9c6fecbd42d7a93ea2a32167eb 100644 --- a/bootx-common-starters/common-starter-data-perm/pom.xml +++ b/bootx-common-starters/common-starter-data-perm/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.2.3 + 1.3.0 4.0.0 diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/DataPermAutoConfiguration.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/DataPermAutoConfiguration.java similarity index 91% rename from bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/DataPermAutoConfiguration.java rename to bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/DataPermAutoConfiguration.java index 19afb878b45eed40d5fc8f7621781fae3fc18b85..cf2b8e39805b358e85cf7c1e9a5b7691e85a05c6 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/DataPermAutoConfiguration.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/DataPermAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.data.perm; +package cn.bootx.platform.starter.data.perm; import org.apache.ibatis.annotations.Mapper; import org.mybatis.spring.annotation.MapperScan; diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/code/DataScopeEnum.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/code/DataScopeEnum.java similarity index 89% rename from bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/code/DataScopeEnum.java rename to bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/code/DataScopeEnum.java index 8ccd5e0f007aaa1a8fc59424055f5dc269222fdc..eeb8257d184ac0c1335935e7dddc8a43b6c39183 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/code/DataScopeEnum.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/code/DataScopeEnum.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.data.perm.code; +package cn.bootx.platform.starter.data.perm.code; -import cn.bootx.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.BizException; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/configuration/DataPermProperties.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/configuration/DataPermProperties.java similarity index 95% rename from bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/configuration/DataPermProperties.java rename to bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/configuration/DataPermProperties.java index 71f4d53bf1cc195e00e2ab9328059dfd8e5e8ee0..5deb7019e0032361efcf46acdcb9b765e3be0e80 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/configuration/DataPermProperties.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/configuration/DataPermProperties.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.data.perm.configuration; +package cn.bootx.platform.starter.data.perm.configuration; import lombok.Getter; import lombok.Setter; diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/configuration/DatePermConfiguration.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/configuration/DatePermConfiguration.java similarity index 80% rename from bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/configuration/DatePermConfiguration.java rename to bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/configuration/DatePermConfiguration.java index 3f14f7cee37a8dc8e6455c26f024dcbaf293bd0a..a820205ceb078fff431e1d688a1609f035f4a3ee 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/configuration/DatePermConfiguration.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/configuration/DatePermConfiguration.java @@ -1,8 +1,8 @@ -package cn.bootx.starter.data.perm.configuration; +package cn.bootx.platform.starter.data.perm.configuration; -import cn.bootx.common.mybatisplus.interceptor.MpInterceptor; -import cn.bootx.starter.data.perm.scope.DataScopeInterceptor; -import cn.bootx.starter.data.perm.select.SelectFieldPermInterceptor; +import cn.bootx.platform.common.mybatisplus.interceptor.MpInterceptor; +import cn.bootx.platform.starter.data.perm.scope.DataScopeInterceptor; +import cn.bootx.platform.starter.data.perm.select.SelectFieldPermInterceptor; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/dbencrypt/DecryptInterceptor.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/dbencrypt/DecryptInterceptor.java similarity index 92% rename from bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/dbencrypt/DecryptInterceptor.java rename to bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/dbencrypt/DecryptInterceptor.java index e680cfc2839ed4ccb0b6404c71cc4be4cea7900c..b4da845f846ca4b3a8ce573452007657330b8bd9 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/dbencrypt/DecryptInterceptor.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/dbencrypt/DecryptInterceptor.java @@ -1,7 +1,7 @@ -package cn.bootx.starter.data.perm.dbencrypt; +package cn.bootx.platform.starter.data.perm.dbencrypt; -import cn.bootx.common.core.annotation.EncryptionField; -import cn.bootx.starter.data.perm.configuration.DataPermProperties; +import cn.bootx.platform.starter.data.perm.configuration.DataPermProperties; +import cn.bootx.platform.common.core.annotation.EncryptionField; import cn.hutool.core.codec.Base64; import cn.hutool.core.util.ReflectUtil; import cn.hutool.crypto.SecureUtil; diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/dbencrypt/EncryptInterceptor.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/dbencrypt/EncryptInterceptor.java similarity index 92% rename from bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/dbencrypt/EncryptInterceptor.java rename to bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/dbencrypt/EncryptInterceptor.java index af63ff289f41e89e8460dc7a37b49aff3d835f43..1045250ba52e225f8ecd12d85a4c1d5b8a4c1941 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/dbencrypt/EncryptInterceptor.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/dbencrypt/EncryptInterceptor.java @@ -1,7 +1,7 @@ -package cn.bootx.starter.data.perm.dbencrypt; +package cn.bootx.platform.starter.data.perm.dbencrypt; -import cn.bootx.common.core.annotation.EncryptionField; -import cn.bootx.starter.data.perm.configuration.DataPermProperties; +import cn.bootx.platform.starter.data.perm.configuration.DataPermProperties; +import cn.bootx.platform.common.core.annotation.EncryptionField; import cn.hutool.core.util.ReflectUtil; import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.symmetric.AES; diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/exception/NotLoginPermException.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/exception/NotLoginPermException.java similarity index 67% rename from bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/exception/NotLoginPermException.java rename to bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/exception/NotLoginPermException.java index 7c16a3b37fb970b744a5e16c3b65e46fe4e1ceaf..bbe67637544d354ffc3088a370711859d15c165d 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/exception/NotLoginPermException.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/exception/NotLoginPermException.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.data.perm.exception; +package cn.bootx.platform.starter.data.perm.exception; -import cn.bootx.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.BizException; /** * 未登录无法进行数据鉴权异常 diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/handler/DataPermAspectHandler.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/handler/DataPermAspectHandler.java similarity index 85% rename from bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/handler/DataPermAspectHandler.java rename to bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/handler/DataPermAspectHandler.java index 2b7d5af2a288cfc850bfd2fa5c94147f0477d518..485f4af8391367850cdce41a084195eb759b2109 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/handler/DataPermAspectHandler.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/handler/DataPermAspectHandler.java @@ -1,10 +1,10 @@ -package cn.bootx.starter.data.perm.handler; +package cn.bootx.platform.starter.data.perm.handler; -import cn.bootx.common.core.annotation.NestedPermission; -import cn.bootx.common.core.annotation.Permission; -import cn.bootx.common.spring.util.AopUtil; -import cn.bootx.starter.auth.util.SecurityUtil; -import cn.bootx.starter.data.perm.local.DataPermContextHolder; +import cn.bootx.platform.common.core.annotation.NestedPermission; +import cn.bootx.platform.common.core.annotation.Permission; +import cn.bootx.platform.common.spring.util.AopUtil; +import cn.bootx.platform.starter.auth.util.SecurityUtil; +import cn.bootx.platform.starter.data.perm.local.DataPermContextHolder; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/local/DataPermContextHolder.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/local/DataPermContextHolder.java similarity index 88% rename from bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/local/DataPermContextHolder.java rename to bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/local/DataPermContextHolder.java index 64ff5e7fb3cfe5ca7e468100146ed583ddda319c..992d94363f51378b608d6696adfb593658ab1132 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/local/DataPermContextHolder.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/local/DataPermContextHolder.java @@ -1,8 +1,8 @@ -package cn.bootx.starter.data.perm.local; +package cn.bootx.platform.starter.data.perm.local; -import cn.bootx.common.core.annotation.NestedPermission; -import cn.bootx.common.core.annotation.Permission; -import cn.bootx.common.core.entity.UserDetail; +import cn.bootx.platform.common.core.annotation.NestedPermission; +import cn.bootx.platform.common.core.annotation.Permission; +import cn.bootx.platform.common.core.entity.UserDetail; import com.alibaba.ttl.TransmittableThreadLocal; import java.util.Optional; diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/scope/DataPermScope.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataPermScope.java similarity index 80% rename from bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/scope/DataPermScope.java rename to bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataPermScope.java index f943be339730043e9fc33262e72ef79855896c14..6c6485e81524f635009245a0f89f2170d57fd82b 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/scope/DataPermScope.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataPermScope.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.data.perm.scope; +package cn.bootx.platform.starter.data.perm.scope; -import cn.bootx.starter.data.perm.code.DataScopeEnum; +import cn.bootx.platform.starter.data.perm.code.DataScopeEnum; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/scope/DataPermScopeHandler.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataPermScopeHandler.java similarity index 81% rename from bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/scope/DataPermScopeHandler.java rename to bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataPermScopeHandler.java index 44bf17881939919fc2d67f55c9ba4eb097d4f095..ccb83e37d8690b4626c04e379e12a0d5b6a33074 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/scope/DataPermScopeHandler.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataPermScopeHandler.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.data.perm.scope; +package cn.bootx.platform.starter.data.perm.scope; /** * 数据范围权限业务实现接口 diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/scope/DataScopeInterceptor.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataScopeInterceptor.java similarity index 94% rename from bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/scope/DataScopeInterceptor.java rename to bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataScopeInterceptor.java index f8125deccb3c391c9b7e1e7023b0c29c551fb0fb..690ee265475097740795a48821efc64ec25ea703 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/scope/DataScopeInterceptor.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataScopeInterceptor.java @@ -1,16 +1,16 @@ -package cn.bootx.starter.data.perm.scope; +package cn.bootx.platform.starter.data.perm.scope; -import cn.bootx.common.core.annotation.NestedPermission; -import cn.bootx.common.core.annotation.Permission; -import cn.bootx.common.core.code.CommonCode; -import cn.bootx.common.core.entity.UserDetail; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.util.CollUtil; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.starter.data.perm.code.DataScopeEnum; -import cn.bootx.starter.data.perm.configuration.DataPermProperties; -import cn.bootx.starter.data.perm.exception.NotLoginPermException; -import cn.bootx.starter.data.perm.local.DataPermContextHolder; +import cn.bootx.platform.starter.data.perm.configuration.DataPermProperties; +import cn.bootx.platform.starter.data.perm.exception.NotLoginPermException; +import cn.bootx.platform.common.core.annotation.NestedPermission; +import cn.bootx.platform.common.core.annotation.Permission; +import cn.bootx.platform.common.core.code.CommonCode; +import cn.bootx.platform.common.core.entity.UserDetail; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.util.CollUtil; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.starter.data.perm.code.DataScopeEnum; +import cn.bootx.platform.starter.data.perm.local.DataPermContextHolder; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; import com.baomidou.mybatisplus.core.metadata.TableInfo; diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/select/SelectFieldPermHandler.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/select/SelectFieldPermHandler.java similarity index 88% rename from bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/select/SelectFieldPermHandler.java rename to bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/select/SelectFieldPermHandler.java index 359fe5fed49d24acd4ee5fb9914615835b9b8d19..01cced0eed998a402b0875826ea5b72d52d85f15 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/select/SelectFieldPermHandler.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/select/SelectFieldPermHandler.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.data.perm.select; +package cn.bootx.platform.starter.data.perm.select; import net.sf.jsqlparser.statement.select.SelectItem; diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/select/SelectFieldPermInterceptor.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/select/SelectFieldPermInterceptor.java similarity index 82% rename from bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/select/SelectFieldPermInterceptor.java rename to bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/select/SelectFieldPermInterceptor.java index 294cce011f706f42c03fc84969d99b17b33c254c..181f64ec179ca9caac2b1888d5b60dd4def66845 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/select/SelectFieldPermInterceptor.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/select/SelectFieldPermInterceptor.java @@ -1,17 +1,12 @@ -package cn.bootx.starter.data.perm.select; +package cn.bootx.platform.starter.data.perm.select; -import cn.bootx.common.core.annotation.NestedPermission; -import cn.bootx.common.core.annotation.Permission; -import cn.bootx.common.core.code.CommonCode; -import cn.bootx.common.core.entity.UserDetail; -import cn.bootx.common.core.util.CollUtil; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.starter.data.perm.configuration.DataPermProperties; -import cn.bootx.starter.data.perm.exception.NotLoginPermException; -import cn.bootx.starter.data.perm.local.DataPermContextHolder; -import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; -import com.baomidou.mybatisplus.core.metadata.TableInfo; -import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; +import cn.bootx.platform.starter.data.perm.configuration.DataPermProperties; +import cn.bootx.platform.starter.data.perm.exception.NotLoginPermException; +import cn.bootx.platform.common.core.annotation.NestedPermission; +import cn.bootx.platform.common.core.annotation.Permission; +import cn.bootx.platform.common.core.entity.UserDetail; +import cn.bootx.platform.common.core.util.CollUtil; +import cn.bootx.platform.starter.data.perm.local.DataPermContextHolder; import com.baomidou.mybatisplus.core.toolkit.PluginUtils; import com.baomidou.mybatisplus.extension.parser.JsqlParserSupport; import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor; diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/sensitive/SensitiveInfo.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/sensitive/SensitiveInfo.java similarity index 96% rename from bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/sensitive/SensitiveInfo.java rename to bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/sensitive/SensitiveInfo.java index a092fdf5794a4cc9570f378417e31a6a44af11f4..9a1079313008a443297ee992b489ca927869c7e4 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/sensitive/SensitiveInfo.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/sensitive/SensitiveInfo.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.data.perm.sensitive; +package cn.bootx.platform.starter.data.perm.sensitive; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/sensitive/SensitiveInfoSerialize.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/sensitive/SensitiveInfoSerialize.java similarity index 98% rename from bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/sensitive/SensitiveInfoSerialize.java rename to bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/sensitive/SensitiveInfoSerialize.java index 137b5578f940aeecdf49d1448bbb405282e972b4..415d262ce20c4c30641c27dd95ebf80c2055c37a 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/starter/data/perm/sensitive/SensitiveInfoSerialize.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/sensitive/SensitiveInfoSerialize.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.data.perm.sensitive; +package cn.bootx.platform.starter.data.perm.sensitive; import cn.hutool.core.util.DesensitizedUtil; import cn.hutool.core.util.StrUtil; diff --git a/bootx-common-starters/common-starter-data-perm/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-common-starters/common-starter-data-perm/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index ebb40e84a5dca726296b362e2adcdc7fa808074c..39c0ace1c6deb7c3299734dab8cc9a82b13897ab 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-common-starters/common-starter-data-perm/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.starter.data.perm.DataPermAutoConfiguration +cn.bootx.platform.starter.data.perm.DataPermAutoConfiguration diff --git a/bootx-common-starters/common-starter-dingtalk/pom.xml b/bootx-common-starters/common-starter-dingtalk/pom.xml index 07a21b168871380585966024a85cb0498df28765..79e32103ff10cb5a4cd6462f58808401ed6848c6 100644 --- a/bootx-common-starters/common-starter-dingtalk/pom.xml +++ b/bootx-common-starters/common-starter-dingtalk/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.2.3 + 1.3.0 4.0.0 diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/DingTalkAutoConfiguration.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/DingTalkAutoConfiguration.java similarity index 92% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/DingTalkAutoConfiguration.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/DingTalkAutoConfiguration.java index 119859f015e747a41a4cba4262ad203ede97127c..943743a57c974f8e02dfac035e74545a35f61ede 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/DingTalkAutoConfiguration.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/DingTalkAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.dingtalk; +package cn.bootx.platform.starter.dingtalk; import org.apache.ibatis.annotations.Mapper; import org.mybatis.spring.annotation.MapperScan; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/code/DingTalkCode.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/code/DingTalkCode.java similarity index 98% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/code/DingTalkCode.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/code/DingTalkCode.java index 92a5abb39eb573997b5f6e250d051f76aeef4141..bfafaa416d3e3fdaffd2b5dbd0136d39b3e6da6f 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/code/DingTalkCode.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/code/DingTalkCode.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.dingtalk.code; +package cn.bootx.platform.starter.dingtalk.code; /** * 钉钉消息类型 diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/code/DingTalkNoticeCode.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/code/DingTalkNoticeCode.java similarity index 92% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/code/DingTalkNoticeCode.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/code/DingTalkNoticeCode.java index 34813871330ea0e89b5b079f2fc4eb0713abd04f..2d850ca58ff511ab13d7e1266f9d77aece9bc143 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/code/DingTalkNoticeCode.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/code/DingTalkNoticeCode.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.dingtalk.code; +package cn.bootx.platform.starter.dingtalk.code; /** * 钉钉通知消息常量 diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/configuration/DingTalkProperties.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/configuration/DingTalkProperties.java similarity index 88% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/configuration/DingTalkProperties.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/configuration/DingTalkProperties.java index cef7154e65fe08e4ca6c0fbc6ae08bc274afd859..27f67f084dfe75f557c1f761f3e150c750da11c5 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/configuration/DingTalkProperties.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/configuration/DingTalkProperties.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.dingtalk.configuration; +package cn.bootx.platform.starter.dingtalk.configuration; import lombok.Getter; import lombok.Setter; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/controller/DingRobotConfigController.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/controller/DingRobotConfigController.java similarity index 81% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/controller/DingRobotConfigController.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/controller/DingRobotConfigController.java index ca8362d7c0fd1cba4344dbcd1d4635556138e504..2ff96f1207652aebb86d9efe6a938110685ea7ca 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/controller/DingRobotConfigController.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/controller/DingRobotConfigController.java @@ -1,12 +1,12 @@ -package cn.bootx.starter.dingtalk.controller; +package cn.bootx.platform.starter.dingtalk.controller; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.dingtalk.core.robot.service.DingRobotConfigService; -import cn.bootx.starter.dingtalk.dto.robot.DingRobotConfigDto; -import cn.bootx.starter.dingtalk.param.robot.DingRobotConfigParam; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.starter.dingtalk.core.robot.service.DingRobotConfigService; +import cn.bootx.platform.starter.dingtalk.dto.robot.DingRobotConfigDto; +import cn.bootx.platform.starter.dingtalk.param.robot.DingRobotConfigParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/base/result/AccessTokenResult.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/AccessTokenResult.java similarity index 90% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/base/result/AccessTokenResult.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/AccessTokenResult.java index ece6681eeb0b4b8c636b9d899fa4f8f334df8e6d..a0b6f2f51dd8089d8f16727214697392e656607b 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/base/result/AccessTokenResult.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/AccessTokenResult.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.dingtalk.core.base.result; +package cn.bootx.platform.starter.dingtalk.core.base.result; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/base/result/DingTalkResult.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/DingTalkResult.java similarity index 92% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/base/result/DingTalkResult.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/DingTalkResult.java index 14e6daf0ee56b84635e0ab6884609a367a565552..00276c248f5c9c658bbbef5b4828b3c78b5aa846 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/base/result/DingTalkResult.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/DingTalkResult.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.dingtalk.core.base.result; +package cn.bootx.platform.starter.dingtalk.core.base.result; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/base/result/MediaResult.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/MediaResult.java similarity index 93% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/base/result/MediaResult.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/MediaResult.java index b1c443db815e7c8f6da0b408451d8668a4b189f0..435932ce213c43c7ed40ae284d7e89ed994c4619 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/base/result/MediaResult.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/MediaResult.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.dingtalk.core.base.result; +package cn.bootx.platform.starter.dingtalk.core.base.result; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/base/service/DingAccessService.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/service/DingAccessService.java similarity index 85% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/base/service/DingAccessService.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/service/DingAccessService.java index 03302e66d0811c8ac55ce4c9fbfcfb4380fd693e..f5cf1e1a4213a7bb7f8aeffd3ef5b80beabd7957 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/base/service/DingAccessService.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/service/DingAccessService.java @@ -1,10 +1,10 @@ -package cn.bootx.starter.dingtalk.core.base.service; +package cn.bootx.platform.starter.dingtalk.core.base.service; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.jackson.util.JacksonUtil; -import cn.bootx.common.spring.exception.RetryableException; -import cn.bootx.starter.dingtalk.configuration.DingTalkProperties; -import cn.bootx.starter.dingtalk.core.base.result.AccessTokenResult; +import cn.bootx.platform.starter.dingtalk.configuration.DingTalkProperties; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.jackson.util.JacksonUtil; +import cn.bootx.platform.common.spring.exception.RetryableException; +import cn.bootx.platform.starter.dingtalk.core.base.result.AccessTokenResult; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; import cn.hutool.http.HttpException; @@ -20,7 +20,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import static cn.bootx.starter.dingtalk.code.DingTalkCode.*; +import static cn.bootx.platform.starter.dingtalk.code.DingTalkCode.*; /** * 钉钉访问凭证 diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/media/dao/DingMediaMd5Manager.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/dao/DingMediaMd5Manager.java similarity index 72% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/media/dao/DingMediaMd5Manager.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/dao/DingMediaMd5Manager.java index 968f64ee1c51b47f9e4ec461d005e86180131ca7..f698aeab7aa74b3fe3a9b9b486e19cb11a672981 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/media/dao/DingMediaMd5Manager.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/dao/DingMediaMd5Manager.java @@ -1,7 +1,7 @@ -package cn.bootx.starter.dingtalk.core.media.dao; +package cn.bootx.platform.starter.dingtalk.core.media.dao; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.starter.dingtalk.core.media.entity.DingMediaMd5; +import cn.bootx.platform.starter.dingtalk.core.media.entity.DingMediaMd5; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/media/dao/DingMediaMd5Mapper.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/dao/DingMediaMd5Mapper.java similarity index 63% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/media/dao/DingMediaMd5Mapper.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/dao/DingMediaMd5Mapper.java index d166cd27514701607df0868e19050b2022343d6e..a05919de6d31c96c3b0cdd5c985f96b4916da37f 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/media/dao/DingMediaMd5Mapper.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/dao/DingMediaMd5Mapper.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.dingtalk.core.media.dao; +package cn.bootx.platform.starter.dingtalk.core.media.dao; -import cn.bootx.starter.dingtalk.core.media.entity.DingMediaMd5; +import cn.bootx.platform.starter.dingtalk.core.media.entity.DingMediaMd5; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/media/entity/DingMediaMd5.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/entity/DingMediaMd5.java similarity index 83% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/media/entity/DingMediaMd5.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/entity/DingMediaMd5.java index 28b7d7ee68b40f24901517694510e7dc9830fee6..6d643857ec6a4bb8d49d1ed099b2674973456e48 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/media/entity/DingMediaMd5.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/entity/DingMediaMd5.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.dingtalk.core.media.entity; +package cn.bootx.platform.starter.dingtalk.core.media.entity; -import cn.bootx.common.mybatisplus.base.MpCreateEntity; +import cn.bootx.platform.common.mybatisplus.base.MpCreateEntity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/media/service/DingMediaMd5Service.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/service/DingMediaMd5Service.java similarity index 68% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/media/service/DingMediaMd5Service.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/service/DingMediaMd5Service.java index 09d3ca009c1d8f586245c6ab26d9a632657bb66e..95f2ec687da842a1f395706b9c464440d3a2b8a7 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/media/service/DingMediaMd5Service.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/service/DingMediaMd5Service.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.dingtalk.core.media.service; +package cn.bootx.platform.starter.dingtalk.core.media.service; -import cn.bootx.starter.dingtalk.core.media.dao.DingMediaMd5Manager; +import cn.bootx.platform.starter.dingtalk.core.media.dao.DingMediaMd5Manager; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/media/service/DingMediaService.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/service/DingMediaService.java similarity index 82% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/media/service/DingMediaService.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/service/DingMediaService.java index e9866aebfcd8009d61eeb7c1107d70840031f09f..7d25395669e08894964f85b68a055df50b2e6f70 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/media/service/DingMediaService.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/service/DingMediaService.java @@ -1,12 +1,12 @@ -package cn.bootx.starter.dingtalk.core.media.service; +package cn.bootx.platform.starter.dingtalk.core.media.service; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.util.FileUtil; -import cn.bootx.common.jackson.util.JacksonUtil; -import cn.bootx.starter.dingtalk.code.DingTalkCode; -import cn.bootx.starter.dingtalk.core.base.result.MediaResult; -import cn.bootx.starter.dingtalk.core.base.service.DingAccessService; -import cn.bootx.starter.dingtalk.core.media.dao.DingMediaMd5Manager; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.util.FileUtil; +import cn.bootx.platform.common.jackson.util.JacksonUtil; +import cn.bootx.platform.starter.dingtalk.code.DingTalkCode; +import cn.bootx.platform.starter.dingtalk.core.base.result.MediaResult; +import cn.bootx.platform.starter.dingtalk.core.base.service.DingAccessService; +import cn.bootx.platform.starter.dingtalk.core.media.dao.DingMediaMd5Manager; import cn.hutool.core.io.FileTypeUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.file.FileNameUtil; @@ -23,7 +23,7 @@ import java.io.File; import java.io.InputStream; import java.util.Objects; -import static cn.bootx.starter.dingtalk.code.DingTalkCode.*; +import static cn.bootx.platform.starter.dingtalk.code.DingTalkCode.*; /** * 钉钉媒体文件管理 diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/notice/result/ChatNoticeResult.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/result/ChatNoticeResult.java similarity index 90% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/notice/result/ChatNoticeResult.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/result/ChatNoticeResult.java index 4b539be2805f936f11caf093e2048338f6a9655d..de126c275754368ea14369a0971e88ef1f5da01b 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/notice/result/ChatNoticeResult.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/result/ChatNoticeResult.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.dingtalk.core.notice.result; +package cn.bootx.platform.starter.dingtalk.core.notice.result; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/notice/result/CorpNoticeResult.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/result/CorpNoticeResult.java similarity index 92% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/notice/result/CorpNoticeResult.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/result/CorpNoticeResult.java index 230481c1a8b293605b808ec10d0ab7c57711f468..7f6661a8b307ce328c17302f7eec5fe175b2debb 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/notice/result/CorpNoticeResult.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/result/CorpNoticeResult.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.dingtalk.core.notice.result; +package cn.bootx.platform.starter.dingtalk.core.notice.result; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/notice/service/DingNoticeService.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/service/DingNoticeService.java similarity index 78% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/notice/service/DingNoticeService.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/service/DingNoticeService.java index 8c0b19c6e7aa858f26703d37b80c3ad2fe3f447d..a5d431c26c53f68876e68763ab5915703c150bcf 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/notice/service/DingNoticeService.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/service/DingNoticeService.java @@ -1,21 +1,21 @@ -package cn.bootx.starter.dingtalk.core.notice.service; +package cn.bootx.platform.starter.dingtalk.core.notice.service; -import cn.bootx.common.jackson.util.JacksonUtil; -import cn.bootx.starter.dingtalk.core.base.service.DingAccessService; -import cn.bootx.starter.dingtalk.core.base.result.DingTalkResult; -import cn.bootx.starter.dingtalk.core.notice.result.ChatNoticeResult; -import cn.bootx.starter.dingtalk.core.notice.result.CorpNoticeResult; -import cn.bootx.starter.dingtalk.param.notice.ChatNotice; -import cn.bootx.starter.dingtalk.param.notice.CorpNotice; -import cn.bootx.starter.dingtalk.param.notice.RecallCorpNotice; -import cn.bootx.starter.dingtalk.param.notice.UpdateCorpNotice; +import cn.bootx.platform.starter.dingtalk.param.notice.ChatNotice; +import cn.bootx.platform.starter.dingtalk.param.notice.CorpNotice; +import cn.bootx.platform.starter.dingtalk.param.notice.RecallCorpNotice; +import cn.bootx.platform.starter.dingtalk.param.notice.UpdateCorpNotice; +import cn.bootx.platform.common.jackson.util.JacksonUtil; +import cn.bootx.platform.starter.dingtalk.core.base.service.DingAccessService; +import cn.bootx.platform.starter.dingtalk.core.base.result.DingTalkResult; +import cn.bootx.platform.starter.dingtalk.core.notice.result.ChatNoticeResult; +import cn.bootx.platform.starter.dingtalk.core.notice.result.CorpNoticeResult; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import static cn.bootx.starter.dingtalk.code.DingTalkCode.*; +import static cn.bootx.platform.starter.dingtalk.code.DingTalkCode.*; /** * 钉钉通知发送服务 diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/robot/convert/DingRobotConvert.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/convert/DingRobotConvert.java similarity index 56% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/robot/convert/DingRobotConvert.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/convert/DingRobotConvert.java index 7bccd872268e17bfc7160e49c0dfa48cb3a0b915..e6dac6d62699410d5e2cc58e72f761cf348fdae3 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/robot/convert/DingRobotConvert.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/convert/DingRobotConvert.java @@ -1,8 +1,8 @@ -package cn.bootx.starter.dingtalk.core.robot.convert; +package cn.bootx.platform.starter.dingtalk.core.robot.convert; -import cn.bootx.starter.dingtalk.core.robot.entity.DingRobotConfig; -import cn.bootx.starter.dingtalk.dto.robot.DingRobotConfigDto; -import cn.bootx.starter.dingtalk.param.robot.DingRobotConfigParam; +import cn.bootx.platform.starter.dingtalk.param.robot.DingRobotConfigParam; +import cn.bootx.platform.starter.dingtalk.core.robot.entity.DingRobotConfig; +import cn.bootx.platform.starter.dingtalk.dto.robot.DingRobotConfigDto; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/robot/dao/DingRobotConfigManager.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/dao/DingRobotConfigManager.java similarity index 75% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/robot/dao/DingRobotConfigManager.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/dao/DingRobotConfigManager.java index bf8c0d032f54abfd293f3875a6fc7a0720679656..454392aa2831ed165340252feaedaaccdbfba11f 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/robot/dao/DingRobotConfigManager.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/dao/DingRobotConfigManager.java @@ -1,11 +1,11 @@ -package cn.bootx.starter.dingtalk.core.robot.dao; - -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.starter.dingtalk.core.robot.entity.DingRobotConfig; -import cn.bootx.starter.dingtalk.param.robot.DingRobotConfigParam; +package cn.bootx.platform.starter.dingtalk.core.robot.dao; + +import cn.bootx.platform.starter.dingtalk.core.robot.entity.DingRobotConfig; +import cn.bootx.platform.starter.dingtalk.param.robot.DingRobotConfigParam; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/robot/dao/DingRobotConfigMapper.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/dao/DingRobotConfigMapper.java similarity index 65% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/robot/dao/DingRobotConfigMapper.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/dao/DingRobotConfigMapper.java index 3ad527600605e7ba9a394d109f3f1570651b0047..7144aa0c51db88bf0e27da441c8eea3e414b946f 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/robot/dao/DingRobotConfigMapper.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/dao/DingRobotConfigMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.dingtalk.core.robot.dao; +package cn.bootx.platform.starter.dingtalk.core.robot.dao; -import cn.bootx.starter.dingtalk.core.robot.entity.DingRobotConfig; +import cn.bootx.platform.starter.dingtalk.core.robot.entity.DingRobotConfig; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/robot/entity/DingRobotConfig.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/entity/DingRobotConfig.java similarity index 71% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/robot/entity/DingRobotConfig.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/entity/DingRobotConfig.java index d4f073af0e555c7177cc4f4e1c290a474e0d1194..7880a76bc63c2356e1448434a071b893f5ca7055 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/robot/entity/DingRobotConfig.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/entity/DingRobotConfig.java @@ -1,10 +1,10 @@ -package cn.bootx.starter.dingtalk.core.robot.entity; +package cn.bootx.platform.starter.dingtalk.core.robot.entity; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.starter.dingtalk.core.robot.convert.DingRobotConvert; -import cn.bootx.starter.dingtalk.dto.robot.DingRobotConfigDto; -import cn.bootx.starter.dingtalk.param.robot.DingRobotConfigParam; +import cn.bootx.platform.starter.dingtalk.core.robot.convert.DingRobotConvert; +import cn.bootx.platform.starter.dingtalk.param.robot.DingRobotConfigParam; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.starter.dingtalk.dto.robot.DingRobotConfigDto; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/robot/service/DingRobotConfigService.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/service/DingRobotConfigService.java similarity index 77% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/robot/service/DingRobotConfigService.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/service/DingRobotConfigService.java index 9d7d0ae7080deb537905509a0b8a5cb548a5d41f..75a645c57424c85571f41a6b5511d51a56d49ca7 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/robot/service/DingRobotConfigService.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/service/DingRobotConfigService.java @@ -1,15 +1,15 @@ -package cn.bootx.starter.dingtalk.core.robot.service; +package cn.bootx.platform.starter.dingtalk.core.robot.service; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.core.util.ResultConvertUtil; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.starter.dingtalk.core.robot.dao.DingRobotConfigManager; -import cn.bootx.starter.dingtalk.core.robot.entity.DingRobotConfig; -import cn.bootx.starter.dingtalk.dto.robot.DingRobotConfigDto; -import cn.bootx.starter.dingtalk.param.robot.DingRobotConfigParam; +import cn.bootx.platform.starter.dingtalk.param.robot.DingRobotConfigParam; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.ResultConvertUtil; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.starter.dingtalk.core.robot.dao.DingRobotConfigManager; +import cn.bootx.platform.starter.dingtalk.core.robot.entity.DingRobotConfig; +import cn.bootx.platform.starter.dingtalk.dto.robot.DingRobotConfigDto; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/robot/service/DingRobotSendService.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/service/DingRobotSendService.java similarity index 72% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/robot/service/DingRobotSendService.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/service/DingRobotSendService.java index ea18b923547c0a59031d3bd6da23c826e5cfeb7d..920d38841398d40961a418bf0952af8dd732be23 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/robot/service/DingRobotSendService.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/service/DingRobotSendService.java @@ -1,13 +1,13 @@ -package cn.bootx.starter.dingtalk.core.robot.service; +package cn.bootx.platform.starter.dingtalk.core.robot.service; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.jackson.util.JacksonUtil; -import cn.bootx.starter.dingtalk.code.DingTalkCode; -import cn.bootx.starter.dingtalk.core.robot.dao.DingRobotConfigManager; -import cn.bootx.starter.dingtalk.core.robot.entity.DingRobotConfig; -import cn.bootx.starter.dingtalk.core.base.result.DingTalkResult; -import cn.bootx.starter.dingtalk.param.notice.msg.Msg; -import cn.bootx.starter.dingtalk.util.DingTalkUtil; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.Msg; +import cn.bootx.platform.starter.dingtalk.util.DingTalkUtil; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.jackson.util.JacksonUtil; +import cn.bootx.platform.starter.dingtalk.code.DingTalkCode; +import cn.bootx.platform.starter.dingtalk.core.robot.dao.DingRobotConfigManager; +import cn.bootx.platform.starter.dingtalk.core.robot.entity.DingRobotConfig; +import cn.bootx.platform.starter.dingtalk.core.base.result.DingTalkResult; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpUtil; import lombok.RequiredArgsConstructor; @@ -18,7 +18,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; -import static cn.bootx.starter.dingtalk.code.DingTalkCode.SUCCESS_CODE; +import static cn.bootx.platform.starter.dingtalk.code.DingTalkCode.SUCCESS_CODE; /** * 钉钉机器人消息发送 diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/user/entity/UserIdResult.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/user/entity/UserIdResult.java similarity index 89% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/user/entity/UserIdResult.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/user/entity/UserIdResult.java index fb480535e69b11716f1e8b773f669bad12266f22..f3190ea291ae11c42b7610e2adf25d3cb684567e 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/user/entity/UserIdResult.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/user/entity/UserIdResult.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.dingtalk.core.user.entity; +package cn.bootx.platform.starter.dingtalk.core.user.entity; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/user/service/DingUserService.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/user/service/DingUserService.java similarity index 77% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/user/service/DingUserService.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/user/service/DingUserService.java index 2e1e2db6c1e543c9eb0b714d045ff49ba5930065..72e5cd83d9e10c5bdbc171a977e72611217298c9 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/core/user/service/DingUserService.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/user/service/DingUserService.java @@ -1,10 +1,10 @@ -package cn.bootx.starter.dingtalk.core.user.service; +package cn.bootx.platform.starter.dingtalk.core.user.service; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.jackson.util.JacksonUtil; -import cn.bootx.starter.dingtalk.core.base.result.DingTalkResult; -import cn.bootx.starter.dingtalk.core.base.service.DingAccessService; -import cn.bootx.starter.dingtalk.core.user.entity.UserIdResult; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.jackson.util.JacksonUtil; +import cn.bootx.platform.starter.dingtalk.core.base.result.DingTalkResult; +import cn.bootx.platform.starter.dingtalk.core.base.service.DingAccessService; +import cn.bootx.platform.starter.dingtalk.core.user.entity.UserIdResult; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpUtil; import com.fasterxml.jackson.core.type.TypeReference; @@ -16,7 +16,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; -import static cn.bootx.starter.dingtalk.code.DingTalkCode.*; +import static cn.bootx.platform.starter.dingtalk.code.DingTalkCode.*; /** * 钉钉用户信息 diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/dto/robot/DingRobotConfigDto.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/dto/robot/DingRobotConfigDto.java similarity index 83% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/dto/robot/DingRobotConfigDto.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/dto/robot/DingRobotConfigDto.java index c67c96f87be5e3344631c0bcd745caf6bd37d309..d9042be1e26b3251e4c3815ff8928fed97e7a649 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/dto/robot/DingRobotConfigDto.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/dto/robot/DingRobotConfigDto.java @@ -1,7 +1,7 @@ -package cn.bootx.starter.dingtalk.dto.robot; +package cn.bootx.platform.starter.dingtalk.dto.robot; -import cn.bootx.common.core.rest.dto.BaseDto; -import cn.bootx.starter.data.perm.sensitive.SensitiveInfo; +import cn.bootx.platform.common.core.rest.dto.BaseDto; +import cn.bootx.platform.starter.data.perm.sensitive.SensitiveInfo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/ChatNotice.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/ChatNotice.java similarity index 80% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/ChatNotice.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/ChatNotice.java index 597b6b0e86cc3c4457dcdc29ea91585df20c2212..1741c4cc02554b36ecead2ea7ca9aa780b1b9bcf 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/ChatNotice.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/ChatNotice.java @@ -1,7 +1,7 @@ -package cn.bootx.starter.dingtalk.param.notice; +package cn.bootx.platform.starter.dingtalk.param.notice; -import cn.bootx.common.jackson.util.JacksonUtil; -import cn.bootx.starter.dingtalk.param.notice.msg.Msg; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.Msg; +import cn.bootx.platform.common.jackson.util.JacksonUtil; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/CorpNotice.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/CorpNotice.java similarity index 89% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/CorpNotice.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/CorpNotice.java index 1bee6051851373aa1dce5b42cc1fdc9ec4b71844..1e19e88d7344c3bb50eb947d6849b4306c0fe0ba 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/CorpNotice.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/CorpNotice.java @@ -1,7 +1,7 @@ -package cn.bootx.starter.dingtalk.param.notice; +package cn.bootx.platform.starter.dingtalk.param.notice; -import cn.bootx.common.jackson.util.JacksonUtil; -import cn.bootx.starter.dingtalk.param.notice.msg.Msg; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.Msg; +import cn.bootx.platform.common.jackson.util.JacksonUtil; import cn.hutool.core.lang.Opt; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/RecallCorpNotice.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/RecallCorpNotice.java similarity index 87% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/RecallCorpNotice.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/RecallCorpNotice.java index 83ab2b868c699fa2495b4cb77ea2936947ee006e..9c24d194057ac1da97d9bdbff3f662bdf480d476 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/RecallCorpNotice.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/RecallCorpNotice.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.dingtalk.param.notice; +package cn.bootx.platform.starter.dingtalk.param.notice; -import cn.bootx.common.jackson.util.JacksonUtil; +import cn.bootx.platform.common.jackson.util.JacksonUtil; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/UpdateCorpNotice.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/UpdateCorpNotice.java similarity index 89% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/UpdateCorpNotice.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/UpdateCorpNotice.java index 54174214e4c516804f288513401a371399eceb7c..48038f10335471f54efcb8a9eae53e7e81a3df37 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/UpdateCorpNotice.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/UpdateCorpNotice.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.dingtalk.param.notice; +package cn.bootx.platform.starter.dingtalk.param.notice; -import cn.bootx.common.jackson.util.JacksonUtil; +import cn.bootx.platform.common.jackson.util.JacksonUtil; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/ActionCardMsg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/ActionCardMsg.java similarity index 96% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/ActionCardMsg.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/ActionCardMsg.java index d866f79ae45d6d724e0f77cb4bbac7716a9a6823..b40d86664ab843c4bb1fc1461d7997ac74f6b5af 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/ActionCardMsg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/ActionCardMsg.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.dingtalk.param.notice.msg; +package cn.bootx.platform.starter.dingtalk.param.notice.msg; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/At.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/At.java similarity index 95% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/At.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/At.java index 1a83d7c7260d78402c3d16b791f0d950b0dca6bc..5a4cc50053db46e35b02bb2688e178ae7505c81c 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/At.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/At.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.dingtalk.param.notice.msg; +package cn.bootx.platform.starter.dingtalk.param.notice.msg; import cn.hutool.core.collection.CollUtil; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/DingMedia.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/DingMedia.java similarity index 89% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/DingMedia.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/DingMedia.java index 370100a5c5dca04edba56b35dee79eb29dfa20c2..c2fa7336214728a9d8b16b3866d561cf6cda6776 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/DingMedia.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/DingMedia.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.dingtalk.param.notice.msg; +package cn.bootx.platform.starter.dingtalk.param.notice.msg; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/FileMsg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/FileMsg.java similarity index 85% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/FileMsg.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/FileMsg.java index 42b213900aa53b87ca7ba7500df3c3339c9b3307..fbbebed198fa22a9cb2d6d95ff4a79a3721cb1c9 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/FileMsg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/FileMsg.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.dingtalk.param.notice.msg; +package cn.bootx.platform.starter.dingtalk.param.notice.msg; -import cn.bootx.starter.dingtalk.code.DingTalkNoticeCode; +import cn.bootx.platform.starter.dingtalk.code.DingTalkNoticeCode; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/ImageMsg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/ImageMsg.java similarity index 85% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/ImageMsg.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/ImageMsg.java index 0bdbeefb27a49f789d858e43edfe46c793038a6a..d8df2966534a12f672ee8c2c70fca09cf3e69d27 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/ImageMsg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/ImageMsg.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.dingtalk.param.notice.msg; +package cn.bootx.platform.starter.dingtalk.param.notice.msg; -import cn.bootx.starter.dingtalk.code.DingTalkNoticeCode; +import cn.bootx.platform.starter.dingtalk.code.DingTalkNoticeCode; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/LinkMsg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/LinkMsg.java similarity index 93% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/LinkMsg.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/LinkMsg.java index 0e301fbae39b38233efa0480dcb9fdc149d64a5a..51e311c2317c0766e38dfbe7491ff916f1531e04 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/LinkMsg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/LinkMsg.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.dingtalk.param.notice.msg; +package cn.bootx.platform.starter.dingtalk.param.notice.msg; -import cn.bootx.starter.dingtalk.code.DingTalkNoticeCode; +import cn.bootx.platform.starter.dingtalk.code.DingTalkNoticeCode; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/MarkdownMsg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/MarkdownMsg.java similarity index 92% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/MarkdownMsg.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/MarkdownMsg.java index d4b48503fc7d3c621446634d68339db2220f01be..7e6f5b28ebd947fa7e6c68364ca8c4931b827e95 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/MarkdownMsg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/MarkdownMsg.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.dingtalk.param.notice.msg; +package cn.bootx.platform.starter.dingtalk.param.notice.msg; -import cn.bootx.starter.dingtalk.code.DingTalkNoticeCode; +import cn.bootx.platform.starter.dingtalk.code.DingTalkNoticeCode; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/Msg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/Msg.java similarity index 89% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/Msg.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/Msg.java index e728ea8a66cf5c905f1acdb67315371c1f8fceee..6deaccfaaa5839dd8cf76e24eb05b7679685d345 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/Msg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/Msg.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.dingtalk.param.notice.msg; +package cn.bootx.platform.starter.dingtalk.param.notice.msg; -import cn.bootx.starter.dingtalk.code.DingTalkNoticeCode; +import cn.bootx.platform.starter.dingtalk.code.DingTalkNoticeCode; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/OaMsg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/OaMsg.java similarity index 98% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/OaMsg.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/OaMsg.java index 1a906f132fc4ed0305e12a54db6c3e0e890a9ab9..78cea3c2b186ca71cc8f06860b3b753bd2466189 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/OaMsg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/OaMsg.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.dingtalk.param.notice.msg; +package cn.bootx.platform.starter.dingtalk.param.notice.msg; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/TextMsg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/TextMsg.java similarity index 89% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/TextMsg.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/TextMsg.java index c11cac636ebbea77c2854f5ec85aceb48778d091..0f79ceb893e0d10b39b5dfabe8638d993841a5b7 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/TextMsg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/TextMsg.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.dingtalk.param.notice.msg; +package cn.bootx.platform.starter.dingtalk.param.notice.msg; -import cn.bootx.starter.dingtalk.code.DingTalkNoticeCode; +import cn.bootx.platform.starter.dingtalk.code.DingTalkNoticeCode; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/VoiceMsg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/VoiceMsg.java similarity index 90% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/VoiceMsg.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/VoiceMsg.java index 431033172daa6d838af06074a385d140c42729bf..b1296a2a5be8345d12ed49adf01cc904c28c4d1d 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/notice/msg/VoiceMsg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/VoiceMsg.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.dingtalk.param.notice.msg; +package cn.bootx.platform.starter.dingtalk.param.notice.msg; -import cn.bootx.starter.dingtalk.code.DingTalkNoticeCode; +import cn.bootx.platform.starter.dingtalk.code.DingTalkNoticeCode; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/robot/DingRobotConfigParam.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/robot/DingRobotConfigParam.java similarity index 94% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/robot/DingRobotConfigParam.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/robot/DingRobotConfigParam.java index 8acbdddbb026db1cef8467942b980f03e6dc95a9..10039483791774ea439e0877670dd6b9df5b0dc1 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/param/robot/DingRobotConfigParam.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/robot/DingRobotConfigParam.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.dingtalk.param.robot; +package cn.bootx.platform.starter.dingtalk.param.robot; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/util/DingTalkUtil.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/util/DingTalkUtil.java similarity index 95% rename from bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/util/DingTalkUtil.java rename to bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/util/DingTalkUtil.java index 08598a4f51bcc14c74314c3425dab83a600b8072..b5f9fc7f403b07149854893d089446d8d187d452 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/starter/dingtalk/util/DingTalkUtil.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/util/DingTalkUtil.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.dingtalk.util; +package cn.bootx.platform.starter.dingtalk.util; import cn.hutool.crypto.digest.HmacAlgorithm; import lombok.experimental.UtilityClass; diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-common-starters/common-starter-dingtalk/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 1b307d4b9a1f335650c1e6398470565ebcbb5e90..73283971c02f0272f8fa7d64e2c8969b5e5f3428 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-common-starters/common-starter-dingtalk/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.starter.dingtalk.DingTalkAutoConfiguration \ No newline at end of file +cn.bootx.platform.starter.dingtalk.DingTalkAutoConfiguration diff --git a/bootx-common-starters/common-starter-file/pom.xml b/bootx-common-starters/common-starter-file/pom.xml index b8c620a06e117d2e56a06fa70c2886f59b5e0075..59261aeb575b325e87fb095d0c1f3328ba679844 100644 --- a/bootx-common-starters/common-starter-file/pom.xml +++ b/bootx-common-starters/common-starter-file/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.2.3 + 1.3.0 4.0.0 diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/FileAutoConfiguration.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/FileAutoConfiguration.java similarity index 93% rename from bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/FileAutoConfiguration.java rename to bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/FileAutoConfiguration.java index de9daaab36458864c773150d4bc200a34129766f..13db208dc83d5f7c6703ffcf456001305c4d71a0 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/FileAutoConfiguration.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/FileAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.file; +package cn.bootx.platform.starter.file; import org.apache.ibatis.annotations.Mapper; import org.mybatis.spring.annotation.MapperScan; diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/code/FileUploadTypeEnum.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/code/FileUploadTypeEnum.java similarity index 84% rename from bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/code/FileUploadTypeEnum.java rename to bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/code/FileUploadTypeEnum.java index 5e6b022c9699460188267b7e446aa02c9be947e0..c0588edeefaea449652739584fa1dc7f1c6245c1 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/code/FileUploadTypeEnum.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/code/FileUploadTypeEnum.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.file.code; +package cn.bootx.platform.starter.file.code; /** * 文件上传类型 diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/configuration/FileUploadConfiguration.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadConfiguration.java similarity index 93% rename from bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/configuration/FileUploadConfiguration.java rename to bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadConfiguration.java index 009e2bc4430cd7b582ae60398879644423f041fe..af4b07faf7973f4c0085891889f53c2119461abe 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/configuration/FileUploadConfiguration.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.file.configuration; +package cn.bootx.platform.starter.file.configuration; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/configuration/FileUploadProperties.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadProperties.java similarity index 93% rename from bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/configuration/FileUploadProperties.java rename to bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadProperties.java index d65d27e3abfe607ef1587a8159266a2b4fa2c425..bd2474a837b9e2e402b2497bd0afdab29113766e 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/configuration/FileUploadProperties.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadProperties.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.file.configuration; +package cn.bootx.platform.starter.file.configuration; -import cn.bootx.starter.file.code.FileUploadTypeEnum; +import cn.bootx.platform.starter.file.code.FileUploadTypeEnum; import lombok.Data; import lombok.Getter; import lombok.Setter; diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/controller/FIleUpLoadController.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/controller/FIleUpLoadController.java similarity index 83% rename from bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/controller/FIleUpLoadController.java rename to bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/controller/FIleUpLoadController.java index b89c2fe438ce0d49468c0d2365de1e58521c227f..a1bf2f111337933b1137e86861f92c3bfcc00906 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/controller/FIleUpLoadController.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/controller/FIleUpLoadController.java @@ -1,12 +1,12 @@ -package cn.bootx.starter.file.controller; +package cn.bootx.platform.starter.file.controller; -import cn.bootx.common.core.annotation.IgnoreAuth; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.file.dto.UpdateFileDto; -import cn.bootx.starter.file.service.FileUploadService; +import cn.bootx.platform.common.core.annotation.IgnoreAuth; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.starter.file.dto.UpdateFileDto; +import cn.bootx.platform.starter.file.service.FileUploadService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/convert/FileConvert.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/convert/FileConvert.java similarity index 61% rename from bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/convert/FileConvert.java rename to bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/convert/FileConvert.java index 429c34ee2e4e73420eb1160a3ffd0e634051ea62..0aa5e04c10dd3c1c88d2d48cd0d445f489a39945 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/convert/FileConvert.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/convert/FileConvert.java @@ -1,7 +1,7 @@ -package cn.bootx.starter.file.convert; +package cn.bootx.platform.starter.file.convert; -import cn.bootx.starter.file.dto.UpdateFileDto; -import cn.bootx.starter.file.entity.UpdateFileInfo; +import cn.bootx.platform.starter.file.dto.UpdateFileDto; +import cn.bootx.platform.starter.file.entity.UpdateFileInfo; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/dao/UpdateFileManager.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/UpdateFileManager.java similarity index 69% rename from bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/dao/UpdateFileManager.java rename to bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/UpdateFileManager.java index e4d0721640c57e555fca0c613b3193faa5f10032..47919e0daa7a2a36cfd2193427feb32ca55ddb6c 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/dao/UpdateFileManager.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/UpdateFileManager.java @@ -1,10 +1,9 @@ -package cn.bootx.starter.file.dao; +package cn.bootx.platform.starter.file.dao; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.starter.file.entity.UpdateFileInfo; -import cn.hutool.core.util.StrUtil; +import cn.bootx.platform.starter.file.entity.UpdateFileInfo; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/dao/UpdateFileMapper.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/UpdateFileMapper.java similarity index 68% rename from bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/dao/UpdateFileMapper.java rename to bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/UpdateFileMapper.java index 8795669c7874e583fbdd733446ec4809353552c3..a44cc9e35e2aa1af469dfc5f4073eec1dc60668a 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/dao/UpdateFileMapper.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/UpdateFileMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.file.dao; +package cn.bootx.platform.starter.file.dao; -import cn.bootx.starter.file.entity.UpdateFileInfo; +import cn.bootx.platform.starter.file.entity.UpdateFileInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/dto/UpdateFileDto.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dto/UpdateFileDto.java similarity index 95% rename from bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/dto/UpdateFileDto.java rename to bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dto/UpdateFileDto.java index 359bf6c90e5d7b32ce066ea1ab43411a507db5a2..bf341876eb2379d5d7fd0689856a2de173bf83bc 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/dto/UpdateFileDto.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dto/UpdateFileDto.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.file.dto; +package cn.bootx.platform.starter.file.dto; import cn.hutool.core.io.FileUtil; import com.baomidou.mybatisplus.annotation.FieldFill; diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/entity/UpdateFileInfo.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/UpdateFileInfo.java similarity index 80% rename from bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/entity/UpdateFileInfo.java rename to bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/UpdateFileInfo.java index 0ec5c16ce1c63eb59d0289030ec4ee1e51f4e8fc..2a45fdef38b4811b0bdede09a30dd51ec0cacf54 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/entity/UpdateFileInfo.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/UpdateFileInfo.java @@ -1,9 +1,9 @@ -package cn.bootx.starter.file.entity; +package cn.bootx.platform.starter.file.entity; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.starter.file.convert.FileConvert; -import cn.bootx.starter.file.dto.UpdateFileDto; +import cn.bootx.platform.starter.file.convert.FileConvert; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.starter.file.dto.UpdateFileDto; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/entity/UploadFileContext.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/UploadFileContext.java similarity index 88% rename from bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/entity/UploadFileContext.java rename to bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/UploadFileContext.java index 3349d86eb3a24d636e7fd50de7c08fd528e1dd7c..e42bacbf93a24dd0a856db881a5cfb8840b4df32 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/entity/UploadFileContext.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/UploadFileContext.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.file.entity; +package cn.bootx.platform.starter.file.entity; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/service/FileUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/FileUploadService.java similarity index 89% rename from bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/service/FileUploadService.java rename to bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/FileUploadService.java index 7ad60e59a92723bed0e011b71190e9208647c801..57d2cc554591bb0ddc715ee38629a588f40f9bb0 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/service/FileUploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/FileUploadService.java @@ -1,15 +1,15 @@ -package cn.bootx.starter.file.service; - -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.function.ParamService; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.starter.file.configuration.FileUploadProperties; -import cn.bootx.starter.file.dao.UpdateFileManager; -import cn.bootx.starter.file.dto.UpdateFileDto; -import cn.bootx.starter.file.entity.UpdateFileInfo; -import cn.bootx.starter.file.entity.UploadFileContext; +package cn.bootx.platform.starter.file.service; + +import cn.bootx.platform.starter.file.configuration.FileUploadProperties; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.function.ParamService; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.starter.file.dao.UpdateFileManager; +import cn.bootx.platform.starter.file.dto.UpdateFileDto; +import cn.bootx.platform.starter.file.entity.UpdateFileInfo; +import cn.bootx.platform.starter.file.entity.UploadFileContext; import cn.hutool.core.io.FileTypeUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.IdUtil; diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/service/UploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/UploadService.java similarity index 75% rename from bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/service/UploadService.java rename to bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/UploadService.java index 648893f528e358d6a061ac79d4d83fbf3f26838c..386d018c2d2c85c8a8461e905c38361a4393fa15 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/service/UploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/UploadService.java @@ -1,8 +1,8 @@ -package cn.bootx.starter.file.service; +package cn.bootx.platform.starter.file.service; -import cn.bootx.starter.file.code.FileUploadTypeEnum; -import cn.bootx.starter.file.entity.UpdateFileInfo; -import cn.bootx.starter.file.entity.UploadFileContext; +import cn.bootx.platform.starter.file.code.FileUploadTypeEnum; +import cn.bootx.platform.starter.file.entity.UpdateFileInfo; +import cn.bootx.platform.starter.file.entity.UploadFileContext; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/service/impl/LocalUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/LocalUploadService.java similarity index 87% rename from bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/service/impl/LocalUploadService.java rename to bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/LocalUploadService.java index 99a8a1b15e95fd67dd40d9ad39f414f8165bdab7..6f5ec99266186bd0e438d4636b6346b32b343fe3 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/service/impl/LocalUploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/LocalUploadService.java @@ -1,11 +1,11 @@ -package cn.bootx.starter.file.service.impl; +package cn.bootx.platform.starter.file.service.impl; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.starter.file.code.FileUploadTypeEnum; -import cn.bootx.starter.file.configuration.FileUploadProperties; -import cn.bootx.starter.file.entity.UpdateFileInfo; -import cn.bootx.starter.file.entity.UploadFileContext; -import cn.bootx.starter.file.service.UploadService; +import cn.bootx.platform.starter.file.configuration.FileUploadProperties; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.starter.file.code.FileUploadTypeEnum; +import cn.bootx.platform.starter.file.entity.UpdateFileInfo; +import cn.bootx.platform.starter.file.entity.UploadFileContext; +import cn.bootx.platform.starter.file.service.UploadService; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IoUtil; diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/service/impl/MinioUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MinioUploadService.java similarity index 91% rename from bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/service/impl/MinioUploadService.java rename to bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MinioUploadService.java index d1ae8ef6ca0097f5d2e4fa66d301422b30db0d39..96160c661f0ede77b5b4fe1cf6dce70539c0ea88 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/service/impl/MinioUploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MinioUploadService.java @@ -1,10 +1,10 @@ -package cn.bootx.starter.file.service.impl; +package cn.bootx.platform.starter.file.service.impl; -import cn.bootx.starter.file.code.FileUploadTypeEnum; -import cn.bootx.starter.file.configuration.FileUploadProperties; -import cn.bootx.starter.file.entity.UpdateFileInfo; -import cn.bootx.starter.file.entity.UploadFileContext; -import cn.bootx.starter.file.service.UploadService; +import cn.bootx.platform.starter.file.configuration.FileUploadProperties; +import cn.bootx.platform.starter.file.code.FileUploadTypeEnum; +import cn.bootx.platform.starter.file.entity.UpdateFileInfo; +import cn.bootx.platform.starter.file.entity.UploadFileContext; +import cn.bootx.platform.starter.file.service.UploadService; import cn.hutool.core.io.IoUtil; import io.minio.*; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/service/impl/MongoUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MongoUploadService.java similarity index 89% rename from bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/service/impl/MongoUploadService.java rename to bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MongoUploadService.java index fda3531ff1c0b3a8c15dc685b3c112c88c0f4f16..974b0036af77a2eb9f5a9c43b081ef999612d144 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/service/impl/MongoUploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MongoUploadService.java @@ -1,10 +1,10 @@ -package cn.bootx.starter.file.service.impl; +package cn.bootx.platform.starter.file.service.impl; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.starter.file.code.FileUploadTypeEnum; -import cn.bootx.starter.file.entity.UpdateFileInfo; -import cn.bootx.starter.file.entity.UploadFileContext; -import cn.bootx.starter.file.service.UploadService; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.starter.file.code.FileUploadTypeEnum; +import cn.bootx.platform.starter.file.entity.UpdateFileInfo; +import cn.bootx.platform.starter.file.entity.UploadFileContext; +import cn.bootx.platform.starter.file.service.UploadService; import cn.hutool.core.io.IoUtil; import com.mongodb.client.gridfs.model.GridFSFile; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/service/impl/OssUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/OssUploadService.java similarity index 83% rename from bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/service/impl/OssUploadService.java rename to bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/OssUploadService.java index 7e3a43f245a23e866f046a5715c349d6dc2d21e5..e076d2f7dd010504b3b146daf9c6d433c5b75c6c 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/starter/file/service/impl/OssUploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/OssUploadService.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.file.service.impl; +package cn.bootx.platform.starter.file.service.impl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-common-starters/common-starter-file/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-common-starters/common-starter-file/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 08cbdeedc5092404cbad13a15e101f110c99aabe..279f8e239f5aa66b0fcc7edb5b9113e6330e5327 100644 --- a/bootx-common-starters/common-starter-file/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-common-starters/common-starter-file/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.starter.file.FileAutoConfiguration \ No newline at end of file +cn.bootx.platform.starter.file.FileAutoConfiguration diff --git a/bootx-common-starters/common-starter-flowable/pom.xml b/bootx-common-starters/common-starter-flowable/pom.xml deleted file mode 100644 index 73bb2135c9e42b446ecadba03212f8ce5e015371..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - bootx-common-starters - cn.bootx.platform - 1.2.3 - - 4.0.0 - - common-starter-flowable - - - - - cn.bootx.platform - common-starter-auth - - - - cn.bootx.platform - common-mybatis-plus - - - - org.flowable - flowable-spring-boot-starter-process - ${flowable.version} - - - org.mybatis - mybatis - - - - - org.flowable - flowable-spring-boot-starter-actuator - ${flowable.version} - - - diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/FlowableAutoConfiguration.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/FlowableAutoConfiguration.java deleted file mode 100644 index 706dd31ab333f211596a8e97dfee68fb731b28b0..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/FlowableAutoConfiguration.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.bootx.starter.flowable; - -import org.apache.ibatis.annotations.Mapper; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.context.properties.ConfigurationPropertiesScan; -import org.springframework.context.annotation.ComponentScan; - -/** - * 工作流 - * - * @author xxm - * @date 2022/8/22 - */ -@ComponentScan -@ConfigurationPropertiesScan -@AutoConfiguration -@MapperScan(annotationClass = Mapper.class) -public class FlowableAutoConfiguration { - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/code/BpmnCode.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/code/BpmnCode.java deleted file mode 100644 index c71ca9fb01c91a044ce088bcd7504188433149f9..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/code/BpmnCode.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.bootx.starter.flowable.code; - -/** - * 流程 - * - * @author xxm - * @date 2022/9/6 - */ -public interface BpmnCode { - - /** collectionString(候选人集合) */ - String MULTI_COLLECTION = "assignees"; - - /** collectionElementVariable(迭代出来的处理人) */ - String MULTI_COLLECTION_ELEMENT = "assign"; - - /** 下一步标志 */ - String NEXT_NODE_FLAG = "nextNode"; - - /** 多实例任务标示 */ - String MULTI_TASK_ID = "multiId"; - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/code/CachingCode.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/code/CachingCode.java deleted file mode 100644 index a16ff4c8765be354e7da294660c030899d4c3a19..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/code/CachingCode.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bootx.starter.flowable.code; - -/** - * 缓存key常量 - * - * @author xxm - * @date 2022/9/4 - */ -public interface CachingCode { - - /* 流程节点扩展 */ - /** 定义和节点id */ - String NODE_DEF_AND_NODE = "flowable:model:node"; - - /** 缓存列表, 使用模型id/modelId */ - String NODE_MODEL_ID = "flowable:model:nodes"; - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/code/InstanceCode.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/code/InstanceCode.java deleted file mode 100644 index 8e39d850bb54231d4f64cd4cf20bd68c8cc0cf18..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/code/InstanceCode.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.bootx.starter.flowable.code; - -/** - * 流程实例的状态 - * - * @author xxm - * @date 2022/8/23 - */ -public interface InstanceCode { - - /** 运行中 */ - String STATE_RUNNING = "running"; - - /** 已完成 */ - String STATE_FINISH = "finish"; - - /** 取消 */ - String STATE_CANCEL = "cancel"; - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/code/ModelCode.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/code/ModelCode.java deleted file mode 100644 index b1cb80baa0db512f74c2f34dddf8bd2953b328cc..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/code/ModelCode.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.bootx.starter.flowable.code; - -/** - * 工作流模型代码 - * - * @author xxm - * @date 2022/8/23 - */ -public interface ModelCode { - - /** 流程定义已发布 */ - String PUBLISHED = "published"; - - /** 流程定义未发布 */ - String UNPUBLISHED = "unpublished"; - - /** 默认的bpmn20.xml */ - String DEFAULT_XML = "\n" - + "\n" - + " \n" + " \n" - + " \n" - + " \n" + ""; - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/code/ModelNodeCode.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/code/ModelNodeCode.java deleted file mode 100644 index 64fda90b5c9d225a07d70c65098dec73c7841209..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/code/ModelNodeCode.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.bootx.starter.flowable.code; - -/** - * 模型节点配置 - * - * @author xxm - * @date 2022/9/4 - */ -public interface ModelNodeCode { - - /* 用户分配类型 */ - /** 发起人 */ - String ASSIGN_SPONSOR = "sponsor"; - - /** 用户手动选择 */ - String ASSIGN_SELECT = "select"; - - /** 单用户 */ - String ASSIGN_USER = "user"; - - /** 用户组 */ - String ASSIGN_USER_GROUP = "userGroup"; - - /** 角色 */ - String ASSIGN_ROLE = "role"; - - /** 角色组 */ - String ASSIGN_GROUP = "roleGroup"; - - /** 部门成员 */ - String ASSIGN_DEPT_MEMBER = "deptMember"; - - /** 部门的负责人 */ - String ASSIGN_DEPT_LEADER = "deptLeader"; - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/code/TaskCode.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/code/TaskCode.java deleted file mode 100644 index 15b67659965157e5f941fb3a384e8e328a39e48e..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/code/TaskCode.java +++ /dev/null @@ -1,58 +0,0 @@ -package cn.bootx.starter.flowable.code; - -/** - * 流程任务常量 - * - * @author xxm - * @date 2022/9/4 - */ -public interface TaskCode { - - /* 处理状态 */ - /** 处理中 */ - String STATE_PROCESS = "running"; - - /** 通过 */ - String STATE_PASS = "pass"; - - /** 驳回 */ - String STATE_REJECT = "reject"; - - /** 退回 */ - String STATE_BACK = "back"; - - /** 取回 */ - String STATE_RETRIEVE = "retrieve"; - - /** 跳过 */ - String STATE_SKIP = "skip"; - - /** 取消 */ - String STATE_CANCEL = "cancel"; - - /* 处理结果 */ - /** 通过 */ - String RESULT_PASS = "pass"; - - /** 不通过 */ - String RESULT_NOT_PASS = "notPass"; - - /** 弃权 */ - String RESULT_ABSTAIN = "abstain"; - - /** 驳回 */ - String RESULT_REJECT = "reject"; - - /** 自动完成 */ - String RESULT_AUTO_FINISH = "autoFinish"; - - /** 退回 */ - String RESULT_BACK = "back"; - - /** 取回 */ - String RESULT_RETRIEVE = "retrieve"; - - /** 取消 */ - String RESULT_CANCEL = "cancel"; - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/config/FlowableConfiguration.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/config/FlowableConfiguration.java deleted file mode 100644 index 6753d31989d18d06204fe052b293283d0233bb7d..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/config/FlowableConfiguration.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.bootx.starter.flowable.config; - -import cn.bootx.starter.flowable.handler.behavior.BpmActivityBehaviorFactory; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.util.IdUtil; -import org.flowable.common.engine.api.delegate.event.FlowableEventListener; -import org.flowable.spring.SpringProcessEngineConfiguration; -import org.flowable.spring.boot.EngineConfigurationConfigurer; -import org.springframework.beans.factory.ObjectProvider; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * Flowable 配置类 - * - * @author xxm - * @date 2022/8/24 - */ -@Configuration -public class FlowableConfiguration { - - /** - * 1. 设置各种监听器 2. 设置自定义的 ActivityBehaviorFactory 实现 3. 其他的一些配置 - */ - @Bean - public EngineConfigurationConfigurer bpmProcessEngineConfigurationConfigurer( - ObjectProvider listeners, BpmActivityBehaviorFactory bpmActivityBehaviorFactory) { - return configuration -> { - // 注册监听器 - configuration.setEventListeners(ListUtil.toList(listeners.iterator())); - // 设置 ActivityBehaviorFactory 实现类，用于流程任务的审核人的自定义 - configuration.setActivityBehaviorFactory(bpmActivityBehaviorFactory); - // 注册id生成器, 使用雪花id - configuration.setIdGenerator(IdUtil::getSnowflakeNextIdStr); - // 部署时不生成流程图图片 - configuration.setCreateDiagramOnDeploy(false); - }; - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/controller/BpmAssistControl.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/controller/BpmAssistControl.java deleted file mode 100644 index 3d37b86bc1998e554e92f8a6bb920e56ff650900..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/controller/BpmAssistControl.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.bootx.starter.flowable.controller; - -import cn.bootx.starter.flowable.core.model.service.BpmAssistService; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 工作流基础支撑接口 - * @author xxm - * @date 2023/3/28 - */ -@Tag(name = "工作流基础支撑接口") -@RestController -@RequestMapping("/bpm/assist") -@RequiredArgsConstructor -public class BpmAssistControl { - private final BpmAssistService bpmAssistService; -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/controller/BpmInstanceAdminController.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/controller/BpmInstanceAdminController.java deleted file mode 100644 index afa32de9a6f15558dd84065ad6533b42ba33a66e..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/controller/BpmInstanceAdminController.java +++ /dev/null @@ -1,37 +0,0 @@ -package cn.bootx.starter.flowable.controller; - -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.flowable.core.instance.service.BpmInstanceAdminService; -import cn.bootx.starter.flowable.dto.instance.InstanceInfo; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springdoc.api.annotations.ParameterObject; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 流程实例管理服务 - * - * @author xxm - * @date 2022/9/17 - */ -@Tag(name = "流程实例管理服务") -@RestController -@RequestMapping("/bpm/admin/instance") -@RequiredArgsConstructor -public class BpmInstanceAdminController { - - private final BpmInstanceAdminService adminService; - - @Operation(summary = "分页") - @GetMapping("/page") - public ResResult> page(@ParameterObject PageParam pageParam) { - return Res.ok(adminService.page(pageParam)); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/controller/BpmInstanceController.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/controller/BpmInstanceController.java deleted file mode 100644 index c853ca8cbffeee05c53e8a809825013dae45eab9..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/controller/BpmInstanceController.java +++ /dev/null @@ -1,96 +0,0 @@ -package cn.bootx.starter.flowable.controller; - -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.dto.LabelValue; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.flowable.core.instance.service.BpmInstanceQueryService; -import cn.bootx.starter.flowable.core.instance.service.BpmInstanceOperateService; -import cn.bootx.starter.flowable.dto.instance.ActivityInstanceChart; -import cn.bootx.starter.flowable.dto.instance.BpmInstanceDto; -import cn.bootx.starter.flowable.dto.instance.InstanceInfo; -import cn.bootx.starter.flowable.param.instance.InstanceStartParam; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springdoc.api.annotations.ParameterObject; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 流程实例 - * - * @author xxm - * @date 2022/8/24 - */ -@Tag(name = "流程实例") -@RestController -@RequestMapping("/bpm/instance") -@RequiredArgsConstructor -public class BpmInstanceController { - - private final BpmInstanceOperateService operateService; - - private final BpmInstanceQueryService queryService; - - @Operation(summary = "启动任务") - @PostMapping("/start") - public ResResult start(@RequestBody InstanceStartParam instanceParam) { - operateService.start(instanceParam); - return Res.ok(); - } - - @Operation(summary = "挂起流程") - @PostMapping("/suspend") - public ResResult suspend(String instanceId) { - operateService.suspend(instanceId); - return Res.ok(); - } - - @Operation(summary = "激活流程") - @PostMapping("/activate") - public ResResult activate(String instanceId) { - operateService.activate(instanceId); - return Res.ok(); - } - - @Operation(summary = "关闭流程") - @PostMapping("/close") - public ResResult close(String instanceId) { - operateService.close(instanceId); - return Res.ok(); - } - - @Operation(summary = "根据流程Id获取详情") - @GetMapping("/findByInstanceId") - public ResResult findByInstanceId(String instanceId) { - return Res.ok(queryService.findByInstanceId(instanceId)); - } - - @Operation(summary = "获取当前正在执行的节点") - @GetMapping("/getCurrentNodes") - public ResResult> getCurrentNodes(String instanceId) { - return Res.ok(queryService.getCurrentNodes(instanceId)); - } - - @Operation(summary = "获取可回退节点") - @GetMapping("/getBackNodes") - public ResResult> getBackNodes(String instanceId) { - return Res.ok(queryService.getBackNodes(instanceId)); - } - - @Operation(summary = "获取流程执行的节点, 用于绘制流程图") - @GetMapping("/getFlowNodes") - public ResResult> getFlowNodes(String instanceId) { - return Res.ok(queryService.getFlowNodes(instanceId)); - } - - @Operation(summary = "我发起的流程(分页)") - @GetMapping("/pageMyApply") - public ResResult> pageMyApply(@ParameterObject PageParam pageParam) { - return Res.ok(queryService.pageMyApply(pageParam)); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/controller/BpmModelController.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/controller/BpmModelController.java deleted file mode 100644 index fa323969dcf2333aa975765574c9f6a39a652724..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/controller/BpmModelController.java +++ /dev/null @@ -1,105 +0,0 @@ -package cn.bootx.starter.flowable.controller; - -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.dto.LabelValue; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.flowable.core.model.service.BpmModelService; -import cn.bootx.starter.flowable.dto.model.BpmModelDto; -import cn.bootx.starter.flowable.param.model.BpmModelParam; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 流程模型 - * - * @author xxm - * @date 2022-08-23 - */ -@Tag(name = "流程模型") -@RestController -@RequestMapping("/bpm/model") -@RequiredArgsConstructor -public class BpmModelController { - - private final BpmModelService bpmModelService; - - @Operation(summary = "增加流程模型") - @PostMapping("/add") - public ResResult add(@RequestBody BpmModelParam flowModelParam) { - bpmModelService.add(flowModelParam); - return Res.ok(); - } - - @Operation(summary = "上传BPMN文件") - @PostMapping("/uploadBpmn") - public ResResult uploadBpmn(@RequestBody BpmModelParam bpmModelParam) { - bpmModelService.uploadBpmn(bpmModelParam); - return Res.ok(); - } - - @Operation(summary = "上传BPMN文件") - @PostMapping("/copy") - public ResResult uploadBpmn(Long id) { - bpmModelService.copy(id); - return Res.ok(); - } - - @Operation(summary = "发布") - @PostMapping("/publish") - public ResResult publish(Long id) { - bpmModelService.publish(id); - return Res.ok(); - } - - @Operation(summary = "校验流程") - @GetMapping("/verifyModel") - public ResResult verifyModel(Long id) { - bpmModelService.verifyModel(id); - return Res.ok(); - } - - @Operation(summary = "更新") - @PostMapping("/update") - public ResResult update(@RequestBody BpmModelParam param) { - bpmModelService.update(param); - return Res.ok(); - } - - @Operation(summary = "删除") - @DeleteMapping(value = "/delete") - public ResResult delete(Long id) { - bpmModelService.delete(id); - return Res.ok(); - } - - @Operation(summary = "通过ID查询") - @GetMapping(value = "/findById") - public ResResult findById(Long id) { - return Res.ok(bpmModelService.findById(id)); - } - - @Operation(summary = "分页查询") - @GetMapping(value = "/page") - public ResResult> page(PageParam pageParam, BpmModelParam bpmModelParam) { - return Res.ok(bpmModelService.page(pageParam, bpmModelParam)); - } - - @Operation(summary = "获取生效并部署的主流程列表") - @GetMapping("/findMainProcess") - public ResResult> findMainProcess() { - return Res.ok(bpmModelService.findMainProcess()); - } - - @Operation(summary = "根据流程定义id获取模型信息") - @GetMapping("/findByDefId") - public ResResult findByDefId(String defId) { - return Res.ok(bpmModelService.findByDefId(defId)); - } - -} \ No newline at end of file diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/controller/BpmModelNodeController.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/controller/BpmModelNodeController.java deleted file mode 100644 index f099718a21f871674b7d4c538c1afaef536a1bcf..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/controller/BpmModelNodeController.java +++ /dev/null @@ -1,85 +0,0 @@ -package cn.bootx.starter.flowable.controller; - -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.dto.LabelValue; -import cn.bootx.starter.flowable.core.model.service.BpmModelNodeService; -import cn.bootx.starter.flowable.dto.model.BpmModelNodeDto; -import cn.bootx.starter.flowable.param.model.BpmModelNodeParam; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.validation.constraints.NotNull; -import java.util.List; - -/** - * 模型任务节点配置 - * - * @author xxm - * @date 2022-08-25 - */ -@Validated -@Tag(name = "模型任务节点配置") -@RestController -@RequestMapping("/bpm/model/node") -@RequiredArgsConstructor -public class BpmModelNodeController { - - private final BpmModelNodeService bpmModelNodeService; - - @Operation(summary = "添加") - @PostMapping(value = "/add") - public ResResult add(@RequestBody BpmModelNodeParam param) { - bpmModelNodeService.add(param); - return Res.ok(); - } - - @Operation(summary = "修改") - @PostMapping(value = "/update") - public ResResult update(@RequestBody BpmModelNodeParam param) { - bpmModelNodeService.update(param); - return Res.ok(); - } - - @Operation(summary = "删除") - @DeleteMapping(value = "/delete") - public ResResult delete(Long id) { - bpmModelNodeService.delete(id); - return Res.ok(); - } - - @Operation(summary = "通过ID查询") - @GetMapping(value = "/findById") - public ResResult findById(Long id) { - return Res.ok(bpmModelNodeService.findById(id)); - } - - @Operation(summary = "查询任务节点配置项") - @GetMapping(value = "/findByDefIdAndTaskId") - public ResResult findByDefIdAndTaskId(String defId, String nodeId) { - return Res.ok(bpmModelNodeService.findByDefIdAndTaskId(defId, nodeId)); - } - - @Operation(summary = "获取下一步节点列表") - @GetMapping(value = "/getNextNodes") - public ResResult> getNextNodes(String defId, String nodeId) { - return Res.ok(bpmModelNodeService.getNextNodes(defId, nodeId)); - } - - @Operation(summary = "根据模型Id查询所有") - @GetMapping(value = "/findAllByModelId") - public ResResult> findAllByModelId(@NotNull(message = "模型ID不能为空") Long modelId) { - return Res.ok(bpmModelNodeService.findAllByModelId(modelId)); - } - - @Operation(summary = "同步") - @PostMapping("/sync") - public ResResult sync(Long modelId) { - bpmModelNodeService.sync(modelId); - return Res.ok(); - } - -} \ No newline at end of file diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/controller/BpmTaskAdminController.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/controller/BpmTaskAdminController.java deleted file mode 100644 index 9105be18424f724ae1c7244cd1258c471c9d1cec..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/controller/BpmTaskAdminController.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.bootx.starter.flowable.controller; - -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.flowable.core.instance.service.BpmTaskAdminService; -import cn.bootx.starter.flowable.dto.task.TaskInfo; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 流程任务管理服务 - * - * @author xxm - * @date 2022/9/13 - */ -@Tag(name = "流程任务管理服务") -@RestController -@RequestMapping("/bpm/admin/task") -@RequiredArgsConstructor -public class BpmTaskAdminController { - - private final BpmTaskAdminService bpmTaskAdminService; - - @Operation(summary = "待处理任务") - @GetMapping("/pageByTodo") - public ResResult> pageByTodo(PageParam pageParam) { - return Res.ok(bpmTaskAdminService.pageByTodo(pageParam)); - } - - @Operation(summary = "已处理任务") - @GetMapping("/pageByDone") - public ResResult> pageByDone(PageParam pageParam) { - return Res.ok(bpmTaskAdminService.pageByDone(pageParam)); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/controller/BpmTaskController.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/controller/BpmTaskController.java deleted file mode 100644 index fc2af613de6c4ccc60125b03007eba48503a08b8..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/controller/BpmTaskController.java +++ /dev/null @@ -1,72 +0,0 @@ -package cn.bootx.starter.flowable.controller; - -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.flowable.core.instance.service.BpmTaskOperateService; -import cn.bootx.starter.flowable.core.instance.service.BpmTaskQueryService; -import cn.bootx.starter.flowable.dto.task.BpmTaskDto; -import cn.bootx.starter.flowable.dto.task.TaskInfo; -import cn.bootx.starter.flowable.param.task.TaskApproveParam; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Map; - -/** - * @author xxm - * @date 2022/8/24 - */ -@Tag(name = "流程任务") -@RestController -@RequestMapping("/bpm/task") -@RequiredArgsConstructor -public class BpmTaskController { - - private final BpmTaskOperateService operateService; - - private final BpmTaskQueryService queryService; - - @Operation(summary = "我的待办") - @GetMapping("/pageMyTodo") - public ResResult> pageMyTodo(PageParam pageParam) { - return Res.ok(queryService.pageMyTodo(pageParam)); - } - - @Operation(summary = "我的已办") - @GetMapping("/pageMyDone") - public ResResult> pageMyDone(PageParam pageParam) { - return Res.ok(queryService.pageMyDone(pageParam)); - } - - @Operation(summary = "处理任务") - @PostMapping("/approve") - public ResResult approve(@RequestBody TaskApproveParam param) { - operateService.approve(param); - return Res.ok(); - } - - @Operation(summary = "根据任务实例ID查询任务列表") - @GetMapping("/findAllByInstanceId") - public ResResult> findAllByInstanceId(String instanceId) { - return Res.ok(queryService.findAllByInstanceId(instanceId)); - } - - @Operation(summary = "获取流程节点的分组任务信息") - @GetMapping("/getNodeTasks") - public ResResult>> getNodeTasks(String instanceId) { - return Res.ok(queryService.getNodeTasks(instanceId)); - } - - @Operation(summary = "重新分配人员") - @PostMapping("/assignee") - public ResResult assignee(String taskId, Long userId) { - operateService.assignee(taskId, userId); - return Res.ok(); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/convert/BpmActivityConvert.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/convert/BpmActivityConvert.java deleted file mode 100644 index 8bc7349a3a12c2690861ab114ce8f165b7d611ec..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/convert/BpmActivityConvert.java +++ /dev/null @@ -1,25 +0,0 @@ -package cn.bootx.starter.flowable.core.instance.convert; - -import cn.bootx.starter.flowable.dto.instance.ActivityInstanceChart; -import org.flowable.engine.history.HistoricActivityInstance; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * 流程活动转换 - * - * @author xxm - * @date 2022/8/31 - */ -@Mapper -public interface BpmActivityConvert { - - BpmActivityConvert CONVERT = Mappers.getMapper(BpmActivityConvert.class); - - List convert(List in); - - ActivityInstanceChart convert(HistoricActivityInstance in); - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/convert/BpmInstanceConvert.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/convert/BpmInstanceConvert.java deleted file mode 100644 index 33005735595ce79dc74368ee0e979544bb4d93b7..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/convert/BpmInstanceConvert.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.bootx.starter.flowable.core.instance.convert; - -import cn.bootx.starter.flowable.core.instance.entity.BpmInstance; -import cn.bootx.starter.flowable.dto.instance.BpmInstanceDto; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -/** - * 流程实例扩展 - * - * @author xxm - * @date 2022-08-23 - */ -@Mapper -public interface BpmInstanceConvert { - - BpmInstanceConvert CONVERT = Mappers.getMapper(BpmInstanceConvert.class); - - BpmInstanceDto convert(BpmInstance in); - -} \ No newline at end of file diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/convert/BpmTaskConvert.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/convert/BpmTaskConvert.java deleted file mode 100644 index 2b9761a152e43b279c9a9ff870af9000f2d99218..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/convert/BpmTaskConvert.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.bootx.starter.flowable.core.instance.convert; - -import cn.bootx.starter.flowable.core.instance.entity.BpmTask; -import cn.bootx.starter.flowable.dto.task.BpmTaskDto; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -/** - * 流程任务扩展 - * - * @author xxm - * @date 2022-09-01 - */ -@Mapper -public interface BpmTaskConvert { - - BpmTaskConvert CONVERT = Mappers.getMapper(BpmTaskConvert.class); - - BpmTaskDto convert(BpmTask in); - -} \ No newline at end of file diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/dao/BpmInstanceManager.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/dao/BpmInstanceManager.java deleted file mode 100644 index 22b97c8ff5b99896ab942d13a9a4efae05a14724..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/dao/BpmInstanceManager.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.bootx.starter.flowable.core.instance.dao; - -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.starter.flowable.core.instance.entity.BpmInstance; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; - -import java.util.Collection; -import java.util.List; -import java.util.Optional; - -/** - * 流程实例扩展 - * - * @author xxm - * @date 2022-08-23 - */ -@Repository -@RequiredArgsConstructor -public class BpmInstanceManager extends BaseManager { - - /** - * 根据流程实例ID查询 - */ - public Collection findAllByInstanceIds(List ids) { - return findAllByFields(BpmInstance::getInstanceId, ids); - } - - /** - * 根据流程id进行查询 - */ - public Optional findByInstanceId(String instanceId) { - return findByField(BpmInstance::getInstanceId, instanceId); - } - -} \ No newline at end of file diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/dao/BpmInstanceMapper.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/dao/BpmInstanceMapper.java deleted file mode 100644 index f0a75bedd57cd36ab45dab4bd9624f1f3eff9f40..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/dao/BpmInstanceMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.bootx.starter.flowable.core.instance.dao; - -import cn.bootx.starter.flowable.core.instance.entity.BpmInstance; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * 流程实例扩展 - * - * @author xxm - * @date 2022-08-23 - */ -@Mapper -public interface BpmInstanceMapper extends BaseMapper { - -} \ No newline at end of file diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/dao/BpmTaskManager.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/dao/BpmTaskManager.java deleted file mode 100644 index 660fd31b403725812b4446b59a1fb1626f332a94..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/dao/BpmTaskManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package cn.bootx.starter.flowable.core.instance.dao; - -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.starter.flowable.core.instance.entity.BpmTask; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -import static cn.bootx.starter.flowable.code.TaskCode.STATE_PROCESS; - -/** - * 流程任务扩展 - * - * @author xxm - * @date 2022-08-27 - */ -@Repository -@RequiredArgsConstructor -public class BpmTaskManager extends BaseManager { - - /** - * 根据任务id查询 - */ - public Optional findByTaskId(String taskId) { - return findByField(BpmTask::getTaskId, taskId); - } - - /** - * 根据任务id查询 - */ - public List findAllByTaskIds(List taskIds) { - return findAllByFields(BpmTask::getTaskId, taskIds); - } - - /** - * 根据实例id和任务id查询 - */ - public Optional findByInstanceIdAndTaskId(String instanceId, String taskId) { - return lambdaQuery().eq(BpmTask::getInstanceId, instanceId).eq(BpmTask::getTaskId, taskId).oneOpt(); - } - - /** - * 根据实例id和节点id查询 - */ - public List findByInstanceIdAndNodeId(String instanceId, String nodeId) { - return lambdaQuery().eq(BpmTask::getInstanceId, instanceId).eq(BpmTask::getNodeId, nodeId).list(); - } - - public List findAllByInstanceId(String instanceId) { - return lambdaQuery().eq(BpmTask::getInstanceId, instanceId).orderByDesc(MpIdEntity::getId).list(); - } - - /** - * 获取执行中任务 - */ - public List findRunningByInstanceId(String instanceId) { - return lambdaQuery().eq(BpmTask::getInstanceId, instanceId).eq(BpmTask::getState, STATE_PROCESS).list(); - } - -} \ No newline at end of file diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/dao/BpmTaskMapper.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/dao/BpmTaskMapper.java deleted file mode 100644 index 9929206e4a069bd57b1ca62e39251526f5fa38b9..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/dao/BpmTaskMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.bootx.starter.flowable.core.instance.dao; - -import cn.bootx.starter.flowable.core.instance.entity.BpmTask; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * 流程任务扩展 - * - * @author xxm - * @date 2022-08-27 - */ -@Mapper -public interface BpmTaskMapper extends BaseMapper { - -} \ No newline at end of file diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/entity/BpmInstance.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/entity/BpmInstance.java deleted file mode 100644 index e57773eeb78875a753f80d3d60c70a18602896ef..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/entity/BpmInstance.java +++ /dev/null @@ -1,69 +0,0 @@ -package cn.bootx.starter.flowable.core.instance.entity; - -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.starter.flowable.core.instance.convert.BpmInstanceConvert; -import cn.bootx.starter.flowable.dto.instance.BpmInstanceDto; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.time.LocalDateTime; -import java.util.Map; - -/** - * 流程实例扩展 - * - * @author xxm - * @date 2022-08-23 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@TableName(value = "bpm_instance", autoResultMap = true) -public class BpmInstance extends MpBaseEntity implements EntityBaseFunction { - - /** 流程实例的id */ - private String instanceId; - - /** 流程实例名称 */ - private String instanceName; - - /** 模型id */ - private Long modelId; - - /** 流程定义ID */ - private String defId; - - /** 流程定义名称 */ - private String defName; - - /** 发起人 */ - private Long startUserId; - - /** 发起人名称 */ - private String startUserName; - - /** 流程实例的状态 */ - private String state; - - /** 开始时间 */ - private LocalDateTime startTime; - - /** 结束时间 */ - private LocalDateTime endTime; - - /** 提交的表单值 */ - @TableField(typeHandler = JacksonTypeHandler.class) - private Map formVariables; - - /** 转换成dto */ - @Override - public BpmInstanceDto toDto() { - return BpmInstanceConvert.CONVERT.convert(this); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/entity/BpmTask.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/entity/BpmTask.java deleted file mode 100644 index ff0bac3357b56f6668f10c27be6b9907e02565ab..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/entity/BpmTask.java +++ /dev/null @@ -1,96 +0,0 @@ -package cn.bootx.starter.flowable.core.instance.entity; - -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpDelEntity; -import cn.bootx.starter.flowable.core.instance.convert.BpmTaskConvert; -import cn.bootx.starter.flowable.dto.task.BpmTaskDto; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.time.LocalDateTime; -import java.util.Map; - -/** - * 任务扩展存储 - * - * @author xxm - * @date 2022/8/23 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@TableName(value = "bpm_task", autoResultMap = true) -public class BpmTask extends MpDelEntity implements EntityBaseFunction { - - /** 任务id */ - private String taskId; - - /** 任务节点id */ - private String nodeId; - - /** 任务节点名称 */ - private String nodeName; - - /** 执行 ID */ - private String executionId; - - /** 多实例关联 ID */ - private Long multiId; - - /** 流程id */ - private String instanceId; - - /** 流程标题(业务标题) */ - private String instanceName; - - /** 流程名称(流程定义标题) */ - private String defName; - - /** - * 任务执行状态 - * @see cn.bootx.starter.flowable.code.TaskCode#STATE_PROCESS - */ - private String state; - - /** - * 处理结果 - * @see cn.bootx.starter.flowable.code.TaskCode#RESULT_PASS - */ - private String result; - - /** 开始时间 */ - private LocalDateTime startTime; - - /** 结束时间 */ - private LocalDateTime endTime; - - /** 处理意见 */ - private String reason; - - /** 提交的表单值 */ - @TableField(typeHandler = JacksonTypeHandler.class) - private Map formVariables; - - /** 当前处理人 */ - private Long userId; - - /** 当前处理人 */ - private String userName; - - /** 流程发起人id */ - private Long startUserId; - - /** 流程发起人名称 */ - private String startUserName; - - /** 转换成dto */ - @Override - public BpmTaskDto toDto() { - return BpmTaskConvert.CONVERT.convert(this); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/service/BpmInstanceAdminService.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/service/BpmInstanceAdminService.java deleted file mode 100644 index 6171d998c43d436b579259b718480c158564a330..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/service/BpmInstanceAdminService.java +++ /dev/null @@ -1,51 +0,0 @@ -package cn.bootx.starter.flowable.core.instance.service; - -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.flowable.dto.instance.InstanceInfo; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import lombok.val; -import org.flowable.engine.HistoryService; -import org.flowable.engine.history.HistoricProcessInstance; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.stream.Collectors; - -/** - * 流程实例管理 - * - * @author xxm - * @date 2022/9/17 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class BpmInstanceAdminService { - - private final HistoryService historyService; - - private final BpmInstanceQueryService queryService; - - /** - * 我的发起分页 - */ - public PageResult page(PageParam pageParam) { - val instanceQuery = historyService.createHistoricProcessInstanceQuery() - .orderByProcessInstanceStartTime() - .desc(); - val historicProcessInstances = instanceQuery.listPage(pageParam.start(), pageParam.getSize()); - long total = instanceQuery.count(); - - List instanceId = historicProcessInstances.stream() - .map(HistoricProcessInstance::getId) - .collect(Collectors.toList()); - List instanceInfos = queryService.convertInstanceInfo(instanceId); - return new PageResult().setCurrent(pageParam.getCurrent()) - .setRecords(instanceInfos) - .setSize(pageParam.getSize()) - .setTotal(total); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/service/BpmInstanceOperateService.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/service/BpmInstanceOperateService.java deleted file mode 100644 index fe81eff41171087fa2b3ef3f101e4450e5e724d1..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/service/BpmInstanceOperateService.java +++ /dev/null @@ -1,130 +0,0 @@ -package cn.bootx.starter.flowable.core.instance.service; - -import cn.bootx.common.core.entity.UserDetail; -import cn.bootx.common.core.util.CollUtil; -import cn.bootx.starter.auth.util.SecurityUtil; -import cn.bootx.starter.flowable.core.model.dao.BpmModelManager; -import cn.bootx.starter.flowable.core.model.entity.BpmModel; -import cn.bootx.starter.flowable.exception.InstanceNotExistException; -import cn.bootx.starter.flowable.exception.ModelNotExistException; -import cn.bootx.starter.flowable.exception.ModelNotPublishException; -import cn.bootx.starter.flowable.local.BpmContext; -import cn.bootx.starter.flowable.local.BpmContextLocal; -import cn.bootx.starter.flowable.param.instance.InstanceStartParam; -import cn.hutool.core.util.StrUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.flowable.bpmn.model.EndEvent; -import org.flowable.bpmn.model.FlowElement; -import org.flowable.bpmn.model.Process; -import org.flowable.engine.RepositoryService; -import org.flowable.engine.RuntimeService; -import org.flowable.engine.runtime.Execution; -import org.flowable.engine.runtime.ProcessInstance; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import java.util.stream.Collectors; - -import static cn.bootx.starter.flowable.code.InstanceCode.STATE_CANCEL; -import static cn.bootx.starter.flowable.code.ModelCode.PUBLISHED; - -/** - * 流程实例 - * - * @author xxm - * @date 2022/8/23 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class BpmInstanceOperateService { - - private final BpmModelManager bpmModelManager; - - private final RuntimeService runtimeService; - - private final RepositoryService repositoryService; - - /** - * 启动一个流程 - */ - @Transactional(rollbackFor = Exception.class) - public void start(InstanceStartParam instanceParam) { - BpmModel bpmModel = bpmModelManager.findById(instanceParam.getModelId()) - .orElseThrow(ModelNotExistException::new); - // 未发布 - if (!Objects.equals(bpmModel.getPublish(), PUBLISHED)) { - throw new ModelNotPublishException(); - } - Optional currentUser = SecurityUtil.getCurrentUser(); - String userName = currentUser.map(UserDetail::getName).orElse("未知"); - - String title = instanceParam.getName(); - if (StrUtil.isBlank(title)) { - title = bpmModel.getName() + "[" + userName + "]"; - } - BpmContext bpmContext = BpmContextLocal.get(); - bpmContext.setFormVariables(instanceParam.getFormVariables()) - .setModelId(bpmModel.getId()) - .setStartUser(currentUser); - BpmContextLocal.put(bpmContext); - - runtimeService.createProcessInstanceBuilder().processDefinitionId(bpmModel.getDefId()).name(title).start(); - } - - /** - * 挂起实例 - */ - public void suspend(String instanceId) { - // 激活状态 - runtimeService.suspendProcessInstanceById(instanceId); - } - - /** - * 激活流程 - */ - public void activate(String instanceId) { - // 非激活状态 - runtimeService.activateProcessInstanceById(instanceId); - } - - /** - * 关闭流程 - */ - public void close(String instanceId) { - BpmContext bpmContext = BpmContextLocal.get(); - bpmContext.setInstanceState(STATE_CANCEL); - BpmContextLocal.put(bpmContext); - ProcessInstance processInstance = Optional - .ofNullable(runtimeService.createProcessInstanceQuery().processInstanceId(instanceId).singleResult()) - .orElseThrow(InstanceNotExistException::new); - // 1、获取终止节点 - List endNodes = getEndNode(processInstance.getProcessDefinitionId()); - String endId = endNodes.get(0).getId(); - // 2、执行终止 - List executions = runtimeService.createExecutionQuery().parentId(instanceId).list(); - List executionIds = executions.stream().map(Execution::getId).collect(Collectors.toList()); - runtimeService.createChangeActivityStateBuilder() - .moveExecutionsToSingleActivityId(executionIds, endId) - .changeState(); - } - - /** - * 获取结束节点 - */ - private List getEndNode(String processDefId) { - Process mainProcess = Optional.ofNullable(repositoryService.getBpmnModel(processDefId).getMainProcess()) - .orElseThrow(ModelNotExistException::new); - Collection list = mainProcess.getFlowElements(); - if (CollUtil.isEmpty(list)) { - return new ArrayList<>(0); - } - return list.stream() - .filter(f -> f instanceof EndEvent) - .map(flowElement -> (EndEvent) flowElement) - .collect(Collectors.toList()); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/service/BpmInstanceQueryService.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/service/BpmInstanceQueryService.java deleted file mode 100644 index ba36b2c79b8919ecf8afae1e0f3382ddc166509b..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/service/BpmInstanceQueryService.java +++ /dev/null @@ -1,163 +0,0 @@ -package cn.bootx.starter.flowable.core.instance.service; - -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.dto.LabelValue; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.auth.util.SecurityUtil; -import cn.bootx.starter.flowable.core.instance.convert.BpmActivityConvert; -import cn.bootx.starter.flowable.core.instance.dao.BpmInstanceManager; -import cn.bootx.starter.flowable.core.instance.entity.BpmInstance; -import cn.bootx.starter.flowable.core.model.dao.BpmModelManager; -import cn.bootx.starter.flowable.dto.instance.ActivityInstanceChart; -import cn.bootx.starter.flowable.dto.instance.BpmInstanceDto; -import cn.bootx.starter.flowable.dto.instance.InstanceInfo; -import cn.bootx.starter.flowable.exception.ModelNotExistException; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import lombok.val; -import org.flowable.bpmn.model.BpmnModel; -import org.flowable.bpmn.model.Process; -import org.flowable.bpmn.model.Task; -import org.flowable.engine.HistoryService; -import org.flowable.engine.RepositoryService; -import org.flowable.engine.RuntimeService; -import org.flowable.engine.history.HistoricActivityInstance; -import org.flowable.engine.history.HistoricProcessInstance; -import org.flowable.engine.runtime.Execution; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * 实例查询 - * - * @author xxm - * @date 2022/8/31 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class BpmInstanceQueryService { - - private final BpmInstanceManager bpmInstanceManager; - - private final BpmModelManager bpmModelManager; - - private final RuntimeService runtimeService; - - private final HistoryService historyService; - - private final RepositoryService repositoryService; - - /** - * 我的发起分页 - */ - public PageResult pageMyApply(PageParam pageParam) { - val instanceQuery = historyService.createHistoricProcessInstanceQuery() - .startedBy(String.valueOf(SecurityUtil.getUserId())) - .orderByProcessInstanceStartTime() - .desc(); - val historicProcessInstances = instanceQuery.listPage(pageParam.start(), pageParam.getSize()); - long total = instanceQuery.count(); - - List instanceId = historicProcessInstances.stream() - .map(HistoricProcessInstance::getId) - .collect(Collectors.toList()); - List instanceInfos = this.convertInstanceInfo(instanceId); - return new PageResult().setCurrent(pageParam.getCurrent()) - .setRecords(instanceInfos) - .setSize(pageParam.getSize()) - .setTotal(total); - } - - /** - * 获取流程实例详情 - */ - public BpmInstanceDto findByInstanceId(String instanceId) { - return bpmInstanceManager.findByInstanceId(instanceId) - .map(BpmInstance::toDto) - .orElseThrow(() -> new DataNotExistException("流程实例不存在")); - } - - /** - * 获取流程执行的节点, 用于绘制流程进展图 - */ - public List getFlowNodes(String instanceId) { - List activityList = historyService.createHistoricActivityInstanceQuery() - .processInstanceId(instanceId) - .list(); - - return activityList.stream().map(BpmActivityConvert.CONVERT::convert).distinct().collect(Collectors.toList()); - } - - /** - * 获取当前执行的节点 - */ - public List getCurrentNodes(String instanceId) { - - return runtimeService.createExecutionQuery() - .processInstanceId(instanceId) - .list() - .stream() - .map(Execution::getActivityId) - .distinct() - .filter(Objects::nonNull) - .collect(Collectors.toList()); - } - - /** - * 获取可回退节点 - */ - public List getBackNodes(String instanceId) { - BpmInstance bpmInstance = bpmInstanceManager.findByInstanceId(instanceId) - .orElseThrow(() -> new DataNotExistException("流程实例不存在")); - BpmnModel bpmnModel = Optional.ofNullable(repositoryService.getBpmnModel(bpmInstance.getDefId())) - .orElseThrow(ModelNotExistException::new); - Process process = bpmnModel.getMainProcess(); - // 走过的历史记录 - List historicActivityList = historyService.createHistoricActivityInstanceQuery() - .processInstanceId(instanceId) - .list(); - List historicActivities = historicActivityList.stream() - .map(HistoricActivityInstance::getActivityId) - .collect(Collectors.toList()); - // 当前执行的节点 - List currentNodes = this.getCurrentNodes(instanceId); - - return process.getFlowElements() - .stream() - .filter(flowElement -> flowElement instanceof Task) - .filter(flowElement -> historicActivities.contains(flowElement.getId())) - .filter(flowElement -> !currentNodes.contains(flowElement.getId())) - .map(o -> (Task) o) - .map(o -> new LabelValue(o.getName(), o.getId())) - .collect(Collectors.toList()); - } - - /** - * 转换 processInstances 为 系统中的对象 - */ - public List convertInstanceInfo(List instanceIds) { - Map bpmInstanceMap = bpmInstanceManager.findAllByInstanceIds(instanceIds) - .stream() - .collect(Collectors.toMap(BpmInstance::getInstanceId, Function.identity())); - return instanceIds.stream().map(instanceId -> { - BpmInstance bpmInstance = Optional.ofNullable(bpmInstanceMap.get(instanceId)).orElse(new BpmInstance()); - return new InstanceInfo().setName(bpmInstance.getInstanceName()) - .setInstanceId(bpmInstance.getInstanceId()) - .setState(bpmInstance.getState()) - .setStartTime(bpmInstance.getStartTime()) - .setEndTime(bpmInstance.getEndTime()) - .setStartUserId(bpmInstance.getStartUserId()) - .setStartUserName(bpmInstance.getStartUserName()) - .setDefMame(bpmInstance.getDefName()); - }).collect(Collectors.toList()); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/service/BpmTaskAdminService.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/service/BpmTaskAdminService.java deleted file mode 100644 index 49d1bd3959a3be0a8266bb28c88b97c6dfb8587c..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/service/BpmTaskAdminService.java +++ /dev/null @@ -1,86 +0,0 @@ -package cn.bootx.starter.flowable.core.instance.service; - -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.auth.util.SecurityUtil; -import cn.bootx.starter.flowable.core.instance.dao.BpmInstanceManager; -import cn.bootx.starter.flowable.dto.task.TaskInfo; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.flowable.engine.HistoryService; -import org.flowable.engine.RuntimeService; -import org.flowable.engine.TaskService; -import org.flowable.task.api.Task; -import org.flowable.task.api.TaskQuery; -import org.flowable.task.api.history.HistoricTaskInstance; -import org.flowable.task.api.history.HistoricTaskInstanceQuery; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.stream.Collectors; - -/** - * 流程任务管理服务 - * - * @author xxm - * @date 2022/9/11 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class BpmTaskAdminService { - - private final BpmInstanceManager bpmInstanceManager; - - private final RuntimeService runtimeService; - - private final TaskService taskService; - - private final HistoryService historyService; - - private final BpmTaskQueryService queryService; - - /** - * 待处理任务 - */ - public PageResult pageByTodo(PageParam pageParam) { - // 查询待办任务 - TaskQuery taskQuery = taskService.createTaskQuery().orderByTaskCreateTime().desc(); // 创建时间倒序 - List tasks = taskQuery.listPage(pageParam.start(), pageParam.getSize()); - long total = taskQuery.count(); - List ids = tasks.stream().map(Task::getId).collect(Collectors.toList()); - List taskInfos = queryService.convertInstanceInfo(ids); - return new PageResult().setCurrent(pageParam.getCurrent()) - .setRecords(taskInfos) - .setSize(pageParam.getSize()) - .setTotal(total); - } - - /** - * 已处理任务 - */ - public PageResult pageByDone(PageParam pageParam) { - // 查询已办任务 - HistoricTaskInstanceQuery taskQuery = historyService.createHistoricTaskInstanceQuery() - .finished() - .taskAssignee(String.valueOf(SecurityUtil.getUserId())) - .orderByHistoricTaskInstanceStartTime() - .desc(); - List tasks = taskQuery.listPage(pageParam.start(), pageParam.getSize()); - long total = taskQuery.count(); - List ids = tasks.stream().map(HistoricTaskInstance::getId).collect(Collectors.toList()); - List taskInfos = queryService.convertInstanceInfo(ids); - return new PageResult().setCurrent(pageParam.getCurrent()) - .setRecords(taskInfos) - .setSize(pageParam.getSize()) - .setTotal(total); - } - - /** - * 取消任务 - */ - public void cancel() { - - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/service/BpmTaskOperateService.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/service/BpmTaskOperateService.java deleted file mode 100644 index ac616414ee538198954845771dbf22886fbef39a..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/service/BpmTaskOperateService.java +++ /dev/null @@ -1,215 +0,0 @@ -package cn.bootx.starter.flowable.core.instance.service; - -import cn.bootx.common.core.exception.BizException; -import cn.bootx.starter.auth.util.SecurityUtil; -import cn.bootx.starter.flowable.code.BpmnCode; -import cn.bootx.starter.flowable.code.TaskCode; -import cn.bootx.starter.flowable.core.instance.dao.BpmTaskManager; -import cn.bootx.starter.flowable.core.instance.entity.BpmTask; -import cn.bootx.starter.flowable.event.BpmEventService; -import cn.bootx.starter.flowable.exception.TaskNotExistException; -import cn.bootx.starter.flowable.handler.reject.TaskRejectHandler; -import cn.bootx.starter.flowable.local.BpmContext; -import cn.bootx.starter.flowable.local.BpmContextLocal; -import cn.bootx.starter.flowable.param.task.TaskApproveParam; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.flowable.engine.TaskService; -import org.flowable.task.api.Task; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; -import java.util.*; -import java.util.stream.Collectors; - -import static cn.bootx.starter.flowable.code.TaskCode.*; - -/** - * 流程任务接口 - * - * @author xxm - * @date 2022/8/24 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class BpmTaskOperateService { - - private final TaskService taskService; - - private final BpmTaskManager bpmTaskManager; - - private final BpmEventService bpmEventService; - - private final TaskRejectHandler taskRejectHandler; - - /** - * 处理任务 - */ - @Transactional(rollbackFor = Exception.class) - public void approve(TaskApproveParam param) { - // 查询到任务和扩展属性 - Task task = Optional.ofNullable(taskService.createTaskQuery().taskId(param.getTaskId()).singleResult()) - .orElseThrow(TaskNotExistException::new); - // 实际处理人与设置处理人不一致进行更改 - String userId = String.valueOf(SecurityUtil.getUserId()); - if (!Objects.equals(task.getAssignee(), String.valueOf(userId))) { - taskService.setAssignee(task.getId(), userId); - } - - switch (param.getType()) { - case RESULT_PASS: { - this.pass(param, task); - break; - } - case RESULT_NOT_PASS: { - this.notPass(param, task); - break; - } - case RESULT_ABSTAIN: { - this.abstain(param, task); - break; - } - case RESULT_REJECT: { - this.reject(param, task); - break; - } - case RESULT_BACK: { - this.back(param, task); - break; - } - default: - throw new BizException("不存在的流程服务处理类型"); - } - } - - /** - * 通过 - */ - @Transactional(rollbackFor = Exception.class) - public void pass(TaskApproveParam param, Task task) { - BpmContext bpmContext = BpmContextLocal.get(); - bpmContext.setTaskReason(param.getReason()) - .setTaskState(TaskCode.STATE_PASS) - .setTaskResult(RESULT_PASS) - .setNextAssign(param.getNextAssign()) - .setFormVariables(param.getFormVariables()); - BpmContextLocal.put(bpmContext); - - if (Objects.nonNull(param.getNextNodeId())) { - Map map = new HashMap<>(); - map.put(BpmnCode.NEXT_NODE_FLAG, param.getNextNodeId()); - taskService.complete(task.getId(), null, map); - } - else { - taskService.complete(task.getId()); - } - } - - /** - * 弃权 - */ - @Transactional(rollbackFor = Exception.class) - public void abstain(TaskApproveParam param, Task task) { - BpmContext bpmContext = BpmContextLocal.get(); - bpmContext.setTaskReason(param.getReason()) - .setTaskState(TaskCode.STATE_PASS) - .setTaskResult(TaskCode.RESULT_ABSTAIN) - .setNextAssign(param.getNextAssign()) - .setFormVariables(param.getFormVariables()); - BpmContextLocal.put(bpmContext); - if (Objects.nonNull(param.getNextNodeId())) { - Map map = new HashMap<>(); - map.put(BpmnCode.NEXT_NODE_FLAG, param.getNextNodeId()); - taskService.complete(task.getId(), null, map); - } - else { - taskService.complete(task.getId()); - } - } - - /** - * 不同意 - */ - @Transactional(rollbackFor = Exception.class) - public void notPass(TaskApproveParam param, Task task) { - BpmContext bpmContext = BpmContextLocal.get(); - bpmContext.setTaskReason(param.getReason()) - .setTaskState(TaskCode.STATE_PASS) - .setTaskResult(TaskCode.RESULT_NOT_PASS) - .setNextAssign(param.getNextAssign()) - .setFormVariables(param.getFormVariables()); - BpmContextLocal.put(bpmContext); - if (Objects.nonNull(param.getNextNodeId())) { - Map map = new HashMap<>(); - map.put(BpmnCode.NEXT_NODE_FLAG, param.getNextNodeId()); - taskService.complete(task.getId(), null, map); - } - else { - taskService.complete(task.getId()); - } - } - - /** - * 驳回 - */ - @Transactional(rollbackFor = Exception.class) - public void reject(TaskApproveParam param, Task task) { - BpmContext bpmContext = BpmContextLocal.get(); - bpmContext.setTaskState(TaskCode.STATE_REJECT); - BpmContextLocal.put(bpmContext); - - taskRejectHandler.rejectTalk(task); - - // 更新驳回任务的记录 - this.rejectOrBackAfter(task, param.getReason(), STATE_REJECT); - } - - /** - * 流程回退 - */ - @Transactional(rollbackFor = Exception.class) - public void back(TaskApproveParam param, Task task) { - BpmContext bpmContext = BpmContextLocal.get(); - bpmContext.setTaskState(STATE_BACK); - taskRejectHandler.flowReturn(task, param.getBackNodeId()); - - // 更新回退任务的记录 - this.rejectOrBackAfter(task, param.getReason(), STATE_BACK); - } - - /** - * 任务回退或驳回后处理 - * @param reason 原因 - * @param result 处理结果 STATE_BACK/STATE_BACK - */ - private void rejectOrBackAfter(Task task, String reason, String result) { - // 更新驳回任务的记录 - List tasks = bpmTaskManager.findByInstanceIdAndNodeId(task.getProcessInstanceId(), - task.getTaskDefinitionKey()); - // 当前任务状态为驳回, 其他的为取消 - Optional first = tasks.stream() - .filter(bpmTask -> Objects.equals(bpmTask.getTaskId(), task.getId())) - .findFirst(); - first.ifPresent(bpmTask -> { - bpmTask.setReason(reason).setState(result).setResult(result).setEndTime(LocalDateTime.now()); - bpmTaskManager.updateById(bpmTask); - }); - // 其他的设置为取消 - List bpmTasks = tasks.stream() - .filter(bpmTask -> !Objects.equals(bpmTask.getTaskId(), task.getId())) - .peek(bpmTask -> bpmTask.setState(result).setResult(RESULT_CANCEL).setEndTime(LocalDateTime.now())) - .collect(Collectors.toList()); - bpmTaskManager.updateAllById(bpmTasks); - bpmEventService.taskCancel(tasks); - } - - /** - * 重新分配人员 - */ - public void assignee(String taskId, Long userId) { - taskService.setAssignee(taskId, String.valueOf(userId)); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/service/BpmTaskQueryService.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/service/BpmTaskQueryService.java deleted file mode 100644 index 35209879ad58c3acdb50889b6d5df009737d4730..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/instance/service/BpmTaskQueryService.java +++ /dev/null @@ -1,119 +0,0 @@ -package cn.bootx.starter.flowable.core.instance.service; - -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.core.util.ResultConvertUtil; -import cn.bootx.starter.auth.util.SecurityUtil; -import cn.bootx.starter.flowable.core.instance.dao.BpmTaskManager; -import cn.bootx.starter.flowable.core.instance.entity.BpmTask; -import cn.bootx.starter.flowable.dto.task.BpmTaskDto; -import cn.bootx.starter.flowable.dto.task.TaskInfo; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.flowable.engine.HistoryService; -import org.flowable.engine.TaskService; -import org.flowable.task.api.Task; -import org.flowable.task.api.TaskQuery; -import org.flowable.task.api.history.HistoricTaskInstance; -import org.flowable.task.api.history.HistoricTaskInstanceQuery; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * 流程任务查询 - * - * @author xxm - * @date 2022/9/1 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class BpmTaskQueryService { - - private final TaskService taskService; - - private final HistoryService historyService; - - private final BpmTaskManager bpmTaskManager; - - /** - * 获取自己的代办任务 - */ - public PageResult pageMyTodo(PageParam pageParam) { - // 查询待办任务 - TaskQuery taskQuery = taskService.createTaskQuery() - .taskAssignee(String.valueOf(SecurityUtil.getUserId())) // 分配给自己 - .orderByTaskCreateTime() - .desc(); // 创建时间倒序 - List tasks = taskQuery.listPage(pageParam.start(), pageParam.getSize()); - long total = taskQuery.count(); - List ids = tasks.stream().map(Task::getId).collect(Collectors.toList()); - List taskInfos = this.convertInstanceInfo(ids); - return new PageResult().setCurrent(pageParam.getCurrent()) - .setRecords(taskInfos) - .setSize(pageParam.getSize()) - .setTotal(total); - } - - /** - * 获取自己已处理的任务 - */ - public PageResult pageMyDone(PageParam pageParam) { - // 查询已办任务 - HistoricTaskInstanceQuery taskQuery = historyService.createHistoricTaskInstanceQuery() - .finished() - .taskAssignee(String.valueOf(SecurityUtil.getUserId())) - .orderByHistoricTaskInstanceStartTime() - .desc(); - List tasks = taskQuery.listPage(pageParam.start(), pageParam.getSize()); - long total = taskQuery.count(); - List ids = tasks.stream().map(HistoricTaskInstance::getId).collect(Collectors.toList()); - List taskInfos = this.convertInstanceInfo(ids); - return new PageResult().setCurrent(pageParam.getCurrent()) - .setRecords(taskInfos) - .setSize(pageParam.getSize()) - .setTotal(total); - } - - /** - * 根据实例id查询关联的任务 历史记录显示用 - */ - public List findAllByInstanceId(String instanceId) { - return ResultConvertUtil.dtoListConvert(bpmTaskManager.findAllByInstanceId(instanceId)); - } - - /** - * 获取流程节点的分组任务信息 - */ - public Map> getNodeTasks(String instanceId) { - return this.findAllByInstanceId(instanceId).stream().collect(Collectors.groupingBy(BpmTaskDto::getNodeId)); - } - - /** - * 转换 - */ - public List convertInstanceInfo(List taskIds) { - Map bpmTaskMap = bpmTaskManager.findAllByTaskIds(taskIds) - .stream() - .collect(Collectors.toMap(BpmTask::getTaskId, Function.identity())); - return taskIds.stream().map(taskId -> { - BpmTask bpmTask = Optional.ofNullable(bpmTaskMap.get(taskId)).orElse(new BpmTask()); - return new TaskInfo().setTaskId(bpmTask.getTaskId()) - .setNodeName(bpmTask.getNodeName()) - .setExecutionId(bpmTask.getExecutionId()) - .setInstanceId(bpmTask.getInstanceId()) - .setInstanceName(bpmTask.getInstanceName()) - .setDefName(bpmTask.getDefName()) - .setStartTime(bpmTask.getStartTime()) - .setEndTime(bpmTask.getEndTime()) - .setStartUserId(bpmTask.getStartUserId()) - .setStartUserName(bpmTask.getStartUserName()); - }).collect(Collectors.toList()); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/convert/BpmModelConvert.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/convert/BpmModelConvert.java deleted file mode 100644 index 0ddff8ce33e12b6719479a030502071277aaf73c..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/convert/BpmModelConvert.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.bootx.starter.flowable.core.model.convert; - -import cn.bootx.starter.flowable.core.model.entity.BpmModel; -import cn.bootx.starter.flowable.dto.model.BpmModelDto; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -/** - * 流程模型 - * - * @author xxm - * @date 2022-08-23 - */ -@Mapper -public interface BpmModelConvert { - - BpmModelConvert CONVERT = Mappers.getMapper(BpmModelConvert.class); - - BpmModelDto convert(BpmModel in); - -} \ No newline at end of file diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/convert/BpmModelNodeConvert.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/convert/BpmModelNodeConvert.java deleted file mode 100644 index 5621d02bcdcccaaa7f858665fbaf152ad535b015..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/convert/BpmModelNodeConvert.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.bootx.starter.flowable.core.model.convert; - -import cn.bootx.starter.flowable.core.model.entity.BpmModelNode; -import cn.bootx.starter.flowable.dto.model.BpmModelNodeDto; -import cn.bootx.starter.flowable.param.model.BpmModelNodeParam; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -/** - * 模型任务节点配置 - * - * @author xxm - * @date 2022-08-25 - */ -@Mapper -public interface BpmModelNodeConvert { - - BpmModelNodeConvert CONVERT = Mappers.getMapper(BpmModelNodeConvert.class); - - BpmModelNode convert(BpmModelNodeParam in); - - BpmModelNodeDto convert(BpmModelNode in); - -} \ No newline at end of file diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/dao/BpmModelManager.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/dao/BpmModelManager.java deleted file mode 100644 index 9bbb2f14d9157a12592e6b9dd9f44542874209ce..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/dao/BpmModelManager.java +++ /dev/null @@ -1,61 +0,0 @@ -package cn.bootx.starter.flowable.core.model.dao; - -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.starter.flowable.core.model.entity.BpmModel; -import cn.bootx.starter.flowable.param.model.BpmModelParam; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -/** - * 流程模型 - * - * @author xxm - * @date 2022-08-23 - */ -@Repository -@RequiredArgsConstructor -public class BpmModelManager extends BaseManager { - - /** - * 分页 - */ - public Page page(PageParam pageParam, BpmModelParam param) { - Page mpPage = MpUtil.getMpPage(pageParam, BpmModel.class); - return this.lambdaQuery() - .select(this.getEntityClass(), MpUtil::excludeBigField) - .like(StrUtil.isNotBlank(param.getName()), BpmModel::getName, param.getName()) - .orderByDesc(MpIdEntity::getId) - .page(mpPage); - } - - /** - * 取消主流程 - */ - public void cancelMainProcessByDefKey(String defKey) { - lambdaUpdate().set(BpmModel::getMainProcess, false).eq(BpmModel::getDefKey, defKey).update(); - - } - - /** - * 获取生效并部署的主流程列表 - */ - public List findMainProcess() { - return findAllByField(BpmModel::getMainProcess, true); - } - - /** - * 根据流程定义id获取模型信息 - */ - public Optional findByDefId(String defId) { - return findByField(BpmModel::getDefId, defId); - } - -} \ No newline at end of file diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/dao/BpmModelMapper.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/dao/BpmModelMapper.java deleted file mode 100644 index fc9dacb17ddc0129d834bb1b96c6965b536b81f7..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/dao/BpmModelMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.bootx.starter.flowable.core.model.dao; - -import cn.bootx.starter.flowable.core.model.entity.BpmModel; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * 流程模型 - * - * @author xxm - * @date 2022-08-23 - */ -@Mapper -public interface BpmModelMapper extends BaseMapper { - -} \ No newline at end of file diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/dao/BpmModelNodeManager.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/dao/BpmModelNodeManager.java deleted file mode 100644 index fedddabddbe8ff01628b43c9c7a82790feaf7c06..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/dao/BpmModelNodeManager.java +++ /dev/null @@ -1,49 +0,0 @@ -package cn.bootx.starter.flowable.core.model.dao; - -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.starter.flowable.core.model.entity.BpmModelNode; -import lombok.RequiredArgsConstructor; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -import static cn.bootx.starter.flowable.code.CachingCode.*; - -/** - * 模型任务节点配置 - * - * @author xxm - * @date 2022-08-25 - */ -@Repository -@RequiredArgsConstructor -public class BpmModelNodeManager extends BaseManager { - - /** - * 根据ModelId查询 - */ - @Cacheable(value = NODE_MODEL_ID, key = "#modelId") - public List findAllByModelId(Long modelId) { - return findAllByField(BpmModelNode::getModelId, modelId); - } - - /** - * 查询任务节点配置项 - * @param defId 定义id - * @param nodeId 任务节点id - */ - @Cacheable(value = NODE_DEF_AND_NODE, key = "#defId+':'+#nodeId") - public Optional findByDefIdAndNodeId(String defId, String nodeId) { - return lambdaQuery().eq(BpmModelNode::getDefId, defId).eq(BpmModelNode::getNodeId, nodeId).oneOpt(); - } - - /** - * 根据模型id删除 - */ - public void deleteByModelId(Long modelId) { - deleteByField(BpmModelNode::getModelId, modelId); - } - -} \ No newline at end of file diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/dao/BpmModelNodeMapper.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/dao/BpmModelNodeMapper.java deleted file mode 100644 index 254f5a3689ab3dc653458dfc964049fb620b71ad..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/dao/BpmModelNodeMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.bootx.starter.flowable.core.model.dao; - -import cn.bootx.starter.flowable.core.model.entity.BpmModelNode; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * 模型任务节点配置 - * - * @author xxm - * @date 2022-08-25 - */ -@Mapper -public interface BpmModelNodeMapper extends BaseMapper { - -} \ No newline at end of file diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/entity/BpmModel.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/entity/BpmModel.java deleted file mode 100644 index 321ecae5fae5538ece5a5316509c744c8dc527b6..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/entity/BpmModel.java +++ /dev/null @@ -1,74 +0,0 @@ -package cn.bootx.starter.flowable.core.model.entity; - -import cn.bootx.common.core.annotation.BigField; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.starter.flowable.core.model.convert.BpmModelConvert; -import cn.bootx.starter.flowable.dto.model.BpmModelDto; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 流程模型 - * - * @author xxm - * @date 2020/2/28 19:44 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@TableName("bpm_model") -public class BpmModel extends MpBaseEntity implements EntityBaseFunction { - - /** 名称 */ - private String name; - - /** 流程类型 */ - private String modelType; - - /** 关联表单id */ - private Long formId; - - /** 发布状态 */ - private String publish; - - /** 启用状态 */ - private Boolean enable; - - /** 部署id */ - private String deployId; - - /** 流程定义id */ - private String defId; - - /** 流程key */ - private String defKey; - - /** 流程名称 */ - private String defName; - - /** 流程备注 */ - private String defRemark; - - /** 是否主流程 */ - private Boolean mainProcess; - - /** 流程版本号 */ - private Integer processVersion; - - /** 流程xml */ - @BigField - private String modelEditorXml; - - /** 备注 */ - private String remark; - - /** 转换成dto */ - @Override - public BpmModelDto toDto() { - return BpmModelConvert.CONVERT.convert(this); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/entity/BpmModelNode.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/entity/BpmModelNode.java deleted file mode 100644 index 3069d57b7ae3c892901f8f4d43e6d46786807f32..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/entity/BpmModelNode.java +++ /dev/null @@ -1,104 +0,0 @@ -package cn.bootx.starter.flowable.core.model.entity; - -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpDelEntity; -import cn.bootx.common.mybatisplus.handler.JacksonRawTypeHandler; -import cn.bootx.starter.flowable.core.model.convert.BpmModelNodeConvert; -import cn.bootx.starter.flowable.dto.model.BpmModelNodeDto; -import cn.bootx.starter.flowable.param.model.BpmModelNodeParam; -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import lombok.experimental.FieldNameConstants; - -/** - * 模型任务节点配置 - * - * @author xxm - * @date 2022-08-25 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@FieldNameConstants -@TableName(value = "bpm_model_node", autoResultMap = true) -public class BpmModelNode extends MpDelEntity implements EntityBaseFunction { - - /** 关联模型id */ - private Long modelId; - - /** 流程定义id */ - private String defId; - - /** 流程key */ - private String defKey; - - /** 关联表单id */ - private Long formId; - - /** 任务节点id */ - private String nodeId; - - /** 任务节点名称 */ - private String nodeName; - - /** 是否多实例 */ - private boolean multi; - - /** 是否串签 */ - @TableField(updateStrategy = FieldStrategy.IGNORED) - private Boolean sequential; - - /** 是否是或签, 会签情况下使用,一个同意的直接通过这个任务 */ - @TableField(updateStrategy = FieldStrategy.IGNORED) - private Boolean orSign; - - /** 是否比例通过 会签情况下使用 */ - @TableField(updateStrategy = FieldStrategy.IGNORED) - private Boolean ratioPass; - - /** 通过比例 */ - @TableField(updateStrategy = FieldStrategy.IGNORED) - private Double passRatio; - - /** 是否自动跳过当前节点(通常用于开始节点) */ - private boolean skip; - - /** 是否允许驳回 */ - private boolean reject; - - /** 是否允许回退 */ - private boolean back; - - /** 是否允许取回 */ - private boolean retrieve; - - /** - * 分配类型 - * @see cn.bootx.starter.flowable.code.ModelNodeCode - */ - private String assignType; - - /** 分配的原始数据 */ - @TableField(typeHandler = JacksonRawTypeHandler.class, updateStrategy = FieldStrategy.IGNORED) - private Object assignRaw; - - /** 分配的数据的展示 */ - @TableField(updateStrategy = FieldStrategy.IGNORED) - private String assignShow; - - /** 创建对象 */ - public static BpmModelNode init(BpmModelNodeParam in) { - return BpmModelNodeConvert.CONVERT.convert(in); - } - - /** 转换成dto */ - @Override - public BpmModelNodeDto toDto() { - return BpmModelNodeConvert.CONVERT.convert(this); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/service/BpmAssistService.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/service/BpmAssistService.java deleted file mode 100644 index 74e55a9c84a38e71c9f4578b2f4f78b2576585c2..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/service/BpmAssistService.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.bootx.starter.flowable.core.model.service; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * 工作流基础支撑接口 - * @author xxm - * @date 2023/3/28 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class BpmAssistService { - - /** - * 判断是传入的类否是监听器 - */ -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/service/BpmModelNodeService.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/service/BpmModelNodeService.java deleted file mode 100644 index 57f50991936db288adbdd53a8a4bfcca917bf47c..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/service/BpmModelNodeService.java +++ /dev/null @@ -1,252 +0,0 @@ -package cn.bootx.starter.flowable.core.model.service; - -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.dto.LabelValue; -import cn.bootx.common.core.util.CollUtil; -import cn.bootx.common.core.util.ResultConvertUtil; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.starter.flowable.core.model.dao.BpmModelManager; -import cn.bootx.starter.flowable.core.model.dao.BpmModelNodeManager; -import cn.bootx.starter.flowable.core.model.entity.BpmModel; -import cn.bootx.starter.flowable.core.model.entity.BpmModelNode; -import cn.bootx.starter.flowable.dto.model.BpmModelNodeDto; -import cn.bootx.starter.flowable.exception.ModelNotExistException; -import cn.bootx.starter.flowable.param.model.BpmModelNodeParam; -import cn.bootx.starter.flowable.util.BpmXmlUtil; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import cn.hutool.core.util.StrUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import lombok.val; -import org.flowable.bpmn.model.Process; -import org.flowable.bpmn.model.*; -import org.flowable.engine.RepositoryService; -import org.springframework.cache.annotation.CacheEvict; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - -import static cn.bootx.starter.flowable.code.CachingCode.NODE_MODEL_ID; -import static cn.bootx.starter.flowable.code.ModelNodeCode.ASSIGN_SELECT; -import static cn.bootx.starter.flowable.code.ModelNodeCode.ASSIGN_SPONSOR; - -/** - * 模型任务节点服务 - * - * @author xxm - * @date 2022/8/25 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class BpmModelNodeService { - - private final BpmModelManager bpmModelManager; - - private final BpmModelNodeManager bpmModelNodeManager; - - private final RepositoryService repositoryService; - - private final List nodeAssignTypes = CollUtil.toList(ASSIGN_SPONSOR, ASSIGN_SELECT); - - /** - * 添加 - */ - @CacheEvict(value = NODE_MODEL_ID, key = "#param.modelId") - public void add(BpmModelNodeParam param) { - BpmModelNode bpmModelNode = BpmModelNode.init(param); - bpmModelNodeManager.save(bpmModelNode); - } - - /** - * 修改 - */ - @CacheEvict(value = NODE_MODEL_ID, key = "#param.modelId") - public void update(BpmModelNodeParam param) { - BpmModelNode bpmModelNode = bpmModelNodeManager.findById(param.getId()).orElseThrow(DataNotExistException::new); - - BeanUtil.copyProperties(param, bpmModelNode, CopyOptions.create().ignoreNullValue()); - - // 预防脏数据 - if (nodeAssignTypes.contains(bpmModelNode.getAssignType())) { - bpmModelNode.setAssignRaw(null); - bpmModelNode.setAssignShow(null); - } - - bpmModelNodeManager.updateById(bpmModelNode); - } - - /** - * 查询任务节点配置项 - */ - public BpmModelNodeDto findByDefIdAndTaskId(String defId, String nodeId) { - return bpmModelNodeManager.findByDefIdAndNodeId(defId, nodeId) - .map(BpmModelNode::toDto) - .orElseThrow(DataNotExistException::new); - } - - /** - * 获取下一步节点列表 - */ - public List getNextNodes(String defId, String nodeId) { - - BpmnModel bpmnModel = Optional.ofNullable(repositoryService.getBpmnModel(defId)) - .orElseThrow(ModelNotExistException::new); - Process process = bpmnModel.getMainProcess(); - Task taskNode = process.getFlowElements() - .stream() - .filter(o -> Objects.equals(nodeId, o.getId())) - .findFirst() - .map(o -> (Task) o) - .orElseThrow(() -> new BizException("节点不存在")); - List outgoingFlows = taskNode.getOutgoingFlows(); - if (outgoingFlows.size() == 1) { - FlowElement flowElement = outgoingFlows.get(0).getTargetFlowElement(); - if (flowElement instanceof Gateway) { - Gateway gateway = (Gateway) flowElement; - return gateway.getOutgoingFlows() - .stream() - .map(SequenceFlow::getTargetFlowElement) - .map(o -> new LabelValue(o.getName(), o.getId())) - .collect(Collectors.toList()); - } - else { - return Collections.singletonList(new LabelValue(flowElement.getName(), flowElement.getId())); - } - } - else if (outgoingFlows.size() > 1) { - return outgoingFlows.stream() - .map(SequenceFlow::getTargetFlowElement) - .map(o -> new LabelValue(o.getName(), o.getId())) - .collect(Collectors.toList()); - } - else { - return new ArrayList<>(0); - } - } - - /** - * 获取单条 - */ - public BpmModelNodeDto findById(Long id) { - return bpmModelNodeManager.findById(id).map(BpmModelNode::toDto).orElseThrow(DataNotExistException::new); - } - - /** - * 获取全部 - */ - public List findAllByModelId(Long modelId) { - return ResultConvertUtil.dtoListConvert(bpmModelNodeManager.findAllByModelId(modelId)); - } - - /** - * 删除 - */ - @CacheEvict(value = NODE_MODEL_ID, allEntries = true) - public void delete(Long id) { - bpmModelNodeManager.deleteById(id); - } - - /** - * 同步节点 - */ - @Transactional(rollbackFor = Exception.class) - @CacheEvict(value = NODE_MODEL_ID, key = "#modelId") - public void sync(Long modelId) { - // 已经配置的 - List taskNodes = bpmModelNodeManager.findAllByModelId(modelId); - List taskNodeIds = taskNodes.stream().map(BpmModelNode::getNodeId).collect(Collectors.toList()); - // bpmn文件中的 - List flowNodes = this.getFlowNodes(modelId); - List flowNodeIds = flowNodes.stream().map(BpmModelNode::getNodeId).collect(Collectors.toList()); - Map flowNodeMap = flowNodes.stream() - .collect(Collectors.toMap(BpmModelNode::getNodeId, Function.identity())); - // bpmn中有列表没有的添加, 双方都有的不动 - List saves = flowNodes.stream() - .filter(o -> !taskNodeIds.contains(o.getNodeId())) - .peek(o -> o.setModelId(modelId)) - .collect(Collectors.toList()); - - // bpmn中没有列表有的删除 - List deleteIds = taskNodes.stream() - .filter(o -> !flowNodeIds.contains(o.getNodeId())) - .map(MpIdEntity::getId) - .collect(Collectors.toList()); - // 双方都有的查看数据是否需要更新 - List updates = taskNodes.stream() - .filter(taskNode -> flowNodeIds.contains(taskNode.getNodeId())) - .filter(taskNode -> { - BpmModelNode node = flowNodeMap.get(taskNode.getNodeId()); - // 注意, 这里对任务做了处理 - return comparisonAndUpdateNodeAttr(node, taskNode); - }) - .collect(Collectors.toList()); - bpmModelNodeManager.saveAll(saves); - bpmModelNodeManager.updateAllById(updates); - bpmModelNodeManager.deleteByIds(deleteIds); - } - - /** - * 查询流程定义各节点 后期需要修改成根据不同节点做不同的处理 - */ - private List getFlowNodes(Long id) { - BpmModel bpmModel = bpmModelManager.findById(id).orElseThrow(ModelNotExistException::new); - - String modelEditorXml = bpmModel.getModelEditorXml(); - BpmnModel bpmnModel = BpmXmlUtil.convertByte2BpmnModel(modelEditorXml.getBytes()); - Process process = bpmnModel.getMainProcess(); - List userTasks = process.findFlowElementsOfType(UserTask.class); - - return userTasks.stream().map(userTask -> convert(userTask, bpmModel)).collect(Collectors.toList()); - } - - /** - * 比较节点属性并更新任务节点不一致的属性 - * @return 是否进行了处理 - */ - private boolean comparisonAndUpdateNodeAttr(BpmModelNode node, BpmModelNode userTask) { - boolean flag = false; - // 名称 - if (!StrUtil.equals(node.getNodeName(), userTask.getNodeName())) { - userTask.setNodeName(node.getNodeName()); - flag = true; - } - // 是否多任务 - if (node.isMulti() != userTask.isMulti()) { - userTask.setMulti(node.isMulti()); - flag = true; - } - // 是否串行任务 - if (node.getSequential() != userTask.getSequential()) { - userTask.setSequential(node.getSequential()); - flag = true; - } - return flag; - } - - /** - * 节点转换 - * @param userTask flowable 任务节点 - * @param bpmModel - */ - public BpmModelNode convert(UserTask userTask, BpmModel bpmModel) { - BpmModelNode modelNode = new BpmModelNode().setModelId(bpmModel.getId()) - .setDefId(bpmModel.getDefId()) - .setDefKey(bpmModel.getDefKey()) - .setNodeId(userTask.getId()) - .setNodeName(userTask.getName()); - // 多实例(循环任务)处理 - val loopCharacteristics = userTask.getLoopCharacteristics(); - if (Objects.nonNull(loopCharacteristics)) { - modelNode.setMulti(true); - modelNode.setSequential(loopCharacteristics.isSequential()); - } - return modelNode; - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/service/BpmModelService.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/service/BpmModelService.java deleted file mode 100644 index 8ee44f16e0864243eddf7352de33b5d40066d02c..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/core/model/service/BpmModelService.java +++ /dev/null @@ -1,260 +0,0 @@ -package cn.bootx.starter.flowable.core.model.service; - -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.dto.LabelValue; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpCreateEntity.Create; -import cn.bootx.common.mybatisplus.base.MpDelEntity.Del; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.starter.flowable.core.model.dao.BpmModelManager; -import cn.bootx.starter.flowable.core.model.dao.BpmModelNodeManager; -import cn.bootx.starter.flowable.core.model.entity.BpmModel; -import cn.bootx.starter.flowable.core.model.entity.BpmModelNode; -import cn.bootx.starter.flowable.dto.model.BpmModelDto; -import cn.bootx.starter.flowable.exception.ModelNotExistException; -import cn.bootx.starter.flowable.param.model.BpmModelParam; -import cn.bootx.starter.flowable.util.BpmXmlUtil; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import cn.hutool.core.util.RandomUtil; -import cn.hutool.core.util.StrUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import lombok.val; -import org.flowable.bpmn.model.BpmnModel; -import org.flowable.bpmn.model.Process; -import org.flowable.bpmn.model.UserTask; -import org.flowable.engine.RepositoryService; -import org.flowable.engine.repository.Deployment; -import org.flowable.engine.repository.DeploymentBuilder; -import org.flowable.engine.repository.ProcessDefinition; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Objects; -import java.util.function.Function; -import java.util.stream.Collectors; - -import static cn.bootx.starter.flowable.code.ModelCode.*; - -/** - * 流程模型 - * - * @author xxm - * @date 2022/8/23 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class BpmModelService { - - private final RepositoryService repositoryService; - - private final BpmModelManager bpmModelManager; - - private final BpmModelNodeManager bpmModelNodeManager; - - /** - * 创建模型 - */ - public void add(BpmModelParam bpmModelParam) { - - String xml = StrUtil.format(DEFAULT_XML, RandomUtil.randomString(8), RandomUtil.randomString(8)); - BpmModel bpmModel = new BpmModel().setName(bpmModelParam.getName()) - .setModelType(bpmModelParam.getModelType()) - .setMainProcess(false) - .setPublish(UNPUBLISHED) - .setModelEditorXml(xml) - .setEnable(false) - .setRemark(bpmModelParam.getRemark()); - bpmModelManager.save(bpmModel); - } - - /** - * 上传bpm文件 - */ - public void uploadBpmn(BpmModelParam bpmModelParam) { - String modelEditorXml = bpmModelParam.getModelEditorXml(); - BpmModel bpmModel = bpmModelManager.findById(bpmModelParam.getId()).orElseThrow(ModelNotExistException::new); - bpmModel.setModelEditorXml(modelEditorXml); - bpmModelManager.updateById(bpmModel); - } - - /** - * 复制 - */ - @Transactional(rollbackFor = Exception.class) - public void copy(Long id) { - BpmModel bpmModel = bpmModelManager.findById(id).orElseThrow(ModelNotExistException::new); - BpmModel newBpmModel = new BpmModel().setName(bpmModel.getName()) - .setFormId(bpmModel.getFormId()) - .setModelType(bpmModel.getModelType()) - .setMainProcess(false) - .setPublish(UNPUBLISHED) - .setModelEditorXml(bpmModel.getModelEditorXml()) - .setEnable(false) - .setRemark(bpmModel.getRemark()); - bpmModelManager.save(newBpmModel); - List bpmModelNodes = bpmModelNodeManager.findAllByModelId(id); - - List newModelTasks = bpmModelNodes.stream().map(bpmModelNode -> { - BpmModelNode node = new BpmModelNode(); - BeanUtil.copyProperties(bpmModelNode, node, BpmModelNode.Fields.modelId, BpmModelNode.Fields.defId, - BpmModelNode.Fields.defKey, MpIdEntity.Id.id, Create.createTime, Create.creator, - Del.lastModifiedTime, Del.lastModifier, Del.version); - node.setModelId(newBpmModel.getId()); - return node; - }).collect(Collectors.toList()); - bpmModelNodeManager.saveAll(newModelTasks); - } - - /** - * 修改 - */ - public void update(BpmModelParam param) { - BpmModel flowBpmModel = bpmModelManager.findById(param.getId()).orElseThrow(ModelNotExistException::new); - - BeanUtil.copyProperties(param, flowBpmModel, CopyOptions.create().ignoreNullValue()); - bpmModelManager.updateById(flowBpmModel); - } - - /** - * 发布流程 - */ - @Transactional(rollbackFor = Exception.class) - public void publish(Long id) { - BpmModel bpmModel = bpmModelManager.findById(id).orElseThrow(ModelNotExistException::new); - - // 校验检查 - this.verifyModel(bpmModel); - // 部署 - DeploymentBuilder deploymentBuilder = repositoryService.createDeployment(); - - Deployment deploy = deploymentBuilder.name(bpmModel.getName()) - // 文件后缀名有要求 - .addString(bpmModel.getName() + ".bpmn", bpmModel.getModelEditorXml()) - .key(bpmModel.getDefKey()) - .category(bpmModel.getModelType()) - .deploy(); - // 流程定义 - ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery() - .deploymentId(deploy.getId()) - .singleResult(); - // 回填属性 - bpmModel.setDeployId(deploy.getId()) - .setDefId(processDefinition.getId()) - .setDefKey(processDefinition.getKey()) - .setDefName(processDefinition.getName()) - .setDefRemark(processDefinition.getDescription()) - .setMainProcess(true) - .setPublish(PUBLISHED) - .setEnable(true) - .setProcessVersion(processDefinition.getVersion()); - bpmModelManager.cancelMainProcessByDefKey(bpmModel.getDefKey()); - bpmModelManager.updateById(bpmModel); - this.updateTaskNodes(bpmModel); - } - - /** - * 删除 - */ - @Transactional(rollbackFor = Exception.class) - public void delete(Long id) { - BpmModel flowBpmModel = bpmModelManager.findById(id).orElseThrow(() -> new DataNotExistException("")); - - // 发布状态删除 - if (Objects.equals(PUBLISHED, flowBpmModel.getPublish())) { - throw new BizException("流程已发布, 无法删除"); - // 先删除部署以及对应的流程 - // repositoryService.deleteDeployment(flowBpmModel.getDeployId(),true); - // bpmModelManager.deleteById(id); - } - bpmModelNodeManager.deleteByModelId(id); - bpmModelManager.deleteById(id); - } - - /** - * 分页 - */ - public PageResult page(PageParam pageParam, BpmModelParam bpmModelParam) { - return MpUtil.convert2DtoPageResult(bpmModelManager.page(pageParam, bpmModelParam)); - } - - /** - * 获取单条 - */ - public BpmModelDto findById(Long id) { - return bpmModelManager.findById(id).map(BpmModel::toDto).orElseThrow(ModelNotExistException::new); - } - - /** - * 根据流程定义id获取模型信息 - */ - public BpmModelDto findByDefId(String defId) { - return bpmModelManager.findByDefId(defId).map(BpmModel::toDto).orElseThrow(ModelNotExistException::new); - } - - /** - * 获取生效并部署的主流程列表 - */ - public List findMainProcess() { - return bpmModelManager.findMainProcess() - .stream() - .map(bpmModel -> new LabelValue(bpmModel.getName(), bpmModel.getId())) - .collect(Collectors.toList()); - } - - /** - * 更新关联任务节点信息 - */ - private void updateTaskNodes(BpmModel bpmModel) { - bpmModelNodeManager.lambdaUpdate() - .set(BpmModelNode::getDefId, bpmModel.getDefId()) - .set(BpmModelNode::getDefKey, bpmModel.getDefKey()) - .eq(BpmModelNode::getModelId, bpmModel.getId()) - .update(); - } - - /** - * 校验流程 - */ - public void verifyModel(Long modelId) { - BpmModel bpmModel = bpmModelManager.findById(modelId).orElseThrow(ModelNotExistException::new); - this.verifyModel(bpmModel); - } - - /** - * 校验流程 - */ - public void verifyModel(BpmModel bpmModel) { - // 校验是否已经发布 - if (Objects.equals(bpmModel.getPublish(), PUBLISHED)) { - throw new BizException("流程模型已经发布"); - } - - // 校验对应的任务节点是否已经被配置 - String modelEditorXml = bpmModel.getModelEditorXml(); - BpmnModel bpmnModel = BpmXmlUtil.convertByte2BpmnModel(modelEditorXml.getBytes()); - Process process = bpmnModel.getMainProcess(); - List userTasks = process.findFlowElementsOfType(UserTask.class); - List bpmModelNodes = bpmModelNodeManager.findAllByModelId(bpmModel.getId()); - - val bpmModelNodeMap = bpmModelNodes.stream() - .collect(Collectors.toMap(BpmModelNode::getNodeId, Function.identity())); - - for (val userTask : userTasks) { - BpmModelNode modelTask = bpmModelNodeMap.get(userTask.getId()); - if (Objects.isNull(modelTask)) { - throw new BizException("流程有任务节点未进行配置，请进行配置"); - } - if (StrUtil.isBlank(modelTask.getAssignType())) { - throw new BizException(modelTask.getNodeName() + " 任务节点未配置处理人员类型"); - } - } - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/dto/instance/ActivityInstanceChart.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/dto/instance/ActivityInstanceChart.java deleted file mode 100644 index d0c381b3e818b0cc28886a1847102e2d725ac621..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/dto/instance/ActivityInstanceChart.java +++ /dev/null @@ -1,25 +0,0 @@ -package cn.bootx.starter.flowable.dto.instance; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * @author xxm - * @date 2022/8/31 - */ -@Data -@Accessors(chain = true) -@Schema(title = "流程活动实例(用于绘制流程图)") -public class ActivityInstanceChart { - - @Schema(description = "流程活动的id") - private String activityId; - - @Schema(description = "流程活动的类型") - private String activityType; - - @Schema(description = "运行中") - private boolean running; - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/dto/instance/BpmInstanceDto.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/dto/instance/BpmInstanceDto.java deleted file mode 100644 index 2bb5618558945d3c337a42e5531fa7d8668db4e9..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/dto/instance/BpmInstanceDto.java +++ /dev/null @@ -1,63 +0,0 @@ -package cn.bootx.starter.flowable.dto.instance; - -import cn.bootx.common.core.rest.dto.BaseDto; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.time.LocalDateTime; -import java.util.Map; - -/** - * 流程实例扩展 - * - * @author xxm - * @date 2022-08-23 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Schema(title = "流程实例扩展") -@Accessors(chain = true) -public class BpmInstanceDto extends BaseDto { - - @Schema(description = "流程实例的id") - private String instanceId; - - @Schema(description = "流程实例名称") - private String instanceName; - - @Schema(description = "模型id") - private Long modelId; - - @Schema(description = "流程定义的id") - private String defId; - - @Schema(description = "流程定义的名称") - private String defName; - - @Schema(description = "流程分类") - private String modelType; - - @Schema(description = "发起人") - private Long startUserId; - - @Schema(description = "发起人名称") - private String startUserName; - - @Schema(description = "流程实例的状态") - private String state; - - @Schema(description = "流程实例的执行结果") - private String result; - - @Schema(description = "开始时间") - private LocalDateTime startTime; - - @Schema(description = "结束时间") - private LocalDateTime endTime; - - @Schema(description = "提交的表单值") - private Map formVariables; - -} \ No newline at end of file diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/dto/instance/InstanceInfo.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/dto/instance/InstanceInfo.java deleted file mode 100644 index 235dba155786def28a3ce1f3aac85bc117a4a50a..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/dto/instance/InstanceInfo.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.bootx.starter.flowable.dto.instance; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.time.LocalDateTime; - -/** - * 流程实例信息 - * - * @author xxm - * @date 2022/8/27 - */ -@Data -@Accessors(chain = true) -@Schema(title = "流程实例信息") -public class InstanceInfo { - - @Schema(description = "标题") - private String name; - - @Schema(description = "实例ID") - private String instanceId; - - @Schema(description = "流程定义名称") - private String defMame; - - @Schema(description = "流程实例的状态") - private String state; - - @Schema(description = "开始时间") - private LocalDateTime startTime; - - @Schema(description = "结束时间") - private LocalDateTime endTime; - - @Schema(description = "发起人id") - private Long startUserId; - - @Schema(description = "发起人名称") - private String startUserName; - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/dto/model/BpmModelDto.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/dto/model/BpmModelDto.java deleted file mode 100644 index baadd807dcabb86e561caded2f4578a48aae0bf5..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/dto/model/BpmModelDto.java +++ /dev/null @@ -1,63 +0,0 @@ -package cn.bootx.starter.flowable.dto.model; - -import cn.bootx.common.core.rest.dto.BaseDto; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 流程模型 - * - * @author xxm - * @date 2022-08-23 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Schema(title = "流程模型") -@Accessors(chain = true) -public class BpmModelDto extends BaseDto { - - @Schema(description = "名称") - private String name; - - @Schema(description = "流程类型") - private String modelType; - - @Schema(description = "关联表单id") - private Long formId; - - @Schema(description = "发布状态") - private String publish; - - @Schema(description = "启用状态") - private Boolean enable; - - @Schema(description = "部署id") - private String deployId; - - @Schema(description = "流程定义id") - private String defId; - - @Schema(description = "流程key") - private String defKey; - - @Schema(description = "流程名称") - private String defName; - - @Schema(description = "流程备注") - private String defRemark; - - @Schema(description = "是否主流程") - private Boolean mainProcess; - - @Schema(description = "流程版本号") - private Integer processVersion; - - @Schema(description = "流程xml") - private String modelEditorXml; - - @Schema(description = "备注") - private String remark; - -} \ No newline at end of file diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/dto/model/BpmModelNodeDto.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/dto/model/BpmModelNodeDto.java deleted file mode 100644 index e550d17988ce719b8d3a4b2a0e45a5f5e1ea893c..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/dto/model/BpmModelNodeDto.java +++ /dev/null @@ -1,72 +0,0 @@ -package cn.bootx.starter.flowable.dto.model; - -import cn.bootx.common.core.rest.dto.BaseDto; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 模型任务节点配置 - * - * @author xxm - * @date 2022-08-25 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Schema(title = "模型任务节点配置") -@Accessors(chain = true) -public class BpmModelNodeDto extends BaseDto { - - @Schema(description = "关联模型id") - private Long modelId; - - @Schema(description = "流程定义id") - private String defId; - - @Schema(description = "流程key") - private String defKey; - - @Schema(description = "任务节点id") - private String nodeId; - - @Schema(description = "任务节点名称") - private String nodeName; - - @Schema(description = "是否多任务") - private boolean multi; - - @Schema(description = "是否串签") - private Boolean sequential; - - /** 是否是或签, 会签情况下使用,一个同意的直接通过这个任务 */ - private Boolean orSign; - - /** 是否比例通过 会签情况下使用 */ - private Boolean ratioPass; - - /** 通过比例 */ - private Double passRatio; - - @Schema(description = "是否自动跳过当前节点(通常用于开始节点)") - private boolean skip; - - @Schema(description = "是否允许驳回") - private boolean reject; - - @Schema(description = "是否允许回退") - private boolean back; - - @Schema(description = "是否允许取回") - private boolean retrieve; - - @Schema(description = "分配类型") - private String assignType; - - @Schema(description = "分配的原始数据") - private Object assignRaw; - - @Schema(description = "分配的数据的展示") - private String assignShow; - -} \ No newline at end of file diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/dto/task/BpmTaskDto.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/dto/task/BpmTaskDto.java deleted file mode 100644 index e3593815e32553241d2e63848ef09106242447f9..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/dto/task/BpmTaskDto.java +++ /dev/null @@ -1,78 +0,0 @@ -package cn.bootx.starter.flowable.dto.task; - -import cn.bootx.common.core.rest.dto.BaseDto; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.time.LocalDateTime; -import java.util.Map; - -/** - * 流程任务扩展 - * - * @author xxm - * @date 2022-09-01 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Schema(title = "流程任务扩展") -@Accessors(chain = true) -public class BpmTaskDto extends BaseDto { - - @Schema(description = "任务ID") - private String taskId; - - @Schema(description = "任务执行 ID") - private String executionId; - - @Schema(description = "流程实例的id") - private String instanceId; - - @Schema(description = "流程名称(业务标题)") - private String instanceName; - - @Schema(description = "流程定义名称") - private String defName; - - @Schema(description = "任务节点id") - private String nodeId; - - @Schema(description = "任务节点名称") - private String nodeName; - - @Schema(description = "流程任务的状态") - private String state; - - /** - * @see cn.bootx.starter.flowable.code.TaskCode#RESULT_PASS - */ - @Schema(description = "处理结果") - private String result; - - @Schema(description = "处理意见") - private String reason; - - @Schema(description = "开始时间") - private LocalDateTime startTime; - - @Schema(description = "结束时间") - private LocalDateTime endTime; - - @Schema(description = "当前处理人") - private Long userId; - - @Schema(description = "当前处理人") - private String userName; - - @Schema(description = "发起人") - private Long startUserId; - - @Schema(description = "发起人名称") - private String startUserName; - - @Schema(description = "提交的表单值") - private Map formVariables; - -} \ No newline at end of file diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/dto/task/TaskInfo.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/dto/task/TaskInfo.java deleted file mode 100644 index 2791a6c8e0e9c148629c706927f2271137befbff..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/dto/task/TaskInfo.java +++ /dev/null @@ -1,59 +0,0 @@ -package cn.bootx.starter.flowable.dto.task; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.time.LocalDateTime; - -/** - * 流程任务扩展 - * - * @author xxm - * @date 2022/8/28 - */ -@Data -@Accessors(chain = true) -@Schema(title = "流程任务信息") -public class TaskInfo { - - @Schema(description = "任务id") - private String taskId; - - @Schema(description = "执行 ID") - private String executionId; - - @Schema(description = "实例ID") - private String instanceId; - - @Schema(description = "流程名称(业务标题)") - private String instanceName; - - @Schema(description = "流程定义名称") - private String defName; - - @Schema(description = "当前环节名称") - private String nodeName; - - @Schema(description = "流程任务的状态") - private String state; - - @Schema(description = "处理人") - private Long userId; - - @Schema(description = "处理人") - private String userName; - - @Schema(description = "流程发起人id") - private Long startUserId; - - @Schema(description = "流程发起人名称") - private String startUserName; - - @Schema(description = "开始时间") - private LocalDateTime startTime; - - @Schema(description = "结束时间") - private LocalDateTime endTime; - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/BpmEventService.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/BpmEventService.java deleted file mode 100644 index acae99e6be2d938d9e5d68edbd804387ef7e3eee..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/BpmEventService.java +++ /dev/null @@ -1,122 +0,0 @@ -package cn.bootx.starter.flowable.event; - -import cn.bootx.starter.flowable.core.instance.entity.BpmInstance; -import cn.bootx.starter.flowable.core.instance.entity.BpmTask; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.ApplicationEventPublisher; -import org.springframework.stereotype.Service; -import org.springframework.transaction.support.TransactionSynchronization; -import org.springframework.transaction.support.TransactionSynchronizationManager; - -import java.util.List; - -/** - * 流程时间发送器 - * - * @author xxm - * @date 2022/9/18 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class BpmEventService { - - private final ApplicationEventPublisher eventPublisher; - - /** - * 注册 事务提交成功后的回调操作 - * @param runnable 回调函数 - */ - private void afterCommit(Runnable runnable) { - TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { - @Override - public void afterCommit() { - runnable.run(); - } - }); - } - - /** - * 流程创建事件 - */ - public void processCreated(BpmInstance bpmInstance) { - this.afterCommit(() -> { - eventPublisher.publishEvent(new ProcessCreatedEvent(this, bpmInstance)); - }); - } - - /** - * 流程完成事件 - */ - public void processCompleted(BpmInstance bpmInstance) { - this.afterCommit(() -> { - eventPublisher.publishEvent(new ProcessCompletedEvent(this, bpmInstance)); - }); - } - - /** - * 流程取消事件 - */ - public void processCancel(BpmInstance bpmInstance) { - this.afterCommit(() -> { - eventPublisher.publishEvent(new ProcessCancelEvent(this, bpmInstance)); - }); - } - - /** - * 任务创建事件 - */ - public void taskCreated(BpmTask task) { - this.afterCommit(() -> { - eventPublisher.publishEvent(new TaskCreatedEvent(this, task)); - }); - } - - /** - * 任务完成事件 - */ - public void taskCompleted(List tasks, boolean multi) { - this.afterCommit(() -> { - eventPublisher.publishEvent(new TaskCompletedEvent(this, tasks, multi)); - }); - } - - /** - * 任务分配人员事件 - */ - public void taskAssign(BpmTask task, Long oldAssign, String oldAssignName, Long newAssign, String newAssignName) { - this.afterCommit(() -> { - eventPublisher - .publishEvent(new TaskAssignEvent(this, task, oldAssign, oldAssignName, newAssign, newAssignName)); - }); - } - - /** - * 任务取消事件 - */ - public void taskCancel(List tasks) { - this.afterCommit(() -> { - eventPublisher.publishEvent(new TaskCancelEvent(this, tasks)); - }); - } - - /** - * 驳回 - */ - public void taskReject(BpmTask task) { - this.afterCommit(() -> { - eventPublisher.publishEvent(new TaskRejectEvent(this, task)); - }); - } - - /** - * 退回回 - */ - public void taskBack(BpmTask task) { - this.afterCommit(() -> { - eventPublisher.publishEvent(new TaskBackEvent(this, task)); - }); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/ProcessCancelEvent.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/ProcessCancelEvent.java deleted file mode 100644 index bb0bb2f302ad68cb3ce0ddb46b1418a21d178335..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/ProcessCancelEvent.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.bootx.starter.flowable.event; - -import cn.bootx.starter.flowable.core.instance.entity.BpmInstance; -import lombok.Getter; -import org.springframework.context.ApplicationEvent; - -/** - * 流程实例取消事件 - * - * @author xxm - * @date 2022/9/18 - */ -@Getter -public class ProcessCancelEvent extends ApplicationEvent { - - private final BpmInstance bpmInstance; - - public ProcessCancelEvent(Object source, BpmInstance bpmInstance) { - super(source); - this.bpmInstance = bpmInstance; - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/ProcessCompletedEvent.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/ProcessCompletedEvent.java deleted file mode 100644 index a56be043bbecfa6fe8d37fff4c541d06c81ee601..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/ProcessCompletedEvent.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.bootx.starter.flowable.event; - -import cn.bootx.starter.flowable.core.instance.entity.BpmInstance; -import lombok.Getter; -import org.springframework.context.ApplicationEvent; - -/** - * 流程实例完成事件 - * - * @author xxm - * @date 2022/9/18 - */ -@Getter -public class ProcessCompletedEvent extends ApplicationEvent { - - private final BpmInstance bpmInstance; - - public ProcessCompletedEvent(Object source, BpmInstance bpmInstance) { - super(source); - this.bpmInstance = bpmInstance; - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/ProcessCreatedEvent.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/ProcessCreatedEvent.java deleted file mode 100644 index 8d3faaf31b172bd85cd316a5c8eee133293f7082..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/ProcessCreatedEvent.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.bootx.starter.flowable.event; - -import cn.bootx.starter.flowable.core.instance.entity.BpmInstance; -import lombok.Getter; -import org.springframework.context.ApplicationEvent; - -/** - * 流程实例创建事件 - * - * @author xxm - * @date 2022/9/18 - */ -@Getter -public class ProcessCreatedEvent extends ApplicationEvent { - - private final BpmInstance bpmInstance; - - public ProcessCreatedEvent(Object source, BpmInstance bpmInstance) { - super(source); - this.bpmInstance = bpmInstance; - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/TaskAssignEvent.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/TaskAssignEvent.java deleted file mode 100644 index a5783a31003e0263d0c49362bebca29f036994a8..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/TaskAssignEvent.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.bootx.starter.flowable.event; - -import cn.bootx.starter.flowable.core.instance.entity.BpmTask; -import lombok.Getter; -import org.springframework.context.ApplicationEvent; - -/** - * 流程任务人员分配事件 - * - * @author xxm - * @date 2022/9/18 - */ -@Getter -public class TaskAssignEvent extends ApplicationEvent { - - private final BpmTask bpmTask; - - private final Long oldAssign; - - private final String oldAssignName; - - private final Long newAssign; - - private final String newAssignName; - - public TaskAssignEvent(Object source, BpmTask bpmTask, Long oldAssign, String oldAssignName, Long newAssign, - String newAssignName) { - super(source); - this.bpmTask = bpmTask; - this.oldAssign = oldAssign; - this.oldAssignName = oldAssignName; - this.newAssign = newAssign; - this.newAssignName = newAssignName; - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/TaskBackEvent.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/TaskBackEvent.java deleted file mode 100644 index 1c9daac871cc1f83c400c7b10b73f78bc6a744b2..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/TaskBackEvent.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.bootx.starter.flowable.event; - -import cn.bootx.starter.flowable.core.instance.entity.BpmTask; -import lombok.Getter; -import org.springframework.context.ApplicationEvent; - -/** - * 流程任务退回事件 - * - * @author xxm - * @date 2022/9/18 - */ -@Getter -public class TaskBackEvent extends ApplicationEvent { - - private final BpmTask bpmTask; - - public TaskBackEvent(Object source, BpmTask bpmTask) { - super(source); - this.bpmTask = bpmTask; - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/TaskCancelEvent.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/TaskCancelEvent.java deleted file mode 100644 index 4cf14ee25173b75ba782de4773dda785cbe5c8e6..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/TaskCancelEvent.java +++ /dev/null @@ -1,25 +0,0 @@ -package cn.bootx.starter.flowable.event; - -import cn.bootx.starter.flowable.core.instance.entity.BpmTask; -import lombok.Getter; -import org.springframework.context.ApplicationEvent; - -import java.util.List; - -/** - * 流程任务取消事件 - * - * @author xxm - * @date 2022/9/18 - */ -@Getter -public class TaskCancelEvent extends ApplicationEvent { - - private final List bpmTasks; - - public TaskCancelEvent(Object source, List bpmTasks) { - super(source); - this.bpmTasks = bpmTasks; - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/TaskCompletedEvent.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/TaskCompletedEvent.java deleted file mode 100644 index 5046fdabd03b45e41c1acfa544a89ad20b7b986d..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/TaskCompletedEvent.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.bootx.starter.flowable.event; - -import cn.bootx.starter.flowable.core.instance.entity.BpmTask; -import lombok.Getter; -import org.springframework.context.ApplicationEvent; - -import java.util.List; - -/** - * 流程任务完成事件 - * - * @author xxm - * @date 2022/9/18 - */ -@Getter -public class TaskCompletedEvent extends ApplicationEvent { - - private final List bpmTasks; - - private final boolean multi; - - public TaskCompletedEvent(Object source, List bpmTasks, boolean multi) { - super(source); - this.bpmTasks = bpmTasks; - this.multi = multi; - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/TaskCreatedEvent.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/TaskCreatedEvent.java deleted file mode 100644 index 2bf4210a51afcf7b8df493910ba6b24511f799cf..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/TaskCreatedEvent.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.bootx.starter.flowable.event; - -import cn.bootx.starter.flowable.core.instance.entity.BpmTask; -import lombok.Getter; -import org.springframework.context.ApplicationEvent; - -/** - * 流程任务创建事件 - * - * @author xxm - * @date 2022/9/18 - */ -@Getter -public class TaskCreatedEvent extends ApplicationEvent { - - private final BpmTask bpmTask; - - public TaskCreatedEvent(Object source, BpmTask bpmTask) { - super(source); - this.bpmTask = bpmTask; - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/TaskRejectEvent.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/TaskRejectEvent.java deleted file mode 100644 index ffe9ce31fdc77a198796f8df5e29e11e2e4b9777..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/event/TaskRejectEvent.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.bootx.starter.flowable.event; - -import cn.bootx.starter.flowable.core.instance.entity.BpmTask; -import lombok.Getter; -import org.springframework.context.ApplicationEvent; - -/** - * 流程任务驳回事件 - * - * @author xxm - * @date 2022/9/18 - */ -@Getter -public class TaskRejectEvent extends ApplicationEvent { - - private final BpmTask bpmTask; - - public TaskRejectEvent(Object source, BpmTask bpmTask) { - super(source); - this.bpmTask = bpmTask; - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/exception/InstanceNotExistException.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/exception/InstanceNotExistException.java deleted file mode 100644 index 31defb06dd88336ffc6cf6fe175d531bf4d5b7be..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/exception/InstanceNotExistException.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.bootx.starter.flowable.exception; - -import cn.bootx.common.core.exception.BizException; - -/** - * 流程实例不存在 - * - * @author xxm - * @date 2020/3/1 15:28 - */ -public class InstanceNotExistException extends BizException { - - public InstanceNotExistException(String message) { - super(message); - } - - public InstanceNotExistException() { - super("流程实例不存在"); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/exception/ModelNodeNotExistException.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/exception/ModelNodeNotExistException.java deleted file mode 100644 index 1d1920eaa817840631d131268e50c52650bfc073..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/exception/ModelNodeNotExistException.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.bootx.starter.flowable.exception; - -import cn.bootx.common.core.exception.BizException; - -/** - * 流程模型节点定义不存在 - * - * @author xxm - * @date 2022/9/4 - */ -public class ModelNodeNotExistException extends BizException { - - public ModelNodeNotExistException() { - super("流程模型节点定义不存在"); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/exception/ModelNotExistException.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/exception/ModelNotExistException.java deleted file mode 100644 index 1ad844b4eb510d9888cfef2d5d7754f20e277c5c..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/exception/ModelNotExistException.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.bootx.starter.flowable.exception; - -import cn.bootx.common.core.exception.BizException; - -/** - * 流程模型定义不存在 - * - * @author xxm - * @date 2020/3/1 13:33 - */ -public class ModelNotExistException extends BizException { - - public ModelNotExistException(String message) { - super(message); - } - - public ModelNotExistException() { - super("流程模型定义不存在"); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/exception/ModelNotPublishException.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/exception/ModelNotPublishException.java deleted file mode 100644 index 28cfc58cb491afcde0064cd9a1e41c2526b8d631..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/exception/ModelNotPublishException.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.bootx.starter.flowable.exception; - -import cn.bootx.common.core.exception.BizException; - -/** - * 流程模型未发布 - * - * @author xxm - * @date 2020/3/1 19:25 - */ -public class ModelNotPublishException extends BizException { - - public ModelNotPublishException(String message) { - super(message); - } - - public ModelNotPublishException() { - super("流程模型未发布"); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/exception/TaskNotExistException.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/exception/TaskNotExistException.java deleted file mode 100644 index a57f976bab57add191b6db309e97bde7a2ac277a..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/exception/TaskNotExistException.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.bootx.starter.flowable.exception; - -import cn.bootx.common.core.exception.BizException; - -/** - * 流程任务不存在 - * - * @author xxm - * @date 2022/9/12 - */ -public class TaskNotExistException extends BizException { - - public TaskNotExistException(String message) { - super(message); - } - - public TaskNotExistException() { - super("流程任务不存在"); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/behavior/BpmActivityBehaviorFactory.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/behavior/BpmActivityBehaviorFactory.java deleted file mode 100644 index 48fe40b986aa9fb30acf910d7594e58386f4f149..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/behavior/BpmActivityBehaviorFactory.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.bootx.starter.flowable.handler.behavior; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.flowable.bpmn.model.Activity; -import org.flowable.bpmn.model.UserTask; -import org.flowable.engine.impl.bpmn.behavior.AbstractBpmnActivityBehavior; -import org.flowable.engine.impl.bpmn.behavior.ParallelMultiInstanceBehavior; -import org.flowable.engine.impl.bpmn.behavior.SequentialMultiInstanceBehavior; -import org.flowable.engine.impl.bpmn.behavior.UserTaskActivityBehavior; -import org.flowable.engine.impl.bpmn.parser.factory.DefaultActivityBehaviorFactory; -import org.springframework.stereotype.Component; - -/** - * Bpm 活动行为工厂 - * - * @author xxm - * @date 2022/8/24 - */ -@Slf4j -@Component -@RequiredArgsConstructor -public class BpmActivityBehaviorFactory extends DefaultActivityBehaviorFactory { - - private final BpmUserTaskAssignService bpmUserTaskAssignService; - - private final BpmMultiInstanceBehaviorService assistService; - - /** - * 任务人员分配 - */ - @Override - public UserTaskActivityBehavior createUserTaskActivityBehavior(UserTask userTask) { - return new BpmUserTaskActivityBehavior(userTask, bpmUserTaskAssignService); - } - - /** - * 创建并行多实例行为 - */ - @Override - public ParallelMultiInstanceBehavior createParallelMultiInstanceBehavior(Activity activity, - AbstractBpmnActivityBehavior innerActivityBehavior) { - return new BpmParallelMultiInstanceBehavior(activity, innerActivityBehavior, assistService); - } - - /** - * 创建串行多实例行为 - */ - @Override - public SequentialMultiInstanceBehavior createSequentialMultiInstanceBehavior(Activity activity, - AbstractBpmnActivityBehavior innerActivityBehavior) { - return new BpmSequentialMultiInstanceBehavior(activity, innerActivityBehavior, assistService); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/behavior/BpmMultiInstanceBehaviorService.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/behavior/BpmMultiInstanceBehaviorService.java deleted file mode 100644 index d3b39460e2d1bab09c428a996f640c79ed8f86bf..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/behavior/BpmMultiInstanceBehaviorService.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.bootx.starter.flowable.handler.behavior; - -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.impl.bpmn.behavior.MultiInstanceActivityBehavior; - -import java.util.List; - -/** - * Bpm 多实例行为服务 - * - * @author xxm - * @date 2022/9/4 - */ -public interface BpmMultiInstanceBehaviorService { - - /** - * 计算当前执行任务的处理人id集合 - */ - List getTaskUsers(DelegateExecution execution, MultiInstanceActivityBehavior multiInstanceActivityBehavior); - - /** - * 是否满足结束条件 - */ - boolean completionConditionSatisfied(DelegateExecution execution, MultiInstanceActivityBehavior behavior); - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/behavior/BpmParallelMultiInstanceBehavior.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/behavior/BpmParallelMultiInstanceBehavior.java deleted file mode 100644 index 9230d7642b5a9d1ce5535682dc4695140c643754..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/behavior/BpmParallelMultiInstanceBehavior.java +++ /dev/null @@ -1,67 +0,0 @@ -package cn.bootx.starter.flowable.handler.behavior; - -import cn.bootx.starter.flowable.local.BpmContext; -import cn.bootx.starter.flowable.local.BpmContextLocal; -import cn.hutool.core.util.IdUtil; -import org.flowable.bpmn.model.Activity; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.impl.bpmn.behavior.AbstractBpmnActivityBehavior; -import org.flowable.engine.impl.bpmn.behavior.ParallelMultiInstanceBehavior; - -import java.util.List; - -import static cn.bootx.starter.flowable.code.BpmnCode.*; - -/** - * Bpm 并行多实例行为 - * - * @author xxm - * @date 2022/8/28 - */ -public class BpmParallelMultiInstanceBehavior extends ParallelMultiInstanceBehavior { - - private final BpmMultiInstanceBehaviorService behaviorService; - - public BpmParallelMultiInstanceBehavior(Activity activity, AbstractBpmnActivityBehavior originalActivityBehavior, - BpmMultiInstanceBehaviorService bpmMultiInstanceBehaviorService) { - super(activity, originalActivityBehavior); - this.behaviorService = bpmMultiInstanceBehaviorService; - } - - /** - * 忽略原有的 collectionString、collectionElementVariable 表达式，而是采用自己定义的 获得任务的处理人，并设置到 - * collectionVariable 中，用于 BpmUserTaskActivityBehavior 从中可以获取任务的处理人 - * 多个任务实例，每个任务实例对应一个处理人，所以返回的数量就是任务处理人的数量 - */ - @Override - protected int resolveNrOfInstances(DelegateExecution execution) { - // 清空collectionExpression , 它和 collectionVariable 是互斥的 - super.setCollectionExpression(null); - // 设置 collectionElementVariable(迭代出来的处理人) 和 collectionString(候选人集合) - super.setCollectionString(MULTI_COLLECTION); - super.setCollectionElementVariable(MULTI_COLLECTION_ELEMENT); - - List taskUsers = behaviorService.getTaskUsers(execution, this); - BpmContext bpmContext = BpmContextLocal.get(); - bpmContext.setTaskMultiId(IdUtil.getSnowflakeNextId()); - BpmContextLocal.put(bpmContext); - execution.setVariable(super.collectionString, taskUsers); - return taskUsers.size(); - } - - /** - * 是否满足结束条件 - */ - @Override - public boolean completionConditionSatisfied(DelegateExecution execution) { - // 先进行自定义判断处理, 不通过调用原生的处理 - boolean conditionSatisfied = behaviorService.completionConditionSatisfied(execution, this) - || super.completionConditionSatisfied(execution); - if (conditionSatisfied) { - // 删除多实例id - execution.removeVariable(MULTI_TASK_ID); - } - return conditionSatisfied; - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/behavior/BpmSequentialMultiInstanceBehavior.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/behavior/BpmSequentialMultiInstanceBehavior.java deleted file mode 100644 index 7406af746bac31d1fe1dd6d67227d5eac306e208..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/behavior/BpmSequentialMultiInstanceBehavior.java +++ /dev/null @@ -1,61 +0,0 @@ -package cn.bootx.starter.flowable.handler.behavior; - -import cn.hutool.core.util.IdUtil; -import org.flowable.bpmn.model.Activity; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.impl.bpmn.behavior.AbstractBpmnActivityBehavior; -import org.flowable.engine.impl.bpmn.behavior.SequentialMultiInstanceBehavior; - -import java.util.List; - -import static cn.bootx.starter.flowable.code.BpmnCode.*; - -/** - * Bpm 顺序多实例行为 - * - * @author xxm - * @date 2022/9/6 - */ -public class BpmSequentialMultiInstanceBehavior extends SequentialMultiInstanceBehavior { - - private final BpmMultiInstanceBehaviorService behaviorService; - - public BpmSequentialMultiInstanceBehavior(Activity activity, AbstractBpmnActivityBehavior innerActivityBehavior, - BpmMultiInstanceBehaviorService behaviorService) { - super(activity, innerActivityBehavior); - this.behaviorService = behaviorService; - } - - /** - * 多实例创建 - */ - @Override - protected int resolveNrOfInstances(DelegateExecution execution) { - // 清空collectionExpression , 它和 collectionVariable 是互斥的 - super.setCollectionExpression(null); - // 设置 collectionElementVariable(迭代出来的处理人) 和 collectionString(候选人集合) - super.setCollectionString(MULTI_COLLECTION); - super.setCollectionElementVariable(MULTI_COLLECTION_ELEMENT); - - List taskUsers = behaviorService.getTaskUsers(execution, this); - execution.setVariable(super.collectionString, taskUsers); - execution.setVariable(MULTI_TASK_ID, IdUtil.getSnowflakeNextId()); - return taskUsers.size(); - } - - /** - * 是否满足结束条件 - */ - @Override - public boolean completionConditionSatisfied(DelegateExecution execution) { - // 先进行自定义判断处理, 不通过调用原生的处理 - boolean conditionSatisfied = behaviorService.completionConditionSatisfied(execution, this) - || super.completionConditionSatisfied(execution); - if (conditionSatisfied) { - // 删除多实例id - execution.removeVariable(MULTI_TASK_ID); - } - return conditionSatisfied; - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/behavior/BpmUserTaskActivityBehavior.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/behavior/BpmUserTaskActivityBehavior.java deleted file mode 100644 index 98ad62e51f5db6961b2f116c8192e7196380afdd..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/behavior/BpmUserTaskActivityBehavior.java +++ /dev/null @@ -1,43 +0,0 @@ -package cn.bootx.starter.flowable.handler.behavior; - -import lombok.extern.slf4j.Slf4j; -import org.flowable.bpmn.model.UserTask; -import org.flowable.common.engine.impl.el.ExpressionManager; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.impl.bpmn.behavior.UserTaskActivityBehavior; -import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl; -import org.flowable.task.service.TaskService; -import org.flowable.task.service.impl.persistence.entity.TaskEntity; - -import java.util.List; - -/** - * Bpm 自定义单个任务人员分配 - * - * @author xxm - * @date 2022/8/24 - */ -@Slf4j -public class BpmUserTaskActivityBehavior extends UserTaskActivityBehavior { - - private final BpmUserTaskAssignService bpmUserTaskAssignService; - - public BpmUserTaskActivityBehavior(UserTask userTask, BpmUserTaskAssignService bpmUserTaskAssignService) { - super(userTask); - this.bpmUserTaskAssignService = bpmUserTaskAssignService; - } - - /** - * 处理作业, 分配人员 - */ - @Override - protected void handleAssignments(TaskService taskService, String assignee, String owner, - List candidateUsers, List candidateGroups, TaskEntity task, - ExpressionManager expressionManager, DelegateExecution execution, - ProcessEngineConfigurationImpl processEngineConfiguration) { - - bpmUserTaskAssignService.handleAssignments(taskService, assignee, owner, candidateUsers, candidateGroups, task, - expressionManager, execution, processEngineConfiguration, this); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/behavior/BpmUserTaskAssignService.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/behavior/BpmUserTaskAssignService.java deleted file mode 100644 index 0505469141fbc0b09c69258e11289362a46c6c54..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/behavior/BpmUserTaskAssignService.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.bootx.starter.flowable.handler.behavior; - -import org.flowable.common.engine.impl.el.ExpressionManager; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.impl.bpmn.behavior.UserTaskActivityBehavior; -import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl; -import org.flowable.task.service.TaskService; -import org.flowable.task.service.impl.persistence.entity.TaskEntity; - -import java.util.List; - -/** - * 处理普通任务人员分配 - * - * @author xxm - * @date 2022/9/4 - */ -public interface BpmUserTaskAssignService { - - /** - * 处理任务人员分配 - */ - void handleAssignments(TaskService taskService, String assignee, String owner, List candidateUsers, - List candidateGroups, TaskEntity task, ExpressionManager expressionManager, - DelegateExecution execution, ProcessEngineConfigurationImpl processEngineConfiguration, - UserTaskActivityBehavior userTaskActivityBehavior); - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/cmd/TaskRetrieveCmd.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/cmd/TaskRetrieveCmd.java deleted file mode 100644 index f6f5005312663a9e91bfb43a361be068e7d8b4c2..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/cmd/TaskRetrieveCmd.java +++ /dev/null @@ -1,47 +0,0 @@ -package cn.bootx.starter.flowable.handler.cmd; - -import com.google.common.collect.Lists; -import org.flowable.common.engine.impl.interceptor.Command; -import org.flowable.common.engine.impl.interceptor.CommandContext; -import org.flowable.engine.impl.ActivityInstanceQueryImpl; -import org.flowable.engine.impl.util.CommandContextUtil; -import org.flowable.engine.runtime.ActivityInstance; -import org.flowable.task.service.TaskService; -import org.flowable.task.service.impl.persistence.entity.TaskEntity; - -import java.util.List; - -/** - * 取回任务命令类 - * - * @author xxm - * @date 2020/3/18 11:03 - */ -public class TaskRetrieveCmd implements Command { - - /** - * 任务id - */ - protected String taskId; - - public TaskRetrieveCmd(String taskId) { - this.taskId = taskId; - } - - @Override - public Void execute(CommandContext commandContext) { - TaskService taskService = CommandContextUtil.getTaskService(); - - TaskEntity taskEntity = taskService.getTask(taskId); - - List activityInstancesByQueryCriteria = CommandContextUtil.getActivityInstanceEntityManager() - .findActivityInstancesByQueryCriteria( - new ActivityInstanceQueryImpl().processInstanceId(taskEntity.getProcessInstanceId()) - .orderByActivityInstanceStartTime()); - - List reverse = Lists.reverse(activityInstancesByQueryCriteria); - - return null; - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/listener/BpmInstanceEventListener.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/listener/BpmInstanceEventListener.java deleted file mode 100644 index c9f644a8618066716e33be56c93fb59a92b961dc..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/listener/BpmInstanceEventListener.java +++ /dev/null @@ -1,64 +0,0 @@ -package cn.bootx.starter.flowable.handler.listener; - -import cn.bootx.common.core.util.CollUtil; -import cn.bootx.starter.flowable.handler.service.BpmInstanceEvenListenerService; -import lombok.extern.slf4j.Slf4j; -import org.flowable.common.engine.api.delegate.event.FlowableEngineEntityEvent; -import org.flowable.common.engine.api.delegate.event.FlowableEngineEventType; -import org.flowable.engine.delegate.event.AbstractFlowableEngineEventListener; -import org.flowable.engine.delegate.event.FlowableCancelledEvent; -import org.flowable.engine.runtime.ProcessInstance; -import org.springframework.stereotype.Component; - -import java.util.Set; - -import static org.flowable.common.engine.api.delegate.event.FlowableEngineEventType.*; - -/** - * @author xxm - * @date 2022/8/28 - */ -@Slf4j -@Component -public class BpmInstanceEventListener extends AbstractFlowableEngineEventListener { - - private final BpmInstanceEvenListenerService bpmInstanceEvenListenerService; - - /** 处理的事件 */ - private static final Set TASK_EVENTS = CollUtil.newHashSet(PROCESS_CREATED, - PROCESS_CANCELLED, PROCESS_COMPLETED); - - public BpmInstanceEventListener(BpmInstanceEvenListenerService bpmInstanceEvenListenerService) { - super(TASK_EVENTS); - this.bpmInstanceEvenListenerService = bpmInstanceEvenListenerService; - } - - /** - * 流程创建 - */ - @Override - protected void processCreated(FlowableEngineEntityEvent event) { - ProcessInstance instance = (ProcessInstance) event.getEntity(); - bpmInstanceEvenListenerService.processCreated(instance); - } - - /** - * 流程取消(被删除) 一个进程已被取消。在数据库删除之前由 - * org.flowable.engine.impl.RuntimeServiceImpl#deleteProcessInstance(java.lang.String, - * java.lang.String) 删除流程实例时调度。 - */ - @Override - protected void processCancelled(FlowableCancelledEvent event) { - } - - /** - * 流程完成 - */ - @Override - protected void processCompleted(FlowableEngineEntityEvent event) { - ProcessInstance instance = (ProcessInstance) event.getEntity(); - bpmInstanceEvenListenerService.processCompleted(instance); - - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/listener/BpmTaskEventListener.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/listener/BpmTaskEventListener.java deleted file mode 100644 index b8e7ec42f22385fc9a80b4fa623776dde2134f7d..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/listener/BpmTaskEventListener.java +++ /dev/null @@ -1,73 +0,0 @@ -package cn.bootx.starter.flowable.handler.listener; - -import cn.bootx.common.core.util.CollUtil; -import cn.bootx.starter.flowable.handler.service.BpmTaskEventListenerService; -import lombok.extern.slf4j.Slf4j; -import org.flowable.common.engine.api.delegate.event.FlowableEngineEntityEvent; -import org.flowable.common.engine.api.delegate.event.FlowableEngineEventType; -import org.flowable.engine.delegate.event.AbstractFlowableEngineEventListener; -import org.flowable.engine.delegate.event.FlowableMultiInstanceActivityCompletedEvent; -import org.flowable.task.service.impl.persistence.entity.TaskEntity; -import org.springframework.stereotype.Component; - -import java.util.Set; - -import static org.flowable.common.engine.api.delegate.event.FlowableEngineEventType.*; - -/** - * Bpm 任务事件监听器 - * - * @author xxm - * @date 2022/8/24 - */ -@Slf4j -@Component -public class BpmTaskEventListener extends AbstractFlowableEngineEventListener { - - private final BpmTaskEventListenerService bpmTaskEventListenerService; - - /** 处理的事件 */ - private static final Set TASK_EVENTS = CollUtil.newHashSet(TASK_CREATED, TASK_ASSIGNED, - TASK_COMPLETED, MULTI_INSTANCE_ACTIVITY_COMPLETED_WITH_CONDITION); - - public BpmTaskEventListener(BpmTaskEventListenerService bpmTaskEventListenerService) { - super(TASK_EVENTS); - this.bpmTaskEventListenerService = bpmTaskEventListenerService; - } - - /** - * 存储扩展内容 - */ - @Override - protected void taskCreated(FlowableEngineEntityEvent event) { - TaskEntity task = (TaskEntity) event.getEntity(); - bpmTaskEventListenerService.taskCreated(task); - } - - /** - * 任务完成 - */ - @Override - protected void taskCompleted(FlowableEngineEntityEvent event) { - TaskEntity task = (TaskEntity) event.getEntity(); - bpmTaskEventListenerService.taskCompleted(task); - } - - /** - * 任务分配处理人 - */ - @Override - protected void taskAssigned(FlowableEngineEntityEvent event) { - TaskEntity task = (TaskEntity) event.getEntity(); - bpmTaskEventListenerService.taskAssigned(task); - } - - /** - * 多实例活动完成 - */ - @Override - protected void multiInstanceActivityCompletedWithCondition(FlowableMultiInstanceActivityCompletedEvent event) { - bpmTaskEventListenerService.multiInstanceActivityCompletedWithCondition(event); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/reject/TaskRejectHandler.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/reject/TaskRejectHandler.java deleted file mode 100644 index a08cb1e2157d399341746e1913f40874904a0534..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/reject/TaskRejectHandler.java +++ /dev/null @@ -1,264 +0,0 @@ -package cn.bootx.starter.flowable.handler.reject; - -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.util.CollUtil; -import cn.bootx.starter.flowable.util.FlowableUtil; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.flowable.bpmn.model.BaseElement; -import org.flowable.bpmn.model.FlowElement; -import org.flowable.bpmn.model.Process; -import org.flowable.bpmn.model.UserTask; -import org.flowable.common.engine.api.FlowableException; -import org.flowable.common.engine.api.FlowableObjectNotFoundException; -import org.flowable.engine.HistoryService; -import org.flowable.engine.RepositoryService; -import org.flowable.engine.RuntimeService; -import org.flowable.engine.TaskService; -import org.flowable.engine.repository.ProcessDefinition; -import org.flowable.task.api.Task; -import org.flowable.task.api.TaskInfo; -import org.flowable.task.api.history.HistoricTaskInstance; -import org.springframework.stereotype.Service; - -import java.util.*; -import java.util.stream.Collectors; - -/** - * 方法不支持多对多跳转 回退不能够直接回退到子流程上，我这里按照只能回退到用户任务节点处理的 驳回可以直接驳回到子流程开始 - * - * @author linjinp - * @date 2020/4/3 10:37 - */ -@Slf4j -@Service -@AllArgsConstructor -public class TaskRejectHandler { - - private final TaskService taskService; - - private final RuntimeService runtimeService; - - private final RepositoryService repositoryService; - - private final HistoryService historyService; - - /** - * 驳回, 返回驳回到的任务节点id - */ - public void rejectTalk(Task task) { - if (task.isSuspended()) { - throw new BizException("任务处于挂起状态"); - } - // 获取全部节点列表，包含子节点 - Process process = repositoryService.getBpmnModel(task.getProcessDefinitionId()).getMainProcess(); - Collection flowNodes = FlowableUtil.getAllElements(process.getFlowElements(), null); - // 获取当前任务节点元素 - FlowElement currentNode = flowNodes.stream() - .filter(flowElement -> Objects.equals(flowElement.getId(), task.getTaskDefinitionKey())) - .findAny() - .orElse(null); - - // 上级任务列表 目的获取所有跳转到的节点 targetIds - List lastUserTaskList = FlowableUtil.findParentUserTasks(currentNode, null, null); - if (CollUtil.isEmpty(lastUserTaskList)) { - throw new BizException("当前节点为初始任务节点，不能驳回"); - } - // 上级任务节点列表 节点 Key - List lastUserTaskNodeIds = lastUserTaskList.stream() - .map(BaseElement::getId) - .collect(Collectors.toList()); - - // 获取全部历史节点活动实例，即已经走过的节点历史，数据采用开始时间升序 - List historicTaskInstanceList = historyService.createHistoricTaskInstanceQuery() - .processInstanceId(task.getProcessInstanceId()) - .orderByHistoricTaskInstanceStartTime() - .asc() - .list(); - - // 数据清洗，将回滚导致的脏数据清洗掉 - List lastHistoricTaskNodeIds = FlowableUtil.historicTaskInstanceClean(flowNodes, - historicTaskInstanceList); - // 此时历史任务实例为倒序，获取最后走的节点 - List rejectIds = new ArrayList<>(); - // 循环结束标识，遇到当前目标节点的次数 - int number = 0; - String lastHistoricTaskNodeId = null; - for (String historicTaskNodeId : lastHistoricTaskNodeIds) { - // 当会签时候会出现特殊的，连续都是同一个节点历史数据的情况，这种时候跳过 - if (Objects.equals(lastHistoricTaskNodeId, historicTaskNodeId)) { - continue; - } - lastHistoricTaskNodeId = historicTaskNodeId; - if (Objects.equals(historicTaskNodeId, task.getTaskDefinitionKey())) { - number++; - } - // 在数据清洗后，历史节点就是唯一一条从起始到当前节点的历史记录，理论上每个点只会出现一次 - // 在流程中如果出现循环，那么每次循环中间的点也只会出现一次，再出现就是下次循环 - // number == 1，第一次遇到当前节点 - // number == 2，第二次遇到，代表最后一次的循环范围 - if (number == 2) { - break; - } - // 如果当前历史节点，属于父级的节点，说明最后一次经过了这个点，需要退回这个点 - if (lastUserTaskNodeIds.contains(historicTaskNodeId)) { - rejectIds.add(historicTaskNodeId); - } - } - - // 目的获取所有需要被跳转的节点 currentIds - // 取其中一个父级任务，因为后续要么存在公共网关，要么就是串行公共线路 - UserTask oneUserTask = lastUserTaskList.get(0); - // 获取所有正常进行的任务节点 Key，这些任务不能直接使用，需要找出其中需要撤回的任务 - List runTaskList = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).list(); - List runTaskKeyList = runTaskList.stream() - .map(TaskInfo::getTaskDefinitionKey) - .collect(Collectors.toList()); - - // 通过父级网关的出口连线，结合 runTaskList 比对，获取需要撤回的任务 - List currentUserTaskList = FlowableUtil.findChildUserTasks(oneUserTask, runTaskKeyList, null, null); - // 需驳回任务列表 - List currentIds = currentUserTaskList.stream().map(BaseElement::getId).collect(Collectors.toList()); - // 规定：并行网关之前节点必须需存在唯一用户任务节点，如果出现多个任务节点，则并行网关节点默认为结束节点，原因为不考虑多对多情况 - if (rejectIds.size() > 1 && currentIds.size() > 1) { - throw new BizException("任务出现多对多情况，无法撤回"); - } - - try { - // 如果父级任务多于 1 个，说明当前节点不是并行节点，原因为不考虑多对多情况 - if (rejectIds.size() > 1) { - // 1 对 多任务跳转，currentIds 当前节点(1)，targetIds 跳转到的节点(多) - runtimeService.createChangeActivityStateBuilder() - .processInstanceId(task.getProcessInstanceId()) - .moveSingleActivityIdToActivityIds(currentIds.get(0), rejectIds) - .changeState(); - } - // 如果父级任务只有一个，因此当前任务可能为网关中的任务 - if (rejectIds.size() == 1) { - // 1 对 1 或 多 对 1 情况，currentIds 当前要跳转的节点列表(1或多)，targetIds.get(0) 跳转到的节点(1) - runtimeService.createChangeActivityStateBuilder() - .processInstanceId(task.getProcessInstanceId()) - .moveActivityIdsToSingleActivityId(currentIds, rejectIds.get(0)) - .changeState(); - } - } - catch (FlowableObjectNotFoundException e) { - log.error(e.getMessage(), e); - throw new BizException("未找到流程实例，流程可能已发生变化"); - } - catch (FlowableException e) { - log.error(e.getMessage(), e); - throw new BizException("无法取消或开始活动"); - } - } - - /** - * 流程回退 - * @param task 当前任务 - * @param targetKey 要回退的任务 Key - */ - public void flowReturn(Task task, String targetKey) { - if (task.isSuspended()) { - throw new BizException("任务处于挂起状态"); - } - // 获取流程定义信息 - ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery() - .processDefinitionId(task.getProcessDefinitionId()) - .singleResult(); - // 获取所有节点信息 - Process process = repositoryService.getBpmnModel(processDefinition.getId()).getProcesses().get(0); - // 获取全部节点列表，包含子节点 - Collection allElements = FlowableUtil.getAllElements(process.getFlowElements(), null); - // 获取当前任务节点元素 - FlowElement source = null; - // 获取跳转的节点元素 - FlowElement target = null; - if (allElements != null) { - for (FlowElement flowElement : allElements) { - // 当前任务节点元素 - if (flowElement.getId().equals(task.getTaskDefinitionKey())) { - source = flowElement; - } - // 跳转的节点元素 - if (flowElement.getId().equals(targetKey)) { - target = flowElement; - } - } - } - - // 从当前节点向前扫描 - // 如果存在路线上不存在目标节点，说明目标节点是在网关上或非同一路线上，不可跳转 - // 否则目标节点相对于当前节点，属于串行 - Boolean isSequential = FlowableUtil.iteratorCheckSequentialReferTarget(source, targetKey, null, null); - if (!isSequential) { - throw new BizException("当前节点相对于目标节点，不属于串行关系，无法回退"); - } - - // 获取所有正常进行的任务节点 Key，这些任务不能直接使用，需要找出其中需要撤回的任务 - List runTaskList = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).list(); - List runTaskKeyList = new ArrayList<>(); - runTaskList.forEach(item -> runTaskKeyList.add(item.getTaskDefinitionKey())); - // 需退回任务列表 - List currentIds = new ArrayList<>(); - // 通过父级网关的出口连线，结合 runTaskList 比对，获取需要撤回的任务 - List currentUserTaskList = FlowableUtil.findChildUserTasks(target, runTaskKeyList, null, null); - currentUserTaskList.forEach(item -> currentIds.add(item.getId())); - - try { - // 1 对 1 或 多 对 1 情况，currentIds 当前要跳转的节点列表(1或多)，targetKey 跳转到的节点(1) - runtimeService.createChangeActivityStateBuilder() - .processInstanceId(task.getProcessInstanceId()) - .moveActivityIdsToSingleActivityId(currentIds, targetKey) - .changeState(); - } - catch (FlowableObjectNotFoundException e) { - log.error(e.getMessage(), e); - throw new BizException("未找到流程实例，流程可能已发生变化"); - } - catch (FlowableException e) { - log.error(e.getMessage(), e); - throw new BizException("无法取消或开始活动"); - } - } - - /** - * 获取所有可回退的节点 - */ - public List findReturnUserTask(String taskId) { - // 当前任务 task - Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); - // 获取流程定义信息 - ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery() - .processDefinitionId(task.getProcessDefinitionId()) - .singleResult(); - // 获取所有节点信息，暂不考虑子流程情况 - Process process = repositoryService.getBpmnModel(processDefinition.getId()).getProcesses().get(0); - Collection flowElements = process.getFlowElements(); - // 获取当前任务节点元素 - UserTask source = null; - if (flowElements != null) { - for (FlowElement flowElement : flowElements) { - // 类型为用户节点 - if (flowElement.getId().equals(task.getTaskDefinitionKey())) { - source = (UserTask) flowElement; - } - } - } - // 获取节点的所有路线 - List> roads = FlowableUtil.findRoad(source, null, null, null); - // 可回退的节点列表 - List userTaskList = new ArrayList<>(); - for (List road : roads) { - if (userTaskList.size() == 0) { - // 还没有可回退节点直接添加 - userTaskList = road; - } - else { - // 如果已有回退节点，则比对取交集部分 - userTaskList.retainAll(road); - } - } - return userTaskList; - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/service/BpmInstanceEvenListenerService.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/service/BpmInstanceEvenListenerService.java deleted file mode 100644 index 27ba300b171cbb5f5b5f38edc6ea912c73ca79a8..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/service/BpmInstanceEvenListenerService.java +++ /dev/null @@ -1,98 +0,0 @@ -package cn.bootx.starter.flowable.handler.service; - -import cn.bootx.common.core.util.LocalDateTimeUtil; -import cn.bootx.starter.flowable.code.TaskCode; -import cn.bootx.starter.flowable.core.instance.dao.BpmInstanceManager; -import cn.bootx.starter.flowable.core.instance.dao.BpmTaskManager; -import cn.bootx.starter.flowable.core.instance.entity.BpmInstance; -import cn.bootx.starter.flowable.core.instance.entity.BpmTask; -import cn.bootx.starter.flowable.event.BpmEventService; -import cn.bootx.starter.flowable.local.BpmContext; -import cn.bootx.starter.flowable.local.BpmContextLocal; -import cn.hutool.core.util.StrUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.flowable.engine.runtime.ProcessInstance; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; -import java.util.List; -import java.util.Objects; -import java.util.Optional; - -import static cn.bootx.starter.flowable.code.InstanceCode.*; - -/** - * 流程实例事件处理类 - * - * @author xxm - * @date 2022/9/16 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class BpmInstanceEvenListenerService { - - private final BpmInstanceManager bpmInstanceManager; - - private final BpmTaskManager bpmTaskManager; - - private final BpmEventService messageService; - - /** - * 流程创建 - */ - public void processCreated(ProcessInstance instance) { - BpmContext bpmContext = BpmContextLocal.get(); - BpmInstance bpmInstance = new BpmInstance().setInstanceId(instance.getProcessInstanceId()) - .setInstanceName(instance.getName()) - .setModelId(bpmContext.getModelId()) - .setDefId(instance.getProcessDefinitionId()) - .setDefName(instance.getProcessDefinitionName()) - .setStartTime(LocalDateTimeUtil.of(instance.getStartTime())) - .setFormVariables(bpmContext.getFormVariables()) - .setState(STATE_RUNNING); - - // 发起人信息 - bpmContext.getStartUser() - .ifPresent(userDetail -> bpmInstance.setStartUserId(userDetail.getId()) - .setStartUserName(userDetail.getName())); - - bpmInstanceManager.save(bpmInstance); - messageService.processCreated(bpmInstance); - } - - /** - * 任务完成 - */ - @Transactional(rollbackFor = Exception.class) - public void processCompleted(ProcessInstance instance) { - Optional bpmInstanceOpt = bpmInstanceManager.findByInstanceId(instance.getProcessInstanceId()); - BpmContext bpmContext = BpmContextLocal.get(); - String instanceState = bpmContext.getInstanceState(); - bpmInstanceOpt.ifPresent(bpmInstance -> { - String state = STATE_FINISH; - if (StrUtil.isNotBlank(instanceState)) { - state = instanceState; - } - bpmInstance.setEndTime(LocalDateTime.now()).setState(state); - bpmInstanceManager.updateById(bpmInstance); - if (Objects.equals(STATE_FINISH, state)) { - messageService.processCompleted(bpmInstance); - } - else { - messageService.processCancel(bpmInstance); - } - }); - if (Objects.equals(instanceState, STATE_CANCEL)) { - List tasks = bpmTaskManager.findRunningByInstanceId(instance.getProcessInstanceId()); - tasks.forEach(task -> task.setState(TaskCode.STATE_CANCEL) - .setResult(TaskCode.RESULT_CANCEL) - .setEndTime(LocalDateTime.now())); - bpmTaskManager.updateAllById(tasks); - messageService.taskCancel(tasks); - } - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/service/BpmTaskEventListenerService.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/service/BpmTaskEventListenerService.java deleted file mode 100644 index e017e014aab054736bc2a559455e2158e67bca27..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/handler/service/BpmTaskEventListenerService.java +++ /dev/null @@ -1,178 +0,0 @@ -package cn.bootx.starter.flowable.handler.service; - -import cn.bootx.common.core.entity.UserDetail; -import cn.bootx.common.core.function.UserDetailService; -import cn.bootx.common.core.util.CollUtil; -import cn.bootx.common.core.util.LocalDateTimeUtil; -import cn.bootx.starter.flowable.core.instance.dao.BpmInstanceManager; -import cn.bootx.starter.flowable.core.instance.dao.BpmTaskManager; -import cn.bootx.starter.flowable.core.instance.entity.BpmInstance; -import cn.bootx.starter.flowable.core.instance.entity.BpmTask; -import cn.bootx.starter.flowable.core.model.dao.BpmModelNodeManager; -import cn.bootx.starter.flowable.core.model.entity.BpmModelNode; -import cn.bootx.starter.flowable.event.BpmEventService; -import cn.bootx.starter.flowable.exception.ModelNodeNotExistException; -import cn.bootx.starter.flowable.local.BpmContext; -import cn.bootx.starter.flowable.local.BpmContextLocal; -import cn.hutool.core.util.StrUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.flowable.engine.delegate.event.FlowableMultiInstanceActivityCompletedEvent; -import org.flowable.engine.impl.util.CommandContextUtil; -import org.flowable.engine.impl.util.TaskHelper; -import org.flowable.task.service.impl.persistence.entity.TaskEntity; -import org.springframework.stereotype.Service; - -import java.time.LocalDateTime; -import java.util.*; -import java.util.stream.Collectors; - -import static cn.bootx.starter.flowable.code.TaskCode.*; - -/** - * 任务时间处理 - * - * @author xxm - * @date 2022/9/4 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class BpmTaskEventListenerService { - - private final BpmModelNodeManager bpmModelNodeManager; - - private final BpmTaskManager bpmTaskManager; - - private final BpmInstanceManager bpmInstanceManager; - - private final UserDetailService userDetailService; - - private final BpmEventService eventService; - - // 正常执行的状态 - private final List normalTaskStates = CollUtil.newArrayList(null, "", STATE_PROCESS, STATE_PASS); - - /** - * 任务创建处理 - */ - public void taskCreated(TaskEntity task) { - BpmContext bpmContext = BpmContextLocal.get(); - BpmInstance bpmInstance = bpmInstanceManager.findByInstanceId(task.getProcessInstanceId()) - .orElse(new BpmInstance()); - BpmModelNode modelTask = bpmModelNodeManager - .findByDefIdAndNodeId(task.getProcessDefinitionId(), task.getTaskDefinitionKey()) - .orElseThrow(ModelNodeNotExistException::new); - - BpmTask bpmTask = this.convert(task, bpmInstance); - - // 是多实例 - if (Objects.nonNull(bpmContext.getTaskMultiId())) { - bpmTask.setMultiId(bpmContext.getTaskMultiId()); - } - - // 是否跳过该节点, 且是正常情况下 - if (modelTask.isSkip() && normalTaskStates.contains(bpmContext.getTaskState())) { - TaskHelper.completeTask(task, null, null, null, null, CommandContextUtil.getCommandContext()); - bpmTask.setState(STATE_SKIP).setResult(STATE_SKIP).setEndTime(LocalDateTime.now()); - } - - // 是否分配了用户 - if (StrUtil.isNotBlank(task.getAssignee())) { - UserDetail userDetail = userDetailService.findByUserId(Long.valueOf(task.getAssignee())) - .orElse(new UserDetail()); - bpmTask.setUserId(userDetail.getId()).setUserName(userDetail.getName()); - } - - bpmTaskManager.save(bpmTask); - // 驳回/退回还是普通创建 - if (Objects.equals(bpmContext.getTaskState(), STATE_REJECT)) { - eventService.taskReject(bpmTask); - } - else if (Objects.equals(bpmContext.getTaskState(), RESULT_BACK)) { - eventService.taskBack(bpmTask); - } - else { - eventService.taskCreated(bpmTask); - } - } - - /** - * 任务完成 - */ - public void taskCompleted(TaskEntity task) { - Optional bpmTaskOpt = bpmTaskManager.findByInstanceIdAndTaskId(task.getProcessInstanceId(), - task.getId()); - BpmContext bpmContext = BpmContextLocal.get(); - bpmTaskOpt.ifPresent(bpmTask -> { - bpmTask.setEndTime(LocalDateTime.now()) - .setState(bpmContext.getTaskState()) - .setResult(bpmContext.getTaskResult()) - .setReason(bpmContext.getTaskReason()) - .setFormVariables(bpmContext.getFormVariables()); - bpmTaskManager.updateById(bpmTask); - eventService.taskCompleted(Collections.singletonList(bpmTask), false); - }); - } - - /** - * 任务人员分配 - */ - public void taskAssigned(TaskEntity task) { - // 判断扩展内容是否存在, 存的的话进行更新 - Optional bpmTaskOpt = bpmTaskManager.findByInstanceIdAndTaskId(task.getProcessInstanceId(), - task.getId()); - bpmTaskOpt.ifPresent(bpmTask -> { - if (StrUtil.isNotBlank(task.getAssignee())) { - Long userId = Long.valueOf(task.getAssignee()); - UserDetail userDetail = userDetailService.findByUserId(userId).orElse(new UserDetail()); - Long oldAssign = bpmTask.getUserId(); - String oldAssignName = bpmTask.getUserName(); - bpmTask.setUserId(userId).setUserName(userDetail.getName()); - bpmTaskManager.updateById(bpmTask); - eventService.taskAssign(bpmTask, oldAssign, oldAssignName, userId, userDetail.getName()); - } - }); - } - - /** - * 转换 - */ - private BpmTask convert(TaskEntity task, BpmInstance bpmInstance) { - return new BpmTask().setTaskId(task.getId()) - .setNodeId(task.getTaskDefinitionKey()) - .setNodeName(task.getName()) - .setState(STATE_PROCESS) - .setFormVariables(task.getCaseVariables()) - .setExecutionId(task.getExecutionId()) - .setInstanceId(task.getProcessInstanceId()) - .setInstanceName(bpmInstance.getInstanceName()) - .setDefName(bpmInstance.getDefName()) - .setStartUserId(bpmInstance.getStartUserId()) - .setStartUserName(bpmInstance.getStartUserName()) - .setStartTime(LocalDateTimeUtil.of(task.getCreateTime())); - } - - /** - * 活动取消 - */ - public void activityCancelled(String executionId) { - System.out.println(executionId); - } - - /** - * 多实例活动完成 更新被自动处理的类 - */ - public void multiInstanceActivityCompletedWithCondition(FlowableMultiInstanceActivityCompletedEvent event) { - - List tasks = bpmTaskManager.findByInstanceIdAndNodeId(event.getProcessInstanceId(), - event.getActivityId()); - List updateTasks = tasks.stream() - .filter(o -> Objects.equals(o.getState(), STATE_PROCESS)) - .peek(bpmTask -> bpmTask.setResult(RESULT_AUTO_FINISH).setState(STATE_PASS)) - .collect(Collectors.toList()); - bpmTaskManager.updateAllById(updateTasks); - eventService.taskCompleted(updateTasks, true); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/local/BpmContext.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/local/BpmContext.java deleted file mode 100644 index 6067979b5f81c61cbdba46bcac0ba8f2578b3c04..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/local/BpmContext.java +++ /dev/null @@ -1,63 +0,0 @@ -package cn.bootx.starter.flowable.local; - -import cn.bootx.common.core.entity.UserDetail; -import cn.bootx.starter.flowable.code.InstanceCode; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -import java.util.Map; -import java.util.Optional; - -/** - * 流程处理时上下文 - * - * @author xxm - * @date 2022/8/28 - */ -@Getter -@Setter -@Accessors(chain = true) -public class BpmContext { - - /** 流程模型id */ - private Long modelId; - - /** 提交的表单值 */ - private Map formVariables; - - /** 启动任务的用户 */ - private Optional startUser = Optional.empty(); - - /** - * 实例处理状态 - * @see InstanceCode#STATE_RUNNING - */ - private String instanceState; - - /** 处理任务时的审批意见 */ - private String taskReason; - - /** - * 当前任务处理状态 - * @see cn.bootx.starter.flowable.code.TaskCode#STATE_PROCESS - */ - private String taskState; - - /** - * 当前任务处理结果 - * @see cn.bootx.starter.flowable.code.TaskCode#RESULT_PASS - */ - private String taskResult; - - /** - * 多实例id, 用于串联起多实例任务 - */ - private Long taskMultiId; - - /** - * 下一步执行人 - */ - private Object nextAssign; - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/local/BpmContextLocal.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/local/BpmContextLocal.java deleted file mode 100644 index 516f4b8cef9869a67bcdd297e8fadd5cbe4a8262..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/local/BpmContextLocal.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.bootx.starter.flowable.local; - -import com.alibaba.ttl.TransmittableThreadLocal; - -import java.util.Optional; - -/** - * 流程任务处理缓存类 - * - * @author xxm - * @date 2022/8/28 - */ -public class BpmContextLocal { - - private static final ThreadLocal THREAD_LOCAL = new TransmittableThreadLocal<>(); - - /** - * TTL 设置数据 - */ - public static void put(BpmContext bpmContext) { - THREAD_LOCAL.set(bpmContext); - } - - /** - * 获取TTL中的数据 - */ - public static BpmContext get() { - BpmContext bpmContext = Optional.ofNullable(THREAD_LOCAL.get()).orElse(new BpmContext()); - THREAD_LOCAL.set(bpmContext); - return bpmContext; - } - - /** - * 清除 - */ - public static void clear() { - THREAD_LOCAL.remove(); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/param/instance/InstanceStartParam.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/param/instance/InstanceStartParam.java deleted file mode 100644 index a2d045788da86fb3b3d3d117a3a6998e064c88fa..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/param/instance/InstanceStartParam.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.bootx.starter.flowable.param.instance; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.Map; - -/** - * @author xxm - * @date 2020/3/1 13:47 - */ -@Data -@Accessors(chain = true) -@Schema(title = "流程启动参数") -public class InstanceStartParam { - - @Schema(description = "流程实例id") - private Long modelId; - - @Schema(description = "实例名称") - private String name; - - @Schema(description = "外部key") - private String businessKey; - - @Schema(description = "表单信息") - private Map formVariables; - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/param/model/BpmModelNodeParam.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/param/model/BpmModelNodeParam.java deleted file mode 100644 index e5a9da3d337caf0ddc9daa44f486e94fd51c2646..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/param/model/BpmModelNodeParam.java +++ /dev/null @@ -1,72 +0,0 @@ -package cn.bootx.starter.flowable.param.model; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * 模型任务节点配置 - * - * @author xxm - * @date 2022-08-25 - */ -@Data -@Schema(title = "模型任务节点配置") -@Accessors(chain = true) -public class BpmModelNodeParam { - - @Schema(description = "主键") - private Long id; - - @Schema(description = "关联模型id") - private Long modelId; - - @Schema(description = "流程定义id") - private String defId; - - @Schema(description = "流程key") - private String defKey; - - @Schema(description = "任务节点id") - private String nodeId; - - @Schema(description = "任务节点名称") - private String nodeName; - - @Schema(description = "是否多实例") - private boolean multi; - - @Schema(description = "是否串签") - private boolean sequential; - - /** 是否是或签, 会签情况下使用,一个同意的直接通过这个任务 */ - private Boolean orSign; - - /** 是否比例通过 会签情况下使用 */ - private Boolean ratioPass; - - /** 通过比例 */ - private Double passRatio; - - @Schema(description = "是否自动跳过当前节点(通常用于开始节点)") - private boolean skip; - - @Schema(description = "是否允许驳回") - private boolean reject; - - @Schema(description = "是否允许回退") - private boolean back; - - @Schema(description = "是否允许取回") - private boolean retrieve; - - @Schema(description = "分配类型") - private String assignType; - - @Schema(description = "分配的原始数据") - private Object assignRaw; - - @Schema(description = "分配的数据的展示") - private String assignShow; - -} \ No newline at end of file diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/param/model/BpmModelParam.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/param/model/BpmModelParam.java deleted file mode 100644 index 220ea69759d2b32181ca815598083d04f8401c97..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/param/model/BpmModelParam.java +++ /dev/null @@ -1,34 +0,0 @@ -package cn.bootx.starter.flowable.param.model; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * @author xxm - * @date 2022/8/23 - */ -@Data -@Accessors(chain = true) -@Schema(title = "流程模型参数") -public class BpmModelParam { - - @Schema(description = "主键") - private Long id; - - @Schema(description = "流程名称") - private String name; - - @Schema(description = "流程类型(相当于flowable的分类)") - private String modelType; - - @Schema(description = "关联动态表单id") - private Long formId; - - @Schema(description = "备注") - private String remark; - - @Schema(description = "流程xml") - private String modelEditorXml; - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/param/task/TaskApproveParam.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/param/task/TaskApproveParam.java deleted file mode 100644 index 0d5df1136e0cd559a249192f5e391a051310d585..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/param/task/TaskApproveParam.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.bootx.starter.flowable.param.task; - -import cn.bootx.starter.flowable.code.TaskCode; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.Map; - -/** - * 流程任务审批参数 - * - * @author xxm - * @date 2022/8/26 - */ -@Data -@Accessors(chain = true) -@Schema(title = "流程任务审批参数") -public class TaskApproveParam { - - /** - * @see TaskCode#RESULT_PASS - */ - @Schema(description = "处理结果") - private String type; - - @Schema(description = "任务id") - private String taskId; - - @Schema(description = "下一步节点") - private String nextNodeId; - - @Schema(description = "退回节点节点") - private String backNodeId; - - @Schema(description = "下一步执行人") - private Object nextAssign; - - @Schema(description = "表单数据") - private Map formVariables; - - @Schema(description = "审批意见") - private String reason; - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/param/task/TaskReturnParam.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/param/task/TaskReturnParam.java deleted file mode 100644 index 7c8a6af6dae52aabb6de2f8e53d2018758367ee9..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/param/task/TaskReturnParam.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.bootx.starter.flowable.param.task; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * 流程回退参数 - * - * @author xxm - * @date 2022/8/30 - */ -@Data -@Accessors(chain = true) -@Schema(title = "流程回退参数") -public class TaskReturnParam { - - @Schema(description = "任务id") - private String taskId; - - @Schema(description = "回退到的节点key") - private String targetKey; - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/util/BpmXmlUtil.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/util/BpmXmlUtil.java deleted file mode 100644 index f40e6e2a05efa6dace2f903e011fc8ac12178dc4..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/util/BpmXmlUtil.java +++ /dev/null @@ -1,84 +0,0 @@ -package cn.bootx.starter.flowable.util; - -import cn.hutool.core.collection.CollUtil; -import lombok.experimental.UtilityClass; -import lombok.extern.slf4j.Slf4j; -import org.flowable.bpmn.converter.BpmnXMLConverter; -import org.flowable.bpmn.model.BpmnModel; -import org.flowable.bpmn.model.ItemDefinition; -import org.flowable.bpmn.model.Process; -import org.flowable.validation.ProcessValidator; -import org.flowable.validation.ProcessValidatorFactory; -import org.flowable.validation.ValidationError; - -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import java.io.ByteArrayInputStream; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * bpmnXml对象转换工具类 - * - * @author xxm - * @date 2020/3/27 15:21 - */ -@Slf4j -@UtilityClass -public class BpmXmlUtil { - - /** - * 将字节转换成Bpmn对象 - */ - public BpmnModel convertByte2BpmnModel(byte[] bytes) { - // 创建转换对象 - try { - // 将xml文件转换成BpmnModel - BpmnXMLConverter converter = new BpmnXMLConverter(); - XMLInputFactory factory = XMLInputFactory.newInstance(); - XMLStreamReader reader = factory.createXMLStreamReader(new ByteArrayInputStream(bytes)); - BpmnModel bpmnModel = converter.convertToBpmnModel(reader); - - // 进行模型校验 - ProcessValidatorFactory processValidatorFactory = new ProcessValidatorFactory(); - ProcessValidator processValidator = processValidatorFactory.createDefaultProcessValidator(); - List validate = processValidator.validate(bpmnModel); - if (CollUtil.isNotEmpty(validate)) { - validate.forEach(error -> log.error(error.toString())); - throw new RuntimeException("Bpmn文件校验失败"); - } - return bpmnModel; - } - catch (XMLStreamException e) { - log.error(e.getMessage(), e); - throw new RuntimeException("Bpmn文件解析失败"); - } - } - - /** - * 将Bpmn对象转换xml字符串 - */ - public String convertBpmnModel2Str(BpmnModel bpmnModel) { - BpmnXMLConverter converter = new BpmnXMLConverter(); - byte[] bytes = converter.convertToXML(bpmnModel); - return new String(bytes); - } - - public static void main(String[] args) { - BpmnModel bpmnModel = new BpmnModel(); - Process mainProcess = new Process(); - // bpmnModel.addNamespace("extA1","http://www.a1bpm.com/schema/1.0/A1"); - mainProcess.setName("xxm"); - mainProcess.setId("xxaaa"); - - bpmnModel.addNamespace("extA1", "http://www.a1bpm.com/schema/1.0/A1"); - - Map itemDefinitionMap = new HashMap<>(); - - bpmnModel.addProcess(mainProcess); - System.out.println(convertBpmnModel2Str(bpmnModel)); - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/util/FlowableUtil.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/util/FlowableUtil.java deleted file mode 100644 index bb687ef0ab4df279128d12cc1ac6e52be643c93a..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/util/FlowableUtil.java +++ /dev/null @@ -1,640 +0,0 @@ -package cn.bootx.starter.flowable.util; - -import lombok.experimental.UtilityClass; -import lombok.extern.slf4j.Slf4j; -import org.flowable.bpmn.model.*; -import org.flowable.engine.impl.bpmn.behavior.ParallelMultiInstanceBehavior; -import org.flowable.engine.impl.bpmn.behavior.SequentialMultiInstanceBehavior; -import org.flowable.task.api.history.HistoricTaskInstance; - -import java.util.*; - -/** - * 流程引擎工具类封装 - * - * @author linjinp - * @date 2019-12-24 13:51 - */ -@Slf4j -@UtilityClass -public class FlowableUtil { - - /** - * 根据节点，获取入口连线 - * @param source - * @return - */ - public List getElementIncomingFlows(FlowElement source) { - List sequenceFlows = null; - if (source instanceof Task) { - sequenceFlows = ((Task) source).getIncomingFlows(); - } - else if (source instanceof Gateway) { - sequenceFlows = ((Gateway) source).getIncomingFlows(); - } - else if (source instanceof SubProcess) { - sequenceFlows = ((SubProcess) source).getIncomingFlows(); - } - else if (source instanceof StartEvent) { - sequenceFlows = ((StartEvent) source).getIncomingFlows(); - } - else if (source instanceof EndEvent) { - sequenceFlows = ((EndEvent) source).getIncomingFlows(); - } - return sequenceFlows; - } - - /** - * 根据节点，获取出口连线 - * @param source - * @return - */ - public List getElementOutgoingFlows(FlowElement source) { - List sequenceFlows = null; - if (source instanceof Task) { - sequenceFlows = ((Task) source).getOutgoingFlows(); - } - else if (source instanceof Gateway) { - sequenceFlows = ((Gateway) source).getOutgoingFlows(); - } - else if (source instanceof SubProcess) { - sequenceFlows = ((SubProcess) source).getOutgoingFlows(); - } - else if (source instanceof StartEvent) { - sequenceFlows = ((StartEvent) source).getOutgoingFlows(); - } - else if (source instanceof EndEvent) { - sequenceFlows = ((EndEvent) source).getOutgoingFlows(); - } - return sequenceFlows; - } - - /** - * 获取全部节点列表，包含子流程节点 - * @param flowElements - * @param allElements - * @return - */ - public Collection getAllElements(Collection flowElements, - Collection allElements) { - allElements = allElements == null ? new ArrayList<>() : allElements; - - for (FlowElement flowElement : flowElements) { - allElements.add(flowElement); - if (flowElement instanceof SubProcess) { - // 继续深入子流程，进一步获取子流程 - allElements = FlowableUtil.getAllElements(((SubProcess) flowElement).getFlowElements(), allElements); - } - } - return allElements; - } - - /** - * 迭代获取父级任务节点列表，向前找 获取当前节点的所有父级用户任务节点, 深度优先算法思想：延边迭代深入 - * @param source 起始节点 - * @param hasSequenceFlow 已经经过的连线的 ID，用于判断线路是否重复 - * @param userTaskList 已找到的用户任务节点 - * @return - */ - public List findParentUserTasks(FlowElement source, Set hasSequenceFlow, - List userTaskList) { - userTaskList = userTaskList == null ? new ArrayList<>() : userTaskList; - hasSequenceFlow = hasSequenceFlow == null ? new HashSet<>() : hasSequenceFlow; - - // 如果该节点为开始节点，且存在上级子节点，则顺着上级子节点继续迭代 - if (source instanceof StartEvent && source.getSubProcess() != null) { - userTaskList = findParentUserTasks(source.getSubProcess(), hasSequenceFlow, userTaskList); - } - - // 根据类型，获取入口连线 - List sequenceFlows = getElementIncomingFlows(source); - - if (sequenceFlows != null) { - // 循环找到目标元素 - for (SequenceFlow sequenceFlow : sequenceFlows) { - // 如果发现连线重复，说明循环了，跳过这个循环 - if (hasSequenceFlow.contains(sequenceFlow.getId())) { - continue; - } - // 添加已经走过的连线 - hasSequenceFlow.add(sequenceFlow.getId()); - // 类型为用户节点，则新增父级节点 - if (sequenceFlow.getSourceFlowElement() instanceof UserTask) { - userTaskList.add((UserTask) sequenceFlow.getSourceFlowElement()); - continue; - } - // 类型为子流程，则添加子流程开始节点出口处相连的节点 - if (sequenceFlow.getSourceFlowElement() instanceof SubProcess) { - // 获取子流程用户任务节点 - List childUserTaskList = findChildProcessUserTasks( - (StartEvent) ((SubProcess) sequenceFlow.getSourceFlowElement()).getFlowElements() - .toArray()[0], - null, null); - // 如果找到节点，则说明该线路找到节点，不继续向下找，反之继续 - if (childUserTaskList != null && childUserTaskList.size() > 0) { - userTaskList.addAll(childUserTaskList); - continue; - } - } - // 继续迭代 - userTaskList = findParentUserTasks(sequenceFlow.getSourceFlowElement(), hasSequenceFlow, userTaskList); - } - } - return userTaskList; - } - - /** - * 根据正在运行的任务节点，迭代获取子级任务节点列表，向后找 - * @param source 起始节点 - * @param runTaskKeyList 正在运行的任务 Key，用于校验任务节点是否是正在运行的节点 - * @param hasSequenceFlow 已经经过的连线的 ID，用于判断线路是否重复 - * @param userTaskList 需要撤回的用户任务列表 - * @return - */ - public List findChildUserTasks(FlowElement source, List runTaskKeyList, - Set hasSequenceFlow, List userTaskList) { - hasSequenceFlow = hasSequenceFlow == null ? new HashSet<>() : hasSequenceFlow; - userTaskList = userTaskList == null ? new ArrayList<>() : userTaskList; - - // 如果该节点为开始节点，且存在上级子节点，则顺着上级子节点继续迭代 - if (source instanceof EndEvent && source.getSubProcess() != null) { - userTaskList = findChildUserTasks(source.getSubProcess(), runTaskKeyList, hasSequenceFlow, userTaskList); - } - - // 根据类型，获取出口连线 - List sequenceFlows = getElementOutgoingFlows(source); - - if (sequenceFlows != null) { - // 循环找到目标元素 - for (SequenceFlow sequenceFlow : sequenceFlows) { - // 如果发现连线重复，说明循环了，跳过这个循环 - if (hasSequenceFlow.contains(sequenceFlow.getId())) { - continue; - } - // 添加已经走过的连线 - hasSequenceFlow.add(sequenceFlow.getId()); - // 如果为用户任务类型，且任务节点的 Key 正在运行的任务中存在，添加 - if (sequenceFlow.getTargetFlowElement() instanceof UserTask - && runTaskKeyList.contains((sequenceFlow.getTargetFlowElement()).getId())) { - userTaskList.add((UserTask) sequenceFlow.getTargetFlowElement()); - continue; - } - // 如果节点为子流程节点情况，则从节点中的第一个节点开始获取 - if (sequenceFlow.getTargetFlowElement() instanceof SubProcess) { - List childUserTaskList = findChildUserTasks( - (FlowElement) (((SubProcess) sequenceFlow.getTargetFlowElement()).getFlowElements() - .toArray()[0]), - runTaskKeyList, hasSequenceFlow, null); - // 如果找到节点，则说明该线路找到节点，不继续向下找，反之继续 - if (childUserTaskList != null && childUserTaskList.size() > 0) { - userTaskList.addAll(childUserTaskList); - continue; - } - } - // 继续迭代 - userTaskList = findChildUserTasks(sequenceFlow.getTargetFlowElement(), runTaskKeyList, hasSequenceFlow, - userTaskList); - } - } - return userTaskList; - } - - /** - * 迭代获取子流程用户任务节点 - * @param source 起始节点 - * @param hasSequenceFlow 已经经过的连线的 ID，用于判断线路是否重复 - * @param userTaskList 需要撤回的用户任务列表 - * @return - */ - public List findChildProcessUserTasks(FlowElement source, Set hasSequenceFlow, - List userTaskList) { - hasSequenceFlow = hasSequenceFlow == null ? new HashSet<>() : hasSequenceFlow; - userTaskList = userTaskList == null ? new ArrayList<>() : userTaskList; - - // 根据类型，获取出口连线 - List sequenceFlows = getElementOutgoingFlows(source); - - if (sequenceFlows != null) { - // 循环找到目标元素 - for (SequenceFlow sequenceFlow : sequenceFlows) { - // 如果发现连线重复，说明循环了，跳过这个循环 - if (hasSequenceFlow.contains(sequenceFlow.getId())) { - continue; - } - // 添加已经走过的连线 - hasSequenceFlow.add(sequenceFlow.getId()); - // 如果为用户任务类型，且任务节点的 Key 正在运行的任务中存在，添加 - if (sequenceFlow.getTargetFlowElement() instanceof UserTask) { - userTaskList.add((UserTask) sequenceFlow.getTargetFlowElement()); - continue; - } - // 如果节点为子流程节点情况，则从节点中的第一个节点开始获取 - if (sequenceFlow.getTargetFlowElement() instanceof SubProcess) { - List childUserTaskList = findChildProcessUserTasks( - (FlowElement) (((SubProcess) sequenceFlow.getTargetFlowElement()).getFlowElements() - .toArray()[0]), - hasSequenceFlow, null); - // 如果找到节点，则说明该线路找到节点，不继续向下找，反之继续 - if (childUserTaskList != null && childUserTaskList.size() > 0) { - userTaskList.addAll(childUserTaskList); - continue; - } - } - // 继续迭代 - userTaskList = findChildProcessUserTasks(sequenceFlow.getTargetFlowElement(), hasSequenceFlow, - userTaskList); - } - } - return userTaskList; - } - - /** - * 从后向前寻路，获取所有脏线路上的点 - * @param source 起始节点 - * @param passRoads 已经经过的点集合 - * @param hasSequenceFlow 已经经过的连线的 ID，用于判断线路是否重复 - * @param targets 目标脏线路终点 - * @param dirtyRoads 确定为脏数据的点，因为不需要重复，因此使用 set 存储 - * @return - */ - public Set findDirtyRoads(FlowElement source, List passRoads, Set hasSequenceFlow, - List targets, Set dirtyRoads) { - passRoads = passRoads == null ? new ArrayList<>() : passRoads; - dirtyRoads = dirtyRoads == null ? new HashSet<>() : dirtyRoads; - hasSequenceFlow = hasSequenceFlow == null ? new HashSet<>() : hasSequenceFlow; - - // 如果该节点为开始节点，且存在上级子节点，则顺着上级子节点继续迭代 - if (source instanceof StartEvent && source.getSubProcess() != null) { - dirtyRoads = findDirtyRoads(source.getSubProcess(), passRoads, hasSequenceFlow, targets, dirtyRoads); - } - - // 根据类型，获取入口连线 - List sequenceFlows = getElementIncomingFlows(source); - - if (sequenceFlows != null) { - // 循环找到目标元素 - for (SequenceFlow sequenceFlow : sequenceFlows) { - // 如果发现连线重复，说明循环了，跳过这个循环 - if (hasSequenceFlow.contains(sequenceFlow.getId())) { - continue; - } - // 添加已经走过的连线 - hasSequenceFlow.add(sequenceFlow.getId()); - // 新增经过的路线 - passRoads.add(sequenceFlow.getSourceFlowElement().getId()); - // 如果此点为目标点，确定经过的路线为脏线路，添加点到脏线路中，然后找下个连线 - if (targets.contains(sequenceFlow.getSourceFlowElement().getId())) { - dirtyRoads.addAll(passRoads); - continue; - } - // 如果该节点为开始节点，且存在上级子节点，则顺着上级子节点继续迭代 - if (sequenceFlow.getSourceFlowElement() instanceof SubProcess) { - dirtyRoads = findChildProcessAllDirtyRoad( - (StartEvent) ((SubProcess) sequenceFlow.getSourceFlowElement()).getFlowElements() - .toArray()[0], - null, dirtyRoads); - // 是否存在子流程上，true 是，false 否 - Boolean isInChildProcess = dirtyTargetInChildProcess( - (StartEvent) ((SubProcess) sequenceFlow.getSourceFlowElement()).getFlowElements() - .toArray()[0], - null, targets, null); - if (isInChildProcess) { - // 已在子流程上找到，该路线结束 - continue; - } - } - // 继续迭代 - dirtyRoads = findDirtyRoads(sequenceFlow.getSourceFlowElement(), passRoads, hasSequenceFlow, targets, - dirtyRoads); - } - } - return dirtyRoads; - } - - /** - * 迭代获取子流程脏路线 说明，假如回退的点就是子流程，那么也肯定会回退到子流程最初的用户任务节点，因此子流程中的节点全是脏路线 - * @param source 起始节点 - * @param hasSequenceFlow 已经经过的连线的 ID，用于判断线路是否重复 - * @param dirtyRoads 确定为脏数据的点，因为不需要重复，因此使用 set 存储 - * @return - */ - public Set findChildProcessAllDirtyRoad(FlowElement source, Set hasSequenceFlow, - Set dirtyRoads) { - hasSequenceFlow = hasSequenceFlow == null ? new HashSet<>() : hasSequenceFlow; - dirtyRoads = dirtyRoads == null ? new HashSet<>() : dirtyRoads; - - // 根据类型，获取出口连线 - List sequenceFlows = getElementOutgoingFlows(source); - - if (sequenceFlows != null) { - // 循环找到目标元素 - for (SequenceFlow sequenceFlow : sequenceFlows) { - // 如果发现连线重复，说明循环了，跳过这个循环 - if (hasSequenceFlow.contains(sequenceFlow.getId())) { - continue; - } - // 添加已经走过的连线 - hasSequenceFlow.add(sequenceFlow.getId()); - // 添加脏路线 - dirtyRoads.add(sequenceFlow.getTargetFlowElement().getId()); - // 如果节点为子流程节点情况，则从节点中的第一个节点开始获取 - if (sequenceFlow.getTargetFlowElement() instanceof SubProcess) { - dirtyRoads = findChildProcessAllDirtyRoad( - (FlowElement) (((SubProcess) sequenceFlow.getTargetFlowElement()).getFlowElements() - .toArray()[0]), - hasSequenceFlow, dirtyRoads); - } - // 继续迭代 - dirtyRoads = findChildProcessAllDirtyRoad(sequenceFlow.getTargetFlowElement(), hasSequenceFlow, - dirtyRoads); - } - } - return dirtyRoads; - } - - /** - * 判断脏路线结束节点是否在子流程上 - * @param source 起始节点 - * @param hasSequenceFlow 已经经过的连线的 ID，用于判断线路是否重复 - * @param targets 判断脏路线节点是否存在子流程上，只要存在一个，说明脏路线只到子流程为止 - * @param inChildProcess 是否存在子流程上，true 是，false 否 - * @return - */ - public Boolean dirtyTargetInChildProcess(FlowElement source, Set hasSequenceFlow, List targets, - Boolean inChildProcess) { - hasSequenceFlow = hasSequenceFlow == null ? new HashSet<>() : hasSequenceFlow; - inChildProcess = inChildProcess != null && inChildProcess; - - // 根据类型，获取出口连线 - List sequenceFlows = getElementOutgoingFlows(source); - - if (sequenceFlows != null && !inChildProcess) { - // 循环找到目标元素 - for (SequenceFlow sequenceFlow : sequenceFlows) { - // 如果发现连线重复，说明循环了，跳过这个循环 - if (hasSequenceFlow.contains(sequenceFlow.getId())) { - continue; - } - // 添加已经走过的连线 - hasSequenceFlow.add(sequenceFlow.getId()); - // 如果发现目标点在子流程上存在，说明只到子流程为止 - if (targets.contains(sequenceFlow.getTargetFlowElement().getId())) { - inChildProcess = true; - break; - } - // 如果节点为子流程节点情况，则从节点中的第一个节点开始获取 - if (sequenceFlow.getTargetFlowElement() instanceof SubProcess) { - inChildProcess = dirtyTargetInChildProcess( - (FlowElement) (((SubProcess) sequenceFlow.getTargetFlowElement()).getFlowElements() - .toArray()[0]), - hasSequenceFlow, targets, inChildProcess); - } - // 继续迭代 - inChildProcess = dirtyTargetInChildProcess(sequenceFlow.getTargetFlowElement(), hasSequenceFlow, - targets, inChildProcess); - } - } - return inChildProcess; - } - - /** - * 迭代从后向前扫描，判断目标节点相对于当前节点是否是串行 不存在直接回退到子流程中的情况，但存在从子流程出去到父流程情况 - * @param source 起始节点 - * @param isSequential 是否串行 - * @param hasSequenceFlow 已经经过的连线的 ID，用于判断线路是否重复 - * @param targetKsy 目标节点 - * @return - */ - public Boolean iteratorCheckSequentialReferTarget(FlowElement source, String targetKsy, Set hasSequenceFlow, - Boolean isSequential) { - isSequential = isSequential == null || isSequential; - hasSequenceFlow = hasSequenceFlow == null ? new HashSet<>() : hasSequenceFlow; - - // 如果该节点为开始节点，且存在上级子节点，则顺着上级子节点继续迭代 - if (source instanceof StartEvent && source.getSubProcess() != null) { - isSequential = iteratorCheckSequentialReferTarget(source.getSubProcess(), targetKsy, hasSequenceFlow, - isSequential); - } - - // 根据类型，获取入口连线 - List sequenceFlows = getElementIncomingFlows(source); - - if (sequenceFlows != null) { - // 循环找到目标元素 - for (SequenceFlow sequenceFlow : sequenceFlows) { - // 如果发现连线重复，说明循环了，跳过这个循环 - if (hasSequenceFlow.contains(sequenceFlow.getId())) { - continue; - } - // 添加已经走过的连线 - hasSequenceFlow.add(sequenceFlow.getId()); - // 如果目标节点已被判断为并行，后面都不需要执行，直接返回 - if (!isSequential) { - break; - } - // 这条线路存在目标节点，这条线路完成，进入下个线路 - if (targetKsy.equals(sequenceFlow.getSourceFlowElement().getId())) { - continue; - } - if (sequenceFlow.getSourceFlowElement() instanceof StartEvent) { - isSequential = false; - break; - } - // 否则就继续迭代 - isSequential = iteratorCheckSequentialReferTarget(sequenceFlow.getSourceFlowElement(), targetKsy, - hasSequenceFlow, isSequential); - } - } - return isSequential; - } - - /** - * 从后向前寻路，获取到达节点的所有路线 不存在直接回退到子流程，但是存在回退到父级流程的情况 - * @param source 起始节点 - * @param passRoads 已经经过的点集合 - * @param roads 路线 - */ - public List> findRoad(FlowElement source, List passRoads, Set hasSequenceFlow, - List> roads) { - passRoads = passRoads == null ? new ArrayList<>() : passRoads; - roads = roads == null ? new ArrayList<>() : roads; - hasSequenceFlow = hasSequenceFlow == null ? new HashSet<>() : hasSequenceFlow; - - // 如果该节点为开始节点，且存在上级子节点，则顺着上级子节点继续迭代 - if (source instanceof StartEvent && source.getSubProcess() != null) { - roads = findRoad(source.getSubProcess(), passRoads, hasSequenceFlow, roads); - } - - // 根据类型，获取入口连线 - List sequenceFlows = getElementIncomingFlows(source); - - if (sequenceFlows != null && sequenceFlows.size() != 0) { - for (SequenceFlow sequenceFlow : sequenceFlows) { - // 如果发现连线重复，说明循环了，跳过这个循环 - if (hasSequenceFlow.contains(sequenceFlow.getId())) { - continue; - } - // 添加已经走过的连线 - hasSequenceFlow.add(sequenceFlow.getId()); - // 添加经过路线 - if (sequenceFlow.getSourceFlowElement() instanceof UserTask) { - passRoads.add((UserTask) sequenceFlow.getSourceFlowElement()); - } - // 继续迭代 - roads = findRoad(sequenceFlow.getSourceFlowElement(), passRoads, hasSequenceFlow, roads); - } - } - else { - // 添加路线 - roads.add(passRoads); - } - return roads; - } - - /** - * 历史节点数据清洗，清洗掉又回滚导致的脏数据 - * @param allElements 全部节点信息 - * @param historicTaskInstanceList 历史任务实例信息，数据采用开始时间升序 - */ - public List historicTaskInstanceClean(Collection allElements, - List historicTaskInstanceList) { - // 会签节点收集 - List multiTask = new ArrayList<>(); - allElements.forEach(flowElement -> { - if (flowElement instanceof UserTask) { - // 如果该节点的行为为会签行为，说明该节点为会签节点 - if (((UserTask) flowElement).getBehavior() instanceof ParallelMultiInstanceBehavior - || ((UserTask) flowElement).getBehavior() instanceof SequentialMultiInstanceBehavior) { - multiTask.add(flowElement.getId()); - } - } - }); - // 循环放入栈，栈 LIFO：后进先出 - Stack stack = new Stack<>(); - historicTaskInstanceList.forEach(stack::push); - // 清洗后的历史任务实例 - List lastHistoricTaskInstanceList = new ArrayList<>(); - // 网关存在可能只走了部分分支情况，且还存在跳转废弃数据以及其他分支数据的干扰，因此需要对历史节点数据进行清洗 - // 临时用户任务 key - StringBuilder userTaskKey = null; - // 临时被删掉的任务 key，存在并行情况 - List deleteKeyList = new ArrayList<>(); - // 临时脏数据线路 - List> dirtyDataLineList = new ArrayList<>(); - // 由某个点跳到会签点,此时出现多个会签实例对应 1 个跳转情况，需要把这些连续脏数据都找到 - // 会签特殊处理下标 - int multiIndex = -1; - // 会签特殊处理 key - StringBuilder multiKey = null; - // 会签特殊处理操作标识 - boolean multiOpera = false; - while (!stack.empty()) { - // 从这里开始 userTaskKey 都还是上个栈的 key - // 是否是脏数据线路上的点 - final boolean[] isDirtyData = { false }; - for (Set oldDirtyDataLine : dirtyDataLineList) { - if (oldDirtyDataLine.contains(stack.peek().getTaskDefinitionKey())) { - isDirtyData[0] = true; - } - } - // 删除原因不为空，说明从这条数据开始回跳或者回退的 - // MI_END：会签完成后，其他未签到节点的删除原因，不在处理范围内 - if (stack.peek().getDeleteReason() != null && !"MI_END".equals(stack.peek().getDeleteReason())) { - // 可以理解为脏线路起点 - String dirtyPoint = ""; - if (stack.peek().getDeleteReason().contains("Change activity to ")) { - dirtyPoint = stack.peek().getDeleteReason().replace("Change activity to ", ""); - } - // 会签回退删除原因有点不同 - if (stack.peek().getDeleteReason().contains("Change parent activity to ")) { - dirtyPoint = stack.peek().getDeleteReason().replace("Change parent activity to ", ""); - } - FlowElement dirtyTask = null; - // 获取变更节点的对应的入口处连线 - // 如果是网关并行回退情况，会变成两条脏数据路线，效果一样 - for (FlowElement flowElement : allElements) { - if (flowElement.getId().equals(stack.peek().getTaskDefinitionKey())) { - dirtyTask = flowElement; - } - } - // 获取脏数据线路 - Set dirtyDataLine = FlowableUtil.findDirtyRoads(dirtyTask, null, null, - Arrays.asList(dirtyPoint.split(",")), null); - // 自己本身也是脏线路上的点，加进去 - dirtyDataLine.add(stack.peek().getTaskDefinitionKey()); - log.info(stack.peek().getTaskDefinitionKey() + "点脏路线集合：" + dirtyDataLine); - // 是全新的需要添加的脏线路 - boolean isNewDirtyData = true; - for (Set strings : dirtyDataLineList) { - // 如果发现他的上个节点在脏线路内，说明这个点可能是并行的节点，或者连续驳回 - // 这时，都以之前的脏线路节点为标准，只需合并脏线路即可，也就是路线补全 - if (strings.contains(userTaskKey.toString())) { - isNewDirtyData = false; - strings.addAll(dirtyDataLine); - } - } - // 已确定时全新的脏线路 - if (isNewDirtyData) { - // deleteKey 单一路线驳回到并行，这种同时生成多个新实例记录情况，这时 deleteKey 其实是由多个值组成 - // 按照逻辑，回退后立刻生成的实例记录就是回退的记录 - // 至于驳回所生成的 Key，直接从删除原因中获取，因为存在驳回到并行的情况 - deleteKeyList.add(dirtyPoint + ","); - dirtyDataLineList.add(dirtyDataLine); - } - // 添加后，现在这个点变成脏线路上的点了 - isDirtyData[0] = true; - } - // 如果不是脏线路上的点，说明是有效数据，添加历史实例 Key - if (!isDirtyData[0]) { - lastHistoricTaskInstanceList.add(stack.peek().getTaskDefinitionKey()); - } - // 校验脏线路是否结束 - for (int i = 0; i < deleteKeyList.size(); i++) { - // 如果发现脏数据属于会签，记录下下标与对应 Key，以备后续比对，会签脏数据范畴开始 - if (multiKey == null && multiTask.contains(stack.peek().getTaskDefinitionKey()) - && deleteKeyList.get(i).contains(stack.peek().getTaskDefinitionKey())) { - multiIndex = i; - multiKey = new StringBuilder(stack.peek().getTaskDefinitionKey()); - } - // 会签脏数据处理，节点退回会签清空 - // 如果在会签脏数据范畴中发现 Key改变，说明会签脏数据在上个节点就结束了，可以把会签脏数据删掉 - if (multiKey != null && !multiKey.toString().equals(stack.peek().getTaskDefinitionKey())) { - deleteKeyList.set(multiIndex, - deleteKeyList.get(multiIndex).replace(stack.peek().getTaskDefinitionKey() + ",", "")); - multiKey = null; - // 结束进行下校验删除 - multiOpera = true; - } - // 其他脏数据处理 - // 发现该路线最后一条脏数据，说明这条脏数据线路处理完了，删除脏数据信息 - // 脏数据产生的新实例中是否包含这条数据 - if (multiKey == null && deleteKeyList.get(i).contains(stack.peek().getTaskDefinitionKey())) { - // 删除匹配到的部分 - deleteKeyList.set(i, deleteKeyList.get(i).replace(stack.peek().getTaskDefinitionKey() + ",", "")); - } - // 如果每组中的元素都以匹配过，说明脏数据结束 - if ("".equals(deleteKeyList.get(i))) { - // 同时删除脏数据 - deleteKeyList.remove(i); - dirtyDataLineList.remove(i); - break; - } - } - // 会签数据处理需要在循环外处理，否则可能导致溢出 - // 会签的数据肯定是之前放进去的所以理论上不会溢出，但还是校验下 - if (multiOpera && deleteKeyList.size() > multiIndex && "".equals(deleteKeyList.get(multiIndex))) { - // 同时删除脏数据 - deleteKeyList.remove(multiIndex); - dirtyDataLineList.remove(multiIndex); - multiIndex = -1; - multiOpera = false; - } - // pop() 方法与 peek() 方法不同，在返回值的同时，会把值从栈中移除 - // 保存新的 userTaskKey 在下个循环中使用 - userTaskKey = new StringBuilder(stack.pop().getTaskDefinitionKey()); - } - log.info("清洗后的历史节点数据：" + lastHistoricTaskInstanceList); - return lastHistoricTaskInstanceList; - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/web/FlowableWebFilter.java b/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/web/FlowableWebFilter.java deleted file mode 100644 index f55aa43f269d1cddd0de9e9add6aea9fa433ef3c..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/java/cn/bootx/starter/flowable/web/FlowableWebFilter.java +++ /dev/null @@ -1,50 +0,0 @@ -package cn.bootx.starter.flowable.web; - -import cn.bootx.common.core.entity.UserDetail; -import cn.bootx.starter.auth.util.SecurityUtil; -import cn.bootx.starter.flowable.local.BpmContextLocal; -import cn.hutool.core.util.StrUtil; -import lombok.RequiredArgsConstructor; -import org.flowable.common.engine.impl.identity.Authentication; -import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; -import org.springframework.stereotype.Component; -import org.springframework.web.filter.OncePerRequestFilter; - -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -/** - * flowable Web 过滤器，将 userId 设置到工作流里 - * - * @author xxm - * @date 2022/8/24 - */ -@Component -@RequiredArgsConstructor -@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) -public class FlowableWebFilter extends OncePerRequestFilter { - - @Override - protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) - throws ServletException, IOException { - try { - // 设置工作流的用户 - String userId = SecurityUtil.getCurrentUser().map(UserDetail::getId).map(String::valueOf).orElse(null); - if (StrUtil.isNotBlank(userId)) { - Authentication.setAuthenticatedUserId(String.valueOf(userId)); - } - // 过滤 - chain.doFilter(request, response); - } - finally { - BpmContextLocal.clear(); - // 清理 - Authentication.setAuthenticatedUserId(null); - - } - } - -} diff --git a/bootx-common-starters/common-starter-flowable/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-common-starters/common-starter-flowable/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 789d667a5651554d6f60e0f8785f9741ce1076e4..0000000000000000000000000000000000000000 --- a/bootx-common-starters/common-starter-flowable/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.bootx.starter.flowable.FlowableAutoConfiguration \ No newline at end of file diff --git a/bootx-common-starters/common-starter-monitor/pom.xml b/bootx-common-starters/common-starter-monitor/pom.xml index 6024f7bdc25dd3e4dbb3e8f4f50cc667af67fffe..431dbeb68445dc7609d597d21a28ece900c47fa4 100644 --- a/bootx-common-starters/common-starter-monitor/pom.xml +++ b/bootx-common-starters/common-starter-monitor/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.2.3 + 1.3.0 4.0.0 jar diff --git a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/starter/monitor/MonitorAutoConfiguration.java b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/MonitorAutoConfiguration.java similarity index 86% rename from bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/starter/monitor/MonitorAutoConfiguration.java rename to bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/MonitorAutoConfiguration.java index 25bf1686c373950299126199cdf044e3570b8521..da3251d9812efc695fe6773238ba66fc9add8038 100644 --- a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/starter/monitor/MonitorAutoConfiguration.java +++ b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/MonitorAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.monitor; +package cn.bootx.platform.starter.monitor; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.ComponentScan; diff --git a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/starter/monitor/controller/SystemMonitorController.java b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/controller/SystemMonitorController.java similarity index 69% rename from bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/starter/monitor/controller/SystemMonitorController.java rename to bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/controller/SystemMonitorController.java index ad9675fffe290b31f2e70cc23c5f4cfc6cf97ea9..094b5bdf3d4f6129e1f30bc44d4f46622b4f71aa 100644 --- a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/starter/monitor/controller/SystemMonitorController.java +++ b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/controller/SystemMonitorController.java @@ -1,13 +1,13 @@ -package cn.bootx.starter.monitor.controller; - -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.starter.monitor.entity.MongoMonitorResult; -import cn.bootx.starter.monitor.entity.RedisMonitorResult; -import cn.bootx.starter.monitor.entity.SystemMonitorResult; -import cn.bootx.starter.monitor.service.MongoMonitorService; -import cn.bootx.starter.monitor.service.RedisMonitorService; -import cn.bootx.starter.monitor.service.SystemMonitorService; +package cn.bootx.platform.starter.monitor.controller; + +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.starter.monitor.entity.MongoMonitorResult; +import cn.bootx.platform.starter.monitor.entity.RedisMonitorResult; +import cn.bootx.platform.starter.monitor.entity.SystemMonitorResult; +import cn.bootx.platform.starter.monitor.service.MongoMonitorService; +import cn.bootx.platform.starter.monitor.service.RedisMonitorService; +import cn.bootx.platform.starter.monitor.service.SystemMonitorService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/starter/monitor/entity/MongoMonitorResult.java b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/MongoMonitorResult.java similarity index 85% rename from bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/starter/monitor/entity/MongoMonitorResult.java rename to bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/MongoMonitorResult.java index c30b6e4bc46c25e184a6a5542167dea287f29573..88ccd7e11cde7d1d66ab42977330a848faa89544 100644 --- a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/starter/monitor/entity/MongoMonitorResult.java +++ b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/MongoMonitorResult.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.monitor.entity; +package cn.bootx.platform.starter.monitor.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/starter/monitor/entity/RedisMonitorResult.java b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/RedisMonitorResult.java similarity index 82% rename from bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/starter/monitor/entity/RedisMonitorResult.java rename to bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/RedisMonitorResult.java index 1b213b82481c50a3d7b993d89998eec07042408d..ae79f43524d534652117be266116a99071bcd831 100644 --- a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/starter/monitor/entity/RedisMonitorResult.java +++ b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/RedisMonitorResult.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.monitor.entity; +package cn.bootx.platform.starter.monitor.entity; -import cn.bootx.common.core.rest.dto.KeyValue; +import cn.bootx.platform.common.core.rest.dto.KeyValue; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/starter/monitor/entity/SystemMonitorResult.java b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/SystemMonitorResult.java similarity index 99% rename from bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/starter/monitor/entity/SystemMonitorResult.java rename to bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/SystemMonitorResult.java index f4353659b4137691e45b71f9fc180f913cd8b6ca..3b7084f32c3bb8e6ada888d437cd0ea2a60c5d87 100644 --- a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/starter/monitor/entity/SystemMonitorResult.java +++ b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/SystemMonitorResult.java @@ -22,7 +22,7 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/xiaonuobase/snowy 6.若您的项目无法满足以上几点，可申请商业授权，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip */ -package cn.bootx.starter.monitor.entity; +package cn.bootx.platform.starter.monitor.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/starter/monitor/service/MongoMonitorService.java b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/MongoMonitorService.java similarity index 82% rename from bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/starter/monitor/service/MongoMonitorService.java rename to bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/MongoMonitorService.java index e5188bba7ae9e59dbd03075a4f6f8f2e1895da14..f8678aa5c0361c7d68cc6100dd0c575106d6796c 100644 --- a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/starter/monitor/service/MongoMonitorService.java +++ b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/MongoMonitorService.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.monitor.service; +package cn.bootx.platform.starter.monitor.service; -import cn.bootx.starter.monitor.entity.MongoMonitorResult; +import cn.bootx.platform.starter.monitor.entity.MongoMonitorResult; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.mongodb.core.MongoTemplate; diff --git a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/starter/monitor/service/RedisMonitorService.java b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/RedisMonitorService.java similarity index 91% rename from bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/starter/monitor/service/RedisMonitorService.java rename to bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/RedisMonitorService.java index 9b4a5b81f7c663fd57977235052fdbdf5f209fdd..0644be078bfae5cc3ebbf6b4cc6b384f77d46cb4 100644 --- a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/starter/monitor/service/RedisMonitorService.java +++ b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/RedisMonitorService.java @@ -1,7 +1,7 @@ -package cn.bootx.starter.monitor.service; +package cn.bootx.platform.starter.monitor.service; -import cn.bootx.common.core.rest.dto.KeyValue; -import cn.bootx.starter.monitor.entity.RedisMonitorResult; +import cn.bootx.platform.common.core.rest.dto.KeyValue; +import cn.bootx.platform.starter.monitor.entity.RedisMonitorResult; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/starter/monitor/service/SystemMonitorService.java b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/SystemMonitorService.java similarity index 97% rename from bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/starter/monitor/service/SystemMonitorService.java rename to bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/SystemMonitorService.java index bc542898442205597a0868c52b29852fccb7e615..080b51a8ace0f5f9416d9a1649e4c3bc0234c7b0 100644 --- a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/starter/monitor/service/SystemMonitorService.java +++ b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/SystemMonitorService.java @@ -1,7 +1,7 @@ -package cn.bootx.starter.monitor.service; +package cn.bootx.platform.starter.monitor.service; -import cn.bootx.starter.monitor.entity.SystemMonitorResult; -import cn.bootx.starter.monitor.entity.SystemMonitorResult.*; +import cn.bootx.platform.starter.monitor.entity.SystemMonitorResult; +import cn.bootx.platform.starter.monitor.entity.SystemMonitorResult.*; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.system.*; diff --git a/bootx-common-starters/common-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-common-starters/common-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index dcf55b06ddf45ed6703e3332a5c5babb7942ef50..f6e73c5777accb0362044bd193569e1f1dcc63a4 100644 --- a/bootx-common-starters/common-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-common-starters/common-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.starter.monitor.MonitorAutoConfiguration \ No newline at end of file +cn.bootx.platform.starter.monitor.MonitorAutoConfiguration diff --git a/bootx-common-starters/common-starter-quartz/pom.xml b/bootx-common-starters/common-starter-quartz/pom.xml index a8cb250f62ed1b55dd447790903e6adb17eaae85..8ca96149e2f6991d01f0c908f928099350aa8002 100644 --- a/bootx-common-starters/common-starter-quartz/pom.xml +++ b/bootx-common-starters/common-starter-quartz/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-common-starters - 1.2.3 + 1.3.0 4.0.0 diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/QuartzJobAutoConfiguration.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/QuartzJobAutoConfiguration.java similarity index 92% rename from bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/QuartzJobAutoConfiguration.java rename to bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/QuartzJobAutoConfiguration.java index 55d7aabe4f04443576849df2bfe6f82a2dd56c6d..e6bd9b685ac98cc75ef1112955d2ccea5d85f1b9 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/QuartzJobAutoConfiguration.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/QuartzJobAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.quartz; +package cn.bootx.platform.starter.quartz; import org.apache.ibatis.annotations.Mapper; import org.mybatis.spring.annotation.MapperScan; diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/code/QuartzJobCode.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/code/QuartzJobCode.java similarity index 79% rename from bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/code/QuartzJobCode.java rename to bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/code/QuartzJobCode.java index 94f587322f1001edda01f97cff3aadf42aff08f8..2035ee40a7ef47e2c1db1e3d3608b5bef0c69ef5 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/code/QuartzJobCode.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/code/QuartzJobCode.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.quartz.code; +package cn.bootx.platform.starter.quartz.code; /** * 定时任务状态 diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/configuration/QuartzProperties.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/configuration/QuartzProperties.java similarity index 98% rename from bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/configuration/QuartzProperties.java rename to bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/configuration/QuartzProperties.java index 8aa1316adca185368f18324c1cf921a031652756..9f709451779e5f465e846d248c42d1a6272bf38d 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/configuration/QuartzProperties.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/configuration/QuartzProperties.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.quartz.configuration; +package cn.bootx.platform.starter.quartz.configuration; import lombok.Getter; import lombok.Setter; diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/controller/QuartzJobController.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/controller/QuartzJobController.java similarity index 83% rename from bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/controller/QuartzJobController.java rename to bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/controller/QuartzJobController.java index 15ce104e9839b816fe5ff67606c8bc99e0141110..1f5309b571d199fe1d0b6dba9177343b66005ffd 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/controller/QuartzJobController.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/controller/QuartzJobController.java @@ -1,12 +1,12 @@ -package cn.bootx.starter.quartz.controller; +package cn.bootx.platform.starter.quartz.controller; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.quartz.core.service.QuartzJobService; -import cn.bootx.starter.quartz.dto.QuartzJobDto; -import cn.bootx.starter.quartz.param.QuartzJobParam; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.starter.quartz.core.service.QuartzJobService; +import cn.bootx.platform.starter.quartz.dto.QuartzJobDto; +import cn.bootx.platform.starter.quartz.param.QuartzJobParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/controller/QuartzJobLogController.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/controller/QuartzJobLogController.java similarity index 68% rename from bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/controller/QuartzJobLogController.java rename to bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/controller/QuartzJobLogController.java index 97022c2a4e2b3553cd1bf74dcdaf77a9918ef3ed..b8f5e39facae93b3bea2991217762940b5b6fa13 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/controller/QuartzJobLogController.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/controller/QuartzJobLogController.java @@ -1,12 +1,12 @@ -package cn.bootx.starter.quartz.controller; +package cn.bootx.platform.starter.quartz.controller; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.quartz.core.service.QuartzJobLogService; -import cn.bootx.starter.quartz.dto.QuartzJobLogDto; -import cn.bootx.starter.quartz.param.QuartzJobLogQuery; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.starter.quartz.core.service.QuartzJobLogService; +import cn.bootx.platform.starter.quartz.dto.QuartzJobLogDto; +import cn.bootx.platform.starter.quartz.param.QuartzJobLogQuery; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/core/convert/QuartzJobConvert.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/convert/QuartzJobConvert.java similarity index 51% rename from bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/core/convert/QuartzJobConvert.java rename to bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/convert/QuartzJobConvert.java index d14ea94e804ae21f06b4f762ef27a7cb7f29be83..3528a1827f932df2d90520bb1e2c50c04e712967 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/core/convert/QuartzJobConvert.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/convert/QuartzJobConvert.java @@ -1,10 +1,10 @@ -package cn.bootx.starter.quartz.core.convert; +package cn.bootx.platform.starter.quartz.core.convert; -import cn.bootx.starter.quartz.core.entity.QuartzJob; -import cn.bootx.starter.quartz.core.entity.QuartzJobLog; -import cn.bootx.starter.quartz.dto.QuartzJobDto; -import cn.bootx.starter.quartz.dto.QuartzJobLogDto; -import cn.bootx.starter.quartz.param.QuartzJobParam; +import cn.bootx.platform.starter.quartz.param.QuartzJobParam; +import cn.bootx.platform.starter.quartz.core.entity.QuartzJob; +import cn.bootx.platform.starter.quartz.core.entity.QuartzJobLog; +import cn.bootx.platform.starter.quartz.dto.QuartzJobDto; +import cn.bootx.platform.starter.quartz.dto.QuartzJobLogDto; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/core/dao/QuartzJobLogManager.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobLogManager.java similarity index 67% rename from bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/core/dao/QuartzJobLogManager.java rename to bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobLogManager.java index 4d78b7aad716993cd9029b8ab5685a32acee4a47..81f3ab490602b2ce9d86c727471b8e5bd194a1dd 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/core/dao/QuartzJobLogManager.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobLogManager.java @@ -1,11 +1,11 @@ -package cn.bootx.starter.quartz.core.dao; +package cn.bootx.platform.starter.quartz.core.dao; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.starter.quartz.core.entity.QuartzJobLog; -import cn.bootx.starter.quartz.param.QuartzJobLogQuery; +import cn.bootx.platform.starter.quartz.core.entity.QuartzJobLog; +import cn.bootx.platform.starter.quartz.param.QuartzJobLogQuery; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/core/dao/QuartzJobLogMapper.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobLogMapper.java similarity index 68% rename from bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/core/dao/QuartzJobLogMapper.java rename to bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobLogMapper.java index 1e5a6cdbe4eb205d6124e7173f468acf2a9b0a67..54efefde813031ceeb3575ed0b7f7890b6c9aea6 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/core/dao/QuartzJobLogMapper.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobLogMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.quartz.core.dao; +package cn.bootx.platform.starter.quartz.core.dao; -import cn.bootx.starter.quartz.core.entity.QuartzJobLog; +import cn.bootx.platform.starter.quartz.core.entity.QuartzJobLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/core/dao/QuartzJobManager.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobManager.java similarity index 67% rename from bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/core/dao/QuartzJobManager.java rename to bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobManager.java index 2cc2b333897ff11cd7c223067eb7eff1643ff6ca..0fec09883362852f842f015fa3f8d3736b78d464 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/core/dao/QuartzJobManager.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobManager.java @@ -1,11 +1,11 @@ -package cn.bootx.starter.quartz.core.dao; +package cn.bootx.platform.starter.quartz.core.dao; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.starter.quartz.code.QuartzJobCode; -import cn.bootx.starter.quartz.core.entity.QuartzJob; -import cn.bootx.starter.quartz.param.QuartzJobParam; +import cn.bootx.platform.starter.quartz.core.entity.QuartzJob; +import cn.bootx.platform.starter.quartz.param.QuartzJobParam; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.starter.quartz.code.QuartzJobCode; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/core/dao/QuartzJobMapper.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobMapper.java similarity index 67% rename from bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/core/dao/QuartzJobMapper.java rename to bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobMapper.java index 0974e25862f3c97ba3008b3e5b9828503b68da19..7c244ee2976e5ed31c354c0e0028b2ed3768a8b9 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/core/dao/QuartzJobMapper.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.quartz.core.dao; +package cn.bootx.platform.starter.quartz.core.dao; -import cn.bootx.starter.quartz.core.entity.QuartzJob; +import cn.bootx.platform.starter.quartz.core.entity.QuartzJob; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/core/entity/QuartzJob.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/entity/QuartzJob.java similarity index 67% rename from bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/core/entity/QuartzJob.java rename to bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/entity/QuartzJob.java index 1e9e608b2693368c60f659db15f3fcaec063ce1c..fb53f5522c72e96e19a726d6d40ef66c603db5d6 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/starter/quartz/core/entity/QuartzJob.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/entity/QuartzJob.java @@ -1,10 +1,11 @@ -package cn.bootx.starter.quartz.core.entity; - -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.starter.quartz.core.convert.QuartzJobConvert; -import cn.bootx.starter.quartz.dto.QuartzJobDto; -import cn.bootx.starter.quartz.param.QuartzJobParam; +package cn.bootx.platform.starter.quartz.core.entity; + +import cn.bootx.platform.starter.quartz.core.convert.QuartzJobConvert; +import cn.bootx.platform.starter.quartz.param.QuartzJobParam; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.starter.quartz.code.QuartzJobCode; +import cn.bootx.platform.starter.quartz.dto.QuartzJobDto; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -36,7 +37,7 @@ public class QuartzJob extends MpBaseEntity implements EntityBaseFunction bootx-common-starters cn.bootx.platform - 1.2.3 + 1.3.0 4.0.0 diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/WeChatAutoConfiguration.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/WeChatAutoConfiguration.java similarity index 92% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/WeChatAutoConfiguration.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/WeChatAutoConfiguration.java index 289e076c0e8428a29e9f0e127d0f0297e733a9f8..25fcc2a811569b3b21827d10d31ff455db9750a3 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/WeChatAutoConfiguration.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/WeChatAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.wechat; +package cn.bootx.platform.starter.wechat; import org.apache.ibatis.annotations.Mapper; import org.mybatis.spring.annotation.MapperScan; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/code/WeChatCode.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/code/WeChatCode.java similarity index 92% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/code/WeChatCode.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/code/WeChatCode.java index 8363623330339ddff997da94f82092dcbac87fe7..b1a8f03c2812791d6218b3ba49c7d59cec51182b 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/code/WeChatCode.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/code/WeChatCode.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.wechat.code; +package cn.bootx.platform.starter.wechat.code; /** * 微信编码 diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/configuration/WeChatConfiguration.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatConfiguration.java similarity index 96% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/configuration/WeChatConfiguration.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatConfiguration.java index 95509e98dd62eda824c2a513a4a4c8f3216f869a..1f830932ed63fd67c1c1456e6cb8de913d7f05fe 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/configuration/WeChatConfiguration.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.wechat.configuration; +package cn.bootx.platform.starter.wechat.configuration; import lombok.RequiredArgsConstructor; import me.chanjar.weixin.mp.api.*; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/configuration/WeChatMessageRouterConfiguration.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatMessageRouterConfiguration.java similarity index 87% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/configuration/WeChatMessageRouterConfiguration.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatMessageRouterConfiguration.java index ea78586febcdb03dca440f4b8a3a6b706b5fa4ce..70a6e03987a5572fd8ce4e9e86a75957b55f58d4 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/configuration/WeChatMessageRouterConfiguration.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatMessageRouterConfiguration.java @@ -1,7 +1,7 @@ -package cn.bootx.starter.wechat.configuration; +package cn.bootx.platform.starter.wechat.configuration; -import cn.bootx.starter.wechat.handler.WeChatMpMessageHandler; -import cn.bootx.starter.wechat.handler.WeChatMsgHandler; +import cn.bootx.platform.starter.wechat.handler.WeChatMpMessageHandler; +import cn.bootx.platform.starter.wechat.handler.WeChatMsgHandler; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.mp.api.WxMpMessageRouter; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/configuration/WeChatProperties.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatProperties.java similarity index 90% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/configuration/WeChatProperties.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatProperties.java index 409a27032b522ef2886b9954058e058e1cb601c8..47b6fa53f65e413cb3ec734fc7c17ca0a64313a0 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/configuration/WeChatProperties.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatProperties.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.wechat.configuration; +package cn.bootx.platform.starter.wechat.configuration; import lombok.Getter; import lombok.Setter; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/controller/WeChatArticleController.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatArticleController.java similarity index 65% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/controller/WeChatArticleController.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatArticleController.java index e33522c13cfc9dccf363f8fc83fe9726e10c8e10..765380aee21a25b21e9b98be28d3371b8f5abc58 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/controller/WeChatArticleController.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatArticleController.java @@ -1,11 +1,11 @@ -package cn.bootx.starter.wechat.controller; +package cn.bootx.platform.starter.wechat.controller; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.wechat.core.article.service.WeChatArticleService; -import cn.bootx.starter.wechat.dto.article.WeChatArticleDto; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.starter.wechat.core.article.service.WeChatArticleService; +import cn.bootx.platform.starter.wechat.dto.article.WeChatArticleDto; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/controller/WeChatMediaController.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatMediaController.java similarity index 78% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/controller/WeChatMediaController.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatMediaController.java index 179c4caba1208af0ada874942a66b4fcc73dad91..163b523d69848f40a98a4f24a0789c809315ca0b 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/controller/WeChatMediaController.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatMediaController.java @@ -1,11 +1,11 @@ -package cn.bootx.starter.wechat.controller; - -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.wechat.core.media.service.WeChatMediaService; -import cn.bootx.starter.wechat.dto.media.WeChatMediaDto; +package cn.bootx.platform.starter.wechat.controller; + +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.starter.wechat.core.media.service.WeChatMediaService; +import cn.bootx.platform.starter.wechat.dto.media.WeChatMediaDto; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/controller/WeChatMenuController.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatMenuController.java similarity index 83% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/controller/WeChatMenuController.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatMenuController.java index 492799cb6fb32fc52f8c4188eb5dc888a22fc997..9fd4bf9c0f44bbe9fdb3b0c1cf3364d70bf629da 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/controller/WeChatMenuController.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatMenuController.java @@ -1,12 +1,12 @@ -package cn.bootx.starter.wechat.controller; +package cn.bootx.platform.starter.wechat.controller; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.wechat.core.menu.service.WeChatMenuService; -import cn.bootx.starter.wechat.dto.menu.WeChatMenuDto; -import cn.bootx.starter.wechat.param.menu.WeChatMenuParam; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.starter.wechat.core.menu.service.WeChatMenuService; +import cn.bootx.platform.starter.wechat.dto.menu.WeChatMenuDto; +import cn.bootx.platform.starter.wechat.param.menu.WeChatMenuParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/controller/WeChatPortalController.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatPortalController.java similarity index 89% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/controller/WeChatPortalController.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatPortalController.java index 7b72a8d355372650e31fc9ce9afb257a91e2095e..644d6ea30ca6432b6f082fb4d4a64cec6c47577c 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/controller/WeChatPortalController.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatPortalController.java @@ -1,7 +1,7 @@ -package cn.bootx.starter.wechat.controller; +package cn.bootx.platform.starter.wechat.controller; -import cn.bootx.common.core.annotation.IgnoreAuth; -import cn.bootx.starter.wechat.core.portal.service.WeChatPortalService; +import cn.bootx.platform.common.core.annotation.IgnoreAuth; +import cn.bootx.platform.starter.wechat.core.portal.service.WeChatPortalService; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/controller/WeChatQrLoginController.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatQrLoginController.java similarity index 76% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/controller/WeChatQrLoginController.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatQrLoginController.java index ade053053a6f060ac4e6049b2bd6af1a94d01e83..c9a29a2f4dc09b3bb9be36f7017f1199b24ae819 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/controller/WeChatQrLoginController.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatQrLoginController.java @@ -1,10 +1,10 @@ -package cn.bootx.starter.wechat.controller; +package cn.bootx.platform.starter.wechat.controller; -import cn.bootx.common.core.annotation.IgnoreAuth; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.starter.wechat.core.login.service.WeChatQrLoginService; -import cn.bootx.starter.wechat.dto.login.WeChatLoginQrCode; +import cn.bootx.platform.common.core.annotation.IgnoreAuth; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.starter.wechat.core.login.service.WeChatQrLoginService; +import cn.bootx.platform.starter.wechat.dto.login.WeChatLoginQrCode; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/controller/WeChatTemplateController.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatTemplateController.java similarity index 75% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/controller/WeChatTemplateController.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatTemplateController.java index 86f49f7884792308d605b9afeb5d06116ae40a7a..038ec7b9c7595241c6cc982d8f2b36a072784f55 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/controller/WeChatTemplateController.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatTemplateController.java @@ -1,13 +1,13 @@ -package cn.bootx.starter.wechat.controller; - -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.auth.util.SecurityUtil; -import cn.bootx.starter.wechat.core.notice.service.WeChatTemplateService; -import cn.bootx.starter.wechat.dto.notice.WeChatTemplateDto; -import cn.bootx.starter.wechat.param.notice.WeChatTemplateParam; +package cn.bootx.platform.starter.wechat.controller; + +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.starter.auth.util.SecurityUtil; +import cn.bootx.platform.starter.wechat.core.notice.service.WeChatTemplateService; +import cn.bootx.platform.starter.wechat.dto.notice.WeChatTemplateDto; +import cn.bootx.platform.starter.wechat.param.notice.WeChatTemplateParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/article/service/WeChatArticleService.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/article/service/WeChatArticleService.java similarity index 81% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/article/service/WeChatArticleService.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/article/service/WeChatArticleService.java index 35f84492178048f95f173e3215bf1fce18b62b97..77584a3625f7ec3ff2aa647e934948272a9eea6c 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/article/service/WeChatArticleService.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/article/service/WeChatArticleService.java @@ -1,8 +1,8 @@ -package cn.bootx.starter.wechat.core.article.service; +package cn.bootx.platform.starter.wechat.core.article.service; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.wechat.dto.article.WeChatArticleDto; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.starter.wechat.dto.article.WeChatArticleDto; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/login/service/WeChatQrLoginService.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/login/service/WeChatQrLoginService.java similarity index 88% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/login/service/WeChatQrLoginService.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/login/service/WeChatQrLoginService.java index 34d2f9efd4667a3166e27fc4e8559d3657ca3901..4c5602e55ed263ce62712baa4623465a162141f9 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/login/service/WeChatQrLoginService.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/login/service/WeChatQrLoginService.java @@ -1,8 +1,8 @@ -package cn.bootx.starter.wechat.core.login.service; +package cn.bootx.platform.starter.wechat.core.login.service; -import cn.bootx.common.redis.RedisClient; -import cn.bootx.starter.auth.exception.LoginFailureException; -import cn.bootx.starter.wechat.dto.login.WeChatLoginQrCode; +import cn.bootx.platform.starter.auth.exception.LoginFailureException; +import cn.bootx.platform.common.redis.RedisClient; +import cn.bootx.platform.starter.wechat.dto.login.WeChatLoginQrCode; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; @@ -15,7 +15,7 @@ import org.springframework.stereotype.Service; import java.util.Objects; -import static cn.bootx.starter.wechat.code.WeChatCode.*; +import static cn.bootx.platform.starter.wechat.code.WeChatCode.*; /** * 扫码事件 diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/media/service/WeChatMediaService.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/media/service/WeChatMediaService.java similarity index 92% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/media/service/WeChatMediaService.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/media/service/WeChatMediaService.java index fc9f255f63fb7a9c2720d1cf6d1dafc62ad4335e..14c55c64ef92eb7af2fe257dd151ca05991fd2f5 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/media/service/WeChatMediaService.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/media/service/WeChatMediaService.java @@ -1,9 +1,9 @@ -package cn.bootx.starter.wechat.core.media.service; +package cn.bootx.platform.starter.wechat.core.media.service; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.core.util.FileUtil; -import cn.bootx.starter.wechat.dto.media.WeChatMediaDto; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.FileUtil; +import cn.bootx.platform.starter.wechat.dto.media.WeChatMediaDto; import cn.hutool.core.io.FileTypeUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.file.FileNameUtil; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/menu/convert/WeChatMenuConvert.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/convert/WeChatMenuConvert.java similarity index 58% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/menu/convert/WeChatMenuConvert.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/convert/WeChatMenuConvert.java index 06552d3b8d5783c7d72d9a7299d9220439f18ba1..2390c680eb2a116e49c36b31c6232f0755082d4c 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/menu/convert/WeChatMenuConvert.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/convert/WeChatMenuConvert.java @@ -1,9 +1,9 @@ -package cn.bootx.starter.wechat.core.menu.convert; +package cn.bootx.platform.starter.wechat.core.menu.convert; -import cn.bootx.starter.wechat.core.menu.domin.WeChatMenuInfo; -import cn.bootx.starter.wechat.core.menu.entity.WeChatMenu; -import cn.bootx.starter.wechat.dto.menu.WeChatMenuDto; -import cn.bootx.starter.wechat.param.menu.WeChatMenuParam; +import cn.bootx.platform.starter.wechat.param.menu.WeChatMenuParam; +import cn.bootx.platform.starter.wechat.core.menu.domin.WeChatMenuInfo; +import cn.bootx.platform.starter.wechat.core.menu.entity.WeChatMenu; +import cn.bootx.platform.starter.wechat.dto.menu.WeChatMenuDto; import me.chanjar.weixin.common.bean.menu.WxMenu; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; @@ -27,4 +27,4 @@ public interface WeChatMenuConvert { WxMenu convert(WeChatMenuInfo in); -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/menu/dao/WeChatMenuManager.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/dao/WeChatMenuManager.java similarity index 70% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/menu/dao/WeChatMenuManager.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/dao/WeChatMenuManager.java index da11b7294b5bdfa842f25e2b0e28823946d7a886..7f5244cc3d984e5d9ed35d98c636ee9c55add592 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/menu/dao/WeChatMenuManager.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/dao/WeChatMenuManager.java @@ -1,11 +1,11 @@ -package cn.bootx.starter.wechat.core.menu.dao; +package cn.bootx.platform.starter.wechat.core.menu.dao; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.starter.wechat.core.menu.entity.WeChatMenu; -import cn.bootx.starter.wechat.param.menu.WeChatMenuParam; +import cn.bootx.platform.starter.wechat.core.menu.entity.WeChatMenu; +import cn.bootx.platform.starter.wechat.param.menu.WeChatMenuParam; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; @@ -39,4 +39,4 @@ public class WeChatMenuManager extends BaseManager lambdaUpdate().eq(WeChatMenu::isPublish, true).set(WeChatMenu::isPublish, false).update(); } -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/menu/dao/WeChatMenuMapper.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/dao/WeChatMenuMapper.java similarity index 66% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/menu/dao/WeChatMenuMapper.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/dao/WeChatMenuMapper.java index 49a3393e46719d88cd4c2193ae9d6ae16649b9a0..a9138a44883566931d832ccc51971988b270ebc5 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/menu/dao/WeChatMenuMapper.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/dao/WeChatMenuMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.wechat.core.menu.dao; +package cn.bootx.platform.starter.wechat.core.menu.dao; -import cn.bootx.starter.wechat.core.menu.entity.WeChatMenu; +import cn.bootx.platform.starter.wechat.core.menu.entity.WeChatMenu; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -13,4 +13,4 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface WeChatMenuMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/menu/domin/WeChatMenuInfo.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/domin/WeChatMenuInfo.java similarity index 98% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/menu/domin/WeChatMenuInfo.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/domin/WeChatMenuInfo.java index 6c2c29f1101c0a4c89a11d8c499a296af63af1ae..2d30fcfa034a35eb90afaa05f8765388c835f279 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/menu/domin/WeChatMenuInfo.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/domin/WeChatMenuInfo.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.wechat.core.menu.domin; +package cn.bootx.platform.starter.wechat.core.menu.domin; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/menu/entity/WeChatMenu.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/entity/WeChatMenu.java similarity index 68% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/menu/entity/WeChatMenu.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/entity/WeChatMenu.java index ce618708592c2b0438247c9d71324fa4f28c9eb1..bfd549648abb4698e0630c9dc054bcc9ee2f034f 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/menu/entity/WeChatMenu.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/entity/WeChatMenu.java @@ -1,12 +1,12 @@ -package cn.bootx.starter.wechat.core.menu.entity; - -import cn.bootx.common.core.annotation.BigField; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.starter.wechat.core.menu.convert.WeChatMenuConvert; -import cn.bootx.starter.wechat.core.menu.domin.WeChatMenuInfo; -import cn.bootx.starter.wechat.dto.menu.WeChatMenuDto; -import cn.bootx.starter.wechat.param.menu.WeChatMenuParam; +package cn.bootx.platform.starter.wechat.core.menu.entity; + +import cn.bootx.platform.starter.wechat.core.menu.convert.WeChatMenuConvert; +import cn.bootx.platform.starter.wechat.param.menu.WeChatMenuParam; +import cn.bootx.platform.common.core.annotation.BigField; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.starter.wechat.core.menu.domin.WeChatMenuInfo; +import cn.bootx.platform.starter.wechat.dto.menu.WeChatMenuDto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/menu/service/WeChatMenuService.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/service/WeChatMenuService.java similarity index 82% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/menu/service/WeChatMenuService.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/service/WeChatMenuService.java index 3a316cbeb138b3aad048f95959fe79571792cc03..16616b1322e34bb747e3df2135e549dd3529be6a 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/menu/service/WeChatMenuService.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/service/WeChatMenuService.java @@ -1,15 +1,15 @@ -package cn.bootx.starter.wechat.core.menu.service; - -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.core.util.ResultConvertUtil; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.starter.wechat.core.menu.dao.WeChatMenuManager; -import cn.bootx.starter.wechat.core.menu.domin.WeChatMenuInfo; -import cn.bootx.starter.wechat.core.menu.entity.WeChatMenu; -import cn.bootx.starter.wechat.dto.menu.WeChatMenuDto; -import cn.bootx.starter.wechat.param.menu.WeChatMenuParam; +package cn.bootx.platform.starter.wechat.core.menu.service; + +import cn.bootx.platform.starter.wechat.param.menu.WeChatMenuParam; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.ResultConvertUtil; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.starter.wechat.core.menu.dao.WeChatMenuManager; +import cn.bootx.platform.starter.wechat.core.menu.domin.WeChatMenuInfo; +import cn.bootx.platform.starter.wechat.core.menu.entity.WeChatMenu; +import cn.bootx.platform.starter.wechat.dto.menu.WeChatMenuDto; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.date.DateUtil; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/notice/convert/WeChatTemplateConvert.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/convert/WeChatTemplateConvert.java similarity index 65% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/notice/convert/WeChatTemplateConvert.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/convert/WeChatTemplateConvert.java index dc26cebb449218e20ae3f61cd345fe0e478f3c66..4f65a68e3a3b0e25b8792ca2ca0401174a57d6e5 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/notice/convert/WeChatTemplateConvert.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/convert/WeChatTemplateConvert.java @@ -1,8 +1,8 @@ -package cn.bootx.starter.wechat.core.notice.convert; +package cn.bootx.platform.starter.wechat.core.notice.convert; -import cn.bootx.starter.wechat.core.notice.entity.WeChatTemplate; -import cn.bootx.starter.wechat.dto.notice.WeChatTemplateDto; -import cn.bootx.starter.wechat.param.notice.WeChatTemplateParam; +import cn.bootx.platform.starter.wechat.param.notice.WeChatTemplateParam; +import cn.bootx.platform.starter.wechat.core.notice.entity.WeChatTemplate; +import cn.bootx.platform.starter.wechat.dto.notice.WeChatTemplateDto; import me.chanjar.weixin.mp.bean.template.WxMpTemplate; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/notice/dao/WeChatTemplateManager.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/dao/WeChatTemplateManager.java similarity index 78% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/notice/dao/WeChatTemplateManager.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/dao/WeChatTemplateManager.java index 5c0e6677cabe46fb08e1e0ed1985bd339315f18d..57f9bf65e7bcec886178fbef50a05d34f50cf74e 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/notice/dao/WeChatTemplateManager.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/dao/WeChatTemplateManager.java @@ -1,11 +1,11 @@ -package cn.bootx.starter.wechat.core.notice.dao; - -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.starter.wechat.core.notice.entity.WeChatTemplate; -import cn.bootx.starter.wechat.param.notice.WeChatTemplateParam; +package cn.bootx.platform.starter.wechat.core.notice.dao; + +import cn.bootx.platform.starter.wechat.core.notice.entity.WeChatTemplate; +import cn.bootx.platform.starter.wechat.param.notice.WeChatTemplateParam; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/notice/dao/WeChatTemplateMapper.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/dao/WeChatTemplateMapper.java similarity index 63% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/notice/dao/WeChatTemplateMapper.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/dao/WeChatTemplateMapper.java index d899b0bd7976190769c0a2969c3e9c4589c8eb08..15e67848e0c18507868bc16a80423a38074bd245 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/notice/dao/WeChatTemplateMapper.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/dao/WeChatTemplateMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.wechat.core.notice.dao; +package cn.bootx.platform.starter.wechat.core.notice.dao; -import cn.bootx.starter.wechat.core.notice.entity.WeChatTemplate; +import cn.bootx.platform.starter.wechat.core.notice.entity.WeChatTemplate; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/notice/entity/WeChatTemplate.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/entity/WeChatTemplate.java similarity index 77% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/notice/entity/WeChatTemplate.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/entity/WeChatTemplate.java index 82d01e460620ac06566a289d711b3878f6c8e690..e174692bd567d4c35eb8d35dc940399b25f34655 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/notice/entity/WeChatTemplate.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/entity/WeChatTemplate.java @@ -1,12 +1,12 @@ -package cn.bootx.starter.wechat.core.notice.entity; +package cn.bootx.platform.starter.wechat.core.notice.entity; -import cn.bootx.common.core.annotation.BigField; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpDelEntity; +import cn.bootx.platform.starter.wechat.core.notice.convert.WeChatTemplateConvert; +import cn.bootx.platform.starter.wechat.param.notice.WeChatTemplateParam; +import cn.bootx.platform.common.core.annotation.BigField; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpDelEntity; import com.baomidou.mybatisplus.annotation.TableName; -import cn.bootx.starter.wechat.dto.notice.WeChatTemplateDto; -import cn.bootx.starter.wechat.param.notice.WeChatTemplateParam; -import cn.bootx.starter.wechat.core.notice.convert.WeChatTemplateConvert; +import cn.bootx.platform.starter.wechat.dto.notice.WeChatTemplateDto; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/notice/service/WeChatTemplateService.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/service/WeChatTemplateService.java similarity index 80% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/notice/service/WeChatTemplateService.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/service/WeChatTemplateService.java index a11d9da3100c41ca4cbd9d48f630d125df2f5bda..985dfc533eaa28b9a80996b69f155cc332190e8f 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/notice/service/WeChatTemplateService.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/service/WeChatTemplateService.java @@ -1,18 +1,18 @@ -package cn.bootx.starter.wechat.core.notice.service; +package cn.bootx.platform.starter.wechat.core.notice.service; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.core.util.ResultConvertUtil; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.common.websocket.entity.WsRes; -import cn.bootx.common.websocket.service.UserWsNoticeService; -import cn.bootx.starter.auth.util.SecurityUtil; -import cn.bootx.starter.wechat.core.notice.dao.WeChatTemplateManager; -import cn.bootx.starter.wechat.core.notice.entity.WeChatTemplate; -import cn.bootx.starter.wechat.dto.notice.WeChatTemplateDto; -import cn.bootx.starter.wechat.param.notice.WeChatTemplateParam; +import cn.bootx.platform.common.websocket.entity.WsRes; +import cn.bootx.platform.common.websocket.service.UserWsNoticeService; +import cn.bootx.platform.starter.wechat.param.notice.WeChatTemplateParam; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.ResultConvertUtil; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.starter.auth.util.SecurityUtil; +import cn.bootx.platform.starter.wechat.core.notice.dao.WeChatTemplateManager; +import cn.bootx.platform.starter.wechat.core.notice.entity.WeChatTemplate; +import cn.bootx.platform.starter.wechat.dto.notice.WeChatTemplateDto; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.util.StrUtil; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/notice/service/WechatNoticeService.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/service/WechatNoticeService.java similarity index 84% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/notice/service/WechatNoticeService.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/service/WechatNoticeService.java index 4124e14b3eecd94a3083a8816672a6ec8627fecf..f8e51a967727de7154598bd8ccbcfd89e8e3f272 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/notice/service/WechatNoticeService.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/service/WechatNoticeService.java @@ -1,9 +1,9 @@ -package cn.bootx.starter.wechat.core.notice.service; +package cn.bootx.platform.starter.wechat.core.notice.service; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.dto.KeyValue; -import cn.bootx.starter.wechat.core.notice.dao.WeChatTemplateManager; -import cn.bootx.starter.wechat.core.notice.entity.WeChatTemplate; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.dto.KeyValue; +import cn.bootx.platform.starter.wechat.core.notice.dao.WeChatTemplateManager; +import cn.bootx.platform.starter.wechat.core.notice.entity.WeChatTemplate; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/portal/service/WeChatPortalService.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/portal/service/WeChatPortalService.java similarity index 95% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/portal/service/WeChatPortalService.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/portal/service/WeChatPortalService.java index 4b1256d0999c0dfea5dceef0bc28ae1cad32c63a..c4250101f66818b399ddd90a58a990f0881c7579 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/portal/service/WeChatPortalService.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/portal/service/WeChatPortalService.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.wechat.core.portal.service; +package cn.bootx.platform.starter.wechat.core.portal.service; -import cn.bootx.common.core.exception.ValidationFailedException; +import cn.bootx.platform.common.core.exception.ValidationFailedException; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.symmetric.SymmetricAlgorithm; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/user/convert/WechatFansConvert.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/convert/WechatFansConvert.java similarity index 57% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/user/convert/WechatFansConvert.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/convert/WechatFansConvert.java index 56ac606ababa934105bf050c11336b48df149d72..c6754d644ab5eb9a2f9add8246e6d0b3df7d4056 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/user/convert/WechatFansConvert.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/convert/WechatFansConvert.java @@ -1,8 +1,8 @@ -package cn.bootx.starter.wechat.core.user.convert; +package cn.bootx.platform.starter.wechat.core.user.convert; -import cn.bootx.starter.wechat.core.user.entity.WechatFans; -import cn.bootx.starter.wechat.dto.user.WechatFansDto; -import cn.bootx.starter.wechat.param.user.WechatFansParam; +import cn.bootx.platform.starter.wechat.param.user.WechatFansParam; +import cn.bootx.platform.starter.wechat.core.user.entity.WechatFans; +import cn.bootx.platform.starter.wechat.dto.user.WechatFansDto; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; @@ -21,4 +21,4 @@ public interface WechatFansConvert { WechatFansDto convert(WechatFans in); -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/user/dao/WechatFansManager.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/dao/WechatFansManager.java similarity index 70% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/user/dao/WechatFansManager.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/dao/WechatFansManager.java index 4950050644af522f85d5988af2bf34a4ef666982..7c2d60f77e46fb573a52407004e4ed554e6278a9 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/user/dao/WechatFansManager.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/dao/WechatFansManager.java @@ -1,11 +1,11 @@ -package cn.bootx.starter.wechat.core.user.dao; +package cn.bootx.platform.starter.wechat.core.user.dao; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.starter.wechat.core.user.entity.WechatFans; -import cn.bootx.starter.wechat.param.user.WechatFansParam; +import cn.bootx.platform.starter.wechat.core.user.entity.WechatFans; +import cn.bootx.platform.starter.wechat.param.user.WechatFansParam; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; @@ -42,4 +42,4 @@ public class WechatFansManager extends BaseManager return Optional.empty(); } -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/user/dao/WechatFansMapper.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/dao/WechatFansMapper.java similarity index 66% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/user/dao/WechatFansMapper.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/dao/WechatFansMapper.java index 275764a20a0031bebec5ddd2351e9592925e60dd..963a475cae850ad5bfbeaa3d84e1323dd17a9d86 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/user/dao/WechatFansMapper.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/dao/WechatFansMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.wechat.core.user.dao; +package cn.bootx.platform.starter.wechat.core.user.dao; -import cn.bootx.starter.wechat.core.user.entity.WechatFans; +import cn.bootx.platform.starter.wechat.core.user.entity.WechatFans; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -13,4 +13,4 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface WechatFansMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/user/entity/WechatFans.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/entity/WechatFans.java similarity index 72% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/user/entity/WechatFans.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/entity/WechatFans.java index 37db184938528a18fda6dd1dcdd12c574f8b091b..d5d4bc38a2031739d7aad1572581859b20e6aa1b 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/user/entity/WechatFans.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/entity/WechatFans.java @@ -1,10 +1,10 @@ -package cn.bootx.starter.wechat.core.user.entity; +package cn.bootx.platform.starter.wechat.core.user.entity; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.starter.wechat.core.user.convert.WechatFansConvert; -import cn.bootx.starter.wechat.dto.user.WechatFansDto; -import cn.bootx.starter.wechat.param.user.WechatFansParam; +import cn.bootx.platform.starter.wechat.core.user.convert.WechatFansConvert; +import cn.bootx.platform.starter.wechat.param.user.WechatFansParam; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.starter.wechat.dto.user.WechatFansDto; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/user/service/WeChatUserService.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/service/WeChatUserService.java similarity index 91% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/user/service/WeChatUserService.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/service/WeChatUserService.java index d08ee4b5306cd119d4fbe3782e1e7ea299806567..9f6fa28ddf5287230ee58b2d92de05afb1aab97c 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/core/user/service/WeChatUserService.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/service/WeChatUserService.java @@ -1,8 +1,8 @@ -package cn.bootx.starter.wechat.core.user.service; +package cn.bootx.platform.starter.wechat.core.user.service; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.core.util.LocalDateTimeUtil; -import cn.bootx.starter.wechat.core.user.entity.WechatFans; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.LocalDateTimeUtil; +import cn.bootx.platform.starter.wechat.core.user.entity.WechatFans; import cn.hutool.core.collection.CollUtil; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/dto/article/WeChatArticleDto.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/article/WeChatArticleDto.java similarity index 96% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/dto/article/WeChatArticleDto.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/article/WeChatArticleDto.java index 2734d6763aa7d3704d2638cfcabf3f3040d270e1..0fda6f7ce4a96605de3edb6e3c3e161c50d7d76d 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/dto/article/WeChatArticleDto.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/article/WeChatArticleDto.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.wechat.dto.article; +package cn.bootx.platform.starter.wechat.dto.article; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/dto/login/WeChatLoginQrCode.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/login/WeChatLoginQrCode.java similarity index 90% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/dto/login/WeChatLoginQrCode.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/login/WeChatLoginQrCode.java index 41a093cc1960a8831658338c8fc9ad496e8df11b..7e9990118b561edbca58e3a187391f4c9c0d3db1 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/dto/login/WeChatLoginQrCode.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/login/WeChatLoginQrCode.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.wechat.dto.login; +package cn.bootx.platform.starter.wechat.dto.login; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/dto/media/WeChatMediaDto.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/media/WeChatMediaDto.java similarity index 89% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/dto/media/WeChatMediaDto.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/media/WeChatMediaDto.java index a959d5b40229e72e299a0d4393e4d0681e754248..af0a1b02435511a952fa41c5e8d766094a9448f7 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/dto/media/WeChatMediaDto.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/media/WeChatMediaDto.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.wechat.dto.media; +package cn.bootx.platform.starter.wechat.dto.media; -import cn.bootx.common.core.util.LocalDateTimeUtil; +import cn.bootx.platform.common.core.util.LocalDateTimeUtil; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/dto/menu/WeChatMenuDto.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/menu/WeChatMenuDto.java similarity index 78% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/dto/menu/WeChatMenuDto.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/menu/WeChatMenuDto.java index 440e486f2e7fe43667b1ed1c04a7377607ec1168..5955b832ad5961c7ef77efd3aca87dff991fab07 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/dto/menu/WeChatMenuDto.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/menu/WeChatMenuDto.java @@ -1,7 +1,7 @@ -package cn.bootx.starter.wechat.dto.menu; +package cn.bootx.platform.starter.wechat.dto.menu; -import cn.bootx.common.core.rest.dto.BaseDto; -import cn.bootx.starter.wechat.core.menu.domin.WeChatMenuInfo; +import cn.bootx.platform.common.core.rest.dto.BaseDto; +import cn.bootx.platform.starter.wechat.core.menu.domin.WeChatMenuInfo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -31,4 +31,4 @@ public class WeChatMenuDto extends BaseDto { @Schema(description = "备注") private String remark; -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/dto/notice/WeChatTemplateDto.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/notice/WeChatTemplateDto.java similarity index 90% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/dto/notice/WeChatTemplateDto.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/notice/WeChatTemplateDto.java index 70eb577c97ccb9dc82cfc89756953a08b953130f..01d0a7f4c5df927f0009c60d8695493f4e46fd57 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/dto/notice/WeChatTemplateDto.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/notice/WeChatTemplateDto.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.wechat.dto.notice; +package cn.bootx.platform.starter.wechat.dto.notice; -import cn.bootx.common.core.rest.dto.BaseDto; +import cn.bootx.platform.common.core.rest.dto.BaseDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -45,4 +45,4 @@ public class WeChatTemplateDto extends BaseDto { @Schema(description = "示例") private String example; -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/dto/user/WechatFansDto.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/user/WechatFansDto.java similarity index 91% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/dto/user/WechatFansDto.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/user/WechatFansDto.java index c21c4f5c522399e8ba3878c0e4173f1552639552..836b17ce1fa6e76cbe9a6483259c7046727e1edc 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/dto/user/WechatFansDto.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/user/WechatFansDto.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.wechat.dto.user; +package cn.bootx.platform.starter.wechat.dto.user; -import cn.bootx.common.core.rest.dto.BaseDto; +import cn.bootx.platform.common.core.rest.dto.BaseDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -53,4 +53,4 @@ public class WechatFansDto extends BaseDto { @Schema(description = "备注") private String remark; -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/event/WeChatQrScanEvent.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/event/WeChatQrScanEvent.java similarity index 91% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/event/WeChatQrScanEvent.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/event/WeChatQrScanEvent.java index 5144db0e3ff772d14af95ad2cd5ec201b0383541..d5a08783752c6f628bb14e4eb754e4b97889d2df 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/event/WeChatQrScanEvent.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/event/WeChatQrScanEvent.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.wechat.event; +package cn.bootx.platform.starter.wechat.event; import lombok.Getter; import org.springframework.context.ApplicationEvent; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/handler/WeChatMpMessageHandler.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatMpMessageHandler.java similarity index 92% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/handler/WeChatMpMessageHandler.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatMpMessageHandler.java index d669003729af1df632252dc298c3965d5391acd9..1d5c974a27f8a1d327d7baeee3cf3b26ad456447 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/handler/WeChatMpMessageHandler.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatMpMessageHandler.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.wechat.handler; +package cn.bootx.platform.starter.wechat.handler; import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.mp.api.WxMpMessageHandler; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/handler/WeChatMsgHandler.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatMsgHandler.java similarity index 95% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/handler/WeChatMsgHandler.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatMsgHandler.java index c9d4cbfa39cd08cb072101de8c8a2083659f4537..1717d7da62a2bb4450b048b7a946fee67275c7d5 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/handler/WeChatMsgHandler.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatMsgHandler.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.wechat.handler; +package cn.bootx.platform.starter.wechat.handler; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/handler/WeChatQrScanHandler.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatQrScanHandler.java similarity index 90% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/handler/WeChatQrScanHandler.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatQrScanHandler.java index 7cf015b9680937b46ee1300f3b954fbabf292d8d..d4fe53ac081ce0b7d7e824563af791f768e60206 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/handler/WeChatQrScanHandler.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatQrScanHandler.java @@ -1,7 +1,7 @@ -package cn.bootx.starter.wechat.handler; +package cn.bootx.platform.starter.wechat.handler; -import cn.bootx.starter.wechat.core.login.service.WeChatQrLoginService; -import cn.bootx.starter.wechat.handler.qrscene.WeChatQrSceneMsgHandler; +import cn.bootx.platform.starter.wechat.handler.qrscene.WeChatQrSceneMsgHandler; +import cn.bootx.platform.starter.wechat.core.login.service.WeChatQrLoginService; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/handler/WeChatSubscribeHandler.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatSubscribeHandler.java similarity index 90% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/handler/WeChatSubscribeHandler.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatSubscribeHandler.java index 8aa39ce136259cb053e6884ca26334fb6d302aa7..758aa01eeaae928df98b2ddd8e095978dfcbb1b3 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/handler/WeChatSubscribeHandler.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatSubscribeHandler.java @@ -1,7 +1,6 @@ -package cn.bootx.starter.wechat.handler; +package cn.bootx.platform.starter.wechat.handler; -import cn.bootx.starter.wechat.core.login.service.WeChatQrLoginService; -import cn.bootx.starter.wechat.handler.qrscene.WeChatQrSceneMsgHandler; +import cn.bootx.platform.starter.wechat.handler.qrscene.WeChatQrSceneMsgHandler; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/handler/WeChatUnSubscribeHandler.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatUnSubscribeHandler.java similarity index 95% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/handler/WeChatUnSubscribeHandler.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatUnSubscribeHandler.java index bf9c1743de33366c634dc1ca7fe73057d8767615..fbb499dd884f6edc58a32e634b15650a6fed933a 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/handler/WeChatUnSubscribeHandler.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatUnSubscribeHandler.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.wechat.handler; +package cn.bootx.platform.starter.wechat.handler; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/handler/WechatMenuHandler.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WechatMenuHandler.java similarity index 90% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/handler/WechatMenuHandler.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WechatMenuHandler.java index 48a3a6c04c4284b95b2b785168253cdc7f6ca38d..d3dff71c6b74f28a2e467af0c84092f48a556277 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/handler/WechatMenuHandler.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WechatMenuHandler.java @@ -1,9 +1,8 @@ -package cn.bootx.starter.wechat.handler; +package cn.bootx.platform.starter.wechat.handler; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.api.WxConsts; -import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/handler/qrscene/WeChatQrLoginHandler.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/qrscene/WeChatQrLoginHandler.java similarity index 83% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/handler/qrscene/WeChatQrLoginHandler.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/qrscene/WeChatQrLoginHandler.java index 6cd2fa78972175dc7e10b4832633d5da44982cdc..16e48911f5a0ddc4b98868ae70009deee833a0af 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/handler/qrscene/WeChatQrLoginHandler.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/qrscene/WeChatQrLoginHandler.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.wechat.handler.qrscene; +package cn.bootx.platform.starter.wechat.handler.qrscene; -import cn.bootx.starter.wechat.core.login.service.WeChatQrLoginService; +import cn.bootx.platform.starter.wechat.core.login.service.WeChatQrLoginService; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -13,8 +13,8 @@ import org.springframework.stereotype.Component; import java.util.Map; -import static cn.bootx.starter.wechat.code.WeChatCode.EVENT_KEY_QRSCENE; -import static cn.bootx.starter.wechat.code.WeChatCode.QRSCENE_LOGIN; +import static cn.bootx.platform.starter.wechat.code.WeChatCode.EVENT_KEY_QRSCENE; +import static cn.bootx.platform.starter.wechat.code.WeChatCode.QRSCENE_LOGIN; /** * 微信扫码登录 diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/handler/qrscene/WeChatQrSceneMsgHandler.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/qrscene/WeChatQrSceneMsgHandler.java similarity index 91% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/handler/qrscene/WeChatQrSceneMsgHandler.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/qrscene/WeChatQrSceneMsgHandler.java index 569b0e285d3ce62533eaae85c339cee4188dc61c..f24984bcc1ee66e6240538708819a56161d59acd 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/handler/qrscene/WeChatQrSceneMsgHandler.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/qrscene/WeChatQrSceneMsgHandler.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.wechat.handler.qrscene; +package cn.bootx.platform.starter.wechat.handler.qrscene; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/param/menu/WeChatMenuParam.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/menu/WeChatMenuParam.java similarity index 83% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/param/menu/WeChatMenuParam.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/menu/WeChatMenuParam.java index ca95df3dadc8870b50a7791e64afbe253fcac532..56f159c9ad2b9544c3187bb10da2b37790577d16 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/param/menu/WeChatMenuParam.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/menu/WeChatMenuParam.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.wechat.param.menu; +package cn.bootx.platform.starter.wechat.param.menu; -import cn.bootx.starter.wechat.core.menu.domin.WeChatMenuInfo; +import cn.bootx.platform.starter.wechat.core.menu.domin.WeChatMenuInfo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; @@ -31,4 +31,4 @@ public class WeChatMenuParam { @Schema(description = "备注") private String remark; -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/param/notice/WeChatTemplateParam.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/notice/WeChatTemplateParam.java similarity index 94% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/param/notice/WeChatTemplateParam.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/notice/WeChatTemplateParam.java index ad578b0fcb46fb8857ed9810a4f58487f3ee3516..9cfcd12bb80e177b595ee6a89732db34131c9ddc 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/param/notice/WeChatTemplateParam.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/notice/WeChatTemplateParam.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.wechat.param.notice; +package cn.bootx.platform.starter.wechat.param.notice; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -45,4 +45,4 @@ public class WeChatTemplateParam { @Schema(description = "示例") private String example; -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/param/portal/WeChatPortalParam.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/portal/WeChatPortalParam.java similarity index 67% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/param/portal/WeChatPortalParam.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/portal/WeChatPortalParam.java index 1a9714d90438b6ada2a6b2b814d4428e2fea34e1..4e40f153278d91f88e246c7dd2e2d76c351170e8 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/param/portal/WeChatPortalParam.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/portal/WeChatPortalParam.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.wechat.param.portal; +package cn.bootx.platform.starter.wechat.param.portal; /** * 微信返回的消息入参 diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/param/user/WechatFansParam.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/user/WechatFansParam.java similarity index 95% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/param/user/WechatFansParam.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/user/WechatFansParam.java index cf8f34e1ce86529dc2e76650a9490370cf5d77f2..647203f938019afc3ea862f88be8a0ab2c49160d 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/param/user/WechatFansParam.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/user/WechatFansParam.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.wechat.param.user; +package cn.bootx.platform.starter.wechat.param.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -53,4 +53,4 @@ public class WechatFansParam { @Schema(description = "备注") private String remark; -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/util/WeChatUtil.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/util/WeChatUtil.java similarity index 88% rename from bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/util/WeChatUtil.java rename to bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/util/WeChatUtil.java index 9dfe0131f1f0f58101a063d800d4132e9d7506ad..b9c6dfe15a0e4e6d1733e1d9ce933dc9585da050 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/starter/wechat/util/WeChatUtil.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/util/WeChatUtil.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.wechat.util; +package cn.bootx.platform.starter.wechat.util; import cn.hutool.core.util.StrUtil; import lombok.experimental.UtilityClass; diff --git a/bootx-common-starters/common-starter-wechat/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-common-starters/common-starter-wechat/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 6954d87fd6effb03c83eb3688d3fbdcd16fdce7a..21bbc21391e613f3a4dabf9d208af32bac2d7194 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-common-starters/common-starter-wechat/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.starter.wechat.WeChatAutoConfiguration \ No newline at end of file +cn.bootx.platform.starter.wechat.WeChatAutoConfiguration diff --git a/bootx-common-starters/common-starter-wecom/pom.xml b/bootx-common-starters/common-starter-wecom/pom.xml index 028b74b01bbf49f67cc6afb8a36a71e76d5a618f..80c7d053b52eb3f0222592f00063d1091c6f5c61 100644 --- a/bootx-common-starters/common-starter-wecom/pom.xml +++ b/bootx-common-starters/common-starter-wecom/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-common-starters - 1.2.3 + 1.3.0 4.0.0 jar diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/WeComAutoConfiguration.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/WeComAutoConfiguration.java similarity index 92% rename from bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/WeComAutoConfiguration.java rename to bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/WeComAutoConfiguration.java index 333b399ce20510b3752e19345264573e86c519e8..88b5b69c7cf9341366dfbade367acc0e2753ddf9 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/WeComAutoConfiguration.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/WeComAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.wecom; +package cn.bootx.platform.starter.wecom; import org.apache.ibatis.annotations.Mapper; import org.mybatis.spring.annotation.MapperScan; diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/code/WeComCode.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/code/WeComCode.java similarity index 94% rename from bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/code/WeComCode.java rename to bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/code/WeComCode.java index 0b15cd82f738a5c731d43192f75f70b0371708a6..b27a20959b540bdf78f47b7af3e5889846ab8dee 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/code/WeComCode.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/code/WeComCode.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.wecom.code; +package cn.bootx.platform.starter.wecom.code; /** * 企微常量 diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/configuration/WeComConfiguration.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/configuration/WeComConfiguration.java similarity index 96% rename from bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/configuration/WeComConfiguration.java rename to bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/configuration/WeComConfiguration.java index ce4168c21d95d24890c3966a5907b1b7e2f36534..681ea29659eff42b18c4cc0d3b08732be3568d32 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/configuration/WeComConfiguration.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/configuration/WeComConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.wecom.configuration; +package cn.bootx.platform.starter.wecom.configuration; import lombok.RequiredArgsConstructor; import me.chanjar.weixin.cp.api.WxCpService; diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/configuration/WeComProperties.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/configuration/WeComProperties.java similarity index 91% rename from bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/configuration/WeComProperties.java rename to bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/configuration/WeComProperties.java index ce89b59f3e07ff4438bcccdfa0575fcbc09b8eb2..53cd16675bf03c51188b47c458c8e05a905ab792 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/configuration/WeComProperties.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/configuration/WeComProperties.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.wecom.configuration; +package cn.bootx.platform.starter.wecom.configuration; import lombok.Getter; import lombok.Setter; diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/controller/WecomRobotConfigController.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/controller/WecomRobotConfigController.java similarity index 81% rename from bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/controller/WecomRobotConfigController.java rename to bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/controller/WecomRobotConfigController.java index 48e311ecc9473340cee51bd1fa011f1be38bf3aa..dc46a1ff2e6d87dcf7dee782972c4e6921bf52e0 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/controller/WecomRobotConfigController.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/controller/WecomRobotConfigController.java @@ -1,12 +1,12 @@ -package cn.bootx.starter.wecom.controller; +package cn.bootx.platform.starter.wecom.controller; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.starter.wecom.core.robot.service.WecomRobotConfigService; -import cn.bootx.starter.wecom.dto.robot.WecomRobotConfigDto; -import cn.bootx.starter.wecom.param.robot.WecomRobotConfigParam; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.starter.wecom.core.robot.service.WecomRobotConfigService; +import cn.bootx.platform.starter.wecom.dto.robot.WecomRobotConfigDto; +import cn.bootx.platform.starter.wecom.param.robot.WecomRobotConfigParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/notice/domain/WxCpRecallNoticeResult.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/domain/WxCpRecallNoticeResult.java similarity index 41% rename from bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/notice/domain/WxCpRecallNoticeResult.java rename to bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/domain/WxCpRecallNoticeResult.java index 888368aa5258e840ea13e1111e899f63db51f714..d7ea241ada6244c13d46f0b12fbb3bb35714b12f 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/notice/domain/WxCpRecallNoticeResult.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/domain/WxCpRecallNoticeResult.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.wecom.core.notice.domain; +package cn.bootx.platform.starter.wecom.core.notice.domain; public class WxCpRecallNoticeResult { diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/notice/executor/RecallNoticeRequestExecutor.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/executor/RecallNoticeRequestExecutor.java similarity index 86% rename from bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/notice/executor/RecallNoticeRequestExecutor.java rename to bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/executor/RecallNoticeRequestExecutor.java index 9008a568525af94e2905bad4a49d955acc02d2b9..86cc1eea8b633a1c1b6f3001afc2bc2a9d64d45e 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/notice/executor/RecallNoticeRequestExecutor.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/executor/RecallNoticeRequestExecutor.java @@ -1,6 +1,6 @@ -package cn.bootx.starter.wecom.core.notice.executor; +package cn.bootx.platform.starter.wecom.core.notice.executor; -import cn.bootx.common.jackson.util.JacksonUtil; +import cn.bootx.platform.common.jackson.util.JacksonUtil; import cn.hutool.http.HttpUtil; import me.chanjar.weixin.common.enums.WxType; import me.chanjar.weixin.common.error.WxError; @@ -12,7 +12,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import static cn.bootx.starter.wecom.code.WeComCode.NOTICE_MSG_ID; +import static cn.bootx.platform.starter.wecom.code.WeComCode.NOTICE_MSG_ID; /** * 消息撤回请求执行器. diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/notice/service/WeComNoticeService.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/service/WeComNoticeService.java similarity index 86% rename from bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/notice/service/WeComNoticeService.java rename to bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/service/WeComNoticeService.java index 544b5f3d270fd251a007d137e14571694ef3cc2c..57c7bdba3abf086b7a28c9bd5066b3f2e373e8a2 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/notice/service/WeComNoticeService.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/service/WeComNoticeService.java @@ -1,7 +1,7 @@ -package cn.bootx.starter.wecom.core.notice.service; +package cn.bootx.platform.starter.wecom.core.notice.service; -import cn.bootx.starter.wecom.configuration.WeComProperties; -import cn.bootx.starter.wecom.core.notice.executor.RecallNoticeRequestExecutor; +import cn.bootx.platform.starter.wecom.configuration.WeComProperties; +import cn.bootx.platform.starter.wecom.core.notice.executor.RecallNoticeRequestExecutor; import cn.hutool.core.io.FileTypeUtil; import cn.hutool.core.io.IoUtil; import lombok.RequiredArgsConstructor; @@ -18,7 +18,7 @@ import org.springframework.stereotype.Service; import java.io.ByteArrayInputStream; import java.io.InputStream; -import static cn.bootx.starter.wecom.code.WeComCode.NOTICE_RECALL_URL; +import static cn.bootx.platform.starter.wecom.code.WeComCode.NOTICE_RECALL_URL; /** * 企业微信消息发送 diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/robot/convert/WecomRobotConfigConvert.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/convert/WecomRobotConfigConvert.java similarity index 58% rename from bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/robot/convert/WecomRobotConfigConvert.java rename to bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/convert/WecomRobotConfigConvert.java index 5c1df3e63bc3c9d70b13925a0a07325a1e1e3d9b..477bcaab7bfdf29bd295f5f97edc358363585a03 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/robot/convert/WecomRobotConfigConvert.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/convert/WecomRobotConfigConvert.java @@ -1,8 +1,8 @@ -package cn.bootx.starter.wecom.core.robot.convert; +package cn.bootx.platform.starter.wecom.core.robot.convert; -import cn.bootx.starter.wecom.core.robot.entity.WecomRobotConfig; -import cn.bootx.starter.wecom.dto.robot.WecomRobotConfigDto; -import cn.bootx.starter.wecom.param.robot.WecomRobotConfigParam; +import cn.bootx.platform.starter.wecom.param.robot.WecomRobotConfigParam; +import cn.bootx.platform.starter.wecom.core.robot.entity.WecomRobotConfig; +import cn.bootx.platform.starter.wecom.dto.robot.WecomRobotConfigDto; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; @@ -21,4 +21,4 @@ public interface WecomRobotConfigConvert { WecomRobotConfigDto convert(WecomRobotConfig in); -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/robot/dao/WecomRobotConfigManager.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/dao/WecomRobotConfigManager.java similarity index 77% rename from bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/robot/dao/WecomRobotConfigManager.java rename to bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/dao/WecomRobotConfigManager.java index 8b39aabeffd766f738d36d6128a451d55d9c3909..b3857d1850c161ecf67aa7d53335d00338867450 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/robot/dao/WecomRobotConfigManager.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/dao/WecomRobotConfigManager.java @@ -1,11 +1,11 @@ -package cn.bootx.starter.wecom.core.robot.dao; - -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.starter.wecom.core.robot.entity.WecomRobotConfig; -import cn.bootx.starter.wecom.param.robot.WecomRobotConfigParam; +package cn.bootx.platform.starter.wecom.core.robot.dao; + +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.starter.wecom.core.robot.entity.WecomRobotConfig; +import cn.bootx.platform.starter.wecom.param.robot.WecomRobotConfigParam; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; @@ -50,4 +50,4 @@ public class WecomRobotConfigManager extends BaseManager { -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/robot/domin/UploadMedia.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/domin/UploadMedia.java similarity index 90% rename from bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/robot/domin/UploadMedia.java rename to bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/domin/UploadMedia.java index f914805b5a883c37106d3f9dfda10318bda5ce18..8f797d650cdeb99c4eb2008c0056e8f03e317d71 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/robot/domin/UploadMedia.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/domin/UploadMedia.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.wecom.core.robot.domin; +package cn.bootx.platform.starter.wecom.core.robot.domin; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/robot/entity/WecomRobotConfig.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/entity/WecomRobotConfig.java similarity index 70% rename from bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/robot/entity/WecomRobotConfig.java rename to bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/entity/WecomRobotConfig.java index db840720094337de5d1f4dbc59433f69d381e234..0a71922a661f24c02d9652427127a0fa8c7ca265 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/robot/entity/WecomRobotConfig.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/entity/WecomRobotConfig.java @@ -1,11 +1,11 @@ -package cn.bootx.starter.wecom.core.robot.entity; - -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.starter.wecom.code.WeComCode; -import cn.bootx.starter.wecom.core.robot.convert.WecomRobotConfigConvert; -import cn.bootx.starter.wecom.dto.robot.WecomRobotConfigDto; -import cn.bootx.starter.wecom.param.robot.WecomRobotConfigParam; +package cn.bootx.platform.starter.wecom.core.robot.entity; + +import cn.bootx.platform.starter.wecom.core.robot.convert.WecomRobotConfigConvert; +import cn.bootx.platform.starter.wecom.param.robot.WecomRobotConfigParam; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.starter.wecom.code.WeComCode; +import cn.bootx.platform.starter.wecom.dto.robot.WecomRobotConfigDto; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/robot/executor/RobotMediaFileUploadRequestExecutor.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/executor/RobotMediaFileUploadRequestExecutor.java similarity index 89% rename from bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/robot/executor/RobotMediaFileUploadRequestExecutor.java rename to bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/executor/RobotMediaFileUploadRequestExecutor.java index e56f753c5168396728b04c76dfac8e3993fbf0ba..1b7299b68553bd455a44ce6ccdbb95462f0609b0 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/robot/executor/RobotMediaFileUploadRequestExecutor.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/executor/RobotMediaFileUploadRequestExecutor.java @@ -1,7 +1,7 @@ -package cn.bootx.starter.wecom.core.robot.executor; +package cn.bootx.platform.starter.wecom.core.robot.executor; -import cn.bootx.starter.wecom.code.WeComCode; -import cn.bootx.starter.wecom.core.robot.domin.UploadMedia; +import cn.bootx.platform.starter.wecom.code.WeComCode; +import cn.bootx.platform.starter.wecom.core.robot.domin.UploadMedia; import cn.hutool.http.HttpUtil; import me.chanjar.weixin.common.bean.result.WxMediaUploadResult; import me.chanjar.weixin.common.enums.WxType; diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/robot/service/WeComRobotNoticeService.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/service/WeComRobotNoticeService.java similarity index 90% rename from bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/robot/service/WeComRobotNoticeService.java rename to bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/service/WeComRobotNoticeService.java index e6a5333608e494a1563a75206f22ebd2640ba19f..524f1ad8c52b9ef71a808a0ad62fb8d0e0dab769 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/robot/service/WeComRobotNoticeService.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/service/WeComRobotNoticeService.java @@ -1,10 +1,10 @@ -package cn.bootx.starter.wecom.core.robot.service; +package cn.bootx.platform.starter.wecom.core.robot.service; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.starter.wecom.core.robot.dao.WecomRobotConfigManager; -import cn.bootx.starter.wecom.core.robot.domin.UploadMedia; -import cn.bootx.starter.wecom.core.robot.entity.WecomRobotConfig; -import cn.bootx.starter.wecom.core.robot.executor.RobotMediaFileUploadRequestExecutor; +import cn.bootx.platform.starter.wecom.core.robot.executor.RobotMediaFileUploadRequestExecutor; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.starter.wecom.core.robot.dao.WecomRobotConfigManager; +import cn.bootx.platform.starter.wecom.core.robot.domin.UploadMedia; +import cn.bootx.platform.starter.wecom.core.robot.entity.WecomRobotConfig; import cn.hutool.core.io.FileTypeUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.file.FileNameUtil; @@ -23,7 +23,7 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; import java.util.List; -import static cn.bootx.starter.wecom.code.WeComCode.ROBOT_UPLOAD_URL; +import static cn.bootx.platform.starter.wecom.code.WeComCode.ROBOT_UPLOAD_URL; /** * 企微机器人消息通知 diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/robot/service/WecomRobotConfigService.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/service/WecomRobotConfigService.java similarity index 76% rename from bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/robot/service/WecomRobotConfigService.java rename to bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/service/WecomRobotConfigService.java index d12f672cfdda64b00b67f47c6ec5fd00c84473f0..33b1a7bbc0f6c58e1ddd748326d28cd4c03da844 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/core/robot/service/WecomRobotConfigService.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/service/WecomRobotConfigService.java @@ -1,14 +1,14 @@ -package cn.bootx.starter.wecom.core.robot.service; +package cn.bootx.platform.starter.wecom.core.robot.service; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.core.util.ResultConvertUtil; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.starter.wecom.core.robot.dao.WecomRobotConfigManager; -import cn.bootx.starter.wecom.core.robot.entity.WecomRobotConfig; -import cn.bootx.starter.wecom.dto.robot.WecomRobotConfigDto; -import cn.bootx.starter.wecom.param.robot.WecomRobotConfigParam; +import cn.bootx.platform.starter.wecom.param.robot.WecomRobotConfigParam; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.ResultConvertUtil; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.starter.wecom.core.robot.dao.WecomRobotConfigManager; +import cn.bootx.platform.starter.wecom.core.robot.entity.WecomRobotConfig; +import cn.bootx.platform.starter.wecom.dto.robot.WecomRobotConfigDto; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import lombok.RequiredArgsConstructor; @@ -91,4 +91,4 @@ public class WecomRobotConfigService { return robotConfigManager.existsByCode(code, id); } -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/dto/robot/WecomRobotConfigDto.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/dto/robot/WecomRobotConfigDto.java similarity index 79% rename from bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/dto/robot/WecomRobotConfigDto.java rename to bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/dto/robot/WecomRobotConfigDto.java index 7a7b4e81ec99f1fe0bb607e735648b7cc6c5e3cb..e544899674b4bbd2a896a120896c09a447f170b8 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/dto/robot/WecomRobotConfigDto.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/dto/robot/WecomRobotConfigDto.java @@ -1,7 +1,7 @@ -package cn.bootx.starter.wecom.dto.robot; +package cn.bootx.platform.starter.wecom.dto.robot; -import cn.bootx.common.core.rest.dto.BaseDto; -import cn.bootx.starter.data.perm.sensitive.SensitiveInfo; +import cn.bootx.platform.common.core.rest.dto.BaseDto; +import cn.bootx.platform.starter.data.perm.sensitive.SensitiveInfo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -32,4 +32,4 @@ public class WecomRobotConfigDto extends BaseDto { @Schema(description = "备注") private String remark; -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/param/robot/WecomRobotConfigParam.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/param/robot/WecomRobotConfigParam.java similarity index 92% rename from bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/param/robot/WecomRobotConfigParam.java rename to bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/param/robot/WecomRobotConfigParam.java index 7426182dadad8dd33aef14f6dc18923d17066d39..0fa6cb42690e23af18c1363c32bb8897e762fd88 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/starter/wecom/param/robot/WecomRobotConfigParam.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/param/robot/WecomRobotConfigParam.java @@ -1,4 +1,4 @@ -package cn.bootx.starter.wecom.param.robot; +package cn.bootx.platform.starter.wecom.param.robot; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -30,4 +30,4 @@ public class WecomRobotConfigParam { @Schema(description = "备注") private String remark; -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-wecom/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-common-starters/common-starter-wecom/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index fd445ebb2cca8d683cc778d86e1dd47ff64f1367..79adedc89a8bfddbf48a6e50431e4e3b46e8f8cc 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-common-starters/common-starter-wecom/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.starter.wecom.WeComAutoConfiguration \ No newline at end of file +cn.bootx.platform.starter.wecom.WeComAutoConfiguration diff --git a/bootx-common-starters/pom.xml b/bootx-common-starters/pom.xml index ef8d83c60e949c3305fb284f6a8238047991e651..d0fbb440beeb58af11417fc2473a6760c34766ef 100644 --- a/bootx-common-starters/pom.xml +++ b/bootx-common-starters/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - bootx-platform cn.bootx.platform - 1.2.3 + bootx-platform-parent + 1.3.0 4.0.0 @@ -23,35 +23,39 @@ common-starter-monitor common-starter-wechat common-starter-wecom - common-starter-flowable org.springframework.boot spring-boot-autoconfigure + provided org.springframework.boot spring-boot-configuration-processor + provided org.projectlombok lombok + provided org.projectlombok lombok-mapstruct-binding + provided org.mapstruct mapstruct-processor + provided diff --git a/bootx-commons/common-actable/pom.xml b/bootx-commons/common-actable/pom.xml deleted file mode 100644 index 71967399a840fe184137e6bc75133331bb5fa9f8..0000000000000000000000000000000000000000 --- a/bootx-commons/common-actable/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - 4.0.0 - - cn.bootx.platform - bootx-commons - 1.2.3 - - - common-actable - 通过配置model注解的方式来创建表，修改表结构 - - - - cn.bootx.platform - common-mybatis-plus - - - - - diff --git a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/ActableAutoConfiguration.java b/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/ActableAutoConfiguration.java deleted file mode 100644 index b63df70959161819749be6c5dae8dda81f1787dd..0000000000000000000000000000000000000000 --- a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/ActableAutoConfiguration.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.bootx.common.actable; - -import org.apache.ibatis.annotations.Mapper; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.context.properties.ConfigurationPropertiesScan; -import org.springframework.context.annotation.ComponentScan; - -/** - * Actable 自动根据创建表 - * - * @author xxm - * @date 2022/12/18 - */ -@ComponentScan -@ConfigurationPropertiesScan -@AutoConfiguration -@MapperScan(annotationClass = Mapper.class) -public class ActableAutoConfiguration { - -} diff --git a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/annotation/impl/ColumnImpl.java b/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/annotation/impl/ColumnImpl.java deleted file mode 100644 index 9f7a63a99435beac3a5a99a9ae7ddee919755d9e..0000000000000000000000000000000000000000 --- a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/annotation/impl/ColumnImpl.java +++ /dev/null @@ -1,153 +0,0 @@ -package cn.bootx.common.actable.annotation.impl; - -import cn.bootx.common.core.annotation.actable.Column; -import cn.bootx.common.core.code.actable.MySqlFieldType; -import cn.bootx.common.actable.utils.ColumnUtils; - -import java.lang.annotation.Annotation; - -/** - * 实现行注解 - * - * @author xxm - * @date 2023/1/17 - */ -public class ColumnImpl implements Column { - - /** - * 字段名 1.4.0版本支持，类同javax.persistence.Column.name - * @return 字段名：不填默认使用属性名作为表字段名 - */ - @Override - public String value() { - return ""; - } - - /** - * 字段名 1.3.0版本支持，类同javax.persistence.Column.name - * @return 字段名：不填默认使用属性名作为表字段名 - */ - @Override - public String name() { - return ""; - } - - /** - * 数据库字段排序, 数字小的在前面 - */ - @Override - public int order() { - return 0; - } - - /** - * 字段类型：不填默认使用属性的数据类型进行转换，转换失败的字段不会添加 - * 仅支持cn.bootx.common.actable.constants.MySqlTypeConstant中的枚举数据类型 - * 不填默认转换类：cn.bootx.common.actable.command.JavaToMysqlType - * 1.3.0版本支持，也可通过注解实现：cn.bootx.common.core.annotation.actable.ColumnType - * @return 字段类型 - */ - @Override - public MySqlFieldType type() { - return MySqlFieldType.DEFAULT; - } - - /** - * 字段长度，默认是255 类型默认长度参考：cn.bootx.common.core.code.actable.MySqlFieldType - * 1.3.0版本支持，类同javax.persistence.Column.length - * @return 默认字段长度，默认是255 - */ - @Override - public int length() { - return 255; - } - - /** - * 小数点长度，默认是0 类型默认长度参考：cn.bootx.common.core.code.actable.MySqlFieldType - * 1.3.0版本支持，类同javax.persistence.Column.scale - * @return 小数点长度，默认是0 - */ - @Override - public int decimalLength() { - return 0; - } - - /** - * 是否为可以为null，true是可以，false是不可以，默认为true - * 也可通过注解实现：cn.bootx.common.core.annotation.actable.IsNotNull - * 1.3.0版本支持，类同javax.persistence.Column.nullable - * @return 是否为可以为null，true是可以，false是不可以，默认为true - */ - @Override - public boolean isNull() { - return true; - } - - /** - * 是否是主键，默认false 也可通过注解实现：cn.bootx.common.core.annotation.actable.IsKey - * 1.3.0版本支持，类同javax.persistence.Id - * @return 是否是主键，默认false - */ - @Override - public boolean isKey() { - return false; - } - - /** - * 是否自动递增，默认false 也可通过注解实现：cn.bootx.common.core.annotation.actable.IsAutoIncrement - * @return 是否自动递增，默认false 只有主键才能使用 - */ - @Override - public boolean isAutoIncrement() { - return false; - } - - /** - * 默认值，默认为null - * @return 默认值 - */ - @Override - public String defaultValue() { - return ColumnUtils.DEFAULT_VALUE; - } - - // /** - // * 开启默认值原生模式 - // * 原生模式介绍：默认是false表示非原生，此时value只支持字符串形式，会将value值以字符串的形式设置到字段的默认值，例如value="aa" 即sql为 - // DEFAULT "aa" - // * 如果设置isNative=true，此时如果value="current_timestamp"，即sql为 DEFAULT current_timestamp - // * - // * @return - // */ - // @Override - // public boolean isNativeDefValue() { - // return false; - // } - - /** - * 数据表字段备注 1.3.0版本支持，也可通过注解实现：cn.bootx.common.actable.annotation.Comment - * @return 默认值，默认为空 - */ - @Override - public String comment() { - return ""; - } - - /** - * 是否排除该字段, 默认不排除 - */ - @Override - public boolean ignore() { - return false; - } - - /** - * Returns the annotation type of this annotation. - * @return the annotation type of this annotation - */ - @Override - public Class annotationType() { - return null; - } - -} diff --git a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/command/CreateTableParam.java b/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/command/CreateTableParam.java deleted file mode 100644 index ee19693e783022d0a338b894f52e98b79fad71d1..0000000000000000000000000000000000000000 --- a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/command/CreateTableParam.java +++ /dev/null @@ -1,120 +0,0 @@ -package cn.bootx.common.actable.command; - -import lombok.Getter; -import lombok.Setter; - -import java.util.List; - -/** - * 用于存放创建表的字段信息 - * - * @author sunchenbin, Spet - * @version 2019/07/06 - */ -@Getter -@Setter -public class CreateTableParam implements Cloneable { - - /** - * 字段名 - */ - private String fieldName; - - /** - * 排序 - */ - private int order; - - /** - * 字段类型 - */ - private String fieldType; - - /** - * 类型长度 - */ - private int fieldLength; - - /** - * 类型小数长度 - */ - private int fieldDecimalLength; - - /** - * 字段是否非空 - */ - private boolean fieldIsNull; - - /** - * 字段是否是主键 - */ - private boolean fieldIsKey; - - /** - * 主键是否自增 - */ - private boolean fieldIsAutoIncrement; - - /** - * 字段默认值 - */ - private String fieldDefaultValue; - - /** - * 字段默认值是否原生，原生使用$,非原生使用# - */ - private boolean fieldDefaultValueNative; - - /** - * 该类型需要几个长度（例如，需要小数位数的，那么总长度和小数长度就是2个长度）一版只有0、1、2三个可选值，自动从配置的类型中获取的 - */ - private int fileTypeLength; - - /** - * 值是否唯一 - */ - private boolean fieldIsUnique; - - /** - * 索引名称 - */ - private String filedIndexName; - - /** - * 所有字段列表 - */ - private List filedIndexValue; - - /** - * 唯一约束名称 - */ - private String filedUniqueName; - - /** - * 唯一约束列表 - */ - private List filedUniqueValue; - - /** - * 字段的备注 - */ - private String fieldComment; - - /** - * 是否忽略更新 - */ - private boolean ignoreUpdate; - - @Override - public CreateTableParam clone() { - CreateTableParam createTableParam = null; - try { - createTableParam = (CreateTableParam) super.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } - return createTableParam; - } - -} diff --git a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/command/JavaToMysqlType.java b/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/command/JavaToMysqlType.java deleted file mode 100644 index 0255dc2dd319b9ef34714f20a109eabc120f7ded..0000000000000000000000000000000000000000 --- a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/command/JavaToMysqlType.java +++ /dev/null @@ -1,41 +0,0 @@ -package cn.bootx.common.actable.command; - -import cn.bootx.common.core.code.actable.MySqlFieldType; - -import java.util.HashMap; -import java.util.Map; - -/** - * @author xxm - * @date 2023/1/16 - */ -public class JavaToMysqlType { - - public static Map javaToMysqlTypeMap = new HashMap(); - static { - javaToMysqlTypeMap.put("class java.lang.String", MySqlFieldType.VARCHAR); - javaToMysqlTypeMap.put("class java.lang.Long", MySqlFieldType.BIGINT); - javaToMysqlTypeMap.put("class java.lang.Integer", MySqlFieldType.INT); - javaToMysqlTypeMap.put("class java.lang.Boolean", MySqlFieldType.BIT); - javaToMysqlTypeMap.put("class java.math.BigInteger", MySqlFieldType.BIGINT); - javaToMysqlTypeMap.put("class java.lang.Float", MySqlFieldType.FLOAT); - javaToMysqlTypeMap.put("class java.lang.Double", MySqlFieldType.DOUBLE); - javaToMysqlTypeMap.put("class java.lang.Short", MySqlFieldType.SMALLINT); - javaToMysqlTypeMap.put("class java.math.BigDecimal", MySqlFieldType.DECIMAL); - javaToMysqlTypeMap.put("class java.sql.Date", MySqlFieldType.DATETIME); - javaToMysqlTypeMap.put("class java.util.Date", MySqlFieldType.DATETIME); - javaToMysqlTypeMap.put("class java.sql.Timestamp", MySqlFieldType.DATETIME); - javaToMysqlTypeMap.put("class java.sql.Time", MySqlFieldType.TIME); - javaToMysqlTypeMap.put("class java.time.LocalDateTime", MySqlFieldType.DATETIME); - javaToMysqlTypeMap.put("class java.time.LocalDate", MySqlFieldType.DATE); - javaToMysqlTypeMap.put("class java.time.LocalTime", MySqlFieldType.TIME); - javaToMysqlTypeMap.put("long", MySqlFieldType.BIGINT); - javaToMysqlTypeMap.put("int", MySqlFieldType.INT); - javaToMysqlTypeMap.put("boolean", MySqlFieldType.BIT); - javaToMysqlTypeMap.put("float", MySqlFieldType.FLOAT); - javaToMysqlTypeMap.put("double", MySqlFieldType.DOUBLE); - javaToMysqlTypeMap.put("short", MySqlFieldType.SMALLINT); - javaToMysqlTypeMap.put("char", MySqlFieldType.VARCHAR); - } - -} diff --git a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/command/MySqlTypeAndLength.java b/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/command/MySqlTypeAndLength.java deleted file mode 100644 index 0f5a388887941c418b6cae4366501112d2399b5e..0000000000000000000000000000000000000000 --- a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/command/MySqlTypeAndLength.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.bootx.common.actable.command; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * Mysql 类型和长度 - * - * @author xxm - * @date 2023/1/16 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class MySqlTypeAndLength { - - /** 长度数 */ - private Integer lengthCount; - - /** 长度 */ - private Integer length; - - /** 小数长度 */ - private Integer decimalLength; - - /** 类型 */ - private String type; - -} diff --git a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/command/SysMysqlColumns.java b/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/command/SysMysqlColumns.java deleted file mode 100644 index 32e9fb97f4f6feccecdcc42546592a4bbf7ab084..0000000000000000000000000000000000000000 --- a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/command/SysMysqlColumns.java +++ /dev/null @@ -1,242 +0,0 @@ -package cn.bootx.common.actable.command; - -/** - * 用于查询表中字段结构详细信息 - * - * @author sunchenbin - * @version 2016年6月23日 下午6:10:56 - */ -public class SysMysqlColumns { - - /** - * 字段名 - */ - public static final String COLUMN_NAME_KEY = "column_name"; - - private String table_catalog; - - /** - * 库名 - */ - private String table_schema; - - /** - * 表名 - */ - private String table_name; - - /** - * 字段名 - */ - private String column_name; - - /** - * 字段位置的排序 - */ - private String ordinal_position; - - /** - * 字段默认值 - */ - private String column_default; - - /** - * 是否可以为null - */ - private String is_nullable; - - /** - * 字段类型 - */ - private String data_type; - - private String character_maximum_length; - - private String character_octet_length; - - /** - * 长度 - */ - private String numeric_precision; - - /** - * 小数点数 - */ - private String numeric_scale; - - private String character_set_name; - - private String collation_name; - - /** - * 类型加长度拼接的字符串，例如varchar(100) - */ - private String column_type; - - /** - * 主键:PRI；唯一键:UNI - */ - private String column_key; - - /** - * 是否为自动增长，是的话为auto_increment - */ - private String extra; - - private String privileges; - - private String column_comment; - - public String getTable_catalog() { - return table_catalog; - } - - public void setTable_catalog(String table_catalog) { - this.table_catalog = table_catalog; - } - - public String getTable_schema() { - return table_schema; - } - - public void setTable_schema(String table_schema) { - this.table_schema = table_schema; - } - - public String getTable_name() { - return table_name; - } - - public void setTable_name(String table_name) { - this.table_name = table_name; - } - - public String getColumn_name() { - return column_name; - } - - public void setColumn_name(String column_name) { - this.column_name = column_name; - } - - public String getOrdinal_position() { - return ordinal_position; - } - - public void setOrdinal_position(String ordinal_position) { - this.ordinal_position = ordinal_position; - } - - public String getColumn_default() { - return column_default; - } - - public void setColumn_default(String column_default) { - this.column_default = column_default; - } - - public String getIs_nullable() { - return is_nullable; - } - - public void setIs_nullable(String is_nullable) { - this.is_nullable = is_nullable; - } - - public String getData_type() { - return data_type; - } - - public void setData_type(String data_type) { - this.data_type = data_type; - } - - public String getCharacter_maximum_length() { - return character_maximum_length; - } - - public void setCharacter_maximum_length(String character_maximum_length) { - this.character_maximum_length = character_maximum_length; - } - - public String getCharacter_octet_length() { - return character_octet_length; - } - - public void setCharacter_octet_length(String character_octet_length) { - this.character_octet_length = character_octet_length; - } - - public String getNumeric_precision() { - return numeric_precision; - } - - public void setNumeric_precision(String numeric_precision) { - this.numeric_precision = numeric_precision; - } - - public String getNumeric_scale() { - return numeric_scale; - } - - public void setNumeric_scale(String numeric_scale) { - this.numeric_scale = numeric_scale; - } - - public String getCharacter_set_name() { - return character_set_name; - } - - public void setCharacter_set_name(String character_set_name) { - this.character_set_name = character_set_name; - } - - public String getCollation_name() { - return collation_name; - } - - public void setCollation_name(String collation_name) { - this.collation_name = collation_name; - } - - public String getColumn_type() { - return column_type; - } - - public void setColumn_type(String column_type) { - this.column_type = column_type; - } - - public String getColumn_key() { - return column_key; - } - - public void setColumn_key(String column_key) { - this.column_key = column_key; - } - - public String getExtra() { - return extra; - } - - public void setExtra(String extra) { - this.extra = extra; - } - - public String getPrivileges() { - return privileges; - } - - public void setPrivileges(String privileges) { - this.privileges = privileges; - } - - public String getColumn_comment() { - return column_comment; - } - - public void setColumn_comment(String column_comment) { - this.column_comment = column_comment; - } - -} diff --git a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/command/SysMysqlTable.java b/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/command/SysMysqlTable.java deleted file mode 100644 index 3d82222e041e08393050d1e44652b58e67acd31e..0000000000000000000000000000000000000000 --- a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/command/SysMysqlTable.java +++ /dev/null @@ -1,235 +0,0 @@ -package cn.bootx.common.actable.command; - -import java.util.Date; - -/** - * 表注释 - * - * @author xxm - * @date 2023/1/16 - */ -public class SysMysqlTable { - - /** 字符集的后缀 */ - public static final String TABLE_COLLATION_SUFFIX = "_general_ci"; - - /** 字符集 */ - public static final String TABLE_COLLATION_KEY = "table_collation"; - - /** 注释 */ - public static final String TABLE_COMMENT_KEY = "table_comment"; - - /** 引擎 */ - public static final String TABLE_ENGINE_KEY = "engine"; - - private String table_catalog; - - private String table_schema; - - private String table_name; - - private String table_type; - - private String engine; - - private Long version; - - private String row_format; - - private Long table_rows; - - private Long avg_row_length; - - private Long data_length; - - private Long max_data_length; - - private Long index_length; - - private Long data_free; - - private Long auto_increment; - - private Date create_time; - - private Date update_time; - - private Date check_time; - - private String table_collation; - - private Long checksum; - - private String create_options; - - private String table_comment; - - public String getTable_catalog() { - return table_catalog; - } - - public void setTable_catalog(String table_catalog) { - this.table_catalog = table_catalog; - } - - public String getTable_schema() { - return table_schema; - } - - public void setTable_schema(String table_schema) { - this.table_schema = table_schema; - } - - public String getTable_name() { - return table_name; - } - - public void setTable_name(String table_name) { - this.table_name = table_name; - } - - public String getTable_type() { - return table_type; - } - - public void setTable_type(String table_type) { - this.table_type = table_type; - } - - public String getEngine() { - return engine; - } - - public void setEngine(String engine) { - this.engine = engine; - } - - public Long getVersion() { - return version; - } - - public void setVersion(Long version) { - this.version = version; - } - - public String getRow_format() { - return row_format; - } - - public void setRow_format(String row_format) { - this.row_format = row_format; - } - - public Long getTable_rows() { - return table_rows; - } - - public void setTable_rows(Long table_rows) { - this.table_rows = table_rows; - } - - public Long getAvg_row_length() { - return avg_row_length; - } - - public void setAvg_row_length(Long avg_row_length) { - this.avg_row_length = avg_row_length; - } - - public Long getData_length() { - return data_length; - } - - public void setData_length(Long data_length) { - this.data_length = data_length; - } - - public Long getMax_data_length() { - return max_data_length; - } - - public void setMax_data_length(Long max_data_length) { - this.max_data_length = max_data_length; - } - - public Long getIndex_length() { - return index_length; - } - - public void setIndex_length(Long index_length) { - this.index_length = index_length; - } - - public Long getData_free() { - return data_free; - } - - public void setData_free(Long data_free) { - this.data_free = data_free; - } - - public Long getAuto_increment() { - return auto_increment; - } - - public void setAuto_increment(Long auto_increment) { - this.auto_increment = auto_increment; - } - - public Date getCreate_time() { - return create_time; - } - - public void setCreate_time(Date create_time) { - this.create_time = create_time; - } - - public Date getUpdate_time() { - return update_time; - } - - public void setUpdate_time(Date update_time) { - this.update_time = update_time; - } - - public Date getCheck_time() { - return check_time; - } - - public void setCheck_time(Date check_time) { - this.check_time = check_time; - } - - public String getTable_collation() { - return table_collation; - } - - public void setTable_collation(String table_collation) { - this.table_collation = table_collation; - } - - public Long getChecksum() { - return checksum; - } - - public void setChecksum(Long checksum) { - this.checksum = checksum; - } - - public String getCreate_options() { - return create_options; - } - - public void setCreate_options(String create_options) { - this.create_options = create_options; - } - - public String getTable_comment() { - return table_comment; - } - - public void setTable_comment(String table_comment) { - this.table_comment = table_comment; - } - -} diff --git a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/command/TableConfig.java b/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/command/TableConfig.java deleted file mode 100644 index 73b3ce5df59c2f314e56626de3708307b22f139a..0000000000000000000000000000000000000000 --- a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/command/TableConfig.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.bootx.common.actable.command; - -import lombok.Getter; -import lombok.Setter; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 表配置 - * - * @author xxm - * @date 2023/1/16 - */ -@Getter -@Setter -public class TableConfig { - - /** 表的全部字段 */ - private List list = new ArrayList<>(); - - private Map map = new HashMap<>(); - - public TableConfig(List list, Map map) { - if (list != null) { - this.list = list; - } - if (map != null) { - this.map = map; - } - } - - public TableConfig(List list) { - if (list != null) { - this.list = list; - } - } - - public TableConfig(Map map) { - this.map = map; - } - -} diff --git a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/configuration/ActableProperties.java b/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/configuration/ActableProperties.java deleted file mode 100644 index 26ad16ac07dd286f7dc38937a8ac99bf574a1d36..0000000000000000000000000000000000000000 --- a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/configuration/ActableProperties.java +++ /dev/null @@ -1,61 +0,0 @@ -package cn.bootx.common.actable.configuration; - -import cn.bootx.common.core.code.actable.DatabaseType; -import lombok.Data; -import lombok.experimental.Accessors; -import org.springframework.boot.context.properties.ConfigurationProperties; - -/** - * @author xxm - * @date 2023/1/16 - */ -@Data -@Accessors(chain = true) -@ConfigurationProperties(prefix = "bootx.common.actable") -public class ActableProperties { - - /** - * 数据库类型 - */ - private DatabaseType databaseType = DatabaseType.MYSQL; - - /** - * 更新模式 - */ - private UpdateType updateType = UpdateType.NONE; - - /** - * 扫描包路径, 可以用 ,和 ; 分隔 - */ - private String scanPackage; - - /** - * 指定生成索引前缀 - */ - private String prefixIndex = "actable_idx_"; - - /** - * 指定生成唯一约束前缀 - */ - private String prefixUnique = "actable_uni_"; - - /** - * 更新模式 - * - * @author xxm - * @date 2023/1/16 - */ - public enum UpdateType { - - /** 不进行任何操作 */ - NONE, - /** 更新表结构 */ - UPDATE, - /** 创建表, 已经创建的不再进行处理 */ - CREATE, - /** 删除后重新创建 */ - DROP_CREATE; - - } - -} diff --git a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/constants/Constants.java b/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/constants/Constants.java deleted file mode 100644 index b67d56404c03b11a342879eb53dd0277e1c1daa8..0000000000000000000000000000000000000000 --- a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/constants/Constants.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.bootx.common.actable.constants; - -public interface Constants { - - String NEW_TABLE_MAP = "newTableMap"; - - String MODIFY_TABLE_MAP = "modifyTableMap"; - - String ADD_TABLE_MAP = "addTableMap"; - - String REMOVE_TABLE_MAP = "removeTableMap"; - - String MODIFY_TABLE_PROPERTY_MAP = "modifyTablePropertyMap"; - - String DROPKEY_TABLE_MAP = "dropKeyTableMap"; - - String DROPINDEXANDUNIQUE_TABLE_MAP = "dropIndexAndUniqueTableMap"; - - String ADDINDEX_TABLE_MAP = "addIndexTableMap"; - - String ADDUNIQUE_TABLE_MAP = "addUniqueTableMap"; - -} diff --git a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/dao/system/CreateMysqlTablesMapper.java b/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/dao/system/CreateMysqlTablesMapper.java deleted file mode 100644 index 65c935442b077de39dd3f241a6e30847038d9d2a..0000000000000000000000000000000000000000 --- a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/dao/system/CreateMysqlTablesMapper.java +++ /dev/null @@ -1,105 +0,0 @@ -package cn.bootx.common.actable.dao.system; - -import cn.bootx.common.actable.command.SysMysqlColumns; -import cn.bootx.common.actable.command.SysMysqlTable; -import cn.bootx.common.actable.command.TableConfig; -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * 创建更新表结构的Mapper - * - * @author sunchenbin - * - */ -@Mapper -@InterceptorIgnore(tenantLine = "true") -public interface CreateMysqlTablesMapper { - - /** - * 根据结构注解解析出来的信息创建表 - * @param tableMap 表结构的map - */ - void createTable(@Param("tableMap") Map tableMap); - - /** - * 根据表名查询表在库中是否存在 - * @param tableName 表结构的map - * @return SysMysqlTable - */ - SysMysqlTable findTableByTableName(@Param("tableName") String tableName); - - /** - * 根据表名查询库中该表的字段结构等信息 - * @param tableName 表结构的map - * @return 表的字段结构等信息 - */ - List findTableEnsembleByTableName(@Param("tableName") String tableName); - - /** - * 增加字段 - * @param tableMap 表结构的map - */ - void addTableField(@Param("tableMap") Map tableMap); - - /** - * 删除字段 - * @param tableMap 表结构的map - */ - void removeTableField(@Param("tableMap") Map tableMap); - - /** - * 更新表属性 - * @param tableMap 表结构的map - */ - void modifyTableProperty(@Param("tableMap") Map tableMap); - - /** - * 修改字段 - * @param tableMap 表结构的map - */ - void modifyTableField(@Param("tableMap") Map tableMap); - - /** - * 删除主键约束，附带修改其他字段属性功能 - * @param tableMap 表结构的map - */ - void dropKeyTableField(@Param("tableMap") Map tableMap); - - /** - * 根据表名删除表 - * @param tableName 表名 - */ - void dropTableByName(@Param("tableName") String tableName); - - /** - * 查询当前表存在的索引(除了主键索引primary) - * @param tableMap 表名 - * @return 索引名列表 - */ - Set findTableIndexByTableName(@Param("tableMap") Map tableMap); - - /** - * 删除表索引 - * @param tableMap - */ - void dropTabelIndex(@Param("tableMap") Map tableMap); - - /** - * 创建索引 - * @param tableMap - */ - void addTableIndex(@Param("tableMap") Map tableMap); - - /** - * 创建唯一约束 - * @param tableMap - */ - void addTableUnique(@Param("tableMap") Map tableMap); - -} diff --git a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/manager/handler/StartUpHandler.java b/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/manager/handler/StartUpHandler.java deleted file mode 100644 index f29cecc2ceae035ed2886712729117b9d5cf4fb0..0000000000000000000000000000000000000000 --- a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/manager/handler/StartUpHandler.java +++ /dev/null @@ -1,53 +0,0 @@ -package cn.bootx.common.actable.manager.handler; - -import cn.bootx.common.actable.configuration.ActableProperties; -import cn.bootx.common.core.code.actable.DatabaseType; -import cn.bootx.common.actable.manager.system.SysMysqlCreateTableManager; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import javax.annotation.PostConstruct; - -/** - * 启动时执行处理 - * - * @author chenbin.sun - * - */ -@Slf4j -@Component -@RequiredArgsConstructor -public class StartUpHandler { - - private final ActableProperties actableProperties; - - private final SysMysqlCreateTableManager sysMysqlCreateTableManager; - - /** - * 建表开始 - */ - @PostConstruct - public void startHandler() { - // 获取配置信息 - DatabaseType databaseType = actableProperties.getDatabaseType(); - // 执行mysql的处理方法 - if (DatabaseType.MYSQL == databaseType) { - log.debug("databaseType=mysql，开始执行mysql的处理方法"); - sysMysqlCreateTableManager.createMysqlTable(); - } - else if (DatabaseType.ORACLE == databaseType) { - log.debug("databaseType=oracle，开始执行oracle的处理方法"); - } - else if (DatabaseType.SQLSERVER == databaseType) { - log.debug("databaseType=sqlserver，开始执行sqlserver的处理方法"); - } - else if (DatabaseType.POSTGRESQL == databaseType) { - log.debug("databaseType=postgresql，开始执行postgresql的处理方法"); - } - else { - log.debug("没有找到符合条件的处理方法！"); - } - } - -} diff --git a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/manager/system/SysMysqlCreateTableManager.java b/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/manager/system/SysMysqlCreateTableManager.java deleted file mode 100644 index ba59b05cdf381a1b7900ff2ea07fe904ce177f35..0000000000000000000000000000000000000000 --- a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/manager/system/SysMysqlCreateTableManager.java +++ /dev/null @@ -1,872 +0,0 @@ -package cn.bootx.common.actable.manager.system; - -import cn.bootx.common.actable.command.*; -import cn.bootx.common.actable.configuration.ActableProperties; -import cn.bootx.common.actable.configuration.ActableProperties.UpdateType; -import cn.bootx.common.actable.constants.Constants; -import cn.bootx.common.actable.dao.system.CreateMysqlTablesMapper; -import cn.bootx.common.actable.utils.ClassScanner; -import cn.bootx.common.actable.utils.ClassTools; -import cn.bootx.common.actable.utils.ColumnUtils; -import cn.bootx.common.core.annotation.actable.IgnoreUpdate; -import cn.bootx.common.core.annotation.actable.Index; -import cn.bootx.common.core.annotation.actable.Table; -import cn.bootx.common.core.annotation.actable.Unique; -import cn.bootx.common.core.code.actable.MySqlCharset; -import cn.bootx.common.core.code.actable.MySqlEngine; -import cn.bootx.common.core.code.actable.MySqlFieldType; -import cn.bootx.common.core.exception.FatalException; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -import java.lang.reflect.Field; -import java.util.*; - -/** - * @author sunchenbin - * @version 2016年6月23日 下午6:07:21 - */ -@Slf4j -@Component -@Transactional -@RequiredArgsConstructor -public class SysMysqlCreateTableManager { - - private final CreateMysqlTablesMapper createMysqlTablesMapper; - - private final ActableProperties actableProperties; - - /** - * 读取配置文件的三种状态（创建表、更新表、不做任何事情） - */ - public void createMysqlTable() { - // 要扫描的model所在的pack - String pack = actableProperties.getScanPackage(); - // 自动创建模式：update表示更新，create表示删除原表重新创建 - UpdateType updateType = actableProperties.getUpdateType(); - - // 不做任何事情 - if (Objects.isNull(updateType)) { - log.warn("配置mybatis.table.auto错误无法识别，当前配置只支持[none/update/create/add]三种类型!"); - return; - } - - // 不做任何事情 - if (updateType == UpdateType.NONE) { - log.info("配置mybatis.table.updateType=none，不需要做任何事情"); - return; - } - - // 拆成多个pack，支持多个 - String[] packs = pack.split("[,;]"); - - // 从包package中获取所有的Class - @SuppressWarnings("unchecked") - Set> classes = ClassScanner.scan(packs, Table.class, TableName.class); - - // 初始化用于存储各种操作表结构的容器 - Map> baseTableMap = initTableMap(); - - // 表名集合 - List tableNames = new ArrayList<>(); - - // 循环全部的model - for (Class clas : classes) { - // 没有打注解不需要创建表 或者配置了忽略建表的注解 - if (!ColumnUtils.hasTableAnnotation(clas)) { - continue; - } - // 禁止出现重名表 - this.checkTableName(tableNames, clas); - // 构建出全部表的增删改的map - this.buildTableMapConstruct(clas, baseTableMap, updateType); - } - - // 根据传入的map，分别去创建或修改表结构 - this.createOrModifyTableConstruct(baseTableMap, updateType); - } - - /** - * 检查名称 - */ - private void checkTableName(List tableNames, Class clas) { - String tableName = ColumnUtils.getTableName(clas); - if (tableNames.contains(tableName)) { - throw new FatalException(tableName + "表名出现重复，禁止创建！"); - } - tableNames.add(tableName); - } - - /** - * 初始化用于存储各种操作表结构的容器 - * @return 初始化map - */ - private Map> initTableMap() { - Map> baseTableMap = new HashMap<>(); - // 1.用于存需要创建的表名+（字段结构/表信息） - baseTableMap.put(Constants.NEW_TABLE_MAP, new HashMap<>()); - // 2.用于存需要更新字段类型等的表名+结构 - baseTableMap.put(Constants.MODIFY_TABLE_MAP, new HashMap<>()); - // 3.用于存需要增加字段的表名+结构 - baseTableMap.put(Constants.ADD_TABLE_MAP, new HashMap<>()); - // 4.用于存需要删除字段的表名+结构 - baseTableMap.put(Constants.REMOVE_TABLE_MAP, new HashMap<>()); - // 5.用于存需要删除主键的表名+结构 - baseTableMap.put(Constants.DROPKEY_TABLE_MAP, new HashMap<>()); - // 6.用于存需要删除唯一约束的表名+结构 - baseTableMap.put(Constants.DROPINDEXANDUNIQUE_TABLE_MAP, new HashMap<>()); - // 7.用于存需要增加的索引 - baseTableMap.put(Constants.ADDINDEX_TABLE_MAP, new HashMap<>()); - // 8.用于存需要增加的唯一约束 - baseTableMap.put(Constants.ADDUNIQUE_TABLE_MAP, new HashMap<>()); - // 9.更新表注释 - baseTableMap.put(Constants.MODIFY_TABLE_PROPERTY_MAP, new HashMap<>()); - return baseTableMap; - } - - /** - * 构建出全部表的增删改的map - * @param clas package中的model的Class - * @param baseTableMap 用于存储各种操作表结构的容器 - */ - private void buildTableMapConstruct(Class clas, Map> baseTableMap, - UpdateType updateType) { - - // 获取model的tableName - String tableName = ColumnUtils.getTableName(clas); - - // 获取表注释 - String tableComment = ColumnUtils.getTableComment(clas); - - // 获取表字符集 - MySqlCharset tableCharset = ColumnUtils.getTableCharset(clas); - - // 获取表引擎 - MySqlEngine tableEngine = ColumnUtils.getTableEngine(clas); - - // 1. 用于存表的全部字段 - List allFieldList; - try { - allFieldList = this.getAllFields(clas); - if (allFieldList.size() == 0) { - log.warn("扫描发现" + clas.getName() + "没有建表字段请检查！"); - return; - } - } - catch (Exception e) { - log.error("表：{}，初始化字段结构失败！", tableName); - throw new FatalException(e.getMessage()); - } - - // 如果配置文件配置的是DROP_CREATE，表示将所有的表删掉重新创建 - if (updateType == UpdateType.DROP_CREATE) { - log.info("由于配置的模式是DROP_CREATE，因此先删除表后续根据结构重建，删除表：{}", tableName); - createMysqlTablesMapper.dropTableByName(tableName); - } - - // 先查该表是否以存在 - SysMysqlTable table = createMysqlTablesMapper.findTableByTableName(tableName); - - // 不存在时 - Map map = new HashMap<>(); - if (table == null) { - if (StrUtil.isNotBlank(tableComment)) { - map.put(SysMysqlTable.TABLE_COMMENT_KEY, tableComment); - } - if (tableCharset != null && tableCharset != MySqlCharset.DEFAULT) { - map.put(SysMysqlTable.TABLE_COLLATION_KEY, tableCharset.toString().toLowerCase()); - } - if (tableEngine != null && tableEngine != MySqlEngine.DEFAULT) { - map.put(SysMysqlTable.TABLE_ENGINE_KEY, tableEngine.toString()); - } - baseTableMap.get(Constants.NEW_TABLE_MAP).put(tableName, new TableConfig(allFieldList, map)); - baseTableMap.get(Constants.ADDINDEX_TABLE_MAP) - .put(tableName, new TableConfig(getAddIndexList(null, allFieldList))); - baseTableMap.get(Constants.ADDUNIQUE_TABLE_MAP) - .put(tableName, new TableConfig(getAddUniqueList(null, allFieldList))); - return; - } - else { - // 判断表注释是否要更新 - if (StrUtil.isNotBlank(tableComment) && !Objects.equals(tableComment, table.getTable_comment())) { - map.put(SysMysqlTable.TABLE_COMMENT_KEY, tableComment); - } - // 判断表字符集是否要更新 - if (tableCharset != null && tableCharset != MySqlCharset.DEFAULT - && !tableCharset.toString() - .toLowerCase() - .equals(table.getTable_collation().replace(SysMysqlTable.TABLE_COLLATION_SUFFIX, ""))) { - map.put(SysMysqlTable.TABLE_COLLATION_KEY, tableCharset.toString().toLowerCase()); - } - // 判断表引擎是否要更新 - if (tableEngine != null && tableEngine != MySqlEngine.DEFAULT - && !tableEngine.toString().equals(table.getEngine())) { - map.put(SysMysqlTable.TABLE_ENGINE_KEY, tableEngine.toString()); - } - baseTableMap.get(Constants.MODIFY_TABLE_PROPERTY_MAP).put(tableName, new TableConfig(map)); - } - - // 已存在时理论上做修改的操作，这里查出该表的结构 - List tableColumnList = createMysqlTablesMapper.findTableEnsembleByTableName(tableName); - - // 从sysColumns中取出我们需要比较的列的List - // 先取出name用来筛选出增加和删除的字段 - List columnNames = ClassTools.getPropertyValueList(tableColumnList, SysMysqlColumns.COLUMN_NAME_KEY); - - // 验证对比从model中解析的allFieldList与从数据库查出来的columnList - // 2. 找出增加的字段 - List addFieldList = getAddFieldList(allFieldList, columnNames); - - // 3. 找出删除的字段 - List removeFieldList = getRemoveFieldList(columnNames, allFieldList); - - // 4. 找出更新的字段 - List modifyFieldList = getModifyFieldList(tableColumnList, allFieldList); - - // 5. 找出需要删除主键的字段 - List dropKeyFieldList = getDropKeyFieldList(tableColumnList, allFieldList); - - String uniPrefix = actableProperties.getPrefixUnique(); - String idxPrefix = actableProperties.getPrefixIndex(); - Map paramMap = new HashMap<>(); - paramMap.put("tableName", tableName); - paramMap.put("uniquePrefix", uniPrefix); - paramMap.put("indexPrefix", idxPrefix); - // 查询当前表中全部 acteble 创建的索引和唯一约束，也就是名字前缀是actable_和actable_的 - Set allIndexAndUniqueNames = createMysqlTablesMapper.findTableIndexByTableName(paramMap); - - // 6. 找出需要删除的索引和唯一约束 - List dropIndexAndUniqueFieldList = getDropIndexAndUniqueList(allIndexAndUniqueNames, allFieldList); - - // 7. 找出需要新增的索引 - List addIndexFieldList = getAddIndexList(allIndexAndUniqueNames, allFieldList); - - // 8. 找出需要新增的唯一约束 - List addUniqueFieldList = getAddUniqueList(allIndexAndUniqueNames, allFieldList); - - if (addFieldList.size() != 0) { - baseTableMap.get(Constants.ADD_TABLE_MAP).put(tableName, new TableConfig(addFieldList)); - } - if (removeFieldList.size() != 0) { - baseTableMap.get(Constants.REMOVE_TABLE_MAP).put(tableName, new TableConfig(removeFieldList)); - } - if (modifyFieldList.size() != 0) { - baseTableMap.get(Constants.MODIFY_TABLE_MAP).put(tableName, new TableConfig(modifyFieldList)); - } - if (dropKeyFieldList.size() != 0) { - baseTableMap.get(Constants.DROPKEY_TABLE_MAP).put(tableName, new TableConfig(dropKeyFieldList)); - } - if (dropIndexAndUniqueFieldList.size() != 0) { - baseTableMap.get(Constants.DROPINDEXANDUNIQUE_TABLE_MAP) - .put(tableName, new TableConfig(dropIndexAndUniqueFieldList)); - } - if (addIndexFieldList.size() != 0) { - baseTableMap.get(Constants.ADDINDEX_TABLE_MAP).put(tableName, new TableConfig(addIndexFieldList)); - } - if (addUniqueFieldList.size() != 0) { - baseTableMap.get(Constants.ADDUNIQUE_TABLE_MAP).put(tableName, new TableConfig(addUniqueFieldList)); - } - } - - /** - * 找出需要新建的索引 - * @param allIndexAndUniqueNames 当前数据库的索引很约束名 - * @param allFieldList model中的所有字段 - * @return 需要新建的索引 - */ - private List getAddIndexList(Set allIndexAndUniqueNames, List allFieldList) { - List addIndexFieldList = new ArrayList<>(); - if (null == allIndexAndUniqueNames) { - allIndexAndUniqueNames = new HashSet<>(); - } - for (Object obj : allFieldList) { - CreateTableParam createTableParam = (CreateTableParam) obj; - if (null != createTableParam.getFiledIndexName() - && !allIndexAndUniqueNames.contains(createTableParam.getFiledIndexName())) { - addIndexFieldList.add(createTableParam); - } - } - return addIndexFieldList; - } - - /** - * 找出需要新建的唯一约束 - * @param allIndexAndUniqueNames 当前数据库的索引很约束名 - * @param allFieldList model中的所有字段 - * @return 需要新建的唯一约束 - */ - private List getAddUniqueList(Set allIndexAndUniqueNames, List allFieldList) { - List addUniqueFieldList = new ArrayList<>(); - if (null == allIndexAndUniqueNames) { - allIndexAndUniqueNames = new HashSet<>(); - } - for (Object obj : allFieldList) { - CreateTableParam createTableParam = (CreateTableParam) obj; - if (null != createTableParam.getFiledUniqueName() - && !allIndexAndUniqueNames.contains(createTableParam.getFiledUniqueName())) { - addUniqueFieldList.add(createTableParam); - } - } - return addUniqueFieldList; - } - - /** - * 找出需要删除的索引和唯一约束 - * @param allIndexAndUniqueNames 当前数据库的索引很约束名 - * @param allFieldList model中的所有字段 - * @return 需要删除的索引和唯一约束 - */ - private List getDropIndexAndUniqueList(Set allIndexAndUniqueNames, List allFieldList) { - List dropIndexAndUniqueFieldList = new ArrayList<>(); - if (null == allIndexAndUniqueNames || allIndexAndUniqueNames.size() == 0) { - return dropIndexAndUniqueFieldList; - } - List currentModelIndexAndUnique = new ArrayList<>(); - for (Object obj : allFieldList) { - CreateTableParam createTableParam = (CreateTableParam) obj; - if (null != createTableParam.getFiledIndexName()) { - currentModelIndexAndUnique.add(createTableParam.getFiledIndexName()); - } - if (null != createTableParam.getFiledUniqueName()) { - currentModelIndexAndUnique.add(createTableParam.getFiledUniqueName()); - } - } - for (String string : allIndexAndUniqueNames) { - if (!currentModelIndexAndUnique.contains(string)) { - dropIndexAndUniqueFieldList.add(string); - } - } - return dropIndexAndUniqueFieldList; - } - - /** - * 返回需要删除主键的字段 - * @param tableColumnList 表结构 - * @param allFieldList model中的所有字段 - * @return 需要删除主键的字段 - */ - private List getDropKeyFieldList(List tableColumnList, List allFieldList) { - Map fieldMap = getAllFieldMap(allFieldList); - List dropKeyFieldList = new ArrayList<>(); - for (SysMysqlColumns sysColumn : tableColumnList) { - // 数据库中有该字段时 - CreateTableParam createTableParam = fieldMap.get(sysColumn.getColumn_name().toLowerCase()); - if (createTableParam != null) { - // 原本是主键，现在不是了，那么要去做删除主键的操作 - if ("PRI".equals(sysColumn.getColumn_key()) && !createTableParam.isFieldIsKey()) { - dropKeyFieldList.add(createTableParam); - } - - } - } - return dropKeyFieldList; - } - - /** - * 根据数据库中表的结构和model中表的结构对比找出修改类型默认值等属性的字段 - * @return 需要修改的字段 - */ - private List getModifyFieldList(List tableColumnList, List allFieldList) { - Map fieldMap = getAllFieldMap(allFieldList); - List modifyFieldList = new ArrayList<>(); - for (SysMysqlColumns sysColumn : tableColumnList) { - // 数据库中有该字段时，验证是否有更新 - CreateTableParam createTableParam = fieldMap.get(sysColumn.getColumn_name().toLowerCase()); - if (createTableParam != null && !createTableParam.isIgnoreUpdate()) { - // 该复制操作时为了解决multiple primary key defined的同时又不会drop primary key - CreateTableParam modifyTableParam = createTableParam.clone(); - // 1.验证主键 - // 原本不是主键，现在变成了主键，那么要去做更新 - if (!"PRI".equals(sysColumn.getColumn_key()) && createTableParam.isFieldIsKey()) { - modifyFieldList.add(modifyTableParam); - continue; - } - // 原本是主键，现在依然主键，坚决不能在alter语句后加primary key，否则会报multiple primary - // key defined - if ("PRI".equals(sysColumn.getColumn_key()) && createTableParam.isFieldIsKey()) { - modifyTableParam.setFieldIsKey(false); - } - // 2.验证类型 - if (!sysColumn.getData_type().equalsIgnoreCase(createTableParam.getFieldType())) { - modifyFieldList.add(modifyTableParam); - continue; - } - // 3.验证长度个小数点位数 - String typeAndLength = createTableParam.getFieldType().toLowerCase(); - if (createTableParam.getFileTypeLength() == 1) { - // 拼接出类型加长度，比如varchar(1) - typeAndLength = typeAndLength + "(" + createTableParam.getFieldLength() + ")"; - } - else if (createTableParam.getFileTypeLength() == 2) { - // 拼接出类型加长度，比如varchar(1) - typeAndLength = typeAndLength + "(" + createTableParam.getFieldLength() + "," - + createTableParam.getFieldDecimalLength() + ")"; - } - - // 判断类型+长度是否相同 - if (!sysColumn.getColumn_type().toLowerCase().equals(typeAndLength)) { - modifyFieldList.add(modifyTableParam); - continue; - } - // 5.验证自增 - if ("auto_increment".equals(sysColumn.getExtra()) && !createTableParam.isFieldIsAutoIncrement()) { - modifyFieldList.add(modifyTableParam); - continue; - } - if (!"auto_increment".equals(sysColumn.getExtra()) && createTableParam.isFieldIsAutoIncrement()) { - modifyFieldList.add(modifyTableParam); - continue; - } - // 6.验证默认值 - if (sysColumn.getColumn_default() == null || sysColumn.getColumn_default().equals("")) { - // 数据库默认值是null，model中注解设置的默认值不为NULL时，那么需要更新该字段 - if (createTableParam.getFieldDefaultValue() != null - && !ColumnUtils.DEFAULT_VALUE.equals(createTableParam.getFieldDefaultValue())) { - modifyFieldList.add(modifyTableParam); - continue; - } - } - else if (!sysColumn.getColumn_default().equals(createTableParam.getFieldDefaultValue())) { - if (MySqlFieldType.BIT.toString().toLowerCase().equals(createTableParam.getFieldType()) - && !createTableParam.isFieldDefaultValueNative()) { - if (("true".equals(createTableParam.getFieldDefaultValue()) - || "1".equals(createTableParam.getFieldDefaultValue())) - && !"b'1'".equals(sysColumn.getColumn_default())) { - // 两者不相等时，需要更新该字段 - modifyFieldList.add(modifyTableParam); - continue; - } - if (("false".equals(createTableParam.getFieldDefaultValue()) - || "0".equals(createTableParam.getFieldDefaultValue())) - && !"b'0'".equals(sysColumn.getColumn_default())) { - // 两者不相等时，需要更新该字段 - modifyFieldList.add(modifyTableParam); - continue; - } - } - else { - // 两者不相等时，需要更新该字段 - modifyFieldList.add(modifyTableParam); - continue; - } - } - // 7.验证是否可以为null(主键不参与是否为null的更新) - if (sysColumn.getIs_nullable().equals("NO") && !createTableParam.isFieldIsKey()) { - if (createTableParam.isFieldIsNull()) { - // 一个是可以一个是不可用，所以需要更新该字段 - modifyFieldList.add(modifyTableParam); - continue; - } - } - else if (sysColumn.getIs_nullable().equals("YES") && !createTableParam.isFieldIsKey()) { - if (!createTableParam.isFieldIsNull()) { - // 一个是可以一个是不可用，所以需要更新该字段 - modifyFieldList.add(modifyTableParam); - continue; - } - } - // 8.验证注释 - if (!sysColumn.getColumn_comment().equals(createTableParam.getFieldComment())) { - modifyFieldList.add(modifyTableParam); - } - } - } - return modifyFieldList; - } - - /** - * 将allFieldList转换为Map结构 - */ - private Map getAllFieldMap(List allFieldList) { - // 将fieldList转成Map类型，字段名作为主键 - Map fieldMap = new HashMap<>(); - for (Object obj : allFieldList) { - CreateTableParam createTableParam = (CreateTableParam) obj; - fieldMap.put(createTableParam.getFieldName().toLowerCase(), createTableParam); - } - return fieldMap; - } - - /** - * 根据数据库中表的结构和model中表的结构对比找出删除的字段 - * @param columnNames 数据库中的结构 - * @param allFieldList model中的所有字段 - */ - private List getRemoveFieldList(List columnNames, List allFieldList) { - List toLowerCaseColumnNames = ClassTools.toLowerCase(columnNames); - Map fieldMap = getAllFieldMap(allFieldList); - // 用于存删除的字段 - List removeFieldList = new ArrayList<>(); - for (String fieldNm : toLowerCaseColumnNames) { - // 判断该字段在新的model结构中是否存在 - if (fieldMap.get(fieldNm) == null) { - // 不存在，做删除处理 - removeFieldList.add(fieldNm); - } - } - return removeFieldList; - } - - /** - * 根据数据库中表的结构和model中表的结构对比找出新增的字段 - * @param allFieldList model中的所有字段 - * @param columnNames 数据库中的结构 - * @return 新增的字段 - */ - private List getAddFieldList(List allFieldList, List columnNames) { - List toLowerCaseColumnNames = ClassTools.toLowerCase(columnNames); - List addFieldList = new ArrayList<>(); - for (Object obj : allFieldList) { - CreateTableParam createTableParam = (CreateTableParam) obj; - // 循环新的model中的字段，判断是否在数据库中已经存在 - if (!toLowerCaseColumnNames.contains(createTableParam.getFieldName().toLowerCase())) { - // 不存在，表示要在数据库中增加该字段 - addFieldList.add(obj); - } - } - return addFieldList; - } - - /** - * 迭代出所有model的所有fields - * @param clas 准备做为创建表依据的class - * @return 表的全部字段 - */ - public List getAllFields(Class clas) { - String idxPrefix = actableProperties.getPrefixIndex(); - String uniPrefix = actableProperties.getPrefixUnique(); - List fieldList = new ArrayList<>(); - Field[] fields = clas.getDeclaredFields(); - - // 判断是否有父类，如果有拉取父类的field，这里只支持多层继承 - fields = this.recursionParents(clas, fields); - - for (Field field : fields) { - // 判断方法中是否有指定注解类型的注解 - if (ColumnUtils.hasColumn(field, clas)) { - CreateTableParam param = new CreateTableParam(); - param.setFieldName(ColumnUtils.getColumnName(field, clas)); - param.setOrder(ColumnUtils.getColumnOrder(field, clas)); - MySqlTypeAndLength mySqlTypeAndLength = ColumnUtils.getMySqlTypeAndLength(field, clas); - param.setFieldType(mySqlTypeAndLength.getType().toLowerCase()); - param.setFileTypeLength(mySqlTypeAndLength.getLengthCount()); - if (mySqlTypeAndLength.getLengthCount() == 1) { - param.setFieldLength(mySqlTypeAndLength.getLength()); - } - else if (mySqlTypeAndLength.getLengthCount() == 2) { - param.setFieldLength(mySqlTypeAndLength.getLength()); - param.setFieldDecimalLength(mySqlTypeAndLength.getDecimalLength()); - } - param.setFieldIsNull(ColumnUtils.isNull(field, clas)); - param.setFieldIsKey(ColumnUtils.isKey(field, clas)); - param.setFieldIsAutoIncrement(ColumnUtils.isAutoIncrement(field, clas)); - param.setFieldDefaultValue(ColumnUtils.getDefaultValue(field, clas)); - param.setFieldDefaultValueNative(ColumnUtils.getDefaultValueNative(field, clas)); - param.setFieldComment(ColumnUtils.getComment(field, clas)); - // 获取当前字段的@Index注解 - Index index = field.getAnnotation(Index.class); - if (null != index) { - String[] indexValue = index.columns(); - param - .setFiledIndexName( - (index.value() == null || index.value().equals("")) - ? (idxPrefix + ((indexValue.length == 0) - ? ColumnUtils.getColumnName(field, clas) : stringArrFormat(indexValue))) - : idxPrefix + index.value()); - param.setFiledIndexValue( - indexValue.length == 0 ? Collections.singletonList(ColumnUtils.getColumnName(field, clas)) - : Arrays.asList(indexValue)); - } - // 获取当前字段的@Unique注解 - Unique unique = field.getAnnotation(Unique.class); - if (null != unique) { - String[] uniqueValue = unique.columns(); - param.setFiledUniqueName((unique.value() == null || unique.value().equals("")) - ? (uniPrefix + ((uniqueValue.length == 0) ? ColumnUtils.getColumnName(field, clas) - : stringArrFormat(uniqueValue))) - : uniPrefix + unique.value()); - param.setFiledUniqueValue( - uniqueValue.length == 0 ? Collections.singletonList(ColumnUtils.getColumnName(field, clas)) - : Arrays.asList(uniqueValue)); - } - // 获取当前字段的@IgnoreUpdate注解 - IgnoreUpdate ignoreUpdate = field.getAnnotation(IgnoreUpdate.class); - if (null != ignoreUpdate) { - param.setIgnoreUpdate(ignoreUpdate.value()); - } - fieldList.add(param); - } - } - // 进行排序 - fieldList.sort(Comparator.comparingInt(CreateTableParam::getOrder)); - return new ArrayList<>(fieldList); - } - - /** - * String[] to format xxx_yyy_sss - */ - private String stringArrFormat(String[] arr) { - return Arrays.toString(arr).replaceAll(",", "_").replaceAll(" ", "").replace("[", "").replace("]", ""); - } - - /** - * 递归扫描父类的fields - * @param clas 类 - * @param fields 属性 - */ - @SuppressWarnings("rawtypes") - private Field[] recursionParents(Class clas, Field[] fields) { - if (clas.getSuperclass() != null) { - Class clsSup = clas.getSuperclass(); - List fieldList = new ArrayList<>(Arrays.asList(fields)); - // 获取当前class的所有fields的name列表 - List fdNames = getFieldNames(fieldList); - for (Field pfd : clsSup.getDeclaredFields()) { - // 避免重载属性 - if (fdNames.contains(pfd.getName())) { - continue; - } - fieldList.add(pfd); - } - fields = new Field[fieldList.size()]; - int i = 0; - for (Object field : fieldList.toArray()) { - fields[i] = (Field) field; - i++; - } - fields = recursionParents(clsSup, fields); - } - return fields; - } - - private List getFieldNames(List fieldList) { - List fdNames = new ArrayList<>(); - for (Field fd : fieldList) { - fdNames.add(fd.getName()); - } - return fdNames; - } - - /** - * 根据传入的map创建或修改表结构 - * @param baseTableMap 操作sql的数据结构 - */ - private void createOrModifyTableConstruct(Map> baseTableMap, - UpdateType updateType) { - - // 1. 创建表 - createTableByMap(baseTableMap.get(Constants.NEW_TABLE_MAP)); - - // CREATE模式不做删除和修改操作 - if (updateType != UpdateType.CREATE) { - // 2. 删除要变更主键的表的原来的字段的主键 - dropFieldsKeyByMap(baseTableMap.get(Constants.DROPKEY_TABLE_MAP)); - } - - // CREATE模式不做删除和修改操作 - if (updateType != UpdateType.CREATE) { - // 3. 删除索引和约束 - dropIndexAndUniqueByMap(baseTableMap.get(Constants.DROPINDEXANDUNIQUE_TABLE_MAP)); - // 4. 删除字段 - removeFieldsByMap(baseTableMap.get(Constants.REMOVE_TABLE_MAP)); - // 5. 修改表注释 - modifyTableCommentByMap(baseTableMap.get(Constants.MODIFY_TABLE_PROPERTY_MAP)); - // 6. 修改字段类型等 - modifyFieldsByMap(baseTableMap.get(Constants.MODIFY_TABLE_MAP)); - } - - // 7. 添加新的字段 - addFieldsByMap(baseTableMap.get(Constants.ADD_TABLE_MAP)); - - // 8. 创建索引 - addIndexByMap(baseTableMap.get(Constants.ADDINDEX_TABLE_MAP)); - - // 9. 创建约束 - addUniqueByMap(baseTableMap.get(Constants.ADDUNIQUE_TABLE_MAP)); - - } - - /** - * 根据map结构删除索引和唯一约束 - * @param dropIndexAndUniqueMap 用于删除索引和唯一约束 - */ - private void dropIndexAndUniqueByMap(Map dropIndexAndUniqueMap) { - if (dropIndexAndUniqueMap.size() > 0) { - for (Map.Entry entry : dropIndexAndUniqueMap.entrySet()) { - String key = entry.getKey(); - TableConfig value = entry.getValue(); - for (Object obj : value.getList()) { - Map map = new HashMap<>(); - map.put(key, obj); - log.info("开始删除表" + key + "中的索引" + obj); - createMysqlTablesMapper.dropTabelIndex(map); - log.info("完成删除表" + key + "中的索引" + obj); - } - } - } - } - - /** - * 根据map结构创建索引 - * @param addIndexMap 用于创建索引和唯一约束 - */ - private void addIndexByMap(Map addIndexMap) { - if (addIndexMap.size() > 0) { - for (Map.Entry entry : addIndexMap.entrySet()) { - for (Object obj : entry.getValue().getList()) { - Map map = new HashMap<>(); - map.put(entry.getKey(), obj); - CreateTableParam fieldProperties = (CreateTableParam) obj; - if (null != fieldProperties.getFiledIndexName()) { - log.info("开始创建表" + entry.getKey() + "中的索引" + fieldProperties.getFiledIndexName()); - createMysqlTablesMapper.addTableIndex(map); - log.info("完成创建表" + entry.getKey() + "中的索引" + fieldProperties.getFiledIndexName()); - } - } - } - } - } - - /** - * 根据map结构创建唯一约束 - * @param addUniqueMap 用于创建索引和唯一约束 - */ - private void addUniqueByMap(Map addUniqueMap) { - if (addUniqueMap.size() > 0) { - for (Map.Entry entry : addUniqueMap.entrySet()) { - for (Object obj : entry.getValue().getList()) { - Map map = new HashMap<>(); - map.put(entry.getKey(), obj); - CreateTableParam fieldProperties = (CreateTableParam) obj; - if (null != fieldProperties.getFiledUniqueName()) { - log.info("开始创建表" + entry.getKey() + "中的唯一约束" + fieldProperties.getFiledUniqueName()); - createMysqlTablesMapper.addTableUnique(map); - log.info("完成创建表" + entry.getKey() + "中的唯一约束" + fieldProperties.getFiledUniqueName()); - } - } - } - } - } - - /** - * 根据map结构修改表中的字段类型等 - * @param modifyTableMap 用于存需要更新字段类型等的表名+结构 - */ - private void modifyFieldsByMap(Map modifyTableMap) { - // 做修改字段操作 - if (modifyTableMap.size() > 0) { - for (Map.Entry entry : modifyTableMap.entrySet()) { - for (Object obj : entry.getValue().getList()) { - Map map = new HashMap<>(); - map.put(entry.getKey(), obj); - CreateTableParam fieldProperties = (CreateTableParam) obj; - log.info("开始修改表" + entry.getKey() + "中的字段" + fieldProperties.getFieldName()); - createMysqlTablesMapper.modifyTableField(map); - log.info("完成修改表" + entry.getKey() + "中的字段" + fieldProperties.getFieldName()); - } - } - } - } - - /** - * 根据map结构删除表中的字段 - * @param removeTableMap 用于存需要删除字段的表名+结构 - */ - private void removeFieldsByMap(Map removeTableMap) { - // 做删除字段操作 - if (removeTableMap.size() > 0) { - for (Map.Entry entry : removeTableMap.entrySet()) { - for (Object obj : entry.getValue().getList()) { - Map map = new HashMap<>(); - map.put(entry.getKey(), obj); - String fieldName = (String) obj; - log.info("开始删除表" + entry.getKey() + "中的字段" + fieldName); - createMysqlTablesMapper.removeTableField(map); - log.info("完成删除表" + entry.getKey() + "中的字段" + fieldName); - } - } - } - } - - /** - * 根据map结构更新表的注释 - * @param modifyTableCommentMap 用于存需要更新表名+注释 - */ - private void modifyTableCommentByMap(Map modifyTableCommentMap) { - // 做更新的表注释 - if (modifyTableCommentMap.size() > 0) { - for (Map.Entry entry : modifyTableCommentMap.entrySet()) { - for (String property : entry.getValue().getMap().keySet()) { - Map map = new HashMap<>(); - Map tcMap = new HashMap<>(); - Object value = entry.getValue().getMap().get(property); - tcMap.put(property, value); - map.put(entry.getKey(), new TableConfig(tcMap)); - log.info("开始更新表" + entry.getKey() + "的" + property + "为" + value); - createMysqlTablesMapper.modifyTableProperty(map); - log.info("完成更新表" + entry.getKey() + "的" + property + "为" + value); - } - } - } - } - - /** - * 根据map结构对表中添加新的字段 - * @param addTableMap 用于存需要增加字段的表名+结构 - */ - private void addFieldsByMap(Map addTableMap) { - // 做增加字段操作 - if (addTableMap.size() > 0) { - for (Map.Entry entry : addTableMap.entrySet()) { - for (Object obj : entry.getValue().getList()) { - Map map = new HashMap<>(); - map.put(entry.getKey(), obj); - CreateTableParam fieldProperties = (CreateTableParam) obj; - log.info("开始为表" + entry.getKey() + "增加字段" + fieldProperties.getFieldName()); - createMysqlTablesMapper.addTableField(map); - log.info("完成为表" + entry.getKey() + "增加字段" + fieldProperties.getFieldName()); - } - } - } - } - - /** - * 根据map结构删除要变更表中字段的主键 - * @param dropKeyTableMap 用于存需要删除主键的表名+结构 - */ - private void dropFieldsKeyByMap(Map dropKeyTableMap) { - // 先去做删除主键的操作，这步操作必须在增加和修改字段之前！ - if (dropKeyTableMap.size() > 0) { - for (Map.Entry entry : dropKeyTableMap.entrySet()) { - for (Object obj : entry.getValue().getList()) { - Map map = new HashMap<>(); - map.put(entry.getKey(), obj); - CreateTableParam fieldProperties = (CreateTableParam) obj; - log.info("开始为表" + entry.getKey() + "删除主键" + fieldProperties.getFieldName()); - createMysqlTablesMapper.dropKeyTableField(map); - log.info("完成为表" + entry.getKey() + "删除主键" + fieldProperties.getFieldName()); - } - } - } - } - - /** - * 根据map结构创建表 - * @param newTableMap 用于存需要创建的表名+结构 - */ - private void createTableByMap(Map newTableMap) { - // 做创建表操作 - for (Map.Entry entry : newTableMap.entrySet()) { - Map map = new HashMap<>(); - map.put(entry.getKey(), entry.getValue()); - log.info("开始创建表：" + entry.getKey()); - createMysqlTablesMapper.createTable(map); - log.info("完成创建表：" + entry.getKey()); - } - } - -} diff --git a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/utils/ClassScanner.java b/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/utils/ClassScanner.java deleted file mode 100644 index d5d03207cefac2b7075a44f558436353facfac0c..0000000000000000000000000000000000000000 --- a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/utils/ClassScanner.java +++ /dev/null @@ -1,117 +0,0 @@ -package cn.bootx.common.actable.utils; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.BeanDefinitionStoreException; -import org.springframework.context.ResourceLoaderAware; -import org.springframework.core.io.Resource; -import org.springframework.core.io.ResourceLoader; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import org.springframework.core.io.support.ResourcePatternResolver; -import org.springframework.core.io.support.ResourcePatternUtils; -import org.springframework.core.type.classreading.CachingMetadataReaderFactory; -import org.springframework.core.type.classreading.MetadataReader; -import org.springframework.core.type.classreading.MetadataReaderFactory; -import org.springframework.core.type.filter.AnnotationTypeFilter; -import org.springframework.core.type.filter.TypeFilter; -import org.springframework.util.ClassUtils; -import org.springframework.util.SystemPropertyUtils; - -import java.io.IOException; -import java.lang.annotation.Annotation; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; - -/** - * 类扫描器 - * - * @author xxm - * @date 2023/1/16 - */ -@Slf4j -public class ClassScanner implements ResourceLoaderAware { - - // 保存过滤规则要排除的注解 - private final List includeFilters = new LinkedList<>(); - - private final List excludeFilters = new LinkedList<>(); - - private ResourcePatternResolver resourcePatternResolver = new PathMatchingResourcePatternResolver(); - - private MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory( - this.resourcePatternResolver); - - public static Set> scan(String[] basePackages, Class... annotations) { - ClassScanner cs = new ClassScanner(); - - if (annotations != null) { - for (Class anno : annotations) { - cs.addIncludeFilter(new AnnotationTypeFilter(anno)); - } - } - - Set> classes = new HashSet<>(); - for (String basePackage : basePackages) { - classes.addAll(cs.doScan(basePackage)); - } - return classes; - } - - public void setResourceLoader(ResourceLoader resourceLoader) { - this.resourcePatternResolver = ResourcePatternUtils.getResourcePatternResolver(resourceLoader); - this.metadataReaderFactory = new CachingMetadataReaderFactory(resourceLoader); - } - - public void addIncludeFilter(TypeFilter includeFilter) { - this.includeFilters.add(includeFilter); - } - - /** - * 搜索类 - * @param basePackage - * @return - */ - public Set> doScan(String basePackage) { - Set> classes = new HashSet<>(); - try { - String packageSearchPath = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX - + ClassUtils.convertClassNameToResourcePath(SystemPropertyUtils.resolvePlaceholders(basePackage)) - + "/**/*.class"; - Resource[] resources = this.resourcePatternResolver.getResources(packageSearchPath); - - for (Resource resource : resources) { - if (resource.isReadable()) { - MetadataReader metadataReader = this.metadataReaderFactory.getMetadataReader(resource); - if ((includeFilters.size() == 0 && excludeFilters.size() == 0) || matches(metadataReader)) { - try { - classes.add(Class.forName(metadataReader.getClassMetadata().getClassName())); - } - catch (ClassNotFoundException e) { - log.error("类不存在", e); - } - } - } - } - } - catch (IOException ex) { - throw new BeanDefinitionStoreException("I/O failure during classpath scanning", ex); - } - return classes; - } - - protected boolean matches(MetadataReader metadataReader) throws IOException { - for (TypeFilter tf : this.excludeFilters) { - if (tf.match(metadataReader, this.metadataReaderFactory)) { - return false; - } - } - for (TypeFilter tf : this.includeFilters) { - if (tf.match(metadataReader, this.metadataReaderFactory)) { - return true; - } - } - return false; - } - -} diff --git a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/utils/ClassTools.java b/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/utils/ClassTools.java deleted file mode 100644 index 6ee75734246085846859bcb9a72e254e95f3f4b4..0000000000000000000000000000000000000000 --- a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/utils/ClassTools.java +++ /dev/null @@ -1,53 +0,0 @@ -package cn.bootx.common.actable.utils; - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; - -/** - * 通过包名获取class - * - * @author sunchenbin - * @version 2016年6月23日 下午5:55:18 - */ -public class ClassTools { - - /** - * 取出list对象中的某个属性的值作为list返回 - * @param objList - * @param fieldName - * @return - */ - public static List getPropertyValueList(List objList, String fieldName) { - List list = new ArrayList(); - try { - for (T object : objList) { - Field field = object.getClass().getDeclaredField(fieldName); - field.setAccessible(true); - list.add((E) field.get(object)); - } - } - catch (Exception e) { - e.printStackTrace(); - } - - return list; - } - - /** - * List中的string转换为大写 - * @param list - * @return - */ - public static List toLowerCase(List list) { - if (null == list || list.size() == 0) { - return list; - } - List upperList = new ArrayList(); - for (String str : list) { - upperList.add(str.toLowerCase()); - } - return upperList; - } - -} diff --git a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/utils/ColumnUtils.java b/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/utils/ColumnUtils.java deleted file mode 100644 index 5519423f224b138f8aeac2cf7e26ead737a29f45..0000000000000000000000000000000000000000 --- a/bootx-commons/common-actable/src/main/java/cn/bootx/common/actable/utils/ColumnUtils.java +++ /dev/null @@ -1,410 +0,0 @@ -package cn.bootx.common.actable.utils; - -import cn.bootx.common.actable.annotation.impl.ColumnImpl; -import cn.bootx.common.actable.command.JavaToMysqlType; -import cn.bootx.common.actable.command.MySqlTypeAndLength; -import cn.bootx.common.core.annotation.actable.*; -import cn.bootx.common.core.code.actable.MySqlCharset; -import cn.bootx.common.core.code.actable.MySqlEngine; -import cn.bootx.common.core.code.actable.MySqlFieldType; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.google.common.base.CaseFormat; -import org.apache.commons.lang3.time.DateFormatUtils; -import org.springframework.beans.BeanUtils; - -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.*; - -/** - * 行工具类 - * - * @author xxm - * @date 2023/1/16 - */ -public class ColumnUtils { - - /** 默认值 */ - public static final String DEFAULT_VALUE = "DEFAULT"; - - /** SQL 转义字符 */ - public static final String SQL_ESCAPE_CHARACTER = "`"; - - /** - * 获取Mysql的类型，以及类型需要设置几个长度，这里构建成map的样式 - * 构建Map(字段名(小写),需要设置几个长度(0表示不需要设置，1表示需要设置一个，2表示需要设置两个)) - */ - public static final Map mySqlTypeAndLengthMap; - - /** - * 获取表名称 - */ - public static String getTableName(Class clazz) { - Table table = clazz.getAnnotation(Table.class); - TableName tableNamePlus = clazz.getAnnotation(TableName.class); - EnableTimeSuffix enableTimeSuffix = clazz.getAnnotation(EnableTimeSuffix.class); - if (!hasTableAnnotation(clazz)) { - return null; - } - String finalTableName = ""; - if (table != null && StrUtil.isNotBlank(table.name())) { - finalTableName = table.name(); - } - if (table != null && StrUtil.isNotBlank(table.value())) { - finalTableName = table.value(); - } - if (tableNamePlus != null && StrUtil.isNotBlank(tableNamePlus.value())) { - finalTableName = tableNamePlus.value(); - } - if (StrUtil.isBlank(finalTableName)) { - // 都为空时采用类名按照驼峰格式转会为表名 - finalTableName = getBuildLowerName(clazz.getSimpleName()); - } - if (null != enableTimeSuffix && enableTimeSuffix.value()) { - finalTableName = appendTimeSuffix(finalTableName, enableTimeSuffix.pattern()); - } - return finalTableName; - } - - /** - * 获取表备注 - */ - public static String getTableComment(Class clazz) { - Table table = clazz.getAnnotation(Table.class); - if (!hasTableAnnotation(clazz)) { - return ""; - } - if (table != null && StrUtil.isNotBlank(table.comment())) { - return table.comment(); - } - return ""; - } - - /** - * 获取表字符集 - */ - public static MySqlCharset getTableCharset(Class clazz) { - Table table = clazz.getAnnotation(Table.class); - if (!hasTableAnnotation(clazz)) { - return null; - } - if (table != null && table.charset() != MySqlCharset.DEFAULT) { - return table.charset(); - } - return null; - } - - /** - * 获取表引擎类型 - */ - public static MySqlEngine getTableEngine(Class clazz) { - Table table = clazz.getAnnotation(Table.class); - if (!hasTableAnnotation(clazz)) { - return null; - } - if (table != null && table.engine() != MySqlEngine.DEFAULT) { - return table.engine(); - } - return null; - } - - /** - * 获取行名称 - * @return - */ - public static String getColumnName(Field field, Class clazz) { - Column column = getColumn(field, clazz); - TableField tableField = field.getAnnotation(TableField.class); - TableId tableId = field.getAnnotation(TableId.class); - if (!hasColumn(field, clazz)) { - return null; - } - if (column != null && StrUtil.isNotBlank(column.name())) { - return column.name().toLowerCase().replace(SQL_ESCAPE_CHARACTER, ""); - } - if (column != null && StrUtil.isNotBlank(column.value())) { - return column.value().toLowerCase().replace(SQL_ESCAPE_CHARACTER, ""); - } - if (tableField != null && StrUtil.isNotBlank(tableField.value()) && tableField.exist()) { - return tableField.value().toLowerCase().replace(SQL_ESCAPE_CHARACTER, ""); - } - if (tableId != null && StrUtil.isNotBlank(tableId.value())) { - return tableId.value().replace(SQL_ESCAPE_CHARACTER, ""); - } - return getBuildLowerName(field.getName()).replace(SQL_ESCAPE_CHARACTER, ""); - } - - /** - * 获取数据库字段的排序 - */ - public static int getColumnOrder(Field field, Class clazz) { - Column column = getColumn(field, clazz); - if (!hasColumn(field, clazz)) { - return 0; - } - return Optional.ofNullable(column).map(Column::order).orElse(0); - } - - /** - * 获取构建小写表名称 - */ - private static String getBuildLowerName(String name) { - return CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name).toLowerCase(); - } - - /** - * 是否是主键 - */ - public static boolean isKey(Field field, Class clazz) { - Column column = getColumn(field, clazz); - if (!hasColumn(field, clazz)) { - return false; - } - TableId tableId = field.getAnnotation(TableId.class); - if (column != null && column.isKey()) { - return true; - } - else { - return null != tableId; - } - } - - /** - * 是否是自增主键 - */ - public static boolean isAutoIncrement(Field field, Class clazz) { - Column column = getColumn(field, clazz); - if (!hasColumn(field, clazz)) { - return false; - } - return column != null && column.isAutoIncrement(); - } - - /** - * 是否可以为空 - * @param field - * @param clazz - * @return - */ - public static Boolean isNull(Field field, Class clazz) { - Column column = getColumn(field, clazz); - if (!hasColumn(field, clazz)) { - return true; - } - boolean isKey = isKey(field, clazz); - // 主键默认为非空 - if (isKey) { - return false; - } - if (column != null) { - return column.isNull(); - } - return true; - } - - /** - * 获取字段的备注 - */ - public static String getComment(Field field, Class clazz) { - Column column = getColumn(field, clazz); - if (!hasColumn(field, clazz)) { - return null; - } - if (column != null && StrUtil.isNotBlank(column.comment())) { - return column.comment(); - } - return ""; - } - - /** - * 获取默认值 - */ - public static String getDefaultValue(Field field, Class clazz) { - Column column = getColumn(field, clazz); - if (!hasColumn(field, clazz)) { - return null; - } - if (column != null && !DEFAULT_VALUE.equals(column.defaultValue())) { - return column.defaultValue(); - } - return null; - } - - /** - * 获取 开启默认值原生模式 - */ - public static boolean getDefaultValueNative(Field field, Class clazz) { - IsNativeDefValue isNativeDefValue = field.getAnnotation(IsNativeDefValue.class); - if (isNativeDefValue != null) { - return isNativeDefValue.value(); - } - if (field.getGenericType().toString().equals("class java.lang.String") - || field.getGenericType().toString().equals("char") - || field.getGenericType().toString().equals("class java.lang.Boolean") - || field.getGenericType().toString().equals("boolean")) { - return false; - } - return true; - } - - /** - * Mysql 类型和长度 - */ - public static MySqlTypeAndLength getMySqlTypeAndLength(Field field, Class clazz) { - Column column = getColumn(field, clazz); - if (!hasColumn(field, clazz)) { - throw new RuntimeException("字段名：" + field.getName() + "没有字段标识的注解，异常抛出！"); - } - if (column != null && column.type() != MySqlFieldType.DEFAULT) { - return buildMySqlTypeAndLength(field, column.type().toString().toLowerCase(), column.length(), - column.decimalLength()); - } - // 类型为空根据字段类型去默认匹配类型 - MySqlFieldType mysqlType = JavaToMysqlType.javaToMysqlTypeMap.get(field.getGenericType().toString()); - if (mysqlType == null) { - throw new RuntimeException("字段名：" + field.getName() + "不支持" + field.getGenericType().toString() - + "类型转换到mysql类型，仅支持JavaToMysqlType类中的类型默认转换，异常抛出！"); - } - String sqlType = mysqlType.toString().toLowerCase(); - // 默认类型可以使用column来设置长度 - if (column != null) { - return buildMySqlTypeAndLength(field, sqlType, column.length(), column.decimalLength()); - } - return buildMySqlTypeAndLength(field, sqlType, 255, 0); - } - - /** - * 构建 Mysql 类型和长度 - */ - private static MySqlTypeAndLength buildMySqlTypeAndLength(Field field, String type, int length, int decimalLength) { - MySqlTypeAndLength mySqlTypeAndLength = mySqlTypeAndLengthMap.get(type); - if (mySqlTypeAndLength == null) { - throw new RuntimeException("字段名：" + field.getName() + "使用的" + type - + "类型，没有配置对应的MySqlTypeConstant，只支持创建MySqlTypeConstant中类型的字段，异常抛出！"); - } - MySqlTypeAndLength targetMySqlTypeAndLength = new MySqlTypeAndLength(); - BeanUtils.copyProperties(mySqlTypeAndLength, targetMySqlTypeAndLength); - if (length != 255) { - targetMySqlTypeAndLength.setLength(length); - } - if (decimalLength != 0) { - targetMySqlTypeAndLength.setDecimalLength(decimalLength); - } - return targetMySqlTypeAndLength; - } - - /** - * 是否有 Table 注解 - */ - public static boolean hasTableAnnotation(Class clazz) { - Table table = clazz.getAnnotation(Table.class); - return table != null; - } - - /** - * 本行是否需要进行处理, - */ - public static boolean hasColumn(Field field, Class clazz) { - // 是否开启simple模式 - boolean isSimple = isSimple(clazz); - // 不参与建表的字段 - String[] excludeFields = excludeFields(clazz); - // 当前属性名在排除建表的字段内 - if (Arrays.asList(excludeFields).contains(field.getName())) { - return false; - } - // 排除静态字段 - if (Modifier.isStatic(field.getModifiers())) { - return false; - } - Column column = field.getAnnotation(Column.class); - TableField tableField = field.getAnnotation(TableField.class); - TableId tableId = field.getAnnotation(TableId.class); - // 判断是否忽略该字段 - if (column != null && column.ignore()) { - return false; - } - // 开启了simple模式 - if (column == null && (tableField == null || !tableField.exist()) && tableId == null) { - return isSimple; - } - return true; - } - - /** - * 获取列注解 - */ - private static Column getColumn(Field field, Class clazz) { - // 不参与建表的字段 - String[] excludeFields = excludeFields(clazz); - if (Arrays.asList(excludeFields).contains(field.getName())) { - return null; - } - Column column = field.getAnnotation(Column.class); - if (column != null) { - return column; - } - // 是否开启simple模式 - // 开启了simple模式 - if (isSimple(clazz)) { - return new ColumnImpl(); - } - return null; - } - - /** - * 排除字段 - */ - private static String[] excludeFields(Class clazz) { - String[] excludeFields = {}; - Table tableName = clazz.getAnnotation(Table.class); - if (tableName != null) { - excludeFields = tableName.excludeFields(); - } - return excludeFields; - } - - /** - * 是否是简单模式 - */ - private static boolean isSimple(Class clazz) { - boolean isSimple = false; - Table tableName = clazz.getAnnotation(Table.class); - if (tableName != null) { - isSimple = tableName.isSimple(); - } - return isSimple; - } - - /** - * 添加时间后缀 - * @param tableName 表名 - * @param pattern 时间格式 - * @return - */ - public static String appendTimeSuffix(String tableName, String pattern) { - String suffix; - try { - suffix = DateFormatUtils.format(new Date(), pattern); - } - catch (Exception e) { - throw new RuntimeException("无法转换时间格式" + pattern); - } - return tableName + "_" + suffix; - } - - /** - * 初始化 mysql的类型 - */ - static { - mySqlTypeAndLengthMap = new HashMap<>(); - for (MySqlFieldType type : MySqlFieldType.values()) { - mySqlTypeAndLengthMap.put(type.toString().toLowerCase(), new MySqlTypeAndLength(type.getLengthCount(), - type.getLengthDefault(), type.getDecimalLengthDefault(), type.toString().toLowerCase())); - } - } - -} diff --git a/bootx-commons/common-actable/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-commons/common-actable/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 4c025de3db5fb4550a09a9294825a21a952b7f6e..0000000000000000000000000000000000000000 --- a/bootx-commons/common-actable/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.bootx.common.actable.ActableAutoConfiguration \ No newline at end of file diff --git a/bootx-commons/common-actable/src/main/resources/mapper/system/CreateMysqlTablesMapper.xml b/bootx-commons/common-actable/src/main/resources/mapper/system/CreateMysqlTablesMapper.xml deleted file mode 100644 index 00b9d24444cc904d9c7f24fa0d9b09fa14a59974..0000000000000000000000000000000000000000 --- a/bootx-commons/common-actable/src/main/resources/mapper/system/CreateMysqlTablesMapper.xml +++ /dev/null @@ -1,315 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - `${fields.fieldName}` ${fields.fieldType} - - - `${fields.fieldName}` ${fields.fieldType}(${fields.fieldLength}) - - - `${fields.fieldName}` - ${fields.fieldType}(${fields.fieldLength},${fields.fieldDecimalLength}) - - - NULL - - - NOT NULL - - - AUTO_INCREMENT - - - - - - - DEFAULT 1 - - - DEFAULT 0 - - - DEFAULT 1 - - - DEFAULT 0 - - - - DEFAULT ${fields.fieldDefaultValue} - - - - DEFAULT ${fields.fieldDefaultValue} - - - DEFAULT #{fields.fieldDefaultValue} - - - - - - - - - DEFAULT 1 - - - DEFAULT 0 - - - DEFAULT 1 - - - DEFAULT 0 - - - - DEFAULT ${fields.fieldDefaultValue} - - - - DEFAULT ${fields.fieldDefaultValue} - - - DEFAULT #{fields.fieldDefaultValue} - - - - - COMMENT #{fields.fieldComment} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bootx-commons/common-cache/pom.xml b/bootx-commons/common-cache/pom.xml index 4dbba5ad2ca0c23b66ef955a69dd58e7c2fe9977..eabf6f39603b2b0dd9edbdd7e6c81109cdb9f679 100644 --- a/bootx-commons/common-cache/pom.xml +++ b/bootx-commons/common-cache/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.2.3 + 1.3.0 4.0.0 diff --git a/bootx-commons/common-cache/src/main/java/cn/bootx/common/cache/CacheAutoConfiguration.java b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/CacheAutoConfiguration.java similarity index 90% rename from bootx-commons/common-cache/src/main/java/cn/bootx/common/cache/CacheAutoConfiguration.java rename to bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/CacheAutoConfiguration.java index 9170f6517f7459178ceefe132fd9614606fd5185..db4da7ebda3153ba820df6f2e1a22e904b04385b 100644 --- a/bootx-commons/common-cache/src/main/java/cn/bootx/common/cache/CacheAutoConfiguration.java +++ b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/CacheAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.common.cache; +package cn.bootx.platform.common.cache; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.ConfigurationPropertiesScan; diff --git a/bootx-commons/common-cache/src/main/java/cn/bootx/common/cache/configuration/BootxRedisCache.java b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/configuration/BootxRedisCache.java similarity index 95% rename from bootx-commons/common-cache/src/main/java/cn/bootx/common/cache/configuration/BootxRedisCache.java rename to bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/configuration/BootxRedisCache.java index 0c98d103726a7c99049201075030243ac2f64a6f..e9955cd1df518655d019ada39febfa61dfe99ff1 100644 --- a/bootx-commons/common-cache/src/main/java/cn/bootx/common/cache/configuration/BootxRedisCache.java +++ b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/configuration/BootxRedisCache.java @@ -1,4 +1,4 @@ -package cn.bootx.common.cache.configuration; +package cn.bootx.platform.common.cache.configuration; import org.springframework.data.redis.cache.RedisCache; import org.springframework.data.redis.cache.RedisCacheConfiguration; diff --git a/bootx-commons/common-cache/src/main/java/cn/bootx/common/cache/configuration/BootxRedisCacheManager.java b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/configuration/BootxRedisCacheManager.java similarity index 98% rename from bootx-commons/common-cache/src/main/java/cn/bootx/common/cache/configuration/BootxRedisCacheManager.java rename to bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/configuration/BootxRedisCacheManager.java index 612f1ea688233c7a68c66086c6fcd47522e17f8c..4aac9e5436fff402a1ca722ed5d33f0317fd1684 100644 --- a/bootx-commons/common-cache/src/main/java/cn/bootx/common/cache/configuration/BootxRedisCacheManager.java +++ b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/configuration/BootxRedisCacheManager.java @@ -1,4 +1,4 @@ -package cn.bootx.common.cache.configuration; +package cn.bootx.platform.common.cache.configuration; import cn.hutool.core.util.StrUtil; import lombok.Setter; diff --git a/bootx-commons/common-cache/src/main/java/cn/bootx/common/cache/manager/CachingConfiguration.java b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/manager/CachingConfiguration.java similarity index 97% rename from bootx-commons/common-cache/src/main/java/cn/bootx/common/cache/manager/CachingConfiguration.java rename to bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/manager/CachingConfiguration.java index 80fa16ff9e793281a839ee02c76341fe79dbd83e..941ff9cd720f6ee10320b2ce38f3f18e26cecad3 100644 --- a/bootx-commons/common-cache/src/main/java/cn/bootx/common/cache/manager/CachingConfiguration.java +++ b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/manager/CachingConfiguration.java @@ -1,6 +1,6 @@ -package cn.bootx.common.cache.manager; +package cn.bootx.platform.common.cache.manager; -import cn.bootx.common.cache.configuration.BootxRedisCacheManager; +import cn.bootx.platform.common.cache.configuration.BootxRedisCacheManager; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/bootx-commons/common-cache/src/main/java/cn/bootx/common/cache/manager/CachingProperties.java b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/manager/CachingProperties.java similarity index 93% rename from bootx-commons/common-cache/src/main/java/cn/bootx/common/cache/manager/CachingProperties.java rename to bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/manager/CachingProperties.java index e1300ed439b82beae4f6c6853d62c8b18891e769..6551aaafb4e0b345888e7eae7e1ab6f3ff2d353b 100644 --- a/bootx-commons/common-cache/src/main/java/cn/bootx/common/cache/manager/CachingProperties.java +++ b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/manager/CachingProperties.java @@ -1,4 +1,4 @@ -package cn.bootx.common.cache.manager; +package cn.bootx.platform.common.cache.manager; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-commons/common-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-commons/common-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 542315e96193bb8ff5b96d5082682c5a76162ac8..75ea486d6094ba615bcc0b9e84ad9056b6e21c7a 100644 --- a/bootx-commons/common-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-commons/common-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.common.cache.CacheAutoConfiguration \ No newline at end of file +cn.bootx.platform.common.cache.CacheAutoConfiguration diff --git a/bootx-commons/common-data-translate/pom.xml b/bootx-commons/common-data-translate/pom.xml index 5b6005039b732ecc900f1be462d1ec685027ef2f..ea209174da8f0a68c16eda6763a068708b8496aa 100644 --- a/bootx-commons/common-data-translate/pom.xml +++ b/bootx-commons/common-data-translate/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.2.3 + 1.3.0 4.0.0 diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/DataTranslateAutoConfiguration.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/DataTranslateAutoConfiguration.java similarity index 86% rename from bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/DataTranslateAutoConfiguration.java rename to bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/DataTranslateAutoConfiguration.java index c760d09536313cc789f389a16af3893184742cbb..d6f98fa42978313aff1809ba084801650f9b18ea 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/DataTranslateAutoConfiguration.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/DataTranslateAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.common.translate; +package cn.bootx.platform.common.translate; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.ComponentScan; diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/aop/TranslationAnnotationAdvisor.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/aop/TranslationAnnotationAdvisor.java similarity index 88% rename from bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/aop/TranslationAnnotationAdvisor.java rename to bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/aop/TranslationAnnotationAdvisor.java index 6afcbbb0512209d71b92ff0e95c6015d44c358e3..c09399cc86a996bdeb888faee52e54db3b77cc4d 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/aop/TranslationAnnotationAdvisor.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/aop/TranslationAnnotationAdvisor.java @@ -1,6 +1,6 @@ -package cn.bootx.common.translate.aop; +package cn.bootx.platform.common.translate.aop; -import cn.bootx.common.core.annotation.TranslationResult; +import cn.bootx.platform.common.core.annotation.TranslationResult; import lombok.RequiredArgsConstructor; import org.aopalliance.aop.Advice; import org.springframework.aop.Pointcut; diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/aop/TranslationInterceptor.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/aop/TranslationInterceptor.java similarity index 91% rename from bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/aop/TranslationInterceptor.java rename to bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/aop/TranslationInterceptor.java index b0742f9d4151c49c93d60af934b12f22a466320d..a6980fd281f86aa7a0c5ff7d428e7230920a4ff6 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/aop/TranslationInterceptor.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/aop/TranslationInterceptor.java @@ -1,7 +1,7 @@ -package cn.bootx.common.translate.aop; +package cn.bootx.platform.common.translate.aop; -import cn.bootx.common.core.annotation.TranslationResult; -import cn.bootx.common.translate.handler.TranslationHandler; +import cn.bootx.platform.common.translate.handler.TranslationHandler; +import cn.bootx.platform.common.core.annotation.TranslationResult; import cn.hutool.core.util.TypeUtil; import lombok.RequiredArgsConstructor; import org.aopalliance.intercept.MethodInterceptor; diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/cache/TranslationCacheFilter.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheFilter.java similarity index 96% rename from bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/cache/TranslationCacheFilter.java rename to bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheFilter.java index b03ba3e4d969e09765648f2f2710be171e50f80f..24114714852d81fe1c73f7e3463a2e6ccf597cb5 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/cache/TranslationCacheFilter.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheFilter.java @@ -1,4 +1,4 @@ -package cn.bootx.common.translate.cache; +package cn.bootx.platform.common.translate.cache; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/cache/TranslationCacheLocal.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheLocal.java similarity index 98% rename from bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/cache/TranslationCacheLocal.java rename to bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheLocal.java index 44cad977f1dc960717be4397d849fb37b94634d6..14dcd67f3a5c18112b770a34589539f4ec69e32c 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/cache/TranslationCacheLocal.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheLocal.java @@ -1,4 +1,4 @@ -package cn.bootx.common.translate.cache; +package cn.bootx.platform.common.translate.cache; import com.alibaba.ttl.TransmittableThreadLocal; import com.google.common.base.Objects; diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/cache/TranslationCacheService.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheService.java similarity index 90% rename from bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/cache/TranslationCacheService.java rename to bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheService.java index c5a333cc0e106ff5196c654ea73ccd54c3bf7d92..50da1fb61a58a8a151264af2abf02087c507f057 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/cache/TranslationCacheService.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheService.java @@ -1,10 +1,10 @@ -package cn.bootx.common.translate.cache; +package cn.bootx.platform.common.translate.cache; -import cn.bootx.common.core.annotation.Translate; -import cn.bootx.common.core.annotation.TranslationResult; -import cn.bootx.common.translate.cache.TranslationCacheLocal.Cache; -import cn.bootx.common.translate.domain.ConvertInfo; -import cn.bootx.common.translate.service.DictTranslationService; +import cn.bootx.platform.common.translate.domain.ConvertInfo; +import cn.bootx.platform.common.translate.service.DictTranslationService; +import cn.bootx.platform.common.core.annotation.Translate; +import cn.bootx.platform.common.core.annotation.TranslationResult; +import cn.bootx.platform.common.translate.cache.TranslationCacheLocal.Cache; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ClassUtil; diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/domain/Cache.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/domain/Cache.java similarity index 86% rename from bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/domain/Cache.java rename to bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/domain/Cache.java index 2c3faca050641ddc36a424f514ba2e8a8c2eac23..ec82e8de2ef7a459f63d0b85724a14dbd9106bd1 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/domain/Cache.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/domain/Cache.java @@ -1,6 +1,6 @@ -package cn.bootx.common.translate.domain; +package cn.bootx.platform.common.translate.domain; -import cn.bootx.common.translate.cache.TranslationCacheLocal; +import cn.bootx.platform.common.translate.cache.TranslationCacheLocal; import lombok.Getter; import lombok.Setter; diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/domain/ConvertInfo.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/domain/ConvertInfo.java similarity index 72% rename from bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/domain/ConvertInfo.java rename to bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/domain/ConvertInfo.java index 9d652b09bd58fa2cbe4d592b5e91ef127a604172..e6b37cb5182e5c7b657afac7aff6f51ad386b2c3 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/domain/ConvertInfo.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/domain/ConvertInfo.java @@ -1,7 +1,7 @@ -package cn.bootx.common.translate.domain; +package cn.bootx.platform.common.translate.domain; -import cn.bootx.common.core.annotation.Translate; -import cn.bootx.common.core.annotation.TranslationResult; +import cn.bootx.platform.common.core.annotation.Translate; +import cn.bootx.platform.common.core.annotation.TranslationResult; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/handler/TranslationHandler.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/TranslationHandler.java similarity index 75% rename from bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/handler/TranslationHandler.java rename to bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/TranslationHandler.java index 7560b1079e494e97f97ff3730631a2defd81e5d3..a54914b9bfe7cb2abe029059c216328c2fd7a6e2 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/handler/TranslationHandler.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/TranslationHandler.java @@ -1,6 +1,6 @@ -package cn.bootx.common.translate.handler; +package cn.bootx.platform.common.translate.handler; -import cn.bootx.common.core.annotation.TranslationResult; +import cn.bootx.platform.common.core.annotation.TranslationResult; import java.lang.reflect.Type; diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/handler/impl/ResultObjectTranslationHandler.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultObjectTranslationHandler.java similarity index 84% rename from bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/handler/impl/ResultObjectTranslationHandler.java rename to bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultObjectTranslationHandler.java index 83760b2219c41482f0499b519b3cbb32cbdb56da..5ca4002eca0fb334e9e3f5ff25a4a18e3ab6540d 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/handler/impl/ResultObjectTranslationHandler.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultObjectTranslationHandler.java @@ -1,9 +1,9 @@ -package cn.bootx.common.translate.handler.impl; +package cn.bootx.platform.common.translate.handler.impl; -import cn.bootx.common.core.annotation.TranslationResult; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.translate.handler.TranslationHandler; -import cn.bootx.common.translate.service.FieldTranslationService; +import cn.bootx.platform.common.translate.service.FieldTranslationService; +import cn.bootx.platform.common.core.annotation.TranslationResult; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.translate.handler.TranslationHandler; import cn.hutool.core.util.ClassUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/handler/impl/ResultPageIterableTranslationHandler.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultPageIterableTranslationHandler.java similarity index 86% rename from bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/handler/impl/ResultPageIterableTranslationHandler.java rename to bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultPageIterableTranslationHandler.java index 91664e1d4b5df9be05779f291adbe58ed08e2f25..0e9fc1ba34333fafffba3ce633e8f191c6b78981 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/handler/impl/ResultPageIterableTranslationHandler.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultPageIterableTranslationHandler.java @@ -1,9 +1,9 @@ -package cn.bootx.common.translate.handler.impl; +package cn.bootx.platform.common.translate.handler.impl; -import cn.bootx.common.core.annotation.TranslationResult; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.translate.handler.TranslationHandler; -import cn.bootx.common.translate.service.FieldTranslationService; +import cn.bootx.platform.common.translate.service.FieldTranslationService; +import cn.bootx.platform.common.core.annotation.TranslationResult; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.translate.handler.TranslationHandler; import cn.hutool.core.util.ClassUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/handler/impl/ResultPageTranslationHandler.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultPageTranslationHandler.java similarity index 85% rename from bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/handler/impl/ResultPageTranslationHandler.java rename to bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultPageTranslationHandler.java index 4b11a33e722a0a93701fe165c41ffbba6b2add67..491e32f1a6717c00e2a3bd75240f6a2ef17556d9 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/handler/impl/ResultPageTranslationHandler.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultPageTranslationHandler.java @@ -1,10 +1,10 @@ -package cn.bootx.common.translate.handler.impl; +package cn.bootx.platform.common.translate.handler.impl; -import cn.bootx.common.core.annotation.TranslationResult; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.util.CollUtil; -import cn.bootx.common.translate.handler.TranslationHandler; -import cn.bootx.common.translate.service.FieldTranslationService; +import cn.bootx.platform.common.translate.service.FieldTranslationService; +import cn.bootx.platform.common.core.annotation.TranslationResult; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.util.CollUtil; +import cn.bootx.platform.common.translate.handler.TranslationHandler; import cn.hutool.core.util.ClassUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.RequiredArgsConstructor; diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/service/DictTranslationService.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/service/DictTranslationService.java similarity index 78% rename from bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/service/DictTranslationService.java rename to bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/service/DictTranslationService.java index bac0e4ab90b8e2f789554cb7824a6ab37f8cee95..91b50bc9e0a0d1310f26a945a2188fcdc383c65c 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/service/DictTranslationService.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/service/DictTranslationService.java @@ -1,4 +1,4 @@ -package cn.bootx.common.translate.service; +package cn.bootx.platform.common.translate.service; /** * @author xxm diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/service/FieldTranslationService.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/service/FieldTranslationService.java similarity index 94% rename from bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/service/FieldTranslationService.java rename to bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/service/FieldTranslationService.java index e9b25f06001820b0c6ff5620115ab3f04e4366fb..444565cba3c2b6c2db7720f98c028eebaaa078e8 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/common/translate/service/FieldTranslationService.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/service/FieldTranslationService.java @@ -1,12 +1,12 @@ -package cn.bootx.common.translate.service; +package cn.bootx.platform.common.translate.service; -import cn.bootx.common.core.annotation.Translate; -import cn.bootx.common.core.annotation.TranslationResult; -import cn.bootx.common.core.function.CollectorsFunction; -import cn.bootx.common.translate.cache.TranslationCacheLocal; -import cn.bootx.common.translate.cache.TranslationCacheLocal.Cache; -import cn.bootx.common.translate.cache.TranslationCacheService; -import cn.bootx.common.translate.domain.ConvertInfo; +import cn.bootx.platform.common.core.annotation.Translate; +import cn.bootx.platform.common.core.annotation.TranslationResult; +import cn.bootx.platform.common.core.function.CollectorsFunction; +import cn.bootx.platform.common.translate.cache.TranslationCacheLocal; +import cn.bootx.platform.common.translate.cache.TranslationCacheLocal.Cache; +import cn.bootx.platform.common.translate.cache.TranslationCacheService; +import cn.bootx.platform.common.translate.domain.ConvertInfo; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ClassUtil; @@ -63,7 +63,7 @@ public class FieldTranslationService { List translationResults = list.stream() .filter(o -> Objects.nonNull(o.getTranslationResult())) .collect(Collectors.toList()); - for (cn.bootx.common.translate.domain.ConvertInfo translationResult : translationResults) { + for (ConvertInfo translationResult : translationResults) { Object fieldValue = BeanUtil.getFieldValue(object, translationResult.getName()); if (Objects.nonNull(fieldValue)) { // 是否是集合 diff --git a/bootx-commons/common-data-translate/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-commons/common-data-translate/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index df1fb2cc85c0933e712c13845e73ff7f8941a760..8bc1626325443d5c6b327376120269ceb32a38f4 100644 --- a/bootx-commons/common-data-translate/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-commons/common-data-translate/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.common.translate.DataTranslateAutoConfiguration +cn.bootx.platform.common.translate.DataTranslateAutoConfiguration diff --git a/bootx-commons/common-exception-handler/pom.xml b/bootx-commons/common-exception-handler/pom.xml index e40fca6e1f5843f77c5c53b260563e39c3b134f9..3b2b24064fc19a13627c11d74b22b6ddf1183a77 100644 --- a/bootx-commons/common-exception-handler/pom.xml +++ b/bootx-commons/common-exception-handler/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.2.3 + 1.3.0 4.0.0 common-exception-handler diff --git a/bootx-commons/common-exception-handler/src/main/java/cn/bootx/common/exceptionhandler/ExceptionHandlerAutoConfiguration.java b/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/ExceptionHandlerAutoConfiguration.java similarity index 88% rename from bootx-commons/common-exception-handler/src/main/java/cn/bootx/common/exceptionhandler/ExceptionHandlerAutoConfiguration.java rename to bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/ExceptionHandlerAutoConfiguration.java index 5f67dccab735ae3a0660fbc9ae8f7438d24a53be..6db83bac9f7899abd0e67d3f7c021d63ab799836 100644 --- a/bootx-commons/common-exception-handler/src/main/java/cn/bootx/common/exceptionhandler/ExceptionHandlerAutoConfiguration.java +++ b/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/ExceptionHandlerAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.common.exceptionhandler; +package cn.bootx.platform.common.exceptionhandler; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.ConfigurationPropertiesScan; diff --git a/bootx-commons/common-exception-handler/src/main/java/cn/bootx/common/exceptionhandler/handler/ExceptionHandlerProperties.java b/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/handler/ExceptionHandlerProperties.java similarity index 86% rename from bootx-commons/common-exception-handler/src/main/java/cn/bootx/common/exceptionhandler/handler/ExceptionHandlerProperties.java rename to bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/handler/ExceptionHandlerProperties.java index 29196c63f9391cad10db03c5f7fbc505a91428f3..27e27ab35dc396683a8a6108b11fb7d948855a3a 100644 --- a/bootx-commons/common-exception-handler/src/main/java/cn/bootx/common/exceptionhandler/handler/ExceptionHandlerProperties.java +++ b/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/handler/ExceptionHandlerProperties.java @@ -1,4 +1,4 @@ -package cn.bootx.common.exceptionhandler.handler; +package cn.bootx.platform.common.exceptionhandler.handler; import lombok.Getter; import lombok.Setter; diff --git a/bootx-commons/common-exception-handler/src/main/java/cn/bootx/common/exceptionhandler/handler/RestExceptionHandler.java b/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/handler/RestExceptionHandler.java similarity index 88% rename from bootx-commons/common-exception-handler/src/main/java/cn/bootx/common/exceptionhandler/handler/RestExceptionHandler.java rename to bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/handler/RestExceptionHandler.java index 53b5515caa6e2c4794b0b03b69f3d7b6ab5b690c..60e971b9ac0db93ede754349118e065141a1785d 100644 --- a/bootx-commons/common-exception-handler/src/main/java/cn/bootx/common/exceptionhandler/handler/RestExceptionHandler.java +++ b/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/handler/RestExceptionHandler.java @@ -1,12 +1,12 @@ -package cn.bootx.common.exceptionhandler.handler; - -import cn.bootx.common.core.code.CommonCode; -import cn.bootx.common.core.code.CommonErrorCode; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.exception.FatalException; -import cn.bootx.common.core.exception.SystemException; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; +package cn.bootx.platform.common.exceptionhandler.handler; + +import cn.bootx.platform.common.core.code.CommonCode; +import cn.bootx.platform.common.core.code.CommonErrorCode; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.FatalException; +import cn.bootx.platform.common.core.exception.SystemException; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.slf4j.MDC; @@ -21,8 +21,6 @@ import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; import javax.validation.ValidationException; -import static cn.bootx.common.core.code.CommonErrorCode.VALIDATE_PARAMETERS_ERROR; - /** * Web 项目异常处理 * @@ -56,7 +54,7 @@ public class RestExceptionHandler { for (ConstraintViolation violation : ex.getConstraintViolations()) { message.append(violation.getMessage()).append(System.lineSeparator()); } - return Res.response(VALIDATE_PARAMETERS_ERROR, message.toString(), MDC.get(CommonCode.TRACE_ID)); + return Res.response(CommonErrorCode.VALIDATE_PARAMETERS_ERROR, message.toString(), MDC.get(CommonCode.TRACE_ID)); } /** @@ -85,7 +83,7 @@ public class RestExceptionHandler { @ExceptionHandler({ ValidationException.class }) public ResResult handleBusinessException(ValidationException ex) { log.info(ex.getMessage(), ex); - return Res.response(VALIDATE_PARAMETERS_ERROR, ex.getMessage(), MDC.get(CommonCode.TRACE_ID)); + return Res.response(CommonErrorCode.VALIDATE_PARAMETERS_ERROR, ex.getMessage(), MDC.get(CommonCode.TRACE_ID)); } /** diff --git a/bootx-commons/common-exception-handler/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-commons/common-exception-handler/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 54fdc768655e0e5fc18970f21e503780abeb7cbc..2f95903b2255154731c4b6add6b38395973bca68 100644 --- a/bootx-commons/common-exception-handler/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-commons/common-exception-handler/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.common.exceptionhandler.ExceptionHandlerAutoConfiguration \ No newline at end of file +cn.bootx.platform.common.exceptionhandler.ExceptionHandlerAutoConfiguration diff --git a/bootx-commons/common-header-holder/pom.xml b/bootx-commons/common-header-holder/pom.xml index cbaf0aa5b4b4e9f3a0de238d39210315a052c712..630ee9526ce5a0c35a93b3e16ee59e9ee50a086b 100644 --- a/bootx-commons/common-header-holder/pom.xml +++ b/bootx-commons/common-header-holder/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.2.3 + 1.3.0 4.0.0 diff --git a/bootx-commons/common-header-holder/src/main/java/cn/bootx/common/headerholder/HeaderHolder.java b/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/HeaderHolder.java similarity index 87% rename from bootx-commons/common-header-holder/src/main/java/cn/bootx/common/headerholder/HeaderHolder.java rename to bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/HeaderHolder.java index 87f9bdcde866a051c2ee39819879bfa439952dac..2a0d77d0f07cad8f661ceb405288151b9bb702c2 100644 --- a/bootx-commons/common-header-holder/src/main/java/cn/bootx/common/headerholder/HeaderHolder.java +++ b/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/HeaderHolder.java @@ -1,8 +1,7 @@ -package cn.bootx.common.headerholder; +package cn.bootx.platform.common.headerholder; -import cn.bootx.common.core.code.WebHeaderCode; -import cn.bootx.common.headerholder.local.HolderContextHolder; -import cn.bootx.common.spring.util.WebServletUtil; +import cn.bootx.platform.common.headerholder.local.HolderContextHolder; +import cn.bootx.platform.common.core.code.WebHeaderCode; import lombok.experimental.UtilityClass; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; diff --git a/bootx-commons/common-header-holder/src/main/java/cn/bootx/common/headerholder/filter/WebHeaderHolderInterceptor.java b/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/filter/WebHeaderHolderInterceptor.java similarity index 90% rename from bootx-commons/common-header-holder/src/main/java/cn/bootx/common/headerholder/filter/WebHeaderHolderInterceptor.java rename to bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/filter/WebHeaderHolderInterceptor.java index 155a6140aec847e6cca622ce3cc7ab54a96d7338..ca8077d8d5295a2ae02230b8faaf10b8703881f1 100644 --- a/bootx-commons/common-header-holder/src/main/java/cn/bootx/common/headerholder/filter/WebHeaderHolderInterceptor.java +++ b/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/filter/WebHeaderHolderInterceptor.java @@ -1,7 +1,7 @@ -package cn.bootx.common.headerholder.filter; +package cn.bootx.platform.common.headerholder.filter; -import cn.bootx.common.core.code.ServletCode; -import cn.bootx.common.headerholder.local.HolderContextHolder; +import cn.bootx.platform.common.core.code.ServletCode; +import cn.bootx.platform.common.headerholder.local.HolderContextHolder; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/bootx-commons/common-header-holder/src/main/java/cn/bootx/common/headerholder/local/HolderContextHolder.java b/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/local/HolderContextHolder.java similarity index 94% rename from bootx-commons/common-header-holder/src/main/java/cn/bootx/common/headerholder/local/HolderContextHolder.java rename to bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/local/HolderContextHolder.java index 076f09d973a6a24f2a61afd77b387f7ca69102b9..e42e06c2ff3528487e8b6c2da72dc1ef18e03693 100644 --- a/bootx-commons/common-header-holder/src/main/java/cn/bootx/common/headerholder/local/HolderContextHolder.java +++ b/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/local/HolderContextHolder.java @@ -1,4 +1,4 @@ -package cn.bootx.common.headerholder.local; +package cn.bootx.platform.common.headerholder.local; import cn.hutool.core.map.MapUtil; import com.alibaba.ttl.TransmittableThreadLocal; diff --git a/bootx-commons/common-header-holder/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-commons/common-header-holder/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 774af7d47818469810624289dd38fda8914a1e7e..72c1a6b85b13046105e7d21bd2507399047243f5 100644 --- a/bootx-commons/common-header-holder/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-commons/common-header-holder/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.common.headerholder.filter.WebHeaderHolderInterceptor \ No newline at end of file +cn.bootx.platform.common.headerholder.filter.WebHeaderHolderInterceptor diff --git a/bootx-commons/common-idempotency/pom.xml b/bootx-commons/common-idempotency/pom.xml index 58b29780809c5b81e63a7328dd10f1d95f48f7df..f67d1baa3903301466337c0025f3cead6d339126 100644 --- a/bootx-commons/common-idempotency/pom.xml +++ b/bootx-commons/common-idempotency/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.2.3 + 1.3.0 4.0.0 diff --git a/bootx-commons/common-idempotency/src/main/java/cn/bootx/common/idempotency/aop/IdempotentAop.java b/bootx-commons/common-idempotency/src/main/java/cn/bootx/platform/common/idempotency/aop/IdempotentAop.java similarity index 85% rename from bootx-commons/common-idempotency/src/main/java/cn/bootx/common/idempotency/aop/IdempotentAop.java rename to bootx-commons/common-idempotency/src/main/java/cn/bootx/platform/common/idempotency/aop/IdempotentAop.java index 4200d289c63f4da058eb8da04b9cfe9f127319df..93927d3bec8aabcf32a03fbe5ded2d9682eb5ef8 100644 --- a/bootx-commons/common-idempotency/src/main/java/cn/bootx/common/idempotency/aop/IdempotentAop.java +++ b/bootx-commons/common-idempotency/src/main/java/cn/bootx/platform/common/idempotency/aop/IdempotentAop.java @@ -1,11 +1,11 @@ -package cn.bootx.common.idempotency.aop; +package cn.bootx.platform.common.idempotency.aop; -import cn.bootx.common.core.annotation.Idempotent; -import cn.bootx.common.core.code.WebHeaderCode; -import cn.bootx.common.core.exception.RepetitiveOperationException; -import cn.bootx.common.headerholder.HeaderHolder; -import cn.bootx.common.redis.RedisClient; -import cn.bootx.common.spring.util.WebServletUtil; +import cn.bootx.platform.common.core.annotation.Idempotent; +import cn.bootx.platform.common.core.code.WebHeaderCode; +import cn.bootx.platform.common.core.exception.RepetitiveOperationException; +import cn.bootx.platform.common.headerholder.HeaderHolder; +import cn.bootx.platform.common.redis.RedisClient; +import cn.bootx.platform.common.spring.util.WebServletUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.Method; import lombok.RequiredArgsConstructor; diff --git a/bootx-commons/common-idempotency/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-commons/common-idempotency/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index f7f3182de3ed4e4750ebaa29777b7d29ec6f1061..c1044df9b24b3caac93b6d63e9d1b5f782a227ac 100644 --- a/bootx-commons/common-idempotency/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-commons/common-idempotency/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.common.idempotency.aop.IdempotentAop \ No newline at end of file +cn.bootx.platform.common.idempotency.aop.IdempotentAop diff --git a/bootx-commons/common-jackson/pom.xml b/bootx-commons/common-jackson/pom.xml index 59864346f2313f67dc0f509d8852bd2954521e04..d9cb95012ac86f5012651d7a9ffb6fb432fa1b52 100644 --- a/bootx-commons/common-jackson/pom.xml +++ b/bootx-commons/common-jackson/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.2.3 + 1.3.0 4.0.0 diff --git a/bootx-commons/common-jackson/src/main/java/cn/bootx/common/jackson/JacksonAutoConfiguration.java b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/JacksonAutoConfiguration.java similarity index 86% rename from bootx-commons/common-jackson/src/main/java/cn/bootx/common/jackson/JacksonAutoConfiguration.java rename to bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/JacksonAutoConfiguration.java index e9f96db5a61ea36618a7cf01dfc08b0741480ac5..c59159a3a2fefb63a15d562ee62701d3e70f4be4 100644 --- a/bootx-commons/common-jackson/src/main/java/cn/bootx/common/jackson/JacksonAutoConfiguration.java +++ b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/JacksonAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.common.jackson; +package cn.bootx.platform.common.jackson; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.ComponentScan; diff --git a/bootx-commons/common-jackson/src/main/java/cn/bootx/common/jackson/configuration/JacksonConfiguration.java b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/configuration/JacksonConfiguration.java similarity index 92% rename from bootx-commons/common-jackson/src/main/java/cn/bootx/common/jackson/configuration/JacksonConfiguration.java rename to bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/configuration/JacksonConfiguration.java index a117a2dedec2d8e4162af3d3f13ccdb221a962d1..2379a3510b525d0964430cdea5b75084a6c3ee3b 100644 --- a/bootx-commons/common-jackson/src/main/java/cn/bootx/common/jackson/configuration/JacksonConfiguration.java +++ b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/configuration/JacksonConfiguration.java @@ -1,8 +1,8 @@ -package cn.bootx.common.jackson.configuration; +package cn.bootx.platform.common.jackson.configuration; -import cn.bootx.common.jackson.jdk.Java8TimeModule; -import cn.bootx.common.jackson.jdk.JavaLongTypeModule; -import cn.bootx.common.jackson.util.JacksonUtil; +import cn.bootx.platform.common.jackson.jdk.Java8TimeModule; +import cn.bootx.platform.common.jackson.jdk.JavaLongTypeModule; +import cn.bootx.platform.common.jackson.util.JacksonUtil; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/bootx-commons/common-jackson/src/main/java/cn/bootx/common/jackson/jdk/Java8TimeModule.java b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/jdk/Java8TimeModule.java similarity index 97% rename from bootx-commons/common-jackson/src/main/java/cn/bootx/common/jackson/jdk/Java8TimeModule.java rename to bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/jdk/Java8TimeModule.java index a1dbeee8eaa3fb8971c8f4a6ebee8386441af95c..9665f9a4d107cf67798d9ab82f6cd1e7989a815b 100644 --- a/bootx-commons/common-jackson/src/main/java/cn/bootx/common/jackson/jdk/Java8TimeModule.java +++ b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/jdk/Java8TimeModule.java @@ -1,4 +1,4 @@ -package cn.bootx.common.jackson.jdk; +package cn.bootx.platform.common.jackson.jdk; import cn.hutool.core.date.DatePattern; import com.fasterxml.jackson.databind.module.SimpleModule; diff --git a/bootx-commons/common-jackson/src/main/java/cn/bootx/common/jackson/jdk/JavaLongTypeModule.java b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/jdk/JavaLongTypeModule.java similarity index 91% rename from bootx-commons/common-jackson/src/main/java/cn/bootx/common/jackson/jdk/JavaLongTypeModule.java rename to bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/jdk/JavaLongTypeModule.java index 9b4b81dd87282cb662f61222268bc0216708a55f..d6807ab9ee0a12df898bc7d598b2d8d3e48105ef 100644 --- a/bootx-commons/common-jackson/src/main/java/cn/bootx/common/jackson/jdk/JavaLongTypeModule.java +++ b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/jdk/JavaLongTypeModule.java @@ -1,4 +1,4 @@ -package cn.bootx.common.jackson.jdk; +package cn.bootx.platform.common.jackson.jdk; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/bootx-commons/common-jackson/src/main/java/cn/bootx/common/jackson/util/JacksonUtil.java b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/util/JacksonUtil.java similarity index 96% rename from bootx-commons/common-jackson/src/main/java/cn/bootx/common/jackson/util/JacksonUtil.java rename to bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/util/JacksonUtil.java index a01f7d90735ff94aeb67a91c14920ca3a7f9a1a1..d810a4535a59026852dccfaa4e75a0383f25d7cc 100644 --- a/bootx-commons/common-jackson/src/main/java/cn/bootx/common/jackson/util/JacksonUtil.java +++ b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/util/JacksonUtil.java @@ -1,6 +1,6 @@ -package cn.bootx.common.jackson.util; +package cn.bootx.platform.common.jackson.util; -import cn.bootx.common.core.exception.RepetitiveOperationException; +import cn.bootx.platform.common.core.exception.RepetitiveOperationException; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/bootx-commons/common-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-commons/common-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 4cad475de3c2cfe322518ee9e65f42f180416cb0..0f826f86cb5bdbdaf31ec57ab0576b8b748bfe7c 100644 --- a/bootx-commons/common-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-commons/common-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.common.jackson.JacksonAutoConfiguration \ No newline at end of file +cn.bootx.platform.common.jackson.JacksonAutoConfiguration diff --git a/bootx-commons/common-lock/pom.xml b/bootx-commons/common-lock/pom.xml deleted file mode 100644 index 5a5098a831d47633721dc62313ff079d2244b59e..0000000000000000000000000000000000000000 --- a/bootx-commons/common-lock/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - cn.bootx.platform - bootx-commons - 1.2.3 - - 4.0.0 - - common-lock - - - - - cn.bootx.platform - common-redis-client - - - - - com.baomidou - lock4j-redis-template-spring-boot-starter - ${lock4j.version} - - - - - - - - - - org.springframework.boot - spring-boot-starter-aop - - - - diff --git a/bootx-commons/common-lock/src/main/java/cn/bootx/common/lock/LockCommonAutoConfiguration.java b/bootx-commons/common-lock/src/main/java/cn/bootx/common/lock/LockCommonAutoConfiguration.java deleted file mode 100644 index ede20d38909a367993024048c6b0ddc210f51b4b..0000000000000000000000000000000000000000 --- a/bootx-commons/common-lock/src/main/java/cn/bootx/common/lock/LockCommonAutoConfiguration.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bootx.common.lock; - -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.context.properties.ConfigurationPropertiesScan; -import org.springframework.context.annotation.ComponentScan; - -/** - * 分布式锁 - * - * @author xxm - * @date 2022/5/6 - */ -@AutoConfiguration -@ComponentScan -@ConfigurationPropertiesScan -public class LockCommonAutoConfiguration { - -} diff --git a/bootx-commons/common-lock/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-commons/common-lock/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 988f4f4bacae72225b8ad538a65d4ae0cbd5a5b8..0000000000000000000000000000000000000000 --- a/bootx-commons/common-lock/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.bootx.common.lock.LockCommonAutoConfiguration \ No newline at end of file diff --git a/bootx-commons/common-log/README.md b/bootx-commons/common-log/README.md index 42eb52977202395edee1b38592f65b3166aa9660..d304c82ddcee3ffe4ef253420d767cacab91860a 100644 --- a/bootx-commons/common-log/README.md +++ b/bootx-commons/common-log/README.md @@ -15,8 +15,9 @@ ```xml - - + + ``` 如果引入默认的`Logback`xml配置，需要在这条引入语句上面声明项目名称和日志存储地址，如本项目默认的日志输出文件，如果不引入而自己进行编写日志配置文件的话，可以参照`logback-bootx-common.xml`进行编写。 diff --git a/bootx-commons/common-log/pom.xml b/bootx-commons/common-log/pom.xml index 8d8dd678ea2832f4973571bba1d4fb6491bedfc1..6e5d64c7c37c88d2eec4eb23aeff6b23a5de0f87 100644 --- a/bootx-commons/common-log/pom.xml +++ b/bootx-commons/common-log/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.2.3 + 1.3.0 4.0.0 @@ -24,25 +24,12 @@ org.springframework.boot spring-boot-starter-web - + com.plumelog plumelog-lite-spring-boot-starter - - - - - - - - - - - - guava - com.google.guava - - + ${plumelog.version} + provided diff --git a/bootx-commons/common-log/src/main/java/cn/bootx/common/log/LogAutoConfiguration.java b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/LogAutoConfiguration.java similarity index 90% rename from bootx-commons/common-log/src/main/java/cn/bootx/common/log/LogAutoConfiguration.java rename to bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/LogAutoConfiguration.java index fcba03b59d6d59dd3698bc86b5c83b722c87438e..1ffc3501f15302d2814428625daf53d7ec67e538 100644 --- a/bootx-commons/common-log/src/main/java/cn/bootx/common/log/LogAutoConfiguration.java +++ b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/LogAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.common.log; +package cn.bootx.platform.common.log; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.ConfigurationPropertiesScan; diff --git a/bootx-commons/common-log/src/main/java/cn/bootx/common/log/configuration/LogProperties.java b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/configuration/LogProperties.java similarity index 91% rename from bootx-commons/common-log/src/main/java/cn/bootx/common/log/configuration/LogProperties.java rename to bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/configuration/LogProperties.java index d79f8afdff3408a37a767efe4d4e7b862df6f467..c1cf646c2304920c03ef408d9dbe3896ff179b1e 100644 --- a/bootx-commons/common-log/src/main/java/cn/bootx/common/log/configuration/LogProperties.java +++ b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/configuration/LogProperties.java @@ -1,4 +1,4 @@ -package cn.bootx.common.log.configuration; +package cn.bootx.platform.common.log.configuration; import lombok.Getter; import lombok.Setter; diff --git a/bootx-commons/common-log/src/main/java/cn/bootx/common/log/handler/LogTraceHeaderHolderFilter.java b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/handler/LogTraceHeaderHolderFilter.java similarity index 93% rename from bootx-commons/common-log/src/main/java/cn/bootx/common/log/handler/LogTraceHeaderHolderFilter.java rename to bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/handler/LogTraceHeaderHolderFilter.java index c117d52a47e4b7159cda98bc2fe7c0dba797af97..a387c3bdb3f0fa968a48bead0c312748e0675d62 100644 --- a/bootx-commons/common-log/src/main/java/cn/bootx/common/log/handler/LogTraceHeaderHolderFilter.java +++ b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/handler/LogTraceHeaderHolderFilter.java @@ -1,6 +1,6 @@ -package cn.bootx.common.log.handler; +package cn.bootx.platform.common.log.handler; -import cn.bootx.common.core.code.CommonCode; +import cn.bootx.platform.common.core.code.CommonCode; import cn.hutool.core.util.RandomUtil; import com.plumelog.core.TraceId; import lombok.RequiredArgsConstructor; diff --git a/bootx-commons/common-log/src/main/java/cn/bootx/common/log/handler/SensitiveDataLogConverter.java b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/handler/SensitiveDataLogConverter.java similarity index 97% rename from bootx-commons/common-log/src/main/java/cn/bootx/common/log/handler/SensitiveDataLogConverter.java rename to bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/handler/SensitiveDataLogConverter.java index b6d64db6487d718b8fc7a06206f572014c6659b4..36095bc63ea8c70a1ea355e67ab8549a672ddac9 100644 --- a/bootx-commons/common-log/src/main/java/cn/bootx/common/log/handler/SensitiveDataLogConverter.java +++ b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/handler/SensitiveDataLogConverter.java @@ -1,4 +1,4 @@ -package cn.bootx.common.log.handler; +package cn.bootx.platform.common.log.handler; import ch.qos.logback.classic.pattern.MessageConverter; import ch.qos.logback.classic.spi.ILoggingEvent; diff --git a/bootx-commons/common-log/src/main/java/cn/bootx/common/log/plumelog/PlumeLogAutoDeleteLogs.java b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/plumelog/PlumeLogAutoDeleteLogs.java similarity index 89% rename from bootx-commons/common-log/src/main/java/cn/bootx/common/log/plumelog/PlumeLogAutoDeleteLogs.java rename to bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/plumelog/PlumeLogAutoDeleteLogs.java index 6e176fca001a9a5bbf9dd079bf3cf122a71b6fe1..eabc4615fc72cb6958dbcc3117a6b0fcb8a91bf1 100644 --- a/bootx-commons/common-log/src/main/java/cn/bootx/common/log/plumelog/PlumeLogAutoDeleteLogs.java +++ b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/plumelog/PlumeLogAutoDeleteLogs.java @@ -1,11 +1,12 @@ -package cn.bootx.common.log.plumelog; +package cn.bootx.platform.common.log.plumelog; -import cn.bootx.common.log.configuration.LogProperties; +import cn.bootx.platform.common.log.configuration.LogProperties; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; import com.plumelog.lite.client.IndexUtil; import com.plumelog.lite.client.InitConfig; import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -21,6 +22,7 @@ import java.util.stream.IntStream; * @date 2023/3/29 */ @Component +@ConditionalOnClass(name = "com.plumelog.lite.client.InitConfig") @RequiredArgsConstructor public class PlumeLogAutoDeleteLogs { private final LogProperties logProperties; diff --git a/bootx-commons/common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-commons/common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 51bcaaf9bdb3fe6ebc98c3a728793250fc5547a1..215c94270fa3798334aac168052f351963a96f13 100644 --- a/bootx-commons/common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-commons/common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.common.log.LogAutoConfiguration \ No newline at end of file +cn.bootx.platform.common.log.LogAutoConfiguration diff --git a/bootx-commons/common-log/src/main/resources/cn/bootx/common/log/logback-console.xml b/bootx-commons/common-log/src/main/resources/cn/bootx/platform/common/log/logback-console.xml similarity index 100% rename from bootx-commons/common-log/src/main/resources/cn/bootx/common/log/logback-console.xml rename to bootx-commons/common-log/src/main/resources/cn/bootx/platform/common/log/logback-console.xml diff --git a/bootx-commons/common-log/src/main/resources/cn/bootx/common/log/logback-elk.xml b/bootx-commons/common-log/src/main/resources/cn/bootx/platform/common/log/logback-elk.xml similarity index 100% rename from bootx-commons/common-log/src/main/resources/cn/bootx/common/log/logback-elk.xml rename to bootx-commons/common-log/src/main/resources/cn/bootx/platform/common/log/logback-elk.xml diff --git a/bootx-commons/common-log/src/main/resources/cn/bootx/common/log/logback-log-file.xml b/bootx-commons/common-log/src/main/resources/cn/bootx/platform/common/log/logback-log-file.xml similarity index 100% rename from bootx-commons/common-log/src/main/resources/cn/bootx/common/log/logback-log-file.xml rename to bootx-commons/common-log/src/main/resources/cn/bootx/platform/common/log/logback-log-file.xml diff --git a/bootx-commons/common-log/src/main/resources/cn/bootx/common/log/logback-plumelog.xml b/bootx-commons/common-log/src/main/resources/cn/bootx/platform/common/log/logback-plumelog.xml similarity index 100% rename from bootx-commons/common-log/src/main/resources/cn/bootx/common/log/logback-plumelog.xml rename to bootx-commons/common-log/src/main/resources/cn/bootx/platform/common/log/logback-plumelog.xml diff --git a/bootx-commons/common-log/src/main/resources/cn/bootx/common/log/logback-sensitive.xml b/bootx-commons/common-log/src/main/resources/cn/bootx/platform/common/log/logback-sensitive.xml similarity index 64% rename from bootx-commons/common-log/src/main/resources/cn/bootx/common/log/logback-sensitive.xml rename to bootx-commons/common-log/src/main/resources/cn/bootx/platform/common/log/logback-sensitive.xml index 8eff1f02e579e075f52f403890a602c11e63be74..c55cd4b8749b7dcda55adebe50c967557e62cfa2 100644 --- a/bootx-commons/common-log/src/main/resources/cn/bootx/common/log/logback-sensitive.xml +++ b/bootx-commons/common-log/src/main/resources/cn/bootx/platform/common/log/logback-sensitive.xml @@ -1,6 +1,6 @@ - - + + diff --git a/bootx-commons/common-mongo/pom.xml b/bootx-commons/common-mongo/pom.xml index b1c797cf87e09d444d19754523fee19f7e404bc2..ed5df89655ffa63ad42c4a35bc6a8d6f7e719c96 100644 --- a/bootx-commons/common-mongo/pom.xml +++ b/bootx-commons/common-mongo/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.2.3 + 1.3.0 4.0.0 common-mongo diff --git a/bootx-commons/common-mongo/src/main/java/cn/bootx/common/mongo/MongoCommonAutoConfiguration.java b/bootx-commons/common-mongo/src/main/java/cn/bootx/platform/common/mongo/MongoCommonAutoConfiguration.java similarity index 87% rename from bootx-commons/common-mongo/src/main/java/cn/bootx/common/mongo/MongoCommonAutoConfiguration.java rename to bootx-commons/common-mongo/src/main/java/cn/bootx/platform/common/mongo/MongoCommonAutoConfiguration.java index 2788ca9ebb1ac4ac5d78c641d08f1dbf0a04e3da..93ce76d856e7571e27b82876c0de20543855ae51 100644 --- a/bootx-commons/common-mongo/src/main/java/cn/bootx/common/mongo/MongoCommonAutoConfiguration.java +++ b/bootx-commons/common-mongo/src/main/java/cn/bootx/platform/common/mongo/MongoCommonAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.common.mongo; +package cn.bootx.platform.common.mongo; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.ComponentScan; diff --git a/bootx-commons/common-mongo/src/main/java/cn/bootx/common/mongo/config/MongoConfiguration.java b/bootx-commons/common-mongo/src/main/java/cn/bootx/platform/common/mongo/config/MongoConfiguration.java similarity index 93% rename from bootx-commons/common-mongo/src/main/java/cn/bootx/common/mongo/config/MongoConfiguration.java rename to bootx-commons/common-mongo/src/main/java/cn/bootx/platform/common/mongo/config/MongoConfiguration.java index 9a9fccd3e0cd90231d40a1f9d737d5dfa07a0428..10006560af7c69e7f765f82ed0d365e3e47f6af8 100644 --- a/bootx-commons/common-mongo/src/main/java/cn/bootx/common/mongo/config/MongoConfiguration.java +++ b/bootx-commons/common-mongo/src/main/java/cn/bootx/platform/common/mongo/config/MongoConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.common.mongo.config; +package cn.bootx.platform.common.mongo.config; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-commons/common-mongo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-commons/common-mongo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 488882a83d7ede566614bf8501361f1a97112327..1efd150b92861639174cc7dc9c438d2109b54504 100644 --- a/bootx-commons/common-mongo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-commons/common-mongo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.common.mongo.MongoCommonAutoConfiguration \ No newline at end of file +cn.bootx.platform.common.mongo.MongoCommonAutoConfiguration diff --git a/bootx-commons/common-mqtt/pom.xml b/bootx-commons/common-mqtt/pom.xml deleted file mode 100644 index c94eafcaeb74e6c560861838ecabec5df69f808a..0000000000000000000000000000000000000000 --- a/bootx-commons/common-mqtt/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - bootx-commons - cn.bootx.platform - 1.2.3 - - 4.0.0 - - common-mqtt - jar - - - - org.springframework.boot - spring-boot-starter-integration - - - org.springframework.integration - spring-integration-mqtt - - - - diff --git a/bootx-commons/common-mqtt/src/main/java/cn/bootx/common/mqtt/MqttAutoConfiguration.java b/bootx-commons/common-mqtt/src/main/java/cn/bootx/common/mqtt/MqttAutoConfiguration.java deleted file mode 100644 index df1db315eef99c2b70e4763fa98a65e276967659..0000000000000000000000000000000000000000 --- a/bootx-commons/common-mqtt/src/main/java/cn/bootx/common/mqtt/MqttAutoConfiguration.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.bootx.common.mqtt; - -import org.springframework.boot.context.properties.ConfigurationPropertiesScan; -import org.springframework.context.annotation.ComponentScan; - -/** -* mqtt配置 -* @author xxm -* @date 2022/4/25 -*/ -@ComponentScan -@ConfigurationPropertiesScan -public class MqttAutoConfiguration { - - -} diff --git a/bootx-commons/common-mqtt/src/main/java/cn/bootx/common/mqtt/configuration/MqttConfiguration.java b/bootx-commons/common-mqtt/src/main/java/cn/bootx/common/mqtt/configuration/MqttConfiguration.java deleted file mode 100644 index dde2a9e4b1be7ada338aea8f427bb0672e103bc0..0000000000000000000000000000000000000000 --- a/bootx-commons/common-mqtt/src/main/java/cn/bootx/common/mqtt/configuration/MqttConfiguration.java +++ /dev/null @@ -1,62 +0,0 @@ -package cn.bootx.common.mqtt.configuration; - -import cn.hutool.core.util.RandomUtil; -import cn.hutool.core.util.StrUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.eclipse.paho.client.mqttv3.MqttClient; -import org.eclipse.paho.client.mqttv3.MqttConnectOptions; -import org.eclipse.paho.client.mqttv3.MqttException; -import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * mqtt配置 - * @author xxm - * @date 2022/4/25 - */ -@Slf4j -@Configuration -@RequiredArgsConstructor -public class MqttConfiguration { - private final MqttProperties mqttProperties; - - /** - * mqtt终端 - */ - @Bean - public MqttClient mqttClient(){ - MqttClient client = null; - // 是否启用mqtt - try { - String clientId = mqttProperties.getClientId(); - if (mqttProperties.isAutomaticReconnect()){ - clientId = clientId+"@"+ RandomUtil.randomString(5); - } - // 使用内存的持久性, 将不会生成.lock文件 - if (mqttProperties.isMemoryPersistence()){ - client = new MqttClient(mqttProperties.getUrl(), clientId, new MemoryPersistence()); - } else { - client = new MqttClient(mqttProperties.getUrl(), clientId); - } - // MQTT配置对象 - MqttConnectOptions options = new MqttConnectOptions(); - if (StrUtil.isNotBlank(mqttProperties.getName())){ - options.setUserName(mqttProperties.getName()); - } - if (StrUtil.isNotBlank(mqttProperties.getPassword())){ - options.setPassword(mqttProperties.getPassword().toCharArray()); - } - options.setCleanSession(mqttProperties.isCleanSession()); - options.setConnectionTimeout(mqttProperties.getConnectionTimeout()); - options.setKeepAliveInterval(mqttProperties.getKeepAliveInterval()); - options.setAutomaticReconnect(mqttProperties.isAutomaticReconnect()); - client.connect(options); - } catch (MqttException e) { - log.error("MQTT服务初始化失败",e); - } - return client; - } - -} diff --git a/bootx-commons/common-mqtt/src/main/java/cn/bootx/common/mqtt/configuration/MqttProperties.java b/bootx-commons/common-mqtt/src/main/java/cn/bootx/common/mqtt/configuration/MqttProperties.java deleted file mode 100644 index 7316edbe917be9b74bd10e37ca1e058d7d5ee588..0000000000000000000000000000000000000000 --- a/bootx-commons/common-mqtt/src/main/java/cn/bootx/common/mqtt/configuration/MqttProperties.java +++ /dev/null @@ -1,37 +0,0 @@ -package cn.bootx.common.mqtt.configuration; - -import lombok.Getter; -import lombok.Setter; -import org.springframework.boot.context.properties.ConfigurationProperties; - -/** -* mqtt配置 -* @author xxm -* @date 2022/4/25 -*/ -@Getter -@Setter -@ConfigurationProperties("bootx.common.mqtt") -public class MqttProperties { - - /** QTT服务地址 */ - private String url = "tcp://127.0.0.1:1883"; - /** 用户名 */ - private String name; - /** 密码 */ - private String password; - /** 终端id */ - private String clientId = "bootx"; - /** 内存持久化使, 将不会生成.lock文件, 在需要可靠性的情况下, 需要关闭 */ - private boolean memoryPersistence = true; - /** 自动追加终端id后缀 */ - private boolean autoClientIdSuffix = true; - /** 连接超时 */ - private int connectionTimeout = 30; - /** 清理会话 */ - private boolean cleanSession = true; - /** 自动重连 */ - private boolean automaticReconnect = true; - /** 保活间隔 */ - private int keepAliveInterval = 60; -} diff --git a/bootx-commons/common-mqtt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-commons/common-mqtt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index c017b2792c710f7a5e2cc2841872988fe7fb6e47..0000000000000000000000000000000000000000 --- a/bootx-commons/common-mqtt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.bootx.common.mqtt.MqttAutoConfiguration \ No newline at end of file diff --git a/bootx-commons/common-mybatis-plus/pom.xml b/bootx-commons/common-mybatis-plus/pom.xml index d2b3af1f32dfb75ab4c7cff4294503a487db7763..8343cb3f3b6d146a3142b08ca9e487bebd22c3b4 100644 --- a/bootx-commons/common-mybatis-plus/pom.xml +++ b/bootx-commons/common-mybatis-plus/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.2.3 + 1.3.0 4.0.0 @@ -36,6 +36,10 @@ flyway-core ${flyway.version} - + + cn.bootx + mybatis-table-modify + provided + diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/MybatisPlusCommonAutoConfiguration.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/MybatisPlusCommonAutoConfiguration.java similarity index 89% rename from bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/MybatisPlusCommonAutoConfiguration.java rename to bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/MybatisPlusCommonAutoConfiguration.java index aa987dd66a3632ae5f33fa42a019a533c13d67c2..7b9819b6e452007d631a0917a69e920465caab64 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/MybatisPlusCommonAutoConfiguration.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/MybatisPlusCommonAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.common.mybatisplus; +package cn.bootx.platform.common.mybatisplus; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.ConfigurationPropertiesScan; diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpBaseEntity.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpBaseEntity.java similarity index 73% rename from bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpBaseEntity.java rename to bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpBaseEntity.java index d12df31226bfddedaacc164d8b05e861e3429a9c..ae7ccf2d281b28b53dc2206c1bbdb72b716c210e 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpBaseEntity.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpBaseEntity.java @@ -1,6 +1,6 @@ -package cn.bootx.common.mybatisplus.base; +package cn.bootx.platform.common.mybatisplus.base; -import cn.bootx.common.core.annotation.actable.Column; +import cn.bootx.mybatis.table.modify.annotation.DbColumn; import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Getter; import lombok.Setter; @@ -23,7 +23,7 @@ public abstract class MpBaseEntity extends MpDelEntity implements Serializable { /** 删除标志 */ @TableLogic - @Column(comment = "删除标志", isNull = false, order = Integer.MAX_VALUE - 100) + @DbColumn(comment = "删除标志", isNull = false, order = Integer.MAX_VALUE - 100) private boolean deleted; } diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpCreateEntity.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpCreateEntity.java similarity index 69% rename from bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpCreateEntity.java rename to bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpCreateEntity.java index 794a3dea393107e1ecd11f73fa3197f07062ab87..fe0b318b0e74e64930da887cca7c75b899aa80ff 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpCreateEntity.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpCreateEntity.java @@ -1,6 +1,6 @@ -package cn.bootx.common.mybatisplus.base; +package cn.bootx.platform.common.mybatisplus.base; -import cn.bootx.common.core.annotation.actable.Column; +import cn.bootx.mybatis.table.modify.annotation.DbColumn; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import lombok.Getter; @@ -19,12 +19,12 @@ import java.time.LocalDateTime; public abstract class MpCreateEntity extends MpIdEntity { /** 创建者ID */ - @Column(comment = "创建者ID", length = 20, order = Integer.MAX_VALUE - 600) + @DbColumn(comment = "创建者ID", length = 20, order = Integer.MAX_VALUE - 600) @TableField(fill = FieldFill.INSERT) private Long creator; /** 创建时间 */ - @Column(comment = "创建时间", order = Integer.MAX_VALUE - 500) + @DbColumn(comment = "创建时间", order = Integer.MAX_VALUE - 500) @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpDelEntity.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpDelEntity.java similarity index 68% rename from bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpDelEntity.java rename to bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpDelEntity.java index 3fb02d42d24eecf6bcc519dc875f1463722cb5e3..f014f9f7011f30108a8c7d3c29742c2143ae1f49 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpDelEntity.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpDelEntity.java @@ -1,6 +1,6 @@ -package cn.bootx.common.mybatisplus.base; +package cn.bootx.platform.common.mybatisplus.base; -import cn.bootx.common.core.annotation.actable.Column; +import cn.bootx.mybatis.table.modify.annotation.DbColumn; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.Version; @@ -22,18 +22,18 @@ import java.time.LocalDateTime; public abstract class MpDelEntity extends MpCreateEntity { /** 最后修者ID */ - @Column(comment = "最后修者ID", length = 20, order = Integer.MAX_VALUE - 400) + @DbColumn(comment = "最后修者ID", length = 20, order = Integer.MAX_VALUE - 400) @TableField(fill = FieldFill.INSERT_UPDATE) private Long lastModifier; /** 最后修改时间 */ - @Column(comment = "最后修改时间", order = Integer.MAX_VALUE - 300) + @DbColumn(comment = "最后修改时间", order = Integer.MAX_VALUE - 300) @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime lastModifiedTime; /** 乐观锁 */ @Version - @Column(comment = "乐观锁", isNull = false, order = Integer.MAX_VALUE - 200) + @DbColumn(comment = "乐观锁", isNull = false, order = Integer.MAX_VALUE - 200) private Integer version = 0; } diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpIdEntity.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpIdEntity.java similarity index 74% rename from bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpIdEntity.java rename to bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpIdEntity.java index 94ccc126871bbac2e96d3093a73166ce587185da..515517189499ac4135f2b0924add232c04114f46 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/base/MpIdEntity.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpIdEntity.java @@ -1,6 +1,6 @@ -package cn.bootx.common.mybatisplus.base; +package cn.bootx.platform.common.mybatisplus.base; -import cn.bootx.common.core.annotation.actable.Column; +import cn.bootx.mybatis.table.modify.annotation.DbColumn; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Getter; @@ -22,7 +22,7 @@ public abstract class MpIdEntity implements Serializable { private static final long serialVersionUID = 3982181843202226124L; - @Column(comment = "主键", isKey = true, order = Integer.MIN_VALUE + 100) + @DbColumn(comment = "主键", isKey = true, order = Integer.MIN_VALUE + 100) @TableId(type = IdType.ASSIGN_ID) private Long id; diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/configuration/MpConfiguration.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/configuration/MpConfiguration.java similarity index 86% rename from bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/configuration/MpConfiguration.java rename to bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/configuration/MpConfiguration.java index 3320394d60fbdfac7e0067aeab16de032dfc1af2..871b917ce4a023b459709a1605a95989f31a8079 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/configuration/MpConfiguration.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/configuration/MpConfiguration.java @@ -1,7 +1,7 @@ -package cn.bootx.common.mybatisplus.configuration; +package cn.bootx.platform.common.mybatisplus.configuration; -import cn.bootx.common.mybatisplus.handler.SnowflakeIdentifierGenerator; -import cn.bootx.common.mybatisplus.interceptor.MpInterceptor; +import cn.bootx.platform.common.mybatisplus.handler.SnowflakeIdentifierGenerator; +import cn.bootx.platform.common.mybatisplus.interceptor.MpInterceptor; import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import lombok.RequiredArgsConstructor; diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/extension/DataChangeRecorderInnerInterceptor.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/extension/DataChangeRecorderInnerInterceptor.java similarity index 99% rename from bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/extension/DataChangeRecorderInnerInterceptor.java rename to bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/extension/DataChangeRecorderInnerInterceptor.java index 140486a4a024eb578c4d2a0f66859a24cdb7ebff..5e6781396783a55ecae5c3d55bba21923213b8ba 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/extension/DataChangeRecorderInnerInterceptor.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/extension/DataChangeRecorderInnerInterceptor.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.bootx.common.mybatisplus.extension; +package cn.bootx.platform.common.mybatisplus.extension; -import cn.bootx.common.core.annotation.DataVersionLog; -import cn.bootx.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.common.core.annotation.DataVersionLog; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; import com.baomidou.mybatisplus.core.toolkit.PluginUtils; diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/handler/JacksonRawTypeHandler.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/JacksonRawTypeHandler.java similarity index 91% rename from bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/handler/JacksonRawTypeHandler.java rename to bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/JacksonRawTypeHandler.java index dfd58ef9e22a434911b79d174748566815fc02a3..54c9ebb9922a1e7b52af9ea90fd18eff601aecb0 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/handler/JacksonRawTypeHandler.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/JacksonRawTypeHandler.java @@ -1,6 +1,6 @@ -package cn.bootx.common.mybatisplus.handler; +package cn.bootx.platform.common.mybatisplus.handler; -import cn.bootx.common.jackson.util.JacksonUtil; +import cn.bootx.platform.common.jackson.util.JacksonUtil; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/handler/SnowflakeIdentifierGenerator.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/SnowflakeIdentifierGenerator.java similarity index 88% rename from bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/handler/SnowflakeIdentifierGenerator.java rename to bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/SnowflakeIdentifierGenerator.java index d6be75d4211188bd780aa5c5379be10dc2fe2e04..9bb639db9e87927984283094f7e142168c3208d7 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/handler/SnowflakeIdentifierGenerator.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/SnowflakeIdentifierGenerator.java @@ -1,4 +1,4 @@ -package cn.bootx.common.mybatisplus.handler; +package cn.bootx.platform.common.mybatisplus.handler; import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/impl/BaseManager.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/impl/BaseManager.java similarity index 98% rename from bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/impl/BaseManager.java rename to bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/impl/BaseManager.java index b992a6343608d27a12125ff9516c85f0f2457875..d57c94b4a711c6794bf3b1d0ab0eaf2cc4e510ba 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/impl/BaseManager.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/impl/BaseManager.java @@ -1,7 +1,7 @@ -package cn.bootx.common.mybatisplus.impl; +package cn.bootx.platform.common.mybatisplus.impl; -import cn.bootx.common.core.exception.OptimisticLockException; -import cn.bootx.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.common.core.exception.OptimisticLockException; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.enums.SqlMethod; diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/interceptor/MpInterceptor.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/interceptor/MpInterceptor.java similarity index 89% rename from bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/interceptor/MpInterceptor.java rename to bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/interceptor/MpInterceptor.java index da53d14b96cad5640a07a81e95602685d5be2621..de233864edf3169c98450d01c60f54e4a70575c4 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/interceptor/MpInterceptor.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/interceptor/MpInterceptor.java @@ -1,4 +1,4 @@ -package cn.bootx.common.mybatisplus.interceptor; +package cn.bootx.platform.common.mybatisplus.interceptor; import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor; import lombok.*; diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/interceptor/MpInterceptorConfiguration.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/interceptor/MpInterceptorConfiguration.java similarity index 95% rename from bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/interceptor/MpInterceptorConfiguration.java rename to bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/interceptor/MpInterceptorConfiguration.java index d5f26824421bfbd80d7baab4b174b992c14818b9..7ca2402d8744a07a9ff39ecb834fc255e9274ede 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/interceptor/MpInterceptorConfiguration.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/interceptor/MpInterceptorConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.common.mybatisplus.interceptor; +package cn.bootx.platform.common.mybatisplus.interceptor; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor; diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/util/MpUtil.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/util/MpUtil.java similarity index 92% rename from bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/util/MpUtil.java rename to bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/util/MpUtil.java index f3f1c70c1fbaf5c7aa8ef77bd4718c87df00c55a..8163181008b7abf2a1bb744e01d5f9e76d36fccb 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/common/mybatisplus/util/MpUtil.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/util/MpUtil.java @@ -1,13 +1,13 @@ -package cn.bootx.common.mybatisplus.util; - -import cn.bootx.common.core.annotation.BigField; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.common.mybatisplus.base.MpCreateEntity; -import cn.bootx.common.mybatisplus.base.MpDelEntity; -import cn.bootx.common.mybatisplus.base.MpIdEntity; +package cn.bootx.platform.common.mybatisplus.util; + +import cn.bootx.platform.common.core.annotation.BigField; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.common.mybatisplus.base.MpCreateEntity; +import cn.bootx.platform.common.mybatisplus.base.MpDelEntity; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.ArrayUtil; diff --git a/bootx-commons/common-mybatis-plus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-commons/common-mybatis-plus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index fdf7faf66806c52ca898f188656f9d56643058e1..c2a7d2fb96a4ccbd1d23614443e5e040866ca5d8 100644 --- a/bootx-commons/common-mybatis-plus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-commons/common-mybatis-plus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.common.mybatisplus.MybatisPlusCommonAutoConfiguration \ No newline at end of file +cn.bootx.platform.common.mybatisplus.MybatisPlusCommonAutoConfiguration diff --git a/bootx-commons/common-rabbitmq/pom.xml b/bootx-commons/common-rabbitmq/pom.xml index c2d684ba0e8ebe193a5d158b8d453449150fb12b..b5c766ef73f350277dec8a5f40e4b84bbc5e99e2 100644 --- a/bootx-commons/common-rabbitmq/pom.xml +++ b/bootx-commons/common-rabbitmq/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.2.3 + 1.3.0 4.0.0 diff --git a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/common/rabbit/RabbitMqCommonAutoConfiguration.java b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/RabbitMqCommonAutoConfiguration.java similarity index 90% rename from bootx-commons/common-rabbitmq/src/main/java/cn/bootx/common/rabbit/RabbitMqCommonAutoConfiguration.java rename to bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/RabbitMqCommonAutoConfiguration.java index 248d9d90ab9dd50ed4ed19f24925472fdedb8bf6..015a0fd8f2af4e7bd74217256b8485d3c6638f77 100644 --- a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/common/rabbit/RabbitMqCommonAutoConfiguration.java +++ b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/RabbitMqCommonAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.common.rabbit; +package cn.bootx.platform.common.rabbit; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.ConfigurationPropertiesScan; diff --git a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/common/rabbit/conditional/ConditionalOnRabbit.java b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/conditional/ConditionalOnRabbit.java similarity index 93% rename from bootx-commons/common-rabbitmq/src/main/java/cn/bootx/common/rabbit/conditional/ConditionalOnRabbit.java rename to bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/conditional/ConditionalOnRabbit.java index 18ffa4ffaa4d2228c3d82262850668bb9439297d..17160cfefde7659373a8b2f8492d2835876d896a 100644 --- a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/common/rabbit/conditional/ConditionalOnRabbit.java +++ b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/conditional/ConditionalOnRabbit.java @@ -1,4 +1,4 @@ -package cn.bootx.common.rabbit.conditional; +package cn.bootx.platform.common.rabbit.conditional; import org.springframework.context.annotation.Conditional; diff --git a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/common/rabbit/conditional/OnRabbitEnable.java b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/conditional/OnRabbitEnable.java similarity index 88% rename from bootx-commons/common-rabbitmq/src/main/java/cn/bootx/common/rabbit/conditional/OnRabbitEnable.java rename to bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/conditional/OnRabbitEnable.java index 8be7a9301f0bfe39958952ca31deeefae580289b..d90e0141ef4a5f5a5039c84acdd3382a3fef0407 100644 --- a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/common/rabbit/conditional/OnRabbitEnable.java +++ b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/conditional/OnRabbitEnable.java @@ -1,6 +1,6 @@ -package cn.bootx.common.rabbit.conditional; +package cn.bootx.platform.common.rabbit.conditional; -import cn.bootx.common.rabbit.configuration.RabbitMqProperties; +import cn.bootx.platform.common.rabbit.configuration.RabbitMqProperties; import org.springframework.boot.context.properties.bind.Binder; import org.springframework.context.annotation.Condition; import org.springframework.context.annotation.ConditionContext; diff --git a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/common/rabbit/configuration/BootxRabbitListenerConfigurer.java b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/BootxRabbitListenerConfigurer.java similarity index 93% rename from bootx-commons/common-rabbitmq/src/main/java/cn/bootx/common/rabbit/configuration/BootxRabbitListenerConfigurer.java rename to bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/BootxRabbitListenerConfigurer.java index fbe6ceb6ade48ba037896173839670d0b6e3c2bb..162bcbe6516fdb1b7f29a798d415d0d9e66e3721 100644 --- a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/common/rabbit/configuration/BootxRabbitListenerConfigurer.java +++ b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/BootxRabbitListenerConfigurer.java @@ -1,4 +1,4 @@ -package cn.bootx.common.rabbit.configuration; +package cn.bootx.platform.common.rabbit.configuration; import lombok.RequiredArgsConstructor; import org.springframework.amqp.rabbit.annotation.RabbitListenerConfigurer; diff --git a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/common/rabbit/configuration/RabbitMqConfigurer.java b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/RabbitMqConfigurer.java similarity index 97% rename from bootx-commons/common-rabbitmq/src/main/java/cn/bootx/common/rabbit/configuration/RabbitMqConfigurer.java rename to bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/RabbitMqConfigurer.java index 5cff5fac344f6f0c2bfc39b5d55f106002a08af4..211c67b0db25c0a195732f8ce0e2b81d6f361a88 100644 --- a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/common/rabbit/configuration/RabbitMqConfigurer.java +++ b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/RabbitMqConfigurer.java @@ -1,4 +1,4 @@ -package cn.bootx.common.rabbit.configuration; +package cn.bootx.platform.common.rabbit.configuration; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.amqp.rabbit.annotation.EnableRabbit; diff --git a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/common/rabbit/configuration/RabbitMqProperties.java b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/RabbitMqProperties.java similarity index 77% rename from bootx-commons/common-rabbitmq/src/main/java/cn/bootx/common/rabbit/configuration/RabbitMqProperties.java rename to bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/RabbitMqProperties.java index 1138cc4d157805ec70f9fa77003dd8f3256787a1..9ad3ad434de69402458f6ced61116238f64bd679 100644 --- a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/common/rabbit/configuration/RabbitMqProperties.java +++ b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/RabbitMqProperties.java @@ -1,6 +1,6 @@ -package cn.bootx.common.rabbit.configuration; +package cn.bootx.platform.common.rabbit.configuration; -import cn.bootx.common.rabbit.conditional.ConditionalOnRabbit; +import cn.bootx.platform.common.rabbit.conditional.ConditionalOnRabbit; import lombok.Getter; import lombok.Setter; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/bootx-commons/common-rabbitmq/src/main/resources/META-INF/spring.factories b/bootx-commons/common-rabbitmq/src/main/resources/META-INF/spring.factories index 3d4e56271f6c12895bf6703199a6c1d1e99ae5af..9b41ab15efeba2e3d27ebc0b3cf3641d167745a2 100644 --- a/bootx-commons/common-rabbitmq/src/main/resources/META-INF/spring.factories +++ b/bootx-commons/common-rabbitmq/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ ## 配置自定义 starter 的自动化配置 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - cn.bootx.common.rabbit.RabbitMqCommonAutoConfiguration \ No newline at end of file + cn.bootx.platform.common.rabbit.RabbitMqCommonAutoConfiguration diff --git a/bootx-commons/common-rabbitmq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-commons/common-rabbitmq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 622df3c889bb0532ec4bb50cd1a956f90c06231e..5977a658b61d0bb6484ada36f748c79c98d3338c 100644 --- a/bootx-commons/common-rabbitmq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-commons/common-rabbitmq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.common.rabbit.RabbitMqCommonAutoConfiguration \ No newline at end of file +cn.bootx.platform.common.rabbit.RabbitMqCommonAutoConfiguration diff --git a/bootx-commons/common-redis-client/pom.xml b/bootx-commons/common-redis-client/pom.xml index db53606581d6c66e5c72f7ef8e7490cd07106cd8..079962ce2c24614bd841c9d2e4e12c37ce7f2343 100644 --- a/bootx-commons/common-redis-client/pom.xml +++ b/bootx-commons/common-redis-client/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.2.3 + 1.3.0 4.0.0 diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/RedisApplication.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/RedisApplication.java similarity index 81% rename from bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/RedisApplication.java rename to bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/RedisApplication.java index a06f65d493d5c32560776d1b929d5a4a7d7a902f..a82f895cc9840d825f383f5ef29ee5deff3655b2 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/RedisApplication.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/RedisApplication.java @@ -1,4 +1,4 @@ -package cn.bootx.common.redis; +package cn.bootx.platform.common.redis; import org.springframework.context.annotation.ComponentScan; diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/RedisClient.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/RedisClient.java similarity index 97% rename from bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/RedisClient.java rename to bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/RedisClient.java index dedec29fb5eec3984096b3550402861e96ed1c40..4d4af9640d42a28b8c6a13c139915e1673d1af10 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/RedisClient.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/RedisClient.java @@ -1,6 +1,6 @@ -package cn.bootx.common.redis; +package cn.bootx.platform.common.redis; -import cn.bootx.common.redis.code.RedisCode; +import cn.bootx.platform.common.redis.code.RedisCode; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/code/RedisCode.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/code/RedisCode.java similarity index 85% rename from bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/code/RedisCode.java rename to bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/code/RedisCode.java index 3baf0e0d5d08c7f0ce5ed05258dc77483da26c35..84878a061929852533539a429d29882bc2230a3e 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/code/RedisCode.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/code/RedisCode.java @@ -1,4 +1,4 @@ -package cn.bootx.common.redis.code; +package cn.bootx.platform.common.redis.code; /** * redis常量 diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/configuration/RedisAutoConfiguration.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/configuration/RedisAutoConfiguration.java similarity index 95% rename from bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/configuration/RedisAutoConfiguration.java rename to bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/configuration/RedisAutoConfiguration.java index 17cfe4672d306cdd702ef820d3d53ad1df78cca4..1cb50fd60d3d271bdaabfa5b3c63f918c82f653c 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/configuration/RedisAutoConfiguration.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/configuration/RedisAutoConfiguration.java @@ -1,9 +1,9 @@ -package cn.bootx.common.redis.configuration; +package cn.bootx.platform.common.redis.configuration; -import cn.bootx.common.core.exception.FatalException; -import cn.bootx.common.redis.RedisClient; -import cn.bootx.common.redis.code.RedisCode; -import cn.bootx.common.redis.listener.RedisTopicReceiver; +import cn.bootx.platform.common.core.exception.FatalException; +import cn.bootx.platform.common.redis.RedisClient; +import cn.bootx.platform.common.redis.code.RedisCode; +import cn.bootx.platform.common.redis.listener.RedisTopicReceiver; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/listener/RedisKeyExpiredListener.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisKeyExpiredListener.java similarity index 85% rename from bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/listener/RedisKeyExpiredListener.java rename to bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisKeyExpiredListener.java index b8f51a7c402dd2c25bf63bfd09d203c1a6f0f260..f741a8d52354284e8231c0942e4fbabb71dd5cb4 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/listener/RedisKeyExpiredListener.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisKeyExpiredListener.java @@ -1,4 +1,4 @@ -package cn.bootx.common.redis.listener; +package cn.bootx.platform.common.redis.listener; /** * Key过期事件 diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/listener/RedisKeyExpiredReceiver.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisKeyExpiredReceiver.java similarity index 96% rename from bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/listener/RedisKeyExpiredReceiver.java rename to bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisKeyExpiredReceiver.java index 5e2ff98169fd3900e5659e32c66f8f8bcccb185e..084a0313ecda3e8beda0e1ea00d8919866d9058e 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/listener/RedisKeyExpiredReceiver.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisKeyExpiredReceiver.java @@ -1,4 +1,4 @@ -package cn.bootx.common.redis.listener; +package cn.bootx.platform.common.redis.listener; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/listener/RedisTopicListener.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisTopicListener.java similarity index 84% rename from bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/listener/RedisTopicListener.java rename to bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisTopicListener.java index f36157f9f27633402bfbe80d0dd5e982bd68fc64..8c8a6fbff08f2027ae721b85100d09ffa58c69af 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/listener/RedisTopicListener.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisTopicListener.java @@ -1,4 +1,4 @@ -package cn.bootx.common.redis.listener; +package cn.bootx.platform.common.redis.listener; /** * redis订阅消息 diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/listener/RedisTopicReceiver.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisTopicReceiver.java similarity index 91% rename from bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/listener/RedisTopicReceiver.java rename to bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisTopicReceiver.java index cd16a73bdfdb70e5a8f7c95937e2096b306ac713..3369732bdaeaaab3a5c0f7d2f6ebb634f4f30816 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/listener/RedisTopicReceiver.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisTopicReceiver.java @@ -1,7 +1,7 @@ -package cn.bootx.common.redis.listener; +package cn.bootx.platform.common.redis.listener; -import cn.bootx.common.core.exception.FatalException; -import cn.bootx.common.redis.code.RedisCode; +import cn.bootx.platform.common.core.exception.FatalException; +import cn.bootx.platform.common.redis.code.RedisCode; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/redisson/RedissonClientTemporary.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonClientTemporary.java similarity index 99% rename from bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/redisson/RedissonClientTemporary.java rename to bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonClientTemporary.java index 67ffeee2eee103a87160dbaac37b158f5d0728ee..27fe471d31f311955fcdf4e4e92e3d1b278137e8 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/redisson/RedissonClientTemporary.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonClientTemporary.java @@ -1,4 +1,4 @@ -package cn.bootx.common.redis.redisson; +package cn.bootx.platform.common.redis.redisson; import org.redisson.api.*; import org.redisson.api.redisnode.BaseRedisNodes; diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/redisson/RedissonConfiguration.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonConfiguration.java similarity index 98% rename from bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/redisson/RedissonConfiguration.java rename to bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonConfiguration.java index 0a417a0732d3e65bb526f56499e3b532f4836c52..b7d2443b4a4fe655da281f51848a31fc27e2a02e 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/redisson/RedissonConfiguration.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.common.redis.redisson; +package cn.bootx.platform.common.redis.redisson; import cn.hutool.core.collection.CollUtil; import lombok.AllArgsConstructor; diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/redisson/RedissonLoadListener.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonLoadListener.java similarity index 98% rename from bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/redisson/RedissonLoadListener.java rename to bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonLoadListener.java index 8a2866db1af31edfd3468ca9483b05726acb1849..300598872386b2dc11826a9f4b4b8c7b3cb533f7 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/common/redis/redisson/RedissonLoadListener.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonLoadListener.java @@ -1,4 +1,4 @@ -package cn.bootx.common.redis.redisson; +package cn.bootx.platform.common.redis.redisson; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; diff --git a/bootx-commons/common-redis-client/src/main/resources/META-INF/spring.factories b/bootx-commons/common-redis-client/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 9fa970bcaa159d8a38de81dd11baf220dfb823e4..0000000000000000000000000000000000000000 --- a/bootx-commons/common-redis-client/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -## 配置自定义 starter 的自动化配置 -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - cn.bootx.common.redis.RedisApplication diff --git a/bootx-commons/common-redis-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-commons/common-redis-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index fd445ebb2cca8d683cc778d86e1dd47ff64f1367..baa62498862ad97efe0dae574c1dac4fd9ece1b3 100644 --- a/bootx-commons/common-redis-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-commons/common-redis-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.starter.wecom.WeComAutoConfiguration \ No newline at end of file +cn.bootx.platform.common.redis.RedisApplication diff --git a/bootx-commons/common-sequence/pom.xml b/bootx-commons/common-sequence/pom.xml index 550f80d9280a3ab4f6d402aa850968391a4f8c17..04a89d20423f7025c211a01815cee0b9bb4ddb85 100644 --- a/bootx-commons/common-sequence/pom.xml +++ b/bootx-commons/common-sequence/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.2.3 + 1.3.0 4.0.0 diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/SequenceAutoConfiguration.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/SequenceAutoConfiguration.java similarity index 90% rename from bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/SequenceAutoConfiguration.java rename to bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/SequenceAutoConfiguration.java index 5e425759bb6593e40e13b80e57365df59c4439a4..7a559f6db945ec47693538f2357617724298c17c 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/SequenceAutoConfiguration.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/SequenceAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.common.sequence; +package cn.bootx.platform.common.sequence; import org.apache.ibatis.annotations.Mapper; import org.mybatis.spring.annotation.MapperScan; diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/configuration/SequenceConfiguration.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/configuration/SequenceConfiguration.java similarity index 75% rename from bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/configuration/SequenceConfiguration.java rename to bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/configuration/SequenceConfiguration.java index fd4ee400a172676118854f0bdbc9824a2c8cb81d..1cfa25071f15160d2153eab271d4a6fa3eb099cb 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/configuration/SequenceConfiguration.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/configuration/SequenceConfiguration.java @@ -1,9 +1,9 @@ -package cn.bootx.common.sequence.configuration; +package cn.bootx.platform.common.sequence.configuration; -import cn.bootx.common.sequence.func.Sequence; -import cn.bootx.common.sequence.impl.DefaultRangeSequence; -import cn.bootx.common.sequence.range.SeqRangeConfig; -import cn.bootx.common.sequence.range.SeqRangeManager; +import cn.bootx.platform.common.sequence.func.Sequence; +import cn.bootx.platform.common.sequence.impl.DefaultRangeSequence; +import cn.bootx.platform.common.sequence.range.SeqRangeConfig; +import cn.bootx.platform.common.sequence.range.SeqRangeManager; import lombok.RequiredArgsConstructor; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/configuration/SequenceProperties.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/configuration/SequenceProperties.java similarity index 94% rename from bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/configuration/SequenceProperties.java rename to bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/configuration/SequenceProperties.java index 7adc7ab8a9ecc504965d17c0e74e5c38f0af739f..cdf1423c776ff709a771d1c7dac257f41190ebc8 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/configuration/SequenceProperties.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/configuration/SequenceProperties.java @@ -1,4 +1,4 @@ -package cn.bootx.common.sequence.configuration; +package cn.bootx.platform.common.sequence.configuration; import lombok.Getter; import lombok.Setter; diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/exception/SeqException.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/exception/SeqException.java similarity index 66% rename from bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/exception/SeqException.java rename to bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/exception/SeqException.java index c068d61c529adbeb9d9e30006896855fd5db4b0b..005865c1969b7895b080644c48b5e839e1ea898a 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/exception/SeqException.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/exception/SeqException.java @@ -1,7 +1,7 @@ -package cn.bootx.common.sequence.exception; +package cn.bootx.platform.common.sequence.exception; -import cn.bootx.common.core.code.CommonCode; -import cn.bootx.common.core.exception.FatalException; +import cn.bootx.platform.common.core.code.CommonCode; +import cn.bootx.platform.common.core.exception.FatalException; import java.io.Serializable; diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/func/Sequence.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/func/Sequence.java similarity index 70% rename from bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/func/Sequence.java rename to bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/func/Sequence.java index 3feb9b7fb17929c12e572572fec2a5b9bca021a2..f2fffc93b8dd9e8a2b946305cdb744aa1a1ee30a 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/func/Sequence.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/func/Sequence.java @@ -1,6 +1,6 @@ -package cn.bootx.common.sequence.func; +package cn.bootx.platform.common.sequence.func; -import cn.bootx.common.sequence.exception.SeqException; +import cn.bootx.platform.common.sequence.exception.SeqException; /** * 序列号生成器接口 diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/impl/DefaultRangeSequence.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/impl/DefaultRangeSequence.java similarity index 85% rename from bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/impl/DefaultRangeSequence.java rename to bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/impl/DefaultRangeSequence.java index 6fec8cff4b53055d9e82969331475d6281397f9f..af3fb4ed020d2b9cd38a3b89d956fbfb8b9eb01f 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/impl/DefaultRangeSequence.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/impl/DefaultRangeSequence.java @@ -1,10 +1,10 @@ -package cn.bootx.common.sequence.impl; +package cn.bootx.platform.common.sequence.impl; -import cn.bootx.common.sequence.exception.SeqException; -import cn.bootx.common.sequence.func.Sequence; -import cn.bootx.common.sequence.range.SeqRangeConfig; -import cn.bootx.common.sequence.range.SeqRange; -import cn.bootx.common.sequence.range.SeqRangeManager; +import cn.bootx.platform.common.sequence.exception.SeqException; +import cn.bootx.platform.common.sequence.range.SeqRange; +import cn.bootx.platform.common.sequence.range.SeqRangeConfig; +import cn.bootx.platform.common.sequence.range.SeqRangeManager; +import cn.bootx.platform.common.sequence.func.Sequence; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/SeqRange.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/SeqRange.java similarity index 96% rename from bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/SeqRange.java rename to bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/SeqRange.java index 690a67971db9947866260c63159ebc89dba81fe8..cf8cf22c0e255dd5b7fd20b9b88b8639593e12e4 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/SeqRange.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/SeqRange.java @@ -1,4 +1,4 @@ -package cn.bootx.common.sequence.range; +package cn.bootx.platform.common.sequence.range; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/SeqRangeConfig.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/SeqRangeConfig.java similarity index 90% rename from bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/SeqRangeConfig.java rename to bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/SeqRangeConfig.java index 12d97bdded4ebf87b8eacea0fd838b2c2adc8e05..420d0682d0a493b2f2ddb93b1262b6ef22e5771d 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/SeqRangeConfig.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/SeqRangeConfig.java @@ -1,4 +1,4 @@ -package cn.bootx.common.sequence.range; +package cn.bootx.platform.common.sequence.range; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/SeqRangeManager.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/SeqRangeManager.java similarity index 77% rename from bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/SeqRangeManager.java rename to bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/SeqRangeManager.java index 360eaa7c0148a130b41504aa54d9a532d8d88a4f..a773a6309b8c712957eac08334680c5770b10076 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/SeqRangeManager.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/SeqRangeManager.java @@ -1,6 +1,6 @@ -package cn.bootx.common.sequence.range; +package cn.bootx.platform.common.sequence.range; -import cn.bootx.common.sequence.exception.SeqException; +import cn.bootx.platform.common.sequence.exception.SeqException; /** * 区间管理器 diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/jdbc/JdbcRangeHandler.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/JdbcRangeHandler.java similarity index 92% rename from bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/jdbc/JdbcRangeHandler.java rename to bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/JdbcRangeHandler.java index a1ff0b41f5764593a7ed359a7edbad12c7624d81..10690b254030230bb938fc7f5616c63c67d29b5d 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/jdbc/JdbcRangeHandler.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/JdbcRangeHandler.java @@ -1,6 +1,6 @@ -package cn.bootx.common.sequence.range.jdbc; +package cn.bootx.platform.common.sequence.range.jdbc; -import cn.bootx.common.sequence.exception.SeqException; +import cn.bootx.platform.common.sequence.exception.SeqException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/jdbc/JdbcSeqRangeManager.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/JdbcSeqRangeManager.java similarity index 80% rename from bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/jdbc/JdbcSeqRangeManager.java rename to bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/JdbcSeqRangeManager.java index 645e0420bf439ed558aa940a33f871219cf45598..744053beb10beb7a638bab453b4602ea24b4a9f3 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/jdbc/JdbcSeqRangeManager.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/JdbcSeqRangeManager.java @@ -1,9 +1,9 @@ -package cn.bootx.common.sequence.range.jdbc; +package cn.bootx.platform.common.sequence.range.jdbc; -import cn.bootx.common.sequence.exception.SeqException; -import cn.bootx.common.sequence.range.SeqRangeConfig; -import cn.bootx.common.sequence.range.SeqRange; -import cn.bootx.common.sequence.range.SeqRangeManager; +import cn.bootx.platform.common.sequence.exception.SeqException; +import cn.bootx.platform.common.sequence.range.SeqRangeConfig; +import cn.bootx.platform.common.sequence.range.SeqRange; +import cn.bootx.platform.common.sequence.range.SeqRangeManager; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/jdbc/SequenceRange.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRange.java similarity index 80% rename from bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/jdbc/SequenceRange.java rename to bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRange.java index 3bdb92630bd4db2ac381d8a408b884976e15fa0d..c8504e6385c35e2cc3ee6971da117ab535e5fd67 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/jdbc/SequenceRange.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRange.java @@ -1,6 +1,6 @@ -package cn.bootx.common.sequence.range.jdbc; +package cn.bootx.platform.common.sequence.range.jdbc; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/jdbc/SequenceRangeManager.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRangeManager.java similarity index 73% rename from bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/jdbc/SequenceRangeManager.java rename to bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRangeManager.java index 1aa183aabe7e6f7ff762636ffce4f9dfb2fa5b63..40c40a2d6707c3f8867ff92b0e6876b4d7cb7b25 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/jdbc/SequenceRangeManager.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRangeManager.java @@ -1,6 +1,6 @@ -package cn.bootx.common.sequence.range.jdbc; +package cn.bootx.platform.common.sequence.range.jdbc; -import cn.bootx.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/jdbc/SequenceRangeMapper.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRangeMapper.java similarity index 82% rename from bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/jdbc/SequenceRangeMapper.java rename to bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRangeMapper.java index 54ef02fa0e63016308d29cff666c0f5619bc71d9..37c54fff01e8281c166e5ba5af601ce43b525eb6 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/jdbc/SequenceRangeMapper.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRangeMapper.java @@ -1,4 +1,4 @@ -package cn.bootx.common.sequence.range.jdbc; +package cn.bootx.platform.common.sequence.range.jdbc; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/mongo/MongoRangeHandler.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoRangeHandler.java similarity index 93% rename from bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/mongo/MongoRangeHandler.java rename to bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoRangeHandler.java index f1f26cac86edb1e7d60f6df371a532754ec4b2e3..2820262f35b1bc4245409c661071e9c95bfdcfe1 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/mongo/MongoRangeHandler.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoRangeHandler.java @@ -1,6 +1,6 @@ -package cn.bootx.common.sequence.range.mongo; +package cn.bootx.platform.common.sequence.range.mongo; -import cn.bootx.common.sequence.exception.SeqException; +import cn.bootx.platform.common.sequence.exception.SeqException; import cn.hutool.core.util.IdUtil; import lombok.RequiredArgsConstructor; import org.springframework.data.mongodb.core.MongoTemplate; diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/mongo/MongoSeqRangeManager.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoSeqRangeManager.java similarity index 80% rename from bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/mongo/MongoSeqRangeManager.java rename to bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoSeqRangeManager.java index dbd82a8d7a6d3dc9f393838b36db0c0407fe4e5e..1088b673c015afbfa67aff7fa01e6237d3bf404f 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/mongo/MongoSeqRangeManager.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoSeqRangeManager.java @@ -1,9 +1,9 @@ -package cn.bootx.common.sequence.range.mongo; +package cn.bootx.platform.common.sequence.range.mongo; -import cn.bootx.common.sequence.exception.SeqException; -import cn.bootx.common.sequence.range.SeqRange; -import cn.bootx.common.sequence.range.SeqRangeConfig; -import cn.bootx.common.sequence.range.SeqRangeManager; +import cn.bootx.platform.common.sequence.exception.SeqException; +import cn.bootx.platform.common.sequence.range.SeqRange; +import cn.bootx.platform.common.sequence.range.SeqRangeConfig; +import cn.bootx.platform.common.sequence.range.SeqRangeManager; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/mongo/SequenceRange.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/SequenceRange.java similarity index 90% rename from bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/mongo/SequenceRange.java rename to bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/SequenceRange.java index f7f4daa80a50edefbc919256649522c365a74c5a..16875b97d557f4ae70632b263b558baf84d6aeb6 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/mongo/SequenceRange.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/SequenceRange.java @@ -1,4 +1,4 @@ -package cn.bootx.common.sequence.range.mongo; +package cn.bootx.platform.common.sequence.range.mongo; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/redis/RedisSeqRangeManager.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/redis/RedisSeqRangeManager.java similarity index 77% rename from bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/redis/RedisSeqRangeManager.java rename to bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/redis/RedisSeqRangeManager.java index d57e98e2558eccc166efc8608e4bb98f7ee3454a..2232b23f7def8531be53527f3c14d2ddcb0e2275 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/range/redis/RedisSeqRangeManager.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/redis/RedisSeqRangeManager.java @@ -1,11 +1,11 @@ -package cn.bootx.common.sequence.range.redis; +package cn.bootx.platform.common.sequence.range.redis; -import cn.bootx.common.redis.RedisClient; -import cn.bootx.common.sequence.configuration.SequenceProperties; -import cn.bootx.common.sequence.exception.SeqException; -import cn.bootx.common.sequence.range.SeqRangeConfig; -import cn.bootx.common.sequence.range.SeqRange; -import cn.bootx.common.sequence.range.SeqRangeManager; +import cn.bootx.platform.common.redis.RedisClient; +import cn.bootx.platform.common.sequence.configuration.SequenceProperties; +import cn.bootx.platform.common.sequence.exception.SeqException; +import cn.bootx.platform.common.sequence.range.SeqRangeConfig; +import cn.bootx.platform.common.sequence.range.SeqRange; +import cn.bootx.platform.common.sequence.range.SeqRangeManager; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/util/SequenceUtil.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/util/SequenceUtil.java similarity index 69% rename from bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/util/SequenceUtil.java rename to bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/util/SequenceUtil.java index d904eb942fcbde278cd2959dae93b0cb0db6a3ff..9c1a08a088aa2e7daab8aa2737cef28d9964f275 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/common/sequence/util/SequenceUtil.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/util/SequenceUtil.java @@ -1,10 +1,10 @@ -package cn.bootx.common.sequence.util; +package cn.bootx.platform.common.sequence.util; -import cn.bootx.common.core.exception.FatalException; -import cn.bootx.common.sequence.func.Sequence; -import cn.bootx.common.sequence.impl.DefaultRangeSequence; -import cn.bootx.common.sequence.range.SeqRangeConfig; -import cn.bootx.common.sequence.range.SeqRangeManager; +import cn.bootx.platform.common.core.exception.FatalException; +import cn.bootx.platform.common.sequence.range.SeqRangeConfig; +import cn.bootx.platform.common.sequence.range.SeqRangeManager; +import cn.bootx.platform.common.sequence.func.Sequence; +import cn.bootx.platform.common.sequence.impl.DefaultRangeSequence; import cn.hutool.extra.spring.SpringUtil; import lombok.experimental.UtilityClass; diff --git a/bootx-commons/common-sequence/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-commons/common-sequence/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index c4cdc8f432351a8149b34bd84fa9996b59a32802..29a30ce95bfb67a026310125b29ca1557fe92bf4 100644 --- a/bootx-commons/common-sequence/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-commons/common-sequence/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.common.sequence.SequenceAutoConfiguration \ No newline at end of file +cn.bootx.platform.common.sequence.SequenceAutoConfiguration diff --git a/bootx-commons/common-spring/pom.xml b/bootx-commons/common-spring/pom.xml index d543f9788a8672cdc51410074132be1ec411cf7a..9546528afbb60d3c2d88b9cf4f35f5ebd275a38e 100644 --- a/bootx-commons/common-spring/pom.xml +++ b/bootx-commons/common-spring/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.2.3 + 1.3.0 4.0.0 diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/SpringConfigApplication.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/SpringConfigApplication.java similarity index 89% rename from bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/SpringConfigApplication.java rename to bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/SpringConfigApplication.java index fb6a759cd4cbe91f4d76905c373b02e017e223ad..e4af5f1704eb1d8be246deff96aa791ed55cf6ed 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/SpringConfigApplication.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/SpringConfigApplication.java @@ -1,4 +1,4 @@ -package cn.bootx.common.spring; +package cn.bootx.platform.common.spring; import org.springframework.context.annotation.ComponentScan; import org.springframework.retry.annotation.EnableRetry; diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/aop/CountTimeAop.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/aop/CountTimeAop.java similarity index 91% rename from bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/aop/CountTimeAop.java rename to bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/aop/CountTimeAop.java index a0614894842f3eee184375517ddec747b09ff2ca..f34c18b07ebedf1315ae9a534b27e5470547e6bf 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/aop/CountTimeAop.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/aop/CountTimeAop.java @@ -1,6 +1,6 @@ -package cn.bootx.common.spring.aop; +package cn.bootx.platform.common.spring.aop; -import cn.bootx.common.core.annotation.CountTime; +import cn.bootx.platform.common.core.annotation.CountTime; import com.google.common.base.Stopwatch; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/configuration/AsyncExecutorConfiguration.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/AsyncExecutorConfiguration.java similarity index 96% rename from bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/configuration/AsyncExecutorConfiguration.java rename to bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/AsyncExecutorConfiguration.java index 216a41e02987a03e6bbf6165e03edd7f9d14a9e1..71f04231c7137af70ec04eb27a5d85ba055ac630 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/configuration/AsyncExecutorConfiguration.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/AsyncExecutorConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.common.spring.configuration; +package cn.bootx.platform.common.spring.configuration; import cn.hutool.json.JSONUtil; import lombok.RequiredArgsConstructor; diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/configuration/SpringCorsConfiguration.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringCorsConfiguration.java similarity index 97% rename from bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/configuration/SpringCorsConfiguration.java rename to bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringCorsConfiguration.java index e05207b03ad1725775e81df25f5ced86ba8bf670..4880ce6486b7d7365b62e470bb29660e2ef2bcea 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/configuration/SpringCorsConfiguration.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringCorsConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.common.spring.configuration; +package cn.bootx.platform.common.spring.configuration; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/configuration/SpringExecutorConfiguration.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringExecutorConfiguration.java similarity index 97% rename from bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/configuration/SpringExecutorConfiguration.java rename to bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringExecutorConfiguration.java index f70a9ce69fe67d85764b46f268519a8ef2c2525f..fd878e80f6e592a6e4b2d50139a2d0f34f992295 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/configuration/SpringExecutorConfiguration.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringExecutorConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.common.spring.configuration; +package cn.bootx.platform.common.spring.configuration; import cn.hutool.extra.spring.EnableSpringUtil; import com.alibaba.ttl.threadpool.TtlExecutors; diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/configuration/SpringProperties.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringProperties.java similarity index 96% rename from bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/configuration/SpringProperties.java rename to bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringProperties.java index d7dbc6f5f7ae23302117f8c9578a0dbfe6ceb259..e4d8825b89da015545f54594b992f0e9ed60b1e1 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/configuration/SpringProperties.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringProperties.java @@ -1,4 +1,4 @@ -package cn.bootx.common.spring.configuration; +package cn.bootx.platform.common.spring.configuration; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/exception/RetryableException.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/exception/RetryableException.java similarity index 58% rename from bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/exception/RetryableException.java rename to bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/exception/RetryableException.java index 15bf8ef6ee30ad6215a930f073b6c4cc518cb6f5..1b495d61aeaab2999711140fd3624408ccecce76 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/exception/RetryableException.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/exception/RetryableException.java @@ -1,6 +1,6 @@ -package cn.bootx.common.spring.exception; +package cn.bootx.platform.common.spring.exception; -import cn.bootx.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.BizException; /** * 可重试异常，抛出这个异常进行重试 diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/util/AopUtil.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/util/AopUtil.java similarity index 95% rename from bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/util/AopUtil.java rename to bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/util/AopUtil.java index b7553bc7784ef1f275ceffaa36900573d92ae075..eef44db553b979508444d76f7cfa50206511cf30 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/util/AopUtil.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/util/AopUtil.java @@ -1,4 +1,4 @@ -package cn.bootx.common.spring.util; +package cn.bootx.platform.common.spring.util; import lombok.experimental.UtilityClass; import org.aspectj.lang.JoinPoint; diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/util/WebServletUtil.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/util/WebServletUtil.java similarity index 97% rename from bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/util/WebServletUtil.java rename to bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/util/WebServletUtil.java index 95c837ecdf52090e191449cb005ab1113c2abfd8..8e40a2bea4b9a613f275c3719b3787254f16e797 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/common/spring/util/WebServletUtil.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/util/WebServletUtil.java @@ -1,4 +1,4 @@ -package cn.bootx.common.spring.util; +package cn.bootx.platform.common.spring.util; import lombok.experimental.UtilityClass; import org.springframework.web.context.request.RequestAttributes; diff --git a/bootx-commons/common-spring/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-commons/common-spring/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index fc464d564de2ce66fa058b5d4413278ac64b70fe..bebdf8ecf1a1f875b554313c5177e2c04217fade 100644 --- a/bootx-commons/common-spring/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-commons/common-spring/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.common.spring.SpringConfigApplication \ No newline at end of file +cn.bootx.platform.common.spring.SpringConfigApplication diff --git a/bootx-commons/common-super-query/pom.xml b/bootx-commons/common-super-query/pom.xml index 5b0b71ee6d2c1d9d01ece515c8469a8375ac07df..0debaa8b8094cafbce06f9d21b0ef6aef8e5a0ae 100644 --- a/bootx-commons/common-super-query/pom.xml +++ b/bootx-commons/common-super-query/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.2.3 + 1.3.0 4.0.0 diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/QueryApplication.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/QueryApplication.java similarity index 88% rename from bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/QueryApplication.java rename to bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/QueryApplication.java index 97b4390721a9800daf10d12b1a9511a48d61954e..ab2a57d31ea95bb5a93e5c7d230b5830a2e1c90e 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/QueryApplication.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/QueryApplication.java @@ -1,4 +1,4 @@ -package cn.bootx.common.query; +package cn.bootx.platform.common.query; import org.apache.ibatis.annotations.Mapper; import org.mybatis.spring.annotation.MapperScan; diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/code/CompareTypeEnum.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/code/CompareTypeEnum.java similarity index 96% rename from bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/code/CompareTypeEnum.java rename to bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/code/CompareTypeEnum.java index b7f183fcbb167753f92dd0daa49114c832239ce8..b622ea585162473d41d9cc27fedb218dbd9dad0e 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/code/CompareTypeEnum.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/code/CompareTypeEnum.java @@ -1,4 +1,4 @@ -package cn.bootx.common.query.code; +package cn.bootx.platform.common.query.code; import cn.hutool.core.util.StrUtil; import lombok.AllArgsConstructor; diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/code/ParamTypeEnum.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/code/ParamTypeEnum.java similarity index 95% rename from bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/code/ParamTypeEnum.java rename to bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/code/ParamTypeEnum.java index 84c2597788a7f7ff4cbc87ce5ee721ebf44d0640..9ef82b34c4a2b71a6e711a3d256ce2b37f3200df 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/code/ParamTypeEnum.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/code/ParamTypeEnum.java @@ -1,4 +1,4 @@ -package cn.bootx.common.query.code; +package cn.bootx.platform.common.query.code; import cn.hutool.core.util.StrUtil; import lombok.AllArgsConstructor; diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/entity/QueryBetweenParam.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryBetweenParam.java similarity index 90% rename from bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/entity/QueryBetweenParam.java rename to bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryBetweenParam.java index 2b39af0f54d6f00c63b57af05344ba2db1c7a98d..37d87c8efac5c5b86e8eec527ea244811bb38535 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/entity/QueryBetweenParam.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryBetweenParam.java @@ -1,4 +1,4 @@ -package cn.bootx.common.query.entity; +package cn.bootx.platform.common.query.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/entity/QueryOrder.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryOrder.java similarity index 91% rename from bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/entity/QueryOrder.java rename to bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryOrder.java index b8188d85514c209bc9d27d83092ff24b2a35a5c8..1152a5b0f2ce381df3b78e9ab7e9ad7e225e3455 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/entity/QueryOrder.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryOrder.java @@ -1,4 +1,4 @@ -package cn.bootx.common.query.entity; +package cn.bootx.platform.common.query.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/entity/QueryParam.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryParam.java similarity index 84% rename from bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/entity/QueryParam.java rename to bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryParam.java index de5c7a48d9373e1a7152e445d7f986eab57e0406..f36fdfeaf571b7cdd66282a5d12420676f2dcbff 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/entity/QueryParam.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryParam.java @@ -1,7 +1,7 @@ -package cn.bootx.common.query.entity; +package cn.bootx.platform.common.query.entity; -import cn.bootx.common.query.code.CompareTypeEnum; -import cn.bootx.common.query.code.ParamTypeEnum; +import cn.bootx.platform.common.query.code.CompareTypeEnum; +import cn.bootx.platform.common.query.code.ParamTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/entity/QueryParams.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryParams.java similarity index 90% rename from bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/entity/QueryParams.java rename to bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryParams.java index 3c6a6347f97d538c06a03e67d5a46ac7d031ce58..1da487936eaa42be854bd6d5a4610ba3a18710f2 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/entity/QueryParams.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryParams.java @@ -1,4 +1,4 @@ -package cn.bootx.common.query.entity; +package cn.bootx.platform.common.query.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/generator/AnnotationQueryGenerator.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/AnnotationQueryGenerator.java similarity index 88% rename from bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/generator/AnnotationQueryGenerator.java rename to bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/AnnotationQueryGenerator.java index c94dfbdf8415f4e5fb11a37698ba56d39a002a61..6a640d8978c1053a228f67fcabc3d78d29f397ca 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/generator/AnnotationQueryGenerator.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/AnnotationQueryGenerator.java @@ -1,9 +1,8 @@ -package cn.bootx.common.query.generator; +package cn.bootx.platform.common.query.generator; -import cn.bootx.common.core.annotation.QueryParam; -import cn.bootx.common.core.annotation.QueryParam.NamingCaseEnum; -import cn.bootx.common.core.function.CollectorsFunction; -import cn.bootx.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.common.core.annotation.QueryParam; +import cn.bootx.platform.common.core.function.CollectorsFunction; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.text.NamingCase; @@ -19,10 +18,6 @@ import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; -import static cn.bootx.common.core.annotation.QueryParam.CompareTypeEnum; -import static cn.bootx.common.core.annotation.QueryParam.CompareTypeEnum.EQ; -import static cn.bootx.common.core.annotation.QueryParam.NamingCaseEnum.UNDER_LINE; - /** * 注解参数查询生成器 * @@ -67,11 +62,11 @@ public class AnnotationQueryGenerator { continue; } // 获取对应的数据库字段名称 - NamingCaseEnum namingCase = annotation.map(QueryParam::namingCase).orElse(UNDER_LINE); + QueryParam.NamingCaseEnum namingCase = annotation.map(QueryParam::namingCase).orElse(QueryParam.NamingCaseEnum.UNDER_LINE); String columnName = getDatabaseFieldName(paramProp, queryParams.getClass(), clazzDescriptor, clazz, namingCase); // 处理匹配条件类型 - CompareTypeEnum compareType = annotation.map(QueryParam::type).orElse(EQ); + QueryParam.CompareTypeEnum compareType = annotation.map(QueryParam::type).orElse(QueryParam.CompareTypeEnum.EQ); compareTypeSwitch(compareType, wrapper, columnName, paramValue); } } @@ -108,10 +103,10 @@ public class AnnotationQueryGenerator { continue; } // 获取对应的数据库字段名称 - NamingCaseEnum namingCase = annotation.map(QueryParam::namingCase).orElse(UNDER_LINE); + QueryParam.NamingCaseEnum namingCase = annotation.map(QueryParam::namingCase).orElse(QueryParam.NamingCaseEnum.UNDER_LINE); String columnName = getDatabaseFieldName(paramProp, queryParams.getClass(), null, null, namingCase); // 处理匹配条件类型 - CompareTypeEnum compareType = annotation.map(QueryParam::type).orElse(EQ); + QueryParam.CompareTypeEnum compareType = annotation.map(QueryParam::type).orElse(QueryParam.CompareTypeEnum.EQ); compareTypeSwitch(compareType, wrapper, columnName, paramValue); } } @@ -126,8 +121,8 @@ public class AnnotationQueryGenerator { * @param columnName 字段名称 * @param paramValue 字段值 */ - private void compareTypeSwitch(CompareTypeEnum compareType, QueryWrapper wrapper, String columnName, - Object paramValue) { + private void compareTypeSwitch(QueryParam.CompareTypeEnum compareType, QueryWrapper wrapper, String columnName, + Object paramValue) { switch (compareType) { case GT: wrapper.gt(columnName, paramValue); @@ -199,7 +194,7 @@ public class AnnotationQueryGenerator { * 获取字段对应的数据库字段名 */ public String getDatabaseFieldName(PropertyDescriptor paramDescriptor, Class paramClass, - PropertyDescriptor entityDescriptor, Class entityClass, NamingCaseEnum namingCase) { + PropertyDescriptor entityDescriptor, Class entityClass, QueryParam.NamingCaseEnum namingCase) { // 读取注解， 判断有没有自定义字段名, 有自定义字段名直接返回 val queryParam = getQueryParamAnnotation(paramDescriptor, paramClass, entityDescriptor, entityClass); if (queryParam.map(QueryParam::fieldName).isPresent()) { diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/generator/ParamValueTypeConvert.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/ParamValueTypeConvert.java similarity index 90% rename from bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/generator/ParamValueTypeConvert.java rename to bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/ParamValueTypeConvert.java index 390c82ae2e747fcfc1f4c5df0d22c0ea68289294..f9fd67dd1de2735442127664b07363b330b01079 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/generator/ParamValueTypeConvert.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/ParamValueTypeConvert.java @@ -1,9 +1,9 @@ -package cn.bootx.common.query.generator; +package cn.bootx.platform.common.query.generator; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.util.LocalDateTimeUtil; -import cn.bootx.common.query.code.ParamTypeEnum; -import cn.bootx.common.query.entity.QueryParam; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.util.LocalDateTimeUtil; +import cn.bootx.platform.common.query.code.ParamTypeEnum; +import cn.bootx.platform.common.query.entity.QueryParam; import cn.hutool.core.date.DatePattern; import cn.hutool.core.util.StrUtil; diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/generator/QueryGenerator.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/QueryGenerator.java similarity index 93% rename from bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/generator/QueryGenerator.java rename to bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/QueryGenerator.java index 02f43eecd80e18e1881cd8e581b45043a9c8224c..dd09b6f0de5b2e71fa9b96556093ea3a9fa3760c 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/generator/QueryGenerator.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/QueryGenerator.java @@ -1,6 +1,6 @@ -package cn.bootx.common.query.generator; +package cn.bootx.platform.common.query.generator; -import cn.bootx.common.query.entity.QueryParams; +import cn.bootx.platform.common.query.entity.QueryParams; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; /** diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/generator/SuperQueryGenerator.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/SuperQueryGenerator.java similarity index 94% rename from bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/generator/SuperQueryGenerator.java rename to bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/SuperQueryGenerator.java index 171709f221587ec5b63bd57ec7f11f3f95f2174c..c63374d47bb0f76ecd714a28dcf051ccfdd15453 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/common/query/generator/SuperQueryGenerator.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/SuperQueryGenerator.java @@ -1,10 +1,10 @@ -package cn.bootx.common.query.generator; +package cn.bootx.platform.common.query.generator; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.query.code.CompareTypeEnum; -import cn.bootx.common.query.entity.QueryBetweenParam; -import cn.bootx.common.query.entity.QueryOrder; -import cn.bootx.common.query.entity.QueryParam; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.query.code.CompareTypeEnum; +import cn.bootx.platform.common.query.entity.QueryBetweenParam; +import cn.bootx.platform.common.query.entity.QueryOrder; +import cn.bootx.platform.common.query.entity.QueryParam; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/bootx-commons/common-super-query/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-commons/common-super-query/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 83719f33191f0565c7a243a5f59a74af8caa34ff..63a116aa3928e6efba7dabca088578189fc6edd6 100644 --- a/bootx-commons/common-super-query/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-commons/common-super-query/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.common.query.QueryApplication \ No newline at end of file +cn.bootx.platform.common.query.QueryApplication diff --git a/bootx-commons/common-swagger/pom.xml b/bootx-commons/common-swagger/pom.xml index cbd82b609f3e4353fbcffcb86d47a80dc31a3eb8..e6c4574b60e98b8c12d74dbbef99ceef3b99ce66 100644 --- a/bootx-commons/common-swagger/pom.xml +++ b/bootx-commons/common-swagger/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.2.3 + 1.3.0 4.0.0 diff --git a/bootx-commons/common-swagger/src/main/java/cn/bootx/common/swagger/SwaggerAutoConfiguration.java b/bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/SwaggerAutoConfiguration.java similarity index 99% rename from bootx-commons/common-swagger/src/main/java/cn/bootx/common/swagger/SwaggerAutoConfiguration.java rename to bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/SwaggerAutoConfiguration.java index 388829bd7051060d5bcfb8796c529f1d36eb76c3..c5e8c616cbee17be0c9082f5065663f7f4bc76e4 100644 --- a/bootx-commons/common-swagger/src/main/java/cn/bootx/common/swagger/SwaggerAutoConfiguration.java +++ b/bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/SwaggerAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.common.swagger; +package cn.bootx.platform.common.swagger; import cn.hutool.core.util.ArrayUtil; import io.swagger.v3.oas.models.ExternalDocumentation; diff --git a/bootx-commons/common-swagger/src/main/java/cn/bootx/common/swagger/SwaggerProperties.java b/bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/SwaggerProperties.java similarity index 97% rename from bootx-commons/common-swagger/src/main/java/cn/bootx/common/swagger/SwaggerProperties.java rename to bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/SwaggerProperties.java index 8d3eaa5adb0dd62daa056b5a25fdaebb03e24c7c..dcaea363d5363f06180896e754b7969f2385a1d3 100644 --- a/bootx-commons/common-swagger/src/main/java/cn/bootx/common/swagger/SwaggerProperties.java +++ b/bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/SwaggerProperties.java @@ -1,4 +1,4 @@ -package cn.bootx.common.swagger; +package cn.bootx.platform.common.swagger; import lombok.Getter; import lombok.Setter; diff --git a/bootx-commons/common-swagger/src/main/java/cn/bootx/common/swagger/filter/SwaggerBasicAuthFilter.java b/bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/filter/SwaggerBasicAuthFilter.java similarity index 91% rename from bootx-commons/common-swagger/src/main/java/cn/bootx/common/swagger/filter/SwaggerBasicAuthFilter.java rename to bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/filter/SwaggerBasicAuthFilter.java index f9bd867508f4cdea07a7760a9bbcd4e12f9a8121..399a61277af8adc143c4cd8b586b5f041e0de03d 100644 --- a/bootx-commons/common-swagger/src/main/java/cn/bootx/common/swagger/filter/SwaggerBasicAuthFilter.java +++ b/bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/filter/SwaggerBasicAuthFilter.java @@ -1,4 +1,4 @@ -package cn.bootx.common.swagger.filter; +package cn.bootx.platform.common.swagger.filter; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/bootx-commons/common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-commons/common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 93b1713d0c31e9f8641eac022a30c6df1a4601ff..56835d0e4dfb86e55bf321589e8bbbba91ae9f63 100644 --- a/bootx-commons/common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-commons/common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.common.swagger.SwaggerAutoConfiguration \ No newline at end of file +cn.bootx.platform.common.swagger.SwaggerAutoConfiguration diff --git a/bootx-commons/common-websocket/pom.xml b/bootx-commons/common-websocket/pom.xml index d08c922613ec0772fb14d5caa61d86cee8b4b6a4..9267d4280e0641cb187de7a012f9f48f6a26cf3a 100644 --- a/bootx-commons/common-websocket/pom.xml +++ b/bootx-commons/common-websocket/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.2.3 + 1.3.0 4.0.0 diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/WebsocketAutoConfiguration.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/WebsocketAutoConfiguration.java similarity index 84% rename from bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/WebsocketAutoConfiguration.java rename to bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/WebsocketAutoConfiguration.java index e1c66e7b9316c468708d256d894170b63f21db18..6b0d54ff81bc8ac4a690901fab04b15a1a227b91 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/WebsocketAutoConfiguration.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/WebsocketAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.common.websocket; +package cn.bootx.platform.common.websocket; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.ComponentScan; diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/code/WebsocketCode.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/code/WebsocketCode.java similarity index 87% rename from bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/code/WebsocketCode.java rename to bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/code/WebsocketCode.java index fea777660b0cf755fff1467b76a89f858f1d1ac8..c13ca9fedcd68b39d613e15cd5a28cc8f2bb49e8 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/code/WebsocketCode.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/code/WebsocketCode.java @@ -1,4 +1,4 @@ -package cn.bootx.common.websocket.code; +package cn.bootx.platform.common.websocket.code; /** * websocket常量码 diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/configuration/WebSocketConfig.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/configuration/WebSocketConfig.java similarity index 89% rename from bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/configuration/WebSocketConfig.java rename to bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/configuration/WebSocketConfig.java index 8bbd550dbcba68fed02f38f015e1405016e5fc06..46f36d2245a833dcd20b3275f90b49dfee0b06e1 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/configuration/WebSocketConfig.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/configuration/WebSocketConfig.java @@ -1,7 +1,7 @@ -package cn.bootx.common.websocket.configuration; +package cn.bootx.platform.common.websocket.configuration; -import cn.bootx.common.websocket.notice.UserNoticeWebSocketHandler; -import cn.bootx.common.websocket.notice.UserNoticeWebSocketInterceptor; +import cn.bootx.platform.common.websocket.notice.UserNoticeWebSocketHandler; +import cn.bootx.platform.common.websocket.notice.UserNoticeWebSocketInterceptor; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass; diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/entity/WsRes.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/entity/WsRes.java similarity index 90% rename from bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/entity/WsRes.java rename to bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/entity/WsRes.java index 89b57cd20302d4675b1f0e2d8217fc7cb3f7f41a..569806bedac55989acfbccb55a1228e457b7b420 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/entity/WsRes.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/entity/WsRes.java @@ -1,6 +1,6 @@ -package cn.bootx.common.websocket.entity; +package cn.bootx.platform.common.websocket.entity; -import cn.bootx.common.websocket.code.WebsocketCode; +import cn.bootx.platform.common.websocket.code.WebsocketCode; import lombok.experimental.UtilityClass; /** diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/entity/WsResult.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/entity/WsResult.java similarity index 86% rename from bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/entity/WsResult.java rename to bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/entity/WsResult.java index c633f39f9445e914f2d6a9b69c78dbfd5b1560ae..fd54dcee8a0c4f60a09047ac70aa382a94a931b8 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/entity/WsResult.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/entity/WsResult.java @@ -1,6 +1,6 @@ -package cn.bootx.common.websocket.entity; +package cn.bootx.platform.common.websocket.entity; -import cn.bootx.common.core.code.CommonCode; +import cn.bootx.platform.common.core.code.CommonCode; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/func/WsUserAuthService.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/func/WsUserAuthService.java similarity index 81% rename from bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/func/WsUserAuthService.java rename to bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/func/WsUserAuthService.java index ff4235992b64f9ad8862d3fc87a72328a213591e..d04b5395715c0353f13f4bc02d314bf85a2fecdc 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/func/WsUserAuthService.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/func/WsUserAuthService.java @@ -1,4 +1,4 @@ -package cn.bootx.common.websocket.func; +package cn.bootx.platform.common.websocket.func; /** * websocket用户认证相关接口 diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/manager/SpringWebSocketSessionManager.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/manager/SpringWebSocketSessionManager.java similarity index 98% rename from bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/manager/SpringWebSocketSessionManager.java rename to bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/manager/SpringWebSocketSessionManager.java index 2a5e8d698a8ac178777c676999fcb973a343d6bd..1eac21fc1543339bf7825cfa64551c0452cd7519 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/manager/SpringWebSocketSessionManager.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/manager/SpringWebSocketSessionManager.java @@ -1,4 +1,4 @@ -package cn.bootx.common.websocket.manager; +package cn.bootx.platform.common.websocket.manager; import cn.hutool.core.collection.ListUtil; import com.google.common.collect.Lists; diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/manager/WebSocketSessionManager.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/manager/WebSocketSessionManager.java similarity index 97% rename from bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/manager/WebSocketSessionManager.java rename to bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/manager/WebSocketSessionManager.java index 0db2e6e98b87722bdaf4c6aab5285bca1d44fa41..9a92f04a09c4bb0d2b1f7c2d9a73a3df23144083 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/manager/WebSocketSessionManager.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/manager/WebSocketSessionManager.java @@ -1,4 +1,4 @@ -package cn.bootx.common.websocket.manager; +package cn.bootx.platform.common.websocket.manager; import cn.hutool.core.collection.ListUtil; diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/notice/UserNoticeWebSocketHandler.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/notice/UserNoticeWebSocketHandler.java similarity index 94% rename from bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/notice/UserNoticeWebSocketHandler.java rename to bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/notice/UserNoticeWebSocketHandler.java index 1cad6f21bc2a4d205625e0730280de3a70299b0f..2110d3cb241cdeea26dd6ae6b240ec590f5d8b67 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/notice/UserNoticeWebSocketHandler.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/notice/UserNoticeWebSocketHandler.java @@ -1,6 +1,6 @@ -package cn.bootx.common.websocket.notice; +package cn.bootx.platform.common.websocket.notice; -import cn.bootx.common.websocket.manager.SpringWebSocketSessionManager; +import cn.bootx.platform.common.websocket.manager.SpringWebSocketSessionManager; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -12,7 +12,7 @@ import org.springframework.web.socket.handler.TextWebSocketHandler; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import static cn.bootx.common.core.code.CommonCode.USER_ID; +import static cn.bootx.platform.common.core.code.CommonCode.USER_ID; /** * 全局用户WS通知 diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/notice/UserNoticeWebSocketInterceptor.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/notice/UserNoticeWebSocketInterceptor.java similarity index 84% rename from bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/notice/UserNoticeWebSocketInterceptor.java rename to bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/notice/UserNoticeWebSocketInterceptor.java index 635fd912f4c04d24f1da23c63e748bd00ed0af97..b18aef2ff9f184dca4e465ae1e8a9f5ce16fa1ba 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/notice/UserNoticeWebSocketInterceptor.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/notice/UserNoticeWebSocketInterceptor.java @@ -1,6 +1,6 @@ -package cn.bootx.common.websocket.notice; +package cn.bootx.platform.common.websocket.notice; -import cn.bootx.common.websocket.func.WsUserAuthService; +import cn.bootx.platform.common.websocket.func.WsUserAuthService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.server.ServerHttpRequest; @@ -13,8 +13,8 @@ import org.springframework.web.socket.server.HandshakeInterceptor; import java.util.Map; import java.util.Objects; -import static cn.bootx.common.core.code.CommonCode.USER_ID; -import static cn.bootx.common.core.code.WebHeaderCode.ACCESS_TOKEN; +import static cn.bootx.platform.common.core.code.CommonCode.USER_ID; +import static cn.bootx.platform.common.core.code.WebHeaderCode.ACCESS_TOKEN; /** * 全局用户WS通知拦截鉴权 diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/service/UserWsNoticeService.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/service/UserWsNoticeService.java similarity index 81% rename from bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/service/UserWsNoticeService.java rename to bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/service/UserWsNoticeService.java index 832c84b38d95d2ea87092039ef4f06b1388c6a54..c5a898b97914a8a0aa718e91aa863da111250068 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/common/websocket/service/UserWsNoticeService.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/service/UserWsNoticeService.java @@ -1,8 +1,8 @@ -package cn.bootx.common.websocket.service; +package cn.bootx.platform.common.websocket.service; -import cn.bootx.common.jackson.util.JacksonUtil; -import cn.bootx.common.websocket.entity.WsResult; -import cn.bootx.common.websocket.notice.UserNoticeWebSocketHandler; +import cn.bootx.platform.common.jackson.util.JacksonUtil; +import cn.bootx.platform.common.websocket.entity.WsResult; +import cn.bootx.platform.common.websocket.notice.UserNoticeWebSocketHandler; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/bootx-commons/common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-commons/common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 65b8c754ba2ee88c708ea8d956b39016c671e245..33bef36cc3908c80a2bafb66b7b42f7493791e8d 100644 --- a/bootx-commons/common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-commons/common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.common.websocket.WebsocketAutoConfiguration +cn.bootx.platform.common.websocket.WebsocketAutoConfiguration diff --git a/bootx-commons/common-xxl-job/pom.xml b/bootx-commons/common-xxl-job/pom.xml index e01f1f6ac3b797bc4e91f51e0a3f56f17e0d0128..7633c0d9103f5105450ee1055d44f25ff16199ae 100644 --- a/bootx-commons/common-xxl-job/pom.xml +++ b/bootx-commons/common-xxl-job/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.2.3 + 1.3.0 4.0.0 diff --git a/bootx-commons/common-xxl-job/src/main/java/cn/bootx/common/xxljob/JobAutoConfiguration.java b/bootx-commons/common-xxl-job/src/main/java/cn/bootx/platform/common/xxljob/JobAutoConfiguration.java similarity index 96% rename from bootx-commons/common-xxl-job/src/main/java/cn/bootx/common/xxljob/JobAutoConfiguration.java rename to bootx-commons/common-xxl-job/src/main/java/cn/bootx/platform/common/xxljob/JobAutoConfiguration.java index 7f3f68e9ef44d31679a92b740ac85cb0b9cb728b..97b73a4c09876850fd033484c061b7bf95429a8d 100644 --- a/bootx-commons/common-xxl-job/src/main/java/cn/bootx/common/xxljob/JobAutoConfiguration.java +++ b/bootx-commons/common-xxl-job/src/main/java/cn/bootx/platform/common/xxljob/JobAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.common.xxljob; +package cn.bootx.platform.common.xxljob; import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/bootx-commons/common-xxl-job/src/main/java/cn/bootx/common/xxljob/XxlJobProperties.java b/bootx-commons/common-xxl-job/src/main/java/cn/bootx/platform/common/xxljob/XxlJobProperties.java similarity index 97% rename from bootx-commons/common-xxl-job/src/main/java/cn/bootx/common/xxljob/XxlJobProperties.java rename to bootx-commons/common-xxl-job/src/main/java/cn/bootx/platform/common/xxljob/XxlJobProperties.java index 7e0aea6ed26e59de0fab685b83ebe7283d79526b..89cd4906be6d34f3c9eaa869726e75c3d76986ca 100644 --- a/bootx-commons/common-xxl-job/src/main/java/cn/bootx/common/xxljob/XxlJobProperties.java +++ b/bootx-commons/common-xxl-job/src/main/java/cn/bootx/platform/common/xxljob/XxlJobProperties.java @@ -1,4 +1,4 @@ -package cn.bootx.common.xxljob; +package cn.bootx.platform.common.xxljob; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/bootx-commons/common-xxl-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-commons/common-xxl-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 5b28f05594c30200eedbfe2b037b9cdf637d717c..fe5bf6cbb46511455337e16781b745f4fd3ba0f5 100644 --- a/bootx-commons/common-xxl-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-commons/common-xxl-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.common.xxljob.JobAutoConfiguration \ No newline at end of file +cn.bootx.platform.common.xxljob.JobAutoConfiguration diff --git a/bootx-commons/pom.xml b/bootx-commons/pom.xml index f1097a530fbb3b0b57a1ea15481c40fdc2b4150b..27a89e4c2f9e43417c1a0eb0d3956b30197abafb 100644 --- a/bootx-commons/pom.xml +++ b/bootx-commons/pom.xml @@ -6,8 +6,8 @@ cn.bootx.platform - bootx-platform - 1.2.3 + bootx-platform-parent + 1.3.0 bootx-commons @@ -29,10 +29,7 @@ common-xxl-job common-mongo common-websocket - common-rabbitmq - common-lock - common-actable common-data-translate @@ -45,17 +42,20 @@ org.springframework.boot spring-boot-autoconfigure + provided org.springframework.boot spring-boot-configuration-processor + provided org.projectlombok lombok + provided diff --git a/bootx-demo/pom.xml b/bootx-demo/pom.xml index b4a50d5a3ae40aa8a292c81382b5ad0043ed8c80..53ae7b75708d5069b8954c9b8fa564b333bc9fbb 100644 --- a/bootx-demo/pom.xml +++ b/bootx-demo/pom.xml @@ -3,15 +3,25 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - bootx-platform cn.bootx.platform - 1.2.3 + bootx-platform-parent + 1.3.0 4.0.0 bootx-demo + + + true + + + + org.projectlombok + lombok + provided + cn.bootx.platform service-baseapi @@ -27,16 +37,6 @@ service-notice ${bootx-platform.version} - - cn.bootx.platform - service-payment - ${bootx-platform.version} - - - cn.bootx.platform - service-office - ${bootx-platform.version} - cn.bootx.platform service-visualization @@ -50,10 +50,6 @@ cn.bootx.platform common-websocket - - cn.bootx.platform - common-lock - cn.bootx.platform common-starter-dingtalk @@ -64,7 +60,11 @@ cn.bootx.platform - common-actable + common-rabbitmq + + + cn.bootx + mybatis-table-modify diff --git a/bootx-demo/src/main/java/cn/bootx/demo/DemoApplication.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/DemoApplication.java similarity index 92% rename from bootx-demo/src/main/java/cn/bootx/demo/DemoApplication.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/DemoApplication.java index 18fec7366a00d3f4ad700acc2cb0cdf4740c73be..431979942fe2189e823a297bac560d0efc460f8b 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/DemoApplication.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/DemoApplication.java @@ -1,4 +1,4 @@ -package cn.bootx.demo; +package cn.bootx.platform.demo; import org.apache.ibatis.annotations.Mapper; import org.mybatis.spring.annotation.MapperScan; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/controller/TestController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/TestController.java similarity index 70% rename from bootx-demo/src/main/java/cn/bootx/demo/controller/TestController.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/controller/TestController.java index b534fec356a4997b280a417d5aae5ba36e094094..800557e8dc7eb11deb850d2099e186978ae6f3fc 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/controller/TestController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/TestController.java @@ -1,19 +1,20 @@ -package cn.bootx.demo.controller; - -import cn.bootx.common.core.annotation.Idempotent; -import cn.bootx.common.core.annotation.IgnoreAuth; -import cn.bootx.common.core.annotation.OperateLog; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.log.plumelog.PlumeLogAutoDeleteLogs; -import cn.bootx.common.sequence.func.Sequence; -import cn.bootx.common.sequence.impl.DefaultRangeSequence; -import cn.bootx.common.sequence.range.SeqRangeConfig; -import cn.bootx.common.sequence.range.SeqRangeManager; -import cn.bootx.common.spring.exception.RetryableException; -import cn.bootx.common.websocket.entity.WsRes; -import cn.bootx.common.websocket.entity.WsResult; -import cn.bootx.common.websocket.service.UserWsNoticeService; +package cn.bootx.platform.demo.controller; + +import cn.bootx.platform.common.core.annotation.Idempotent; +import cn.bootx.platform.common.core.annotation.IgnoreAuth; +import cn.bootx.platform.common.core.annotation.OperateLog; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.sequence.func.Sequence; +import cn.bootx.platform.common.sequence.impl.DefaultRangeSequence; +import cn.bootx.platform.common.sequence.range.SeqRangeConfig; +import cn.bootx.platform.common.sequence.range.SeqRangeManager; +import cn.bootx.platform.common.spring.exception.RetryableException; +import cn.bootx.platform.common.websocket.entity.WsRes; +import cn.bootx.platform.common.websocket.entity.WsResult; +import cn.bootx.platform.common.websocket.service.UserWsNoticeService; +import cn.bootx.platform.starter.audit.log.ip2region.IpRegion; +import cn.bootx.platform.starter.audit.log.ip2region.IpToRegionService; import cn.hutool.extra.spring.SpringUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -39,21 +40,20 @@ import javax.validation.constraints.NotNull; @RequiredArgsConstructor public class TestController { + private final IpToRegionService ipToRegionService; + private final Sequence sequence; private final SeqRangeManager seqRangeManager; private final UserWsNoticeService userWsNoticeService; - private final PlumeLogAutoDeleteLogs autoDeleteLogs; - @OperateLog(title = "测试日志") @OperateLog(title = "测试重复日志") @Idempotent @Operation(summary = "测试") @GetMapping("/hello") public ResResult hello() { - autoDeleteLogs.task(); return Res.ok("hello"); } @@ -118,4 +118,15 @@ public class TestController { throw new RetryableException(); } + @Operation(summary = "ip地址查询") + @GetMapping("/ipToRegion") + public ResResult ipToRegion(String ip){ + return Res.ok(ipToRegionService.getRegionByIp(ip)); + } + + @Operation(summary = "ip地址查询(文本)") + @GetMapping("/getRegionStrByIp") + public ResResult getRegionStrByIp(String ip){ + return Res.ok(ipToRegionService.getRegionStrByIp(ip)); + } } diff --git a/bootx-demo/src/main/java/cn/bootx/demo/controller/bsp/DictConvertDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/bsp/DictConvertDemoController.java similarity index 88% rename from bootx-demo/src/main/java/cn/bootx/demo/controller/bsp/DictConvertDemoController.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/controller/bsp/DictConvertDemoController.java index bcd2d2895c8d3885e402296f54374f02e0bef719..8d6a721fa4c0b09c89cc7e2818598016220cb0b6 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/controller/bsp/DictConvertDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/bsp/DictConvertDemoController.java @@ -1,11 +1,11 @@ -package cn.bootx.demo.controller.bsp; - -import cn.bootx.baseapi.core.dict.service.DictTranslationServiceImpl; -import cn.bootx.common.core.annotation.Translate; -import cn.bootx.common.core.annotation.TranslationResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; +package cn.bootx.platform.demo.controller.bsp; + +import cn.bootx.platform.baseapi.core.dict.service.DictTranslationServiceImpl; +import cn.bootx.platform.common.core.annotation.Translate; +import cn.bootx.platform.common.core.annotation.TranslationResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.Data; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/controller/data/DataEncryptDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataEncryptDemoController.java similarity index 77% rename from bootx-demo/src/main/java/cn/bootx/demo/controller/data/DataEncryptDemoController.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataEncryptDemoController.java index 70d89b9c99c1ae61aee0296561f699bc4aa7d694..378a276180b53f953c85682daa7a30c61185cc7e 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/controller/data/DataEncryptDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataEncryptDemoController.java @@ -1,11 +1,11 @@ -package cn.bootx.demo.controller.data; - -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.demo.core.encrypt.entity.DataEncryptDemo; -import cn.bootx.demo.core.encrypt.service.DataEncryptDemoService; +package cn.bootx.platform.demo.controller.data; + +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.demo.core.encrypt.entity.DataEncryptDemo; +import cn.bootx.platform.demo.core.encrypt.service.DataEncryptDemoService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/controller/data/DataPermDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataPermDemoController.java similarity index 79% rename from bootx-demo/src/main/java/cn/bootx/demo/controller/data/DataPermDemoController.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataPermDemoController.java index af6cc7cba192e252ebb6a07be751fe8b7e14ec84..69dca5038c87919f1e1866e14cb456f76da3fa55 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/controller/data/DataPermDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataPermDemoController.java @@ -1,11 +1,11 @@ -package cn.bootx.demo.controller.data; - -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.demo.core.perm.entity.DataPermDemo; -import cn.bootx.demo.core.perm.service.DataPermDemoService; +package cn.bootx.platform.demo.controller.data; + +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.demo.core.perm.entity.DataPermDemo; +import cn.bootx.platform.demo.core.perm.service.DataPermDemoService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/controller/data/DataSensitiveDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataSensitiveDemoController.java similarity index 77% rename from bootx-demo/src/main/java/cn/bootx/demo/controller/data/DataSensitiveDemoController.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataSensitiveDemoController.java index 38762bf64636d98b364e47d1b9df55946ac24eec..75c93b7e82225a5cd60a690d38cce9459dd2d727 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/controller/data/DataSensitiveDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataSensitiveDemoController.java @@ -1,11 +1,11 @@ -package cn.bootx.demo.controller.data; - -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.demo.core.sensitive.entity.DataSensitiveDemo; -import cn.bootx.demo.core.sensitive.service.DataSensitiveDemoService; +package cn.bootx.platform.demo.controller.data; + +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.demo.core.sensitive.entity.DataSensitiveDemo; +import cn.bootx.platform.demo.core.sensitive.service.DataSensitiveDemoService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/controller/lock/IdempotencyDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/lock/IdempotencyDemoController.java similarity index 90% rename from bootx-demo/src/main/java/cn/bootx/demo/controller/lock/IdempotencyDemoController.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/controller/lock/IdempotencyDemoController.java index 43f9edad8193536c9845b581449b81b68e39e541..6de82c4c4777c4f8dbb9eaf4cf4766e50eb67a57 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/controller/lock/IdempotencyDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/lock/IdempotencyDemoController.java @@ -1,8 +1,8 @@ -package cn.bootx.demo.controller.lock; +package cn.bootx.platform.demo.controller.lock; -import cn.bootx.common.core.annotation.Idempotent; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; +import cn.bootx.platform.common.core.annotation.Idempotent; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; import cn.hutool.core.thread.ThreadUtil; import com.baomidou.lock.annotation.Lock4j; import io.swagger.v3.oas.annotations.Operation; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/controller/mq/MessageQueueDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/mq/MessageQueueDemoController.java similarity index 90% rename from bootx-demo/src/main/java/cn/bootx/demo/controller/mq/MessageQueueDemoController.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/controller/mq/MessageQueueDemoController.java index 3c222e66eabe693033cb69972620548884bbc353..983e6cc0c5a404d94808b9fa97228e8f5c2f1ed5 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/controller/mq/MessageQueueDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/mq/MessageQueueDemoController.java @@ -1,8 +1,8 @@ -package cn.bootx.demo.controller.mq; +package cn.bootx.platform.demo.controller.mq; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.redis.RedisClient; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.redis.RedisClient; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/controller/notice/EmailSendDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/notice/EmailSendDemoController.java similarity index 75% rename from bootx-demo/src/main/java/cn/bootx/demo/controller/notice/EmailSendDemoController.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/controller/notice/EmailSendDemoController.java index aafc1321cab022a591f6e2982a11f98be4dc4b5f..85b4cf858add568867ae0d48860e8136b7f0fb54 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/controller/notice/EmailSendDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/notice/EmailSendDemoController.java @@ -1,11 +1,11 @@ -package cn.bootx.demo.controller.notice; +package cn.bootx.platform.demo.controller.notice; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.util.ValidationUtil; -import cn.bootx.demo.core.notice.entity.SendSimpleEmailDemoParam; -import cn.bootx.demo.core.notice.service.EmailSendDemoService; -import cn.bootx.notice.dto.mail.SendMailParam; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.util.ValidationUtil; +import cn.bootx.platform.demo.core.notice.entity.SendSimpleEmailDemoParam; +import cn.bootx.platform.demo.core.notice.service.EmailSendDemoService; +import cn.bootx.platform.notice.dto.mail.SendMailParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/controller/query/SuperQueryDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/query/SuperQueryDemoController.java similarity index 82% rename from bootx-demo/src/main/java/cn/bootx/demo/controller/query/SuperQueryDemoController.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/controller/query/SuperQueryDemoController.java index 35935517220310ab3fb804f4b45fa6a7e208ef07..ac2a19ca083040b9cd8bd56ecfbc9a52fae07efb 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/controller/query/SuperQueryDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/query/SuperQueryDemoController.java @@ -1,13 +1,13 @@ -package cn.bootx.demo.controller.query; +package cn.bootx.platform.demo.controller.query; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.query.entity.QueryParams; -import cn.bootx.common.query.generator.QueryGenerator; -import cn.bootx.demo.core.query.entity.SuperQueryDemo; -import cn.bootx.demo.core.query.service.SuperQueryDemoService; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.query.entity.QueryParams; +import cn.bootx.platform.common.query.generator.QueryGenerator; +import cn.bootx.platform.demo.core.query.entity.SuperQueryDemo; +import cn.bootx.platform.demo.core.query.service.SuperQueryDemoService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/controller/ws/GlobalWebsocketDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/ws/GlobalWebsocketDemoController.java similarity index 75% rename from bootx-demo/src/main/java/cn/bootx/demo/controller/ws/GlobalWebsocketDemoController.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/controller/ws/GlobalWebsocketDemoController.java index 07869a089062a3f78047d7cf465bf60db0ceb8c0..2afa138accbc9dd048a4d357534c6364248b4ae3 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/controller/ws/GlobalWebsocketDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/ws/GlobalWebsocketDemoController.java @@ -1,9 +1,9 @@ -package cn.bootx.demo.controller.ws; +package cn.bootx.platform.demo.controller.ws; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.websocket.entity.WsRes; -import cn.bootx.common.websocket.service.UserWsNoticeService; +import cn.bootx.platform.common.websocket.entity.WsRes; +import cn.bootx.platform.common.websocket.service.UserWsNoticeService; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/encrypt/dao/DataEncryptDemoManager.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/dao/DataEncryptDemoManager.java similarity index 63% rename from bootx-demo/src/main/java/cn/bootx/demo/core/encrypt/dao/DataEncryptDemoManager.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/dao/DataEncryptDemoManager.java index 871734f11fda3a1851bca850d25373019a9e39df..5d0c1944f24e9ef350d41739d4ee69e450482643 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/core/encrypt/dao/DataEncryptDemoManager.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/dao/DataEncryptDemoManager.java @@ -1,7 +1,7 @@ -package cn.bootx.demo.core.encrypt.dao; +package cn.bootx.platform.demo.core.encrypt.dao; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.demo.core.encrypt.entity.DataEncryptDemo; +import cn.bootx.platform.demo.core.encrypt.entity.DataEncryptDemo; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/encrypt/dao/DataEncryptDemoMapper.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/dao/DataEncryptDemoMapper.java similarity index 66% rename from bootx-demo/src/main/java/cn/bootx/demo/core/encrypt/dao/DataEncryptDemoMapper.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/dao/DataEncryptDemoMapper.java index 6d34c56c4227a97b30b0eb7ed44ac058abc92fe5..91757000ece870f4e0a90f3f29044256cbd88c73 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/core/encrypt/dao/DataEncryptDemoMapper.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/dao/DataEncryptDemoMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.demo.core.encrypt.dao; +package cn.bootx.platform.demo.core.encrypt.dao; -import cn.bootx.demo.core.encrypt.entity.DataEncryptDemo; +import cn.bootx.platform.demo.core.encrypt.entity.DataEncryptDemo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/encrypt/entity/DataEncryptDemo.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/entity/DataEncryptDemo.java similarity index 83% rename from bootx-demo/src/main/java/cn/bootx/demo/core/encrypt/entity/DataEncryptDemo.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/entity/DataEncryptDemo.java index 164326edcd589111e20166c74864867dd9be7dc4..97ea1347ebe8cada86ddfde1c73b05fb9e4c58d9 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/core/encrypt/entity/DataEncryptDemo.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/entity/DataEncryptDemo.java @@ -1,7 +1,7 @@ -package cn.bootx.demo.core.encrypt.entity; +package cn.bootx.platform.demo.core.encrypt.entity; -import cn.bootx.common.core.annotation.EncryptionField; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.common.core.annotation.EncryptionField; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/encrypt/service/DataEncryptDemoService.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/service/DataEncryptDemoService.java similarity index 69% rename from bootx-demo/src/main/java/cn/bootx/demo/core/encrypt/service/DataEncryptDemoService.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/service/DataEncryptDemoService.java index 90012b749a96ac525fcd59faf840a129fba2ccaa..aa467c0da40673dd4009706e135f38a70c863190 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/core/encrypt/service/DataEncryptDemoService.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/service/DataEncryptDemoService.java @@ -1,11 +1,11 @@ -package cn.bootx.demo.core.encrypt.service; - -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.demo.core.encrypt.dao.DataEncryptDemoManager; -import cn.bootx.demo.core.encrypt.entity.DataEncryptDemo; +package cn.bootx.platform.demo.core.encrypt.service; + +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.demo.core.encrypt.dao.DataEncryptDemoManager; +import cn.bootx.platform.demo.core.encrypt.entity.DataEncryptDemo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/mq/mqtt/DemoMqttConfiguration.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/mqtt/DemoMqttConfiguration.java similarity index 100% rename from bootx-demo/src/main/java/cn/bootx/demo/core/mq/mqtt/DemoMqttConfiguration.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/mqtt/DemoMqttConfiguration.java diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/mq/mqtt/DemoMqttMessageListener.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/mqtt/DemoMqttMessageListener.java similarity index 100% rename from bootx-demo/src/main/java/cn/bootx/demo/core/mq/mqtt/DemoMqttMessageListener.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/mqtt/DemoMqttMessageListener.java diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/mq/rabbit/DemoRabbitMqConfiguration.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/rabbit/DemoRabbitMqConfiguration.java similarity index 95% rename from bootx-demo/src/main/java/cn/bootx/demo/core/mq/rabbit/DemoRabbitMqConfiguration.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/rabbit/DemoRabbitMqConfiguration.java index 56bdf412c8272d29168e373931bb957a2bfe13ed..5115fcf4279c195b94878b476abccc7292c60776 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/core/mq/rabbit/DemoRabbitMqConfiguration.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/rabbit/DemoRabbitMqConfiguration.java @@ -1,4 +1,4 @@ -package cn.bootx.demo.core.mq.rabbit; +package cn.bootx.platform.demo.core.mq.rabbit; import org.springframework.amqp.core.Binding; import org.springframework.amqp.core.BindingBuilder; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/mq/rabbit/DemoRabbitMqMessageListener.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/rabbit/DemoRabbitMqMessageListener.java similarity index 75% rename from bootx-demo/src/main/java/cn/bootx/demo/core/mq/rabbit/DemoRabbitMqMessageListener.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/rabbit/DemoRabbitMqMessageListener.java index 964d4e7309f435a057500452b771692e052e0ae1..f1f2eda81cc68c6cdb8866459f477c9ae94abd36 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/core/mq/rabbit/DemoRabbitMqMessageListener.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/rabbit/DemoRabbitMqMessageListener.java @@ -1,7 +1,7 @@ -package cn.bootx.demo.core.mq.rabbit; +package cn.bootx.platform.demo.core.mq.rabbit; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.rabbit.conditional.ConditionalOnRabbit; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.rabbit.conditional.ConditionalOnRabbit; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.rabbit.annotation.RabbitListener; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/mq/redis/DemoRedisExpiredListener.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisExpiredListener.java similarity index 82% rename from bootx-demo/src/main/java/cn/bootx/demo/core/mq/redis/DemoRedisExpiredListener.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisExpiredListener.java index 141e59deac81c2dc4f4ad6d8f69e7ca1d8c1d2f6..b9d1eca0f903a6e2175415a686a75e5cd3eb8be7 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/core/mq/redis/DemoRedisExpiredListener.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisExpiredListener.java @@ -1,6 +1,6 @@ -package cn.bootx.demo.core.mq.redis; +package cn.bootx.platform.demo.core.mq.redis; -import cn.bootx.common.redis.listener.RedisKeyExpiredListener; +import cn.bootx.platform.common.redis.listener.RedisKeyExpiredListener; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/mq/redis/DemoRedisStreamListener.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisStreamListener.java similarity index 92% rename from bootx-demo/src/main/java/cn/bootx/demo/core/mq/redis/DemoRedisStreamListener.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisStreamListener.java index 059da04dbcc71534d9e44e39f3c6faeae3b0c4ee..e79e26985df20a94b3d327a82169708d06ed2beb 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/core/mq/redis/DemoRedisStreamListener.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisStreamListener.java @@ -1,4 +1,4 @@ -package cn.bootx.demo.core.mq.redis; +package cn.bootx.platform.demo.core.mq.redis; import org.springframework.data.redis.connection.stream.ObjectRecord; import org.springframework.data.redis.connection.stream.RecordId; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/mq/redis/DemoRedisTopicListener.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisTopicListener.java similarity index 72% rename from bootx-demo/src/main/java/cn/bootx/demo/core/mq/redis/DemoRedisTopicListener.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisTopicListener.java index c5e06c6ceddec824669e1255a88ae4a8a9a8fcae..807329a8266945e80f9fd013f6893de5a449cb25 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/core/mq/redis/DemoRedisTopicListener.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisTopicListener.java @@ -1,7 +1,7 @@ -package cn.bootx.demo.core.mq.redis; +package cn.bootx.platform.demo.core.mq.redis; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.redis.listener.RedisTopicListener; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.redis.listener.RedisTopicListener; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/actable/entity/AcTableEntity.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mtm/entity/MtmTableEntity.java similarity index 52% rename from bootx-demo/src/main/java/cn/bootx/demo/core/actable/entity/AcTableEntity.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/mtm/entity/MtmTableEntity.java index 5e1579ff9c815fdf47bb9c0cc13507cddbd4c16a..63a4fcbdcc5bbaa3988f4aa5c1741d4b23f4003b 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/core/actable/entity/AcTableEntity.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mtm/entity/MtmTableEntity.java @@ -1,8 +1,8 @@ -package cn.bootx.demo.core.actable.entity; +package cn.bootx.platform.demo.core.mtm.entity; -import cn.bootx.common.core.annotation.actable.Column; -import cn.bootx.common.core.annotation.actable.Table; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.mybatis.table.modify.annotation.DbColumn; +import cn.bootx.mybatis.table.modify.annotation.DbTable; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,17 +17,17 @@ import java.util.Date; * @date 2023/1/11 */ @EqualsAndHashCode(callSuper = true) -@Table(comment = "actable测试") +@DbTable(name = "mtm_table",comment = "actable测试") @Data @Accessors(chain = true) @Schema(title = "cs") -public class AcTableEntity extends MpBaseEntity { +public class MtmTableEntity extends MpBaseEntity { private String h1; private Date date; - @Column(ignore = true) + @DbColumn(ignore = true) private int he; } diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/notice/entity/SendSimpleEmailDemoParam.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/notice/entity/SendSimpleEmailDemoParam.java similarity index 93% rename from bootx-demo/src/main/java/cn/bootx/demo/core/notice/entity/SendSimpleEmailDemoParam.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/notice/entity/SendSimpleEmailDemoParam.java index 501bfe470d4d148d6bcad8bcb701ad8b25476b96..17a29627e71ec2363f464560ae1fb95e1681b3c6 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/core/notice/entity/SendSimpleEmailDemoParam.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/notice/entity/SendSimpleEmailDemoParam.java @@ -1,4 +1,4 @@ -package cn.bootx.demo.core.notice.entity; +package cn.bootx.platform.demo.core.notice.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/notice/service/EmailSendDemoService.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/notice/service/EmailSendDemoService.java similarity index 80% rename from bootx-demo/src/main/java/cn/bootx/demo/core/notice/service/EmailSendDemoService.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/notice/service/EmailSendDemoService.java index fef6272f6a2249448e20f7cb9795064590f22216..7c7caf455321518345aeda038643a34a4ef5a6b9 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/core/notice/service/EmailSendDemoService.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/notice/service/EmailSendDemoService.java @@ -1,7 +1,7 @@ -package cn.bootx.demo.core.notice.service; +package cn.bootx.platform.demo.core.notice.service; -import cn.bootx.notice.dto.mail.SendMailParam; -import cn.bootx.notice.service.EmailNoticeSender; +import cn.bootx.platform.notice.dto.mail.SendMailParam; +import cn.bootx.platform.notice.service.EmailNoticeSender; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/perm/dao/DataPermDemoManager.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/dao/DataPermDemoManager.java similarity index 71% rename from bootx-demo/src/main/java/cn/bootx/demo/core/perm/dao/DataPermDemoManager.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/dao/DataPermDemoManager.java index 20989b79e555a71f853167ae3278cda95fb78317..eddae2f43f6a0f38a8e96f07321a7037c28cb082 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/core/perm/dao/DataPermDemoManager.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/dao/DataPermDemoManager.java @@ -1,9 +1,9 @@ -package cn.bootx.demo.core.perm.dao; +package cn.bootx.platform.demo.core.perm.dao; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.demo.core.perm.entity.DataPermDemo; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.demo.core.perm.entity.DataPermDemo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/perm/dao/DataPermDemoMapper.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/dao/DataPermDemoMapper.java similarity index 70% rename from bootx-demo/src/main/java/cn/bootx/demo/core/perm/dao/DataPermDemoMapper.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/dao/DataPermDemoMapper.java index 8eb204375fd1a12e952769ef17d3ee4f52a674d1..5e3f01d6c2ea8693026f1894523b719c70a20a81 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/core/perm/dao/DataPermDemoMapper.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/dao/DataPermDemoMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.demo.core.perm.dao; +package cn.bootx.platform.demo.core.perm.dao; -import cn.bootx.demo.core.perm.entity.DataPermDemo; +import cn.bootx.platform.demo.core.perm.entity.DataPermDemo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/perm/entity/DataPermDemo.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/entity/DataPermDemo.java similarity index 75% rename from bootx-demo/src/main/java/cn/bootx/demo/core/perm/entity/DataPermDemo.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/entity/DataPermDemo.java index 7bbc5b04a44f374d9240da628caac36cb6b3a9d7..b392f0926698ad6803d7bdd4bcfcc6f71fbcbbfc 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/core/perm/entity/DataPermDemo.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/entity/DataPermDemo.java @@ -1,8 +1,8 @@ -package cn.bootx.demo.core.perm.entity; +package cn.bootx.platform.demo.core.perm.entity; -import cn.bootx.common.core.annotation.DataVersionLog; -import cn.bootx.common.core.annotation.PermCode; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.common.core.annotation.DataVersionLog; +import cn.bootx.platform.common.core.annotation.PermCode; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/perm/service/DataPermDemoService.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/service/DataPermDemoService.java similarity index 72% rename from bootx-demo/src/main/java/cn/bootx/demo/core/perm/service/DataPermDemoService.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/service/DataPermDemoService.java index 215624ebc5ea48cbd428600ed85e2f43a610ecdd..5c71335cbb72d9abb3c67950d465ed42ef3eb5d8 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/core/perm/service/DataPermDemoService.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/service/DataPermDemoService.java @@ -1,14 +1,14 @@ -package cn.bootx.demo.core.perm.service; +package cn.bootx.platform.demo.core.perm.service; -import cn.bootx.common.core.annotation.Permission; -import cn.bootx.common.core.entity.UserDetail; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.demo.core.perm.dao.DataPermDemoManager; -import cn.bootx.demo.core.perm.entity.DataPermDemo; -import cn.bootx.starter.auth.util.SecurityUtil; +import cn.bootx.platform.common.core.annotation.Permission; +import cn.bootx.platform.common.core.entity.UserDetail; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.demo.core.perm.dao.DataPermDemoManager; +import cn.bootx.platform.starter.auth.util.SecurityUtil; +import cn.bootx.platform.demo.core.perm.entity.DataPermDemo; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import lombok.RequiredArgsConstructor; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/query/dao/SuperQueryDemoManager.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/dao/SuperQueryDemoManager.java similarity index 72% rename from bootx-demo/src/main/java/cn/bootx/demo/core/query/dao/SuperQueryDemoManager.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/dao/SuperQueryDemoManager.java index 8ec982031c63a7a63fce57f49efb3d64ac40c00c..5fec740b538e97319d88b9e9c8db7a98fb11411a 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/core/query/dao/SuperQueryDemoManager.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/dao/SuperQueryDemoManager.java @@ -1,11 +1,11 @@ -package cn.bootx.demo.core.query.dao; +package cn.bootx.platform.demo.core.query.dao; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.common.query.entity.QueryParams; -import cn.bootx.common.query.generator.QueryGenerator; -import cn.bootx.demo.core.query.entity.SuperQueryDemo; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.common.query.generator.QueryGenerator; +import cn.bootx.platform.demo.core.query.entity.SuperQueryDemo; +import cn.bootx.platform.common.query.entity.QueryParams; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/query/dao/SuperQueryDemoMapper.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/dao/SuperQueryDemoMapper.java similarity index 69% rename from bootx-demo/src/main/java/cn/bootx/demo/core/query/dao/SuperQueryDemoMapper.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/dao/SuperQueryDemoMapper.java index fc3d499559e19f844a0acc343d43ab826ab07e40..aeed0b2b32b32c06931a13ed95c90ee415efc595 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/core/query/dao/SuperQueryDemoMapper.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/dao/SuperQueryDemoMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.demo.core.query.dao; +package cn.bootx.platform.demo.core.query.dao; -import cn.bootx.demo.core.query.entity.SuperQueryDemo; +import cn.bootx.platform.demo.core.query.entity.SuperQueryDemo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/query/entity/SuperQueryDemo.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/entity/SuperQueryDemo.java similarity index 90% rename from bootx-demo/src/main/java/cn/bootx/demo/core/query/entity/SuperQueryDemo.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/entity/SuperQueryDemo.java index 2762c9044335b80633a37a1b7b911b06dec022a2..8baaa25e37f8b998c123b25cb028d62167fb92d7 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/core/query/entity/SuperQueryDemo.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/entity/SuperQueryDemo.java @@ -1,6 +1,6 @@ -package cn.bootx.demo.core.query.entity; +package cn.bootx.platform.demo.core.query.entity; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/query/service/SuperQueryDemoService.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/service/SuperQueryDemoService.java similarity index 79% rename from bootx-demo/src/main/java/cn/bootx/demo/core/query/service/SuperQueryDemoService.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/service/SuperQueryDemoService.java index 79b9e97da86798e6c9a3908f6a6e90c8003aa7d6..f6f3dd6169b22c4e415ebf06e40bbf83b3aa0d04 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/core/query/service/SuperQueryDemoService.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/service/SuperQueryDemoService.java @@ -1,12 +1,12 @@ -package cn.bootx.demo.core.query.service; +package cn.bootx.platform.demo.core.query.service; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.common.query.entity.QueryParams; -import cn.bootx.demo.core.query.dao.SuperQueryDemoManager; -import cn.bootx.demo.core.query.entity.SuperQueryDemo; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.common.query.entity.QueryParams; +import cn.bootx.platform.demo.core.query.dao.SuperQueryDemoManager; +import cn.bootx.platform.demo.core.query.entity.SuperQueryDemo; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import lombok.RequiredArgsConstructor; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/sensitive/dao/DataSensitiveDemoManager.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/dao/DataSensitiveDemoManager.java similarity index 63% rename from bootx-demo/src/main/java/cn/bootx/demo/core/sensitive/dao/DataSensitiveDemoManager.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/dao/DataSensitiveDemoManager.java index 424e0ccdba7ed54fed9cc1d721e2decfbdb2d7a9..3b17305f57669d52d06d7d3208dcf389b8e84a19 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/core/sensitive/dao/DataSensitiveDemoManager.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/dao/DataSensitiveDemoManager.java @@ -1,7 +1,7 @@ -package cn.bootx.demo.core.sensitive.dao; +package cn.bootx.platform.demo.core.sensitive.dao; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.demo.core.sensitive.entity.DataSensitiveDemo; +import cn.bootx.platform.demo.core.sensitive.entity.DataSensitiveDemo; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/sensitive/dao/DataSensitiveDemoMapper.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/dao/DataSensitiveDemoMapper.java similarity index 66% rename from bootx-demo/src/main/java/cn/bootx/demo/core/sensitive/dao/DataSensitiveDemoMapper.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/dao/DataSensitiveDemoMapper.java index 62ffb0392b1961e7274c91f731feef2ab7f7d818..dc89d361645a3c504aa91a959bf0e98edfc31f29 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/core/sensitive/dao/DataSensitiveDemoMapper.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/dao/DataSensitiveDemoMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.demo.core.sensitive.dao; +package cn.bootx.platform.demo.core.sensitive.dao; -import cn.bootx.demo.core.sensitive.entity.DataSensitiveDemo; +import cn.bootx.platform.demo.core.sensitive.entity.DataSensitiveDemo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/sensitive/entity/DataSensitiveDemo.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/entity/DataSensitiveDemo.java similarity index 87% rename from bootx-demo/src/main/java/cn/bootx/demo/core/sensitive/entity/DataSensitiveDemo.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/entity/DataSensitiveDemo.java index 90cfc27d9bdb2b1e1918894fafbf551ccde03d7d..0c19d62d8214555380ad45f2042e39d58bd44c4e 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/core/sensitive/entity/DataSensitiveDemo.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/entity/DataSensitiveDemo.java @@ -1,7 +1,7 @@ -package cn.bootx.demo.core.sensitive.entity; +package cn.bootx.platform.demo.core.sensitive.entity; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.starter.data.perm.sensitive.SensitiveInfo; +import cn.bootx.platform.starter.data.perm.sensitive.SensitiveInfo; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/core/sensitive/service/DataSensitiveDemoService.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/service/DataSensitiveDemoService.java similarity index 69% rename from bootx-demo/src/main/java/cn/bootx/demo/core/sensitive/service/DataSensitiveDemoService.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/service/DataSensitiveDemoService.java index 49f63eada7c0fc195ab0171c55acecf565edd9b6..111eca4ec410843649e5dcf525fc4d458cd9e922 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/core/sensitive/service/DataSensitiveDemoService.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/service/DataSensitiveDemoService.java @@ -1,11 +1,11 @@ -package cn.bootx.demo.core.sensitive.service; - -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.demo.core.sensitive.dao.DataSensitiveDemoManager; -import cn.bootx.demo.core.sensitive.entity.DataSensitiveDemo; +package cn.bootx.platform.demo.core.sensitive.service; + +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.demo.core.sensitive.dao.DataSensitiveDemoManager; +import cn.bootx.platform.demo.core.sensitive.entity.DataSensitiveDemo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/bootx-demo/src/main/java/cn/bootx/demo/ws/WebSocketDemo.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/ws/WebSocketDemo.java similarity index 96% rename from bootx-demo/src/main/java/cn/bootx/demo/ws/WebSocketDemo.java rename to bootx-demo/src/main/java/cn/bootx/platform/demo/ws/WebSocketDemo.java index cedc202956fbf39ad46778d45f05e6eca6f25323..2ec6daba38bf200c869a51c5ca952c77e0c7ca7a 100644 --- a/bootx-demo/src/main/java/cn/bootx/demo/ws/WebSocketDemo.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/ws/WebSocketDemo.java @@ -1,6 +1,6 @@ -package cn.bootx.demo.ws; +package cn.bootx.platform.demo.ws; -import cn.bootx.common.websocket.manager.WebSocketSessionManager; +import cn.bootx.platform.common.websocket.manager.WebSocketSessionManager; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/bootx-demo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-demo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index ab88413b228553f07c45abd3357a1e5db229d433..c2a2d344d8a9fd7b7b5e599dc8f89738a644a999 100644 --- a/bootx-demo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-demo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.demo.DemoApplication \ No newline at end of file +cn.bootx.platform.demo.DemoApplication diff --git a/bootx-services/pom.xml b/bootx-services/pom.xml index 852c64ffe8097e8e358da8fbb0b33180d4eb7122..635f03ab52dc0b38bbb5e015a2ab88679ef4c985 100644 --- a/bootx-services/pom.xml +++ b/bootx-services/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> cn.bootx.platform - bootx-platform - 1.2.3 + bootx-platform-parent + 1.3.0 4.0.0 @@ -14,14 +14,30 @@ pom 业务服务父pom - - service-baseapi - service-iam - service-payment - service-notice - service-office - service-visualization - + + + + noDeploy + + service-baseapi + service-iam + service-notice + service-visualization + + + true + + + + + deploy + + service-baseapi + service-iam + service-notice + + + @@ -36,17 +52,6 @@ spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - - net.sourceforge.nekohtml - nekohtml - - org.springframework.boot @@ -65,22 +70,39 @@ spring-boot-starter-data-redis + + + com.baomidou + lock4j-redis-template-spring-boot-starter + ${lock4j.version} + + + + + + + + + org.projectlombok lombok + provided org.projectlombok lombok-mapstruct-binding + provided org.mapstruct mapstruct-processor + provided @@ -116,6 +138,13 @@ ${knife4j.version} + + + cn.bootx + mybatis-table-modify + provided + + cn.bootx.platform diff --git a/bootx-services/service-baseapi/pom.xml b/bootx-services/service-baseapi/pom.xml index e0f8e9324bf38cf45f3b7cfb895872e7b7bd764a..f1ccc346ec42114852c429c4f8e1bf875e9ff3ed 100644 --- a/bootx-services/service-baseapi/pom.xml +++ b/bootx-services/service-baseapi/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-services - 1.2.3 + 1.3.0 4.0.0 @@ -59,6 +59,7 @@ com.alibaba easyexcel + diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/BaseApiApplication.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/BaseApiApplication.java similarity index 89% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/BaseApiApplication.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/BaseApiApplication.java index 726edafb1a3d55f1c375fccb015442698a78ac3b..11756ff06d30d0d6169ad532f1b361200ae60226 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/BaseApiApplication.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/BaseApiApplication.java @@ -1,4 +1,4 @@ -package cn.bootx.baseapi; +package cn.bootx.platform.baseapi; import org.apache.ibatis.annotations.Mapper; import org.mybatis.spring.annotation.MapperScan; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/code/BspErrorCodes.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/BspErrorCodes.java similarity index 98% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/code/BspErrorCodes.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/BspErrorCodes.java index 02363041ec3e7fd47ddb45279f1e47deae9bd9a8..b0e4b1c61d36d88e5a325ef042a0cc89f31c2dad 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/code/BspErrorCodes.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/BspErrorCodes.java @@ -1,4 +1,4 @@ -package cn.bootx.baseapi.code; +package cn.bootx.platform.baseapi.code; /** * 错误码定义类 错误码范围：21000-21999 diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/code/CachingCode.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/CachingCode.java similarity index 85% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/code/CachingCode.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/CachingCode.java index 1fa73a89143eed6addbd4705ed550b00bea87174..0e9d2d0fb7490c0b32401330836338eb25268c70 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/code/CachingCode.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/CachingCode.java @@ -1,4 +1,4 @@ -package cn.bootx.baseapi.code; +package cn.bootx.platform.baseapi.code; /** * 缓存 diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/code/ChinaRegionCode.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/ChinaRegionCode.java similarity index 90% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/code/ChinaRegionCode.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/ChinaRegionCode.java index 62300b00e8f168aaa29052f62b9df1b622ebdafb..40aa3a091fb0132123941375947c26736574cb06 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/code/ChinaRegionCode.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/ChinaRegionCode.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.code; +package cn.bootx.platform.baseapi.code; -import cn.bootx.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.BizException; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/code/QuerySqlCode.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/QuerySqlCode.java similarity index 87% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/code/QuerySqlCode.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/QuerySqlCode.java index 3f0b0f684c155ed78e1cce608aa9a4947e818c9a..3f2281425fb3b586ea6db5f3a5391e9115408997 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/code/QuerySqlCode.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/QuerySqlCode.java @@ -1,4 +1,4 @@ -package cn.bootx.baseapi.code; +package cn.bootx.platform.baseapi.code; /** * 查询SQL diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/AppVersionController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/AppVersionController.java similarity index 75% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/AppVersionController.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/AppVersionController.java index 459a9f66709cb17e532f15ee5eb8eddd0b1711b0..a5cf73377654f0c1e331a9830debd287c6670425 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/AppVersionController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/AppVersionController.java @@ -1,12 +1,12 @@ -package cn.bootx.baseapi.controller; - -import cn.bootx.baseapi.core.app.service.AppVersionService; -import cn.bootx.baseapi.dto.app.AppVersionDto; -import cn.bootx.baseapi.param.app.AppVersionParam; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; +package cn.bootx.platform.baseapi.controller; + +import cn.bootx.platform.baseapi.core.app.service.AppVersionService; +import cn.bootx.platform.baseapi.dto.app.AppVersionDto; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.baseapi.param.app.AppVersionParam; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/CaptchaController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/CaptchaController.java similarity index 69% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/CaptchaController.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/CaptchaController.java index 18fffc4afbda17eb2867cd70ead469184fc90b11..6367424e3db6480a03c568d0a856775c2fcd31d0 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/CaptchaController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/CaptchaController.java @@ -1,10 +1,10 @@ -package cn.bootx.baseapi.controller; +package cn.bootx.platform.baseapi.controller; -import cn.bootx.baseapi.core.captcha.service.CaptchaService; -import cn.bootx.baseapi.dto.captcha.CaptchaDataResult; -import cn.bootx.common.core.annotation.IgnoreAuth; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; +import cn.bootx.platform.baseapi.dto.captcha.CaptchaDataResult; +import cn.bootx.platform.common.core.annotation.IgnoreAuth; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.baseapi.core.captcha.service.CaptchaService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/ChinaRegionController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/ChinaRegionController.java similarity index 85% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/ChinaRegionController.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/ChinaRegionController.java index e36fac626dbb6e804e2cd1a23d92a7c23b03b807..4e7edd5a64c165d5925b7ec821d27e11e130a708 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/ChinaRegionController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/ChinaRegionController.java @@ -1,9 +1,9 @@ -package cn.bootx.baseapi.controller; +package cn.bootx.platform.baseapi.controller; -import cn.bootx.baseapi.core.region.service.ChinaRegionService; -import cn.bootx.baseapi.dto.region.RegionDto; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; +import cn.bootx.platform.baseapi.dto.region.RegionDto; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.baseapi.core.region.service.ChinaRegionService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/DictionaryController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DictionaryController.java similarity index 74% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/DictionaryController.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DictionaryController.java index 9f24892aa8789a3338a97f336043393573801a02..49372c75f45cd8a6bff045b3ee50df58a487de25 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/DictionaryController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DictionaryController.java @@ -1,15 +1,14 @@ -package cn.bootx.baseapi.controller; +package cn.bootx.platform.baseapi.controller; -import cn.bootx.baseapi.core.dict.service.DictionaryService; -import cn.bootx.baseapi.dto.dict.DictionaryDto; -import cn.bootx.baseapi.param.dict.DictionaryParam; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.core.util.ValidationUtil; -import cn.bootx.common.core.validation.ValidationGroup.add; -import cn.bootx.common.core.validation.ValidationGroup.edit; +import cn.bootx.platform.baseapi.dto.dict.DictionaryDto; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.ValidationUtil; +import cn.bootx.platform.common.core.validation.ValidationGroup; +import cn.bootx.platform.baseapi.core.dict.service.DictionaryService; +import cn.bootx.platform.baseapi.param.dict.DictionaryParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -34,7 +33,7 @@ public class DictionaryController { @Operation(summary = "添加") @PostMapping("/add") public ResResult add(@RequestBody DictionaryParam param) { - ValidationUtil.validateParam(param, add.class); + ValidationUtil.validateParam(param, ValidationGroup.add.class); return Res.ok(dictionaryService.add(param)); } @@ -48,7 +47,7 @@ public class DictionaryController { @Operation(summary = "更新") @PostMapping("/update") public ResResult update(@RequestBody DictionaryParam param) { - ValidationUtil.validateParam(param, edit.class); + ValidationUtil.validateParam(param, ValidationGroup.edit.class); return Res.ok(dictionaryService.update(param)); } diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/DictionaryItemController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DictionaryItemController.java similarity index 81% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/DictionaryItemController.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DictionaryItemController.java index 69a903dc9387bc8f5780ac0c73c48d607c3b494a..a71625013a55a5236803e1f68d6c96eb4e378e62 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/DictionaryItemController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DictionaryItemController.java @@ -1,16 +1,16 @@ -package cn.bootx.baseapi.controller; +package cn.bootx.platform.baseapi.controller; -import cn.bootx.baseapi.core.dict.service.DictionaryItemService; -import cn.bootx.baseapi.dto.dict.DictionaryItemDto; -import cn.bootx.baseapi.dto.dict.DictionaryItemSimpleDto; -import cn.bootx.baseapi.param.dict.DictionaryItemParam; -import cn.bootx.common.core.annotation.IgnoreAuth; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.core.util.ValidationUtil; -import cn.bootx.common.core.validation.ValidationGroup; +import cn.bootx.platform.baseapi.dto.dict.DictionaryItemDto; +import cn.bootx.platform.baseapi.dto.dict.DictionaryItemSimpleDto; +import cn.bootx.platform.common.core.annotation.IgnoreAuth; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.ValidationUtil; +import cn.bootx.platform.common.core.validation.ValidationGroup; +import cn.bootx.platform.baseapi.core.dict.service.DictionaryItemService; +import cn.bootx.platform.baseapi.param.dict.DictionaryItemParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/DynamicDataSourceController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicDataSourceController.java similarity index 85% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/DynamicDataSourceController.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicDataSourceController.java index ad3bf4c8337168b0f20a56b283bd7e05a731339d..f0b13d6ea054dca20ee107d933d91d636a194ba2 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/DynamicDataSourceController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicDataSourceController.java @@ -1,13 +1,13 @@ -package cn.bootx.baseapi.controller; - -import cn.bootx.baseapi.core.dynamicsource.service.DynamicDataSourceService; -import cn.bootx.baseapi.dto.dynamicsource.DynamicDataSourceDto; -import cn.bootx.baseapi.param.dynamicsource.DynamicDataSourceParam; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.dto.KeyValue; -import cn.bootx.common.core.rest.param.PageParam; +package cn.bootx.platform.baseapi.controller; + +import cn.bootx.platform.baseapi.dto.dynamicsource.DynamicDataSourceDto; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.dto.KeyValue; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.baseapi.core.dynamicsource.service.DynamicDataSourceService; +import cn.bootx.platform.baseapi.param.dynamicsource.DynamicDataSourceParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -46,7 +46,7 @@ public class DynamicDataSourceController { @Operation(summary = "分页查询") @GetMapping(value = "/page") public ResResult> page(PageParam pageParam, - DynamicDataSourceParam dynamicDataSourceParam) { + DynamicDataSourceParam dynamicDataSourceParam) { return Res.ok(dynamicDataSourceService.page(pageParam, dynamicDataSourceParam)); } diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/DynamicFormController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicFormController.java similarity index 82% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/DynamicFormController.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicFormController.java index b8f4bf85eeee40e800c5108393bf609fe557c097..c1841efe1f07f56b5fc4b03c06bd0c10e9cf88bc 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/DynamicFormController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicFormController.java @@ -1,12 +1,12 @@ -package cn.bootx.baseapi.controller; +package cn.bootx.platform.baseapi.controller; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.baseapi.core.dynamicform.service.DynamicFormService; -import cn.bootx.baseapi.dto.dynamicform.DynamicFormDto; -import cn.bootx.baseapi.param.dynamicform.DynamicFormParam; +import cn.bootx.platform.baseapi.dto.dynamicform.DynamicFormDto; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.baseapi.core.dynamicform.service.DynamicFormService; +import cn.bootx.platform.baseapi.param.dynamicform.DynamicFormParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -79,4 +79,4 @@ public class DynamicFormController { return Res.ok(dynamicFormService.existsByCode(code, id)); } -} \ No newline at end of file +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/DynamicFormDataController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicFormDataController.java similarity index 78% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/DynamicFormDataController.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicFormDataController.java index f5b7491dfce37a42907c28f5e6e54e2dc9b69f5f..16e20e4a5537ec175b171a22cf56ee6433b6d4e0 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/DynamicFormDataController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicFormDataController.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.controller; +package cn.bootx.platform.baseapi.controller; -import cn.bootx.baseapi.core.dynamicform.service.DynamicFormDataService; +import cn.bootx.platform.baseapi.core.dynamicform.service.DynamicFormDataService; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/QuerySqlController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/QuerySqlController.java similarity index 80% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/QuerySqlController.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/QuerySqlController.java index 494ab6e719f5df1abac74d8fa9b4ea7b40e7858d..94b4959a58afd75218b37ac0e94001b77f739008 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/QuerySqlController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/QuerySqlController.java @@ -1,9 +1,9 @@ -package cn.bootx.baseapi.controller; +package cn.bootx.platform.baseapi.controller; -import cn.bootx.baseapi.core.sql.service.QuerySqlService; -import cn.bootx.baseapi.param.sql.QueryFieldParam; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; +import cn.bootx.platform.baseapi.core.sql.service.QuerySqlService; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.baseapi.param.sql.QueryFieldParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/SystemParamController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/SystemParamController.java similarity index 76% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/SystemParamController.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/SystemParamController.java index 13dad9bf647be1d185db6c0ba4e44ce0808f4b62..fcf61835ba49c9d39f3370ecdcf33ed0e8c3ec3b 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/controller/SystemParamController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/SystemParamController.java @@ -1,15 +1,15 @@ -package cn.bootx.baseapi.controller; +package cn.bootx.platform.baseapi.controller; -import cn.bootx.baseapi.core.parameter.service.SystemParamService; -import cn.bootx.baseapi.dto.parameter.SystemParameterDto; -import cn.bootx.baseapi.param.system.SystemParameterParam; -import cn.bootx.common.core.annotation.IgnoreAuth; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.core.util.ValidationUtil; -import cn.bootx.common.core.validation.ValidationGroup; +import cn.bootx.platform.baseapi.dto.parameter.SystemParameterDto; +import cn.bootx.platform.common.core.annotation.IgnoreAuth; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.ValidationUtil; +import cn.bootx.platform.common.core.validation.ValidationGroup; +import cn.bootx.platform.baseapi.core.parameter.service.SystemParamService; +import cn.bootx.platform.baseapi.param.system.SystemParameterParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -50,7 +50,7 @@ public class SystemParamController { @Operation(summary = "分页") @GetMapping("/page") public ResResult> page(@ParameterObject PageParam pageParam, - @ParameterObject SystemParameterParam param) { + @ParameterObject SystemParameterParam param) { return Res.ok(systemParamService.page(pageParam, param)); } diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/app/convert/AppVersionConvert.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/convert/AppVersionConvert.java similarity index 62% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/app/convert/AppVersionConvert.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/convert/AppVersionConvert.java index d71198640cce42db91d73e0039d671bf5b2157fb..bb39a7b27d2dce43709512405793555a2dc3f509 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/app/convert/AppVersionConvert.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/convert/AppVersionConvert.java @@ -1,8 +1,8 @@ -package cn.bootx.baseapi.core.app.convert; +package cn.bootx.platform.baseapi.core.app.convert; -import cn.bootx.baseapi.core.app.entity.AppVersion; -import cn.bootx.baseapi.dto.app.AppVersionDto; -import cn.bootx.baseapi.param.app.AppVersionParam; +import cn.bootx.platform.baseapi.core.app.entity.AppVersion; +import cn.bootx.platform.baseapi.dto.app.AppVersionDto; +import cn.bootx.platform.baseapi.param.app.AppVersionParam; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/app/dao/AppVersionManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionManager.java similarity index 68% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/app/dao/AppVersionManager.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionManager.java index 9bbd550a7fcb047476be5b95d2aa68b4b4c7bca8..789c55654240254c8e22149f0252cca9e3f33461 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/app/dao/AppVersionManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionManager.java @@ -1,10 +1,10 @@ -package cn.bootx.baseapi.core.app.dao; +package cn.bootx.platform.baseapi.core.app.dao; -import cn.bootx.baseapi.core.app.entity.AppVersion; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.baseapi.core.app.entity.AppVersion; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/app/dao/AppVersionMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionMapper.java similarity index 68% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/app/dao/AppVersionMapper.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionMapper.java index 338878d1807cffcd4ad0cef63aee0181d2b92bc1..fb0bfecae695dfe756077d98127e502432112b88 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/app/dao/AppVersionMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.core.app.dao; +package cn.bootx.platform.baseapi.core.app.dao; -import cn.bootx.baseapi.core.app.entity.AppVersion; +import cn.bootx.platform.baseapi.core.app.entity.AppVersion; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/app/entity/AppVersion.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/entity/AppVersion.java similarity index 72% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/app/entity/AppVersion.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/entity/AppVersion.java index 8512a4dc1c9ba52bc9e591bcb9df21936e7c71bd..96476354c57a8460aaae59fbb221249846f21599 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/app/entity/AppVersion.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/entity/AppVersion.java @@ -1,10 +1,10 @@ -package cn.bootx.baseapi.core.app.entity; +package cn.bootx.platform.baseapi.core.app.entity; -import cn.bootx.baseapi.core.app.convert.AppVersionConvert; -import cn.bootx.baseapi.dto.app.AppVersionDto; -import cn.bootx.baseapi.param.app.AppVersionParam; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.baseapi.core.app.convert.AppVersionConvert; +import cn.bootx.platform.baseapi.dto.app.AppVersionDto; +import cn.bootx.platform.baseapi.param.app.AppVersionParam; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/app/service/AppVersionService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/service/AppVersionService.java similarity index 70% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/app/service/AppVersionService.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/service/AppVersionService.java index 9703be49a2fc44c7cd3629385390207e3c8a180d..f71a56b5133107f55e7755614ca1ac51153345bb 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/app/service/AppVersionService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/service/AppVersionService.java @@ -1,13 +1,13 @@ -package cn.bootx.baseapi.core.app.service; +package cn.bootx.platform.baseapi.core.app.service; -import cn.bootx.baseapi.core.app.dao.AppVersionManager; -import cn.bootx.baseapi.core.app.entity.AppVersion; -import cn.bootx.baseapi.dto.app.AppVersionDto; -import cn.bootx.baseapi.param.app.AppVersionParam; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.baseapi.core.app.dao.AppVersionManager; +import cn.bootx.platform.baseapi.core.app.entity.AppVersion; +import cn.bootx.platform.baseapi.dto.app.AppVersionDto; +import cn.bootx.platform.baseapi.param.app.AppVersionParam; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/captcha/service/CaptchaService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/captcha/service/CaptchaService.java similarity index 94% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/captcha/service/CaptchaService.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/captcha/service/CaptchaService.java index 4f7f3c2af311e70a2088a4bca0a551e2b3191ea1..4eefbb062b36d2b94c3a8cbf6e4c8729c828544f 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/captcha/service/CaptchaService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/captcha/service/CaptchaService.java @@ -1,8 +1,8 @@ -package cn.bootx.baseapi.core.captcha.service; +package cn.bootx.platform.baseapi.core.captcha.service; -import cn.bootx.baseapi.dto.captcha.CaptchaDataResult; -import cn.bootx.common.redis.RedisClient; -import cn.bootx.common.websocket.service.UserWsNoticeService; +import cn.bootx.platform.baseapi.dto.captcha.CaptchaDataResult; +import cn.bootx.platform.common.redis.RedisClient; +import cn.bootx.platform.common.websocket.service.UserWsNoticeService; import cn.hutool.core.util.RandomUtil; import com.wf.captcha.ArithmeticCaptcha; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/convert/DictionaryConvert.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/convert/DictionaryConvert.java similarity index 50% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/convert/DictionaryConvert.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/convert/DictionaryConvert.java index 356b814e31f2e0535e9bdb75cd365f108a202177..58ea966f76004732cb3ee42c14dbaecc4e22d045 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/convert/DictionaryConvert.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/convert/DictionaryConvert.java @@ -1,12 +1,12 @@ -package cn.bootx.baseapi.core.dict.convert; - -import cn.bootx.baseapi.core.dict.entity.Dictionary; -import cn.bootx.baseapi.core.dict.entity.DictionaryItem; -import cn.bootx.baseapi.dto.dict.DictionaryDto; -import cn.bootx.baseapi.dto.dict.DictionaryItemDto; -import cn.bootx.baseapi.dto.dict.DictionaryItemSimpleDto; -import cn.bootx.baseapi.param.dict.DictionaryItemParam; -import cn.bootx.baseapi.param.dict.DictionaryParam; +package cn.bootx.platform.baseapi.core.dict.convert; + +import cn.bootx.platform.baseapi.dto.dict.DictionaryDto; +import cn.bootx.platform.baseapi.dto.dict.DictionaryItemDto; +import cn.bootx.platform.baseapi.dto.dict.DictionaryItemSimpleDto; +import cn.bootx.platform.baseapi.param.dict.DictionaryItemParam; +import cn.bootx.platform.baseapi.param.dict.DictionaryParam; +import cn.bootx.platform.baseapi.core.dict.entity.Dictionary; +import cn.bootx.platform.baseapi.core.dict.entity.DictionaryItem; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/dao/DictionaryItemManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryItemManager.java similarity index 87% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/dao/DictionaryItemManager.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryItemManager.java index ea17d154fa901b26f9d278c0d14f8e2bc502e202..61c8fa6ce5e315db0a9ed22006a0e9499d7ae67e 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/dao/DictionaryItemManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryItemManager.java @@ -1,10 +1,10 @@ -package cn.bootx.baseapi.core.dict.dao; +package cn.bootx.platform.baseapi.core.dict.dao; -import cn.bootx.baseapi.core.dict.entity.DictionaryItem; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.baseapi.core.dict.entity.DictionaryItem; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/dao/DictionaryItemMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryItemMapper.java similarity index 68% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/dao/DictionaryItemMapper.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryItemMapper.java index f01eb18be0cfe10bc78513f4cee2c3f88d2d7f84..6626e8e020f459c639921a4d66baab8c659fac50 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/dao/DictionaryItemMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryItemMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.core.dict.dao; +package cn.bootx.platform.baseapi.core.dict.dao; -import cn.bootx.baseapi.core.dict.entity.DictionaryItem; +import cn.bootx.platform.baseapi.core.dict.entity.DictionaryItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/dao/DictionaryManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryManager.java similarity index 77% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/dao/DictionaryManager.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryManager.java index ad81f505f26fa9c205bf5a28f057841aba34ef2d..b6a4e7fc9b61019b2162386b25cf9bde206123de 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/dao/DictionaryManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryManager.java @@ -1,11 +1,11 @@ -package cn.bootx.baseapi.core.dict.dao; - -import cn.bootx.baseapi.core.dict.entity.Dictionary; -import cn.bootx.baseapi.param.dict.DictionaryParam; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; +package cn.bootx.platform.baseapi.core.dict.dao; + +import cn.bootx.platform.baseapi.core.dict.entity.Dictionary; +import cn.bootx.platform.baseapi.param.dict.DictionaryParam; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/dao/DictionaryMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryMapper.java similarity index 67% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/dao/DictionaryMapper.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryMapper.java index 8ddddc2c206466c9962514f78f34efee4fd23b23..99822895824cf7ca5119f2bd1cd8b67ed3ce2957 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/dao/DictionaryMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.core.dict.dao; +package cn.bootx.platform.baseapi.core.dict.dao; -import cn.bootx.baseapi.core.dict.entity.Dictionary; +import cn.bootx.platform.baseapi.core.dict.entity.Dictionary; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -13,4 +13,4 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface DictionaryMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/entity/Dictionary.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/entity/Dictionary.java similarity index 68% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/entity/Dictionary.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/entity/Dictionary.java index 14a8b7291ffd22422b869bcb62c9548a5e5d07e4..7b5a9e81af8ee8ba6e96497c2562c4e19eed3d27 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/entity/Dictionary.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/entity/Dictionary.java @@ -1,10 +1,10 @@ -package cn.bootx.baseapi.core.dict.entity; +package cn.bootx.platform.baseapi.core.dict.entity; -import cn.bootx.baseapi.core.dict.convert.DictionaryConvert; -import cn.bootx.baseapi.dto.dict.DictionaryDto; -import cn.bootx.baseapi.param.dict.DictionaryParam; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.baseapi.core.dict.convert.DictionaryConvert; +import cn.bootx.platform.baseapi.dto.dict.DictionaryDto; +import cn.bootx.platform.baseapi.param.dict.DictionaryParam; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/entity/DictionaryItem.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/entity/DictionaryItem.java similarity index 72% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/entity/DictionaryItem.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/entity/DictionaryItem.java index dac8c5675a200bd7643f9ad17912a492f07c8358..0a04a0f73dbff0c07b2d0efac0bcc21b4771117a 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/entity/DictionaryItem.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/entity/DictionaryItem.java @@ -1,11 +1,11 @@ -package cn.bootx.baseapi.core.dict.entity; +package cn.bootx.platform.baseapi.core.dict.entity; -import cn.bootx.baseapi.core.dict.convert.DictionaryConvert; -import cn.bootx.baseapi.dto.dict.DictionaryItemDto; -import cn.bootx.baseapi.dto.dict.DictionaryItemSimpleDto; -import cn.bootx.baseapi.param.dict.DictionaryItemParam; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.baseapi.core.dict.convert.DictionaryConvert; +import cn.bootx.platform.baseapi.dto.dict.DictionaryItemDto; +import cn.bootx.platform.baseapi.dto.dict.DictionaryItemSimpleDto; +import cn.bootx.platform.baseapi.param.dict.DictionaryItemParam; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/service/DictTranslationServiceImpl.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictTranslationServiceImpl.java similarity index 85% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/service/DictTranslationServiceImpl.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictTranslationServiceImpl.java index 032482463857ff9053ec815783ca05ab0c0da4b4..5dd953245bcf739359c47982583859be085a4995 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/service/DictTranslationServiceImpl.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictTranslationServiceImpl.java @@ -1,11 +1,11 @@ -package cn.bootx.baseapi.core.dict.service; +package cn.bootx.platform.baseapi.core.dict.service; -import cn.bootx.baseapi.core.dict.entity.DictionaryItem; -import cn.bootx.baseapi.dto.dict.DictionaryItemDto; -import cn.bootx.baseapi.dto.dict.DictionaryItemSimpleDto; -import cn.bootx.common.core.function.CollectorsFunction; -import cn.bootx.common.translate.cache.TranslationCacheLocal; -import cn.bootx.common.translate.service.DictTranslationService; +import cn.bootx.platform.baseapi.dto.dict.DictionaryItemDto; +import cn.bootx.platform.baseapi.dto.dict.DictionaryItemSimpleDto; +import cn.bootx.platform.common.core.function.CollectorsFunction; +import cn.bootx.platform.common.translate.cache.TranslationCacheLocal; +import cn.bootx.platform.common.translate.service.DictTranslationService; +import cn.bootx.platform.baseapi.core.dict.entity.DictionaryItem; import com.google.common.base.Objects; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -17,8 +17,6 @@ import java.util.Optional; import java.util.function.Function; import java.util.stream.Collectors; -import static cn.bootx.common.translate.cache.TranslationCacheLocal.get; - /** * 字典值转换工具类 * @@ -37,7 +35,7 @@ public class DictTranslationServiceImpl implements DictTranslationService { */ @Override public void initDictTranslationCache() { - TranslationCacheLocal.Cache cache = get(); + TranslationCacheLocal.Cache cache = TranslationCacheLocal.get(); val dictItems = cache.getDictItems(); // 如果字典项少于三个, 单独查, 字典类型少于三个, 查找项后本地筛选, 其他查全部后筛选 long itemCount = dictItems.stream().distinct().count(); diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/service/DictionaryItemService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictionaryItemService.java similarity index 84% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/service/DictionaryItemService.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictionaryItemService.java index 7f6b95bd1e84345f692b4c306be4b407ea4eb6f4..d3047f86610a95f79e61c20fb0024948157408a5 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/service/DictionaryItemService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictionaryItemService.java @@ -1,20 +1,20 @@ -package cn.bootx.baseapi.core.dict.service; - -import cn.bootx.baseapi.core.dict.dao.DictionaryItemManager; -import cn.bootx.baseapi.core.dict.dao.DictionaryManager; -import cn.bootx.baseapi.core.dict.entity.Dictionary; -import cn.bootx.baseapi.core.dict.entity.DictionaryItem; -import cn.bootx.baseapi.dto.dict.DictionaryItemDto; -import cn.bootx.baseapi.dto.dict.DictionaryItemSimpleDto; -import cn.bootx.baseapi.exception.dict.DictItemAlreadyExistedException; -import cn.bootx.baseapi.exception.dict.DictItemNotExistedException; -import cn.bootx.baseapi.param.dict.DictionaryItemParam; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.util.MpUtil; +package cn.bootx.platform.baseapi.core.dict.service; + +import cn.bootx.platform.baseapi.dto.dict.DictionaryItemDto; +import cn.bootx.platform.baseapi.dto.dict.DictionaryItemSimpleDto; +import cn.bootx.platform.baseapi.exception.dict.DictItemAlreadyExistedException; +import cn.bootx.platform.baseapi.exception.dict.DictItemNotExistedException; +import cn.bootx.platform.baseapi.param.dict.DictionaryItemParam; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.baseapi.core.dict.dao.DictionaryItemManager; +import cn.bootx.platform.baseapi.core.dict.dao.DictionaryManager; +import cn.bootx.platform.baseapi.core.dict.entity.Dictionary; +import cn.bootx.platform.baseapi.core.dict.entity.DictionaryItem; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/service/DictionaryService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictionaryService.java similarity index 78% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/service/DictionaryService.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictionaryService.java index 391622340338fc56b065730173d87a3d5b44e038..a29e2e153bb90837cb4b2666682af82359599a6d 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dict/service/DictionaryService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictionaryService.java @@ -1,17 +1,17 @@ -package cn.bootx.baseapi.core.dict.service; - -import cn.bootx.baseapi.core.dict.dao.DictionaryItemManager; -import cn.bootx.baseapi.core.dict.dao.DictionaryManager; -import cn.bootx.baseapi.core.dict.entity.Dictionary; -import cn.bootx.baseapi.dto.dict.DictionaryDto; -import cn.bootx.baseapi.exception.dict.DictAlreadyExistedException; -import cn.bootx.baseapi.exception.dict.DictItemAlreadyUsedException; -import cn.bootx.baseapi.exception.dict.DictNotExistedException; -import cn.bootx.baseapi.param.dict.DictionaryParam; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.util.MpUtil; +package cn.bootx.platform.baseapi.core.dict.service; + +import cn.bootx.platform.baseapi.dto.dict.DictionaryDto; +import cn.bootx.platform.baseapi.exception.dict.DictAlreadyExistedException; +import cn.bootx.platform.baseapi.exception.dict.DictItemAlreadyUsedException; +import cn.bootx.platform.baseapi.exception.dict.DictNotExistedException; +import cn.bootx.platform.baseapi.param.dict.DictionaryParam; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.baseapi.core.dict.dao.DictionaryItemManager; +import cn.bootx.platform.baseapi.core.dict.dao.DictionaryManager; +import cn.bootx.platform.baseapi.core.dict.entity.Dictionary; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import lombok.AllArgsConstructor; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicform/convert/DynamicFormConvert.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/convert/DynamicFormConvert.java similarity index 56% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicform/convert/DynamicFormConvert.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/convert/DynamicFormConvert.java index 9a5ca93f390c6c6d9f7ff600456074c0f5b33fdf..57e799ab94126c7a22a5e58c14cb4f425f3248f4 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicform/convert/DynamicFormConvert.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/convert/DynamicFormConvert.java @@ -1,8 +1,8 @@ -package cn.bootx.baseapi.core.dynamicform.convert; +package cn.bootx.platform.baseapi.core.dynamicform.convert; -import cn.bootx.baseapi.core.dynamicform.entity.DynamicForm; -import cn.bootx.baseapi.dto.dynamicform.DynamicFormDto; -import cn.bootx.baseapi.param.dynamicform.DynamicFormParam; +import cn.bootx.platform.baseapi.dto.dynamicform.DynamicFormDto; +import cn.bootx.platform.baseapi.param.dynamicform.DynamicFormParam; +import cn.bootx.platform.baseapi.core.dynamicform.entity.DynamicForm; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; @@ -21,4 +21,4 @@ public interface DynamicFormConvert { DynamicFormDto convert(DynamicForm in); -} \ No newline at end of file +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicform/dao/DynamicFormManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/dao/DynamicFormManager.java similarity index 72% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicform/dao/DynamicFormManager.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/dao/DynamicFormManager.java index bdda6b9d86903e0912854c3d04a03a89bf719cf3..05b68eafe30810b69b99ca73087167ef14cd8fb9 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicform/dao/DynamicFormManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/dao/DynamicFormManager.java @@ -1,11 +1,11 @@ -package cn.bootx.baseapi.core.dynamicform.dao; +package cn.bootx.platform.baseapi.core.dynamicform.dao; -import cn.bootx.baseapi.core.dynamicform.entity.DynamicForm; -import cn.bootx.baseapi.param.dynamicform.DynamicFormParam; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.baseapi.core.dynamicform.entity.DynamicForm; +import cn.bootx.platform.baseapi.param.dynamicform.DynamicFormParam; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; @@ -42,4 +42,4 @@ public class DynamicFormManager extends BaseManager { -} \ No newline at end of file +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicform/entity/DynamicForm.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/entity/DynamicForm.java similarity index 66% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicform/entity/DynamicForm.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/entity/DynamicForm.java index 130add29c4e6e23eab1287d0577e06aa3130bbc9..f40023cd38c4b279ee4ff2144dfdcc0f1a288329 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicform/entity/DynamicForm.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/entity/DynamicForm.java @@ -1,11 +1,11 @@ -package cn.bootx.baseapi.core.dynamicform.entity; - -import cn.bootx.baseapi.core.dynamicform.convert.DynamicFormConvert; -import cn.bootx.baseapi.dto.dynamicform.DynamicFormDto; -import cn.bootx.baseapi.param.dynamicform.DynamicFormParam; -import cn.bootx.common.core.annotation.BigField; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; +package cn.bootx.platform.baseapi.core.dynamicform.entity; + +import cn.bootx.platform.baseapi.core.dynamicform.convert.DynamicFormConvert; +import cn.bootx.platform.baseapi.dto.dynamicform.DynamicFormDto; +import cn.bootx.platform.baseapi.param.dynamicform.DynamicFormParam; +import cn.bootx.platform.common.core.annotation.BigField; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicform/entity/DynamicFormData.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/entity/DynamicFormData.java similarity index 77% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicform/entity/DynamicFormData.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/entity/DynamicFormData.java index fed78d092e002cf34b2b9f14a37b8e4b314cb15b..216d0d2f930271ca22b10b607ca66c48ce615473 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicform/entity/DynamicFormData.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/entity/DynamicFormData.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.core.dynamicform.entity; +package cn.bootx.platform.baseapi.core.dynamicform.entity; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicform/service/DynamicFormDataService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/service/DynamicFormDataService.java similarity index 84% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicform/service/DynamicFormDataService.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/service/DynamicFormDataService.java index 135dea93180814a39db7473af842fa02263ec4a0..ac815f77f645abdfc8071c5dcda2c90e5ce13f8c 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicform/service/DynamicFormDataService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/service/DynamicFormDataService.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.core.dynamicform.service; +package cn.bootx.platform.baseapi.core.dynamicform.service; -import cn.bootx.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.rest.param.PageParam; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicform/service/DynamicFormService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/service/DynamicFormService.java similarity index 75% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicform/service/DynamicFormService.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/service/DynamicFormService.java index 6fd3945512d4a5e5184223e182143a1c995698f9..eeb09bc53610808ae4a577fdc92fb7d6ada6993d 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicform/service/DynamicFormService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/service/DynamicFormService.java @@ -1,14 +1,14 @@ -package cn.bootx.baseapi.core.dynamicform.service; +package cn.bootx.platform.baseapi.core.dynamicform.service; -import cn.bootx.baseapi.core.dynamicform.dao.DynamicFormManager; -import cn.bootx.baseapi.core.dynamicform.entity.DynamicForm; -import cn.bootx.baseapi.dto.dynamicform.DynamicFormDto; -import cn.bootx.baseapi.param.dynamicform.DynamicFormParam; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.core.util.ResultConvertUtil; -import cn.bootx.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.baseapi.dto.dynamicform.DynamicFormDto; +import cn.bootx.platform.baseapi.param.dynamicform.DynamicFormParam; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.ResultConvertUtil; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.baseapi.core.dynamicform.dao.DynamicFormManager; +import cn.bootx.platform.baseapi.core.dynamicform.entity.DynamicForm; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import lombok.RequiredArgsConstructor; @@ -90,4 +90,4 @@ public class DynamicFormService { dynamicFormManager.deleteById(id); } -} \ No newline at end of file +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicsource/convert/DynamicDataSourceConvert.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/convert/DynamicDataSourceConvert.java similarity index 57% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicsource/convert/DynamicDataSourceConvert.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/convert/DynamicDataSourceConvert.java index bfc4e4e6b9f0bd66d56c89a2083dda191fc0c660..02956b1bb23fcba1b8c1753802f528e2573c6334 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicsource/convert/DynamicDataSourceConvert.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/convert/DynamicDataSourceConvert.java @@ -1,8 +1,8 @@ -package cn.bootx.baseapi.core.dynamicsource.convert; +package cn.bootx.platform.baseapi.core.dynamicsource.convert; -import cn.bootx.baseapi.core.dynamicsource.entity.DynamicDataSource; -import cn.bootx.baseapi.dto.dynamicsource.DynamicDataSourceDto; -import cn.bootx.baseapi.param.dynamicsource.DynamicDataSourceParam; +import cn.bootx.platform.baseapi.dto.dynamicsource.DynamicDataSourceDto; +import cn.bootx.platform.baseapi.param.dynamicsource.DynamicDataSourceParam; +import cn.bootx.platform.baseapi.core.dynamicsource.entity.DynamicDataSource; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; @@ -21,4 +21,4 @@ public interface DynamicDataSourceConvert { DynamicDataSourceDto convert(DynamicDataSource in); -} \ No newline at end of file +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicsource/dao/DynamicDataSourceManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceManager.java similarity index 77% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicsource/dao/DynamicDataSourceManager.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceManager.java index 7d9b04d8a2a79d65351806019f63c00220978795..b56ae56fec635d1c8f55259db08615f6dc2e8d42 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicsource/dao/DynamicDataSourceManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceManager.java @@ -1,11 +1,11 @@ -package cn.bootx.baseapi.core.dynamicsource.dao; - -import cn.bootx.baseapi.core.dynamicsource.entity.DynamicDataSource; -import cn.bootx.baseapi.param.dynamicsource.DynamicDataSourceParam; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; +package cn.bootx.platform.baseapi.core.dynamicsource.dao; + +import cn.bootx.platform.baseapi.core.dynamicsource.entity.DynamicDataSource; +import cn.bootx.platform.baseapi.param.dynamicsource.DynamicDataSourceParam; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicsource/dao/DynamicDataSourceMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceMapper.java similarity index 65% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicsource/dao/DynamicDataSourceMapper.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceMapper.java index 2ff071c0b5adbea37a606d7d645bf5e3c8fb831f..9085dbcdbd8c4354206b1223415c4f8f258f9037 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicsource/dao/DynamicDataSourceMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.core.dynamicsource.dao; +package cn.bootx.platform.baseapi.core.dynamicsource.dao; -import cn.bootx.baseapi.core.dynamicsource.entity.DynamicDataSource; +import cn.bootx.platform.baseapi.core.dynamicsource.entity.DynamicDataSource; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -13,4 +13,4 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface DynamicDataSourceMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicsource/entity/DynamicDataSource.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/entity/DynamicDataSource.java similarity index 70% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicsource/entity/DynamicDataSource.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/entity/DynamicDataSource.java index a5d762232b292ac28545025750b64f686fe2ccc4..2e5bcb81c1e388eb9531eda37b1d01c6438fa96b 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicsource/entity/DynamicDataSource.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/entity/DynamicDataSource.java @@ -1,11 +1,11 @@ -package cn.bootx.baseapi.core.dynamicsource.entity; - -import cn.bootx.baseapi.core.dynamicsource.convert.DynamicDataSourceConvert; -import cn.bootx.baseapi.dto.dynamicsource.DynamicDataSourceDto; -import cn.bootx.baseapi.param.dynamicsource.DynamicDataSourceParam; -import cn.bootx.common.core.annotation.EncryptionField; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; +package cn.bootx.platform.baseapi.core.dynamicsource.entity; + +import cn.bootx.platform.baseapi.core.dynamicsource.convert.DynamicDataSourceConvert; +import cn.bootx.platform.baseapi.dto.dynamicsource.DynamicDataSourceDto; +import cn.bootx.platform.baseapi.param.dynamicsource.DynamicDataSourceParam; +import cn.bootx.platform.common.core.annotation.EncryptionField; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicsource/service/DynamicDataSourceService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/service/DynamicDataSourceService.java similarity index 89% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicsource/service/DynamicDataSourceService.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/service/DynamicDataSourceService.java index 702d229a91de08894e7b0dc6db0943713e5a4484..47fdf7706ac3662d12d723f09d8956d2de839e18 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/dynamicsource/service/DynamicDataSourceService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/service/DynamicDataSourceService.java @@ -1,16 +1,16 @@ -package cn.bootx.baseapi.core.dynamicsource.service; - -import cn.bootx.baseapi.core.dynamicsource.dao.DynamicDataSourceManager; -import cn.bootx.baseapi.core.dynamicsource.entity.DynamicDataSource; -import cn.bootx.baseapi.dto.dynamicsource.DynamicDataSourceDto; -import cn.bootx.baseapi.param.dynamicsource.DynamicDataSourceParam; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.dto.KeyValue; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.core.util.ResultConvertUtil; -import cn.bootx.common.mybatisplus.util.MpUtil; +package cn.bootx.platform.baseapi.core.dynamicsource.service; + +import cn.bootx.platform.baseapi.dto.dynamicsource.DynamicDataSourceDto; +import cn.bootx.platform.baseapi.param.dynamicsource.DynamicDataSourceParam; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.dto.KeyValue; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.ResultConvertUtil; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.baseapi.core.dynamicsource.dao.DynamicDataSourceManager; +import cn.bootx.platform.baseapi.core.dynamicsource.entity.DynamicDataSource; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.db.ds.simple.SimpleDataSource; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/keyvalue/dao/SysKeyValueManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/dao/SysKeyValueManager.java similarity index 62% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/keyvalue/dao/SysKeyValueManager.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/dao/SysKeyValueManager.java index 08037d6c3fa7654267500b9cd8b9614cc2bc9cc3..4912240d4cf6f088901dc14eb37ef945a658c3f6 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/keyvalue/dao/SysKeyValueManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/dao/SysKeyValueManager.java @@ -1,7 +1,7 @@ -package cn.bootx.baseapi.core.keyvalue.dao; +package cn.bootx.platform.baseapi.core.keyvalue.dao; -import cn.bootx.baseapi.core.keyvalue.entity.SysKeyValue; -import cn.bootx.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.baseapi.core.keyvalue.entity.SysKeyValue; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/keyvalue/dao/SysKeyValueMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/dao/SysKeyValueMapper.java similarity index 65% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/keyvalue/dao/SysKeyValueMapper.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/dao/SysKeyValueMapper.java index 4857497818119a3217291817696a4d84ed8ca08e..6830b32fbc8f53d591f796d038529040bffdae4f 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/keyvalue/dao/SysKeyValueMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/dao/SysKeyValueMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.core.keyvalue.dao; +package cn.bootx.platform.baseapi.core.keyvalue.dao; -import cn.bootx.baseapi.core.keyvalue.entity.SysKeyValue; +import cn.bootx.platform.baseapi.core.keyvalue.entity.SysKeyValue; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/keyvalue/entity/SysKeyValue.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/entity/SysKeyValue.java similarity index 83% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/keyvalue/entity/SysKeyValue.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/entity/SysKeyValue.java index 7e77c4da8886a2c5cd6018ce1e0108a727a582c5..8bc10663800dc5a583db4c1c040f8371a1af5d92 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/keyvalue/entity/SysKeyValue.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/entity/SysKeyValue.java @@ -1,7 +1,7 @@ -package cn.bootx.baseapi.core.keyvalue.entity; +package cn.bootx.platform.baseapi.core.keyvalue.entity; -import cn.bootx.common.core.rest.dto.KeyValue; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.common.core.rest.dto.KeyValue; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/keyvalue/service/SysKeyValueService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/service/SysKeyValueService.java similarity index 80% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/keyvalue/service/SysKeyValueService.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/service/SysKeyValueService.java index a492340aa94493212d823d5c96fdfc6f23e47a10..af2c90a84a550a7b985b7b58411e749f1781f1f1 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/keyvalue/service/SysKeyValueService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/service/SysKeyValueService.java @@ -1,9 +1,9 @@ -package cn.bootx.baseapi.core.keyvalue.service; +package cn.bootx.platform.baseapi.core.keyvalue.service; -import cn.bootx.baseapi.core.keyvalue.dao.SysKeyValueManager; -import cn.bootx.baseapi.core.keyvalue.entity.SysKeyValue; -import cn.bootx.common.core.function.SystemKeyValueService; -import cn.bootx.common.core.rest.dto.KeyValue; +import cn.bootx.platform.common.core.function.SystemKeyValueService; +import cn.bootx.platform.common.core.rest.dto.KeyValue; +import cn.bootx.platform.baseapi.core.keyvalue.dao.SysKeyValueManager; +import cn.bootx.platform.baseapi.core.keyvalue.entity.SysKeyValue; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/parameter/convert/SystemConvert.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/convert/SystemConvert.java similarity index 59% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/parameter/convert/SystemConvert.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/convert/SystemConvert.java index b5ca852a88fc42de9b6ba30fb415c2fb08ac49ea..6dfecc4e8c7a46d1764b0d031ec2865599e1d603 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/parameter/convert/SystemConvert.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/convert/SystemConvert.java @@ -1,8 +1,8 @@ -package cn.bootx.baseapi.core.parameter.convert; +package cn.bootx.platform.baseapi.core.parameter.convert; -import cn.bootx.baseapi.core.parameter.entity.SystemParameter; -import cn.bootx.baseapi.dto.parameter.SystemParameterDto; -import cn.bootx.baseapi.param.system.SystemParameterParam; +import cn.bootx.platform.baseapi.dto.parameter.SystemParameterDto; +import cn.bootx.platform.baseapi.param.system.SystemParameterParam; +import cn.bootx.platform.baseapi.core.parameter.entity.SystemParameter; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/parameter/dao/SystemParamManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/dao/SystemParamManager.java similarity index 73% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/parameter/dao/SystemParamManager.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/dao/SystemParamManager.java index 80c94bddb5a928f07f66d49aa382b918e89a6766..db70e0eabdfd67ebe73561ebc50abd35036b6d1e 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/parameter/dao/SystemParamManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/dao/SystemParamManager.java @@ -1,11 +1,12 @@ -package cn.bootx.baseapi.core.parameter.dao; +package cn.bootx.platform.baseapi.core.parameter.dao; -import cn.bootx.baseapi.core.parameter.entity.SystemParameter; -import cn.bootx.baseapi.param.system.SystemParameterParam; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.baseapi.code.CachingCode; +import cn.bootx.platform.baseapi.core.parameter.entity.SystemParameter; +import cn.bootx.platform.baseapi.param.system.SystemParameterParam; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; @@ -17,8 +18,6 @@ import org.springframework.stereotype.Repository; import java.io.Serializable; import java.util.Optional; -import static cn.bootx.baseapi.code.CachingCode.SYSTEM_PARAM; - /** * 系统参数 * @@ -31,13 +30,13 @@ import static cn.bootx.baseapi.code.CachingCode.SYSTEM_PARAM; public class SystemParamManager extends BaseManager { @Override - @CacheEvict(value = SYSTEM_PARAM, allEntries = true) + @CacheEvict(value = CachingCode.SYSTEM_PARAM, allEntries = true) public SystemParameter updateById(SystemParameter systemParameter) { return super.updateById(systemParameter); } @Override - @CacheEvict(value = SYSTEM_PARAM, allEntries = true) + @CacheEvict(value = CachingCode.SYSTEM_PARAM, allEntries = true) public boolean deleteById(Serializable id) { return super.deleteById(id); } @@ -45,7 +44,7 @@ public class SystemParamManager extends BaseManager findByParamKey(String key) { return this.findByField(SystemParameter::getParamKey, key); } diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/parameter/dao/SystemParamMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/dao/SystemParamMapper.java similarity index 64% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/parameter/dao/SystemParamMapper.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/dao/SystemParamMapper.java index 35253c6c86a1c0cf8a5e2ed0b6914ac672005a51..02b3be62f1d33a790e61daf1b008253d546d0c1b 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/parameter/dao/SystemParamMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/dao/SystemParamMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.core.parameter.dao; +package cn.bootx.platform.baseapi.core.parameter.dao; -import cn.bootx.baseapi.core.parameter.entity.SystemParameter; +import cn.bootx.platform.baseapi.core.parameter.entity.SystemParameter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/parameter/entity/SystemParameter.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/entity/SystemParameter.java similarity index 74% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/parameter/entity/SystemParameter.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/entity/SystemParameter.java index 4c8daeeb8dee9d7dff5699258ac345f676c48147..bb75d4c9a68552a1bb0e2cd9ff9c73e5a1bb92a7 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/parameter/entity/SystemParameter.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/entity/SystemParameter.java @@ -1,10 +1,10 @@ -package cn.bootx.baseapi.core.parameter.entity; +package cn.bootx.platform.baseapi.core.parameter.entity; -import cn.bootx.baseapi.core.parameter.convert.SystemConvert; -import cn.bootx.baseapi.dto.parameter.SystemParameterDto; -import cn.bootx.baseapi.param.system.SystemParameterParam; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.baseapi.core.parameter.convert.SystemConvert; +import cn.bootx.platform.baseapi.dto.parameter.SystemParameterDto; +import cn.bootx.platform.baseapi.param.system.SystemParameterParam; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/parameter/service/SystemParamService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/service/SystemParamService.java similarity index 82% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/parameter/service/SystemParamService.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/service/SystemParamService.java index fe664f996f26dae78ded19ce31a1d844684bcbd5..e195a8d1bc1dc667dde091574ec6fa5ff5fef24e 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/parameter/service/SystemParamService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/service/SystemParamService.java @@ -1,15 +1,15 @@ -package cn.bootx.baseapi.core.parameter.service; +package cn.bootx.platform.baseapi.core.parameter.service; -import cn.bootx.baseapi.core.parameter.dao.SystemParamManager; -import cn.bootx.baseapi.core.parameter.entity.SystemParameter; -import cn.bootx.baseapi.dto.parameter.SystemParameterDto; -import cn.bootx.baseapi.param.system.SystemParameterParam; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.function.ParamService; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.baseapi.dto.parameter.SystemParameterDto; +import cn.bootx.platform.baseapi.param.system.SystemParameterParam; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.function.ParamService; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.baseapi.core.parameter.dao.SystemParamManager; +import cn.bootx.platform.baseapi.core.parameter.entity.SystemParameter; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/AreaManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/AreaManager.java similarity index 70% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/AreaManager.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/AreaManager.java index a618596af2b3fcf2047b85439ba74d19735a5cfe..2b1593875adf95254295f31acffcae0ca5ae6ca5 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/AreaManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/AreaManager.java @@ -1,7 +1,7 @@ -package cn.bootx.baseapi.core.region.dao; +package cn.bootx.platform.baseapi.core.region.dao; -import cn.bootx.baseapi.core.region.entity.Area; -import cn.bootx.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.baseapi.core.region.entity.Area; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/AreaMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/AreaMapper.java similarity index 67% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/AreaMapper.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/AreaMapper.java index 028dca014a13a4ec5c44e0e9b9d445e055e758c1..5cb4759c98601c8a3a98ec018fef00dc72c5216c 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/AreaMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/AreaMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.core.region.dao; +package cn.bootx.platform.baseapi.core.region.dao; -import cn.bootx.baseapi.core.region.entity.Area; +import cn.bootx.platform.baseapi.core.region.entity.Area; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/CityManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/CityManager.java similarity index 71% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/CityManager.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/CityManager.java index c833b0fbbb0d6c448c037f1f705a309a09382360..34de04320c8bd2726d79d3711810e9bc9d3054c5 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/CityManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/CityManager.java @@ -1,7 +1,7 @@ -package cn.bootx.baseapi.core.region.dao; +package cn.bootx.platform.baseapi.core.region.dao; -import cn.bootx.baseapi.core.region.entity.City; -import cn.bootx.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.baseapi.core.region.entity.City; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/CityMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/CityMapper.java similarity index 67% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/CityMapper.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/CityMapper.java index 3fdda764e0faf2d7228ce34013de33cb7a087277..0f906aed1cf6733c2ec3d055fcf2df85673f7c78 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/CityMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/CityMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.core.region.dao; +package cn.bootx.platform.baseapi.core.region.dao; -import cn.bootx.baseapi.core.region.entity.City; +import cn.bootx.platform.baseapi.core.region.entity.City; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/ProvinceManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/ProvinceManager.java similarity index 54% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/ProvinceManager.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/ProvinceManager.java index 6e95fe2796e0e00243b08779c42bb6741ccfed7c..07dc2d32ce7dad16d4c2e65f5355e9550b0b693d 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/ProvinceManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/ProvinceManager.java @@ -1,13 +1,10 @@ -package cn.bootx.baseapi.core.region.dao; +package cn.bootx.platform.baseapi.core.region.dao; -import cn.bootx.baseapi.core.region.entity.City; -import cn.bootx.baseapi.core.region.entity.Province; -import cn.bootx.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.baseapi.core.region.entity.Province; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; -import java.util.List; - /** * 省份表 * diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/ProvinceMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/ProvinceMapper.java similarity index 67% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/ProvinceMapper.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/ProvinceMapper.java index 80665373ffdab9f905172fc2793e52c156eff4bf..536a801d8a364d223c55dffe448c5387e2f42aef 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/ProvinceMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/ProvinceMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.core.region.dao; +package cn.bootx.platform.baseapi.core.region.dao; -import cn.bootx.baseapi.core.region.entity.Province; +import cn.bootx.platform.baseapi.core.region.entity.Province; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/StreetManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/StreetManager.java similarity index 70% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/StreetManager.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/StreetManager.java index 2ac8dc4f8698054f1cefb3469d1a8afb545ac7fe..cab30559ed633bfa7b0989204c048f8071f52d07 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/StreetManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/StreetManager.java @@ -1,7 +1,7 @@ -package cn.bootx.baseapi.core.region.dao; +package cn.bootx.platform.baseapi.core.region.dao; -import cn.bootx.baseapi.core.region.entity.Street; -import cn.bootx.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.baseapi.core.region.entity.Street; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/StreetMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/StreetMapper.java similarity index 67% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/StreetMapper.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/StreetMapper.java index 76d7b97f89ff19f0c298a830cf2b9b1eb4003aa7..58114551c25467c745bd22bc2287a3b24129ab29 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/StreetMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/StreetMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.core.region.dao; +package cn.bootx.platform.baseapi.core.region.dao; -import cn.bootx.baseapi.core.region.entity.Street; +import cn.bootx.platform.baseapi.core.region.entity.Street; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -13,4 +13,4 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface StreetMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/VillageManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/VillageManager.java similarity index 71% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/VillageManager.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/VillageManager.java index 72202695546a8a67937a24e7a38dced97e89614b..aeaf3a1370381a7640341d25cbfc642e9badf08f 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/VillageManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/VillageManager.java @@ -1,7 +1,7 @@ -package cn.bootx.baseapi.core.region.dao; +package cn.bootx.platform.baseapi.core.region.dao; -import cn.bootx.baseapi.core.region.entity.Village; -import cn.bootx.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.baseapi.core.region.entity.Village; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/VillageMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/VillageMapper.java similarity index 67% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/VillageMapper.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/VillageMapper.java index 9f529e2abc6f1f0865cb75a335b9b885bbf279b8..d13742a49eb50e705d400e4b2eab7b18c89398ef 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/dao/VillageMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/VillageMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.core.region.dao; +package cn.bootx.platform.baseapi.core.region.dao; -import cn.bootx.baseapi.core.region.entity.Village; +import cn.bootx.platform.baseapi.core.region.entity.Village; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/entity/Area.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Area.java similarity index 82% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/entity/Area.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Area.java index a84e6515ad2ade57fc80e5ce8b51f5ed73de6184..d7a96d48625cbd17ee0c00013810cf34cf175c55 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/entity/Area.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Area.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.core.region.entity; +package cn.bootx.platform.baseapi.core.region.entity; -import cn.bootx.baseapi.dto.region.RegionDto; +import cn.bootx.platform.baseapi.dto.region.RegionDto; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/entity/City.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/City.java similarity index 83% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/entity/City.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/City.java index fb050d7426510fae14d085c8297a1bcadae3839b..aea0abedc9ce18156c210b4160925ed350d6baa0 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/entity/City.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/City.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.core.region.entity; +package cn.bootx.platform.baseapi.core.region.entity; -import cn.bootx.baseapi.dto.region.RegionDto; +import cn.bootx.platform.baseapi.dto.region.RegionDto; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/entity/Province.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Province.java similarity index 81% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/entity/Province.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Province.java index cb496e42d4b604248697c890f354b3cee0d66772..23d40b86649b6dfa81f8e6704da975a09fa35da8 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/entity/Province.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Province.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.core.region.entity; +package cn.bootx.platform.baseapi.core.region.entity; -import cn.bootx.baseapi.dto.region.RegionDto; +import cn.bootx.platform.baseapi.dto.region.RegionDto; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/entity/Street.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Street.java similarity index 83% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/entity/Street.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Street.java index 8d34e43fd24c6179624e76683fba511c888c5b37..db0737000e431437ee7a0b21b464c4cff100f290 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/entity/Street.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Street.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.core.region.entity; +package cn.bootx.platform.baseapi.core.region.entity; -import cn.bootx.baseapi.dto.region.RegionDto; +import cn.bootx.platform.baseapi.dto.region.RegionDto; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/entity/Village.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Village.java similarity index 83% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/entity/Village.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Village.java index f3dc6ae133d690164e5dafb7f39516be8ae2ac1d..3211ccdd2bf5c13ed58f92a9ed2ac15707b72842 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/entity/Village.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Village.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.core.region.entity; +package cn.bootx.platform.baseapi.core.region.entity; -import cn.bootx.baseapi.dto.region.RegionDto; +import cn.bootx.platform.baseapi.dto.region.RegionDto; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/service/ChinaRegionService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/service/ChinaRegionService.java similarity index 84% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/service/ChinaRegionService.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/service/ChinaRegionService.java index 32852c0eaf799b5c5d12b66b7669ddf522aab9d3..3f54f6effa0f93f9ffe382941ce36649874962b9 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/region/service/ChinaRegionService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/service/ChinaRegionService.java @@ -1,10 +1,11 @@ -package cn.bootx.baseapi.core.region.service; +package cn.bootx.platform.baseapi.core.region.service; -import cn.bootx.baseapi.code.ChinaRegionCode; -import cn.bootx.baseapi.core.region.dao.*; -import cn.bootx.baseapi.core.region.entity.*; -import cn.bootx.baseapi.dto.region.RegionDto; -import cn.bootx.common.core.util.TreeBuildUtil; +import cn.bootx.platform.baseapi.code.CachingCode; +import cn.bootx.platform.baseapi.code.ChinaRegionCode; +import cn.bootx.platform.baseapi.core.region.dao.*; +import cn.bootx.platform.baseapi.core.region.entity.*; +import cn.bootx.platform.baseapi.dto.region.RegionDto; +import cn.bootx.platform.common.core.util.TreeBuildUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.cache.annotation.Cacheable; @@ -14,8 +15,6 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import static cn.bootx.baseapi.code.CachingCode.CHINA_REGION; - /** * 中国行政区划 * @@ -40,7 +39,7 @@ public class ChinaRegionService { /** * 根据区划级别和上级区划代码获取当前行政区划的列表 */ - @Cacheable(value = CHINA_REGION, key = "#parentCode") + @Cacheable(value = CachingCode.CHINA_REGION, key = "#parentCode") public List findAllRegionByParentCode(String parentCode) { if (parentCode.length() == ChinaRegionCode.IMPORT_TYPE_PROVINCE.getLength()) { return cityManager.findAllByProvinceCode(parentCode).stream().map(City::toDto).collect(Collectors.toList()); @@ -65,7 +64,7 @@ public class ChinaRegionService { /** * 获取一级行政区 */ - @Cacheable(value = CHINA_REGION, key = "'p'") + @Cacheable(value = CachingCode.CHINA_REGION, key = "'p'") public List findAllProvince() { return provinceManager.findAll().stream().map(Province::toDto).collect(Collectors.toList()); } @@ -73,7 +72,7 @@ public class ChinaRegionService { /** * 获取省市联动列表 */ - @Cacheable(value = CHINA_REGION, key = "'pc'") + @Cacheable(value = CachingCode.CHINA_REGION, key = "'pc'") public List findAllProvinceAndCity() { List provinceList = provinceManager.findAll() .stream() @@ -90,7 +89,7 @@ public class ChinaRegionService { /** * 获取省市区县联动列表 */ - @Cacheable(value = CHINA_REGION, key = "'pca'") + @Cacheable(value = CachingCode.CHINA_REGION, key = "'pca'") public List findAllProvinceAndCityAndArea() { List provinceList = provinceManager.findAll() .stream() diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/sql/convert/QuerySqlConvert.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/convert/QuerySqlConvert.java similarity index 58% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/sql/convert/QuerySqlConvert.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/convert/QuerySqlConvert.java index 9721c40e59925fc05a1d9a06c02e8ab752cf8724..ffbeedde2f9bb9c176a2dc76adf9b6e763262d67 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/sql/convert/QuerySqlConvert.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/convert/QuerySqlConvert.java @@ -1,8 +1,8 @@ -package cn.bootx.baseapi.core.sql.convert; +package cn.bootx.platform.baseapi.core.sql.convert; -import cn.bootx.baseapi.core.sql.entity.QuerySql; -import cn.bootx.baseapi.dto.sql.QuerySqlDto; -import cn.bootx.baseapi.param.sql.QuerySqlParam; +import cn.bootx.platform.baseapi.core.sql.entity.QuerySql; +import cn.bootx.platform.baseapi.dto.sql.QuerySqlDto; +import cn.bootx.platform.baseapi.param.sql.QuerySqlParam; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/sql/dao/QuerySqlManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/dao/QuerySqlManager.java similarity index 57% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/sql/dao/QuerySqlManager.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/dao/QuerySqlManager.java index 885d2e072d864bae393e3b96cfbcf323a862af2d..022dd6be5cf4c2f65ba0a33c9212642a8afb69f0 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/sql/dao/QuerySqlManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/dao/QuerySqlManager.java @@ -1,7 +1,7 @@ -package cn.bootx.baseapi.core.sql.dao; +package cn.bootx.platform.baseapi.core.sql.dao; -import cn.bootx.baseapi.core.sql.entity.QuerySql; -import cn.bootx.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.baseapi.core.sql.entity.QuerySql; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/sql/dao/QuerySqlMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/dao/QuerySqlMapper.java similarity index 67% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/sql/dao/QuerySqlMapper.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/dao/QuerySqlMapper.java index 4b07d9c2a306dcaeda26d22d0ac1fcc17f6627cc..714cff920135748a10f4b3285c62753ce6dfe083 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/sql/dao/QuerySqlMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/dao/QuerySqlMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.core.sql.dao; +package cn.bootx.platform.baseapi.core.sql.dao; -import cn.bootx.baseapi.core.sql.entity.QuerySql; +import cn.bootx.platform.baseapi.core.sql.entity.QuerySql; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/sql/entity/QuerySql.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/entity/QuerySql.java similarity index 55% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/sql/entity/QuerySql.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/entity/QuerySql.java index c49750edb16112df6c6db241d5c6d77a0c4290a7..c002d399166ef4c92b40aff3a95fa972ea1ab9e6 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/sql/entity/QuerySql.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/entity/QuerySql.java @@ -1,14 +1,11 @@ -package cn.bootx.baseapi.core.sql.entity; - -import cn.bootx.baseapi.core.sql.convert.QuerySqlConvert; -import cn.bootx.baseapi.dto.sql.QuerySqlDto; -import cn.bootx.common.core.annotation.BigField; -import cn.bootx.common.core.annotation.actable.Column; -import cn.bootx.common.core.annotation.actable.Table; -import cn.bootx.common.core.code.actable.MySqlFieldType; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.common.mybatisplus.handler.JacksonRawTypeHandler; +package cn.bootx.platform.baseapi.core.sql.entity; + +import cn.bootx.platform.baseapi.core.sql.convert.QuerySqlConvert; +import cn.bootx.platform.baseapi.dto.sql.QuerySqlDto; +import cn.bootx.platform.common.core.annotation.BigField; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.common.mybatisplus.handler.JacksonRawTypeHandler; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -26,36 +23,29 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Data @Accessors(chain = true) -@Table(comment = "SQL查询语句") @TableName(value = "base_query_sql", autoResultMap = true) public class QuerySql extends MpBaseEntity implements EntityBaseFunction { /** 数据源ID */ - @Column(comment = "数据源ID") private Long databaseId; /** 名称 */ - @Column(comment = "名称") private String name; /** 是否集合 */ - @Column(comment = "是否集合") private Boolean isList; /** sql语句 */ @BigField - @Column(comment = "sql语句", type = MySqlFieldType.TEXT) private String sql; /** SQL查询参数 */ @BigField - @Column(comment = "SQL查询参数", type = MySqlFieldType.LONGTEXT) @TableField(typeHandler = JacksonRawTypeHandler.class) private List params; /** SQL查询结果字段 */ @BigField - @Column(comment = "SQL查询结果字段", type = MySqlFieldType.LONGTEXT) @TableField(typeHandler = JacksonRawTypeHandler.class) private List fields; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/sql/entity/SqlField.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/entity/SqlField.java similarity index 83% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/sql/entity/SqlField.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/entity/SqlField.java index fd7d6499030ed4872d830303a2756d20fe82aeb1..4a8a757ed6427c28fcb0cd595c9a1f401a3caa52 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/sql/entity/SqlField.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/entity/SqlField.java @@ -1,4 +1,4 @@ -package cn.bootx.baseapi.core.sql.entity; +package cn.bootx.platform.baseapi.core.sql.entity; import lombok.Getter; import lombok.Setter; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/sql/entity/SqlParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/entity/SqlParam.java similarity index 65% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/sql/entity/SqlParam.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/entity/SqlParam.java index d77902fb8b4a33207142b2b1da27f2e4b778ff2d..acead8da6a81acc4cea25fd394fa26a00161a6fd 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/sql/entity/SqlParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/entity/SqlParam.java @@ -1,5 +1,6 @@ -package cn.bootx.baseapi.core.sql.entity; +package cn.bootx.platform.baseapi.core.sql.entity; +import cn.bootx.platform.baseapi.code.QuerySqlCode; import lombok.Getter; import lombok.Setter; @@ -18,7 +19,7 @@ public class SqlParam { /** * 类型 * - * @see cn.bootx.baseapi.code.QuerySqlCode + * @see QuerySqlCode */ private String type; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/sql/service/QuerySqlService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/service/QuerySqlService.java similarity index 86% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/sql/service/QuerySqlService.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/service/QuerySqlService.java index 32e2dedbd3c3f6b6d6c3cc376bbe345ec87ccf03..109cb840450b42b3695d0a3b9be1bcbf49ccfaf3 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/core/sql/service/QuerySqlService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/service/QuerySqlService.java @@ -1,16 +1,16 @@ -package cn.bootx.baseapi.core.sql.service; - -import cn.bootx.baseapi.code.QuerySqlCode; -import cn.bootx.baseapi.core.dynamicsource.dao.DynamicDataSourceManager; -import cn.bootx.baseapi.core.dynamicsource.entity.DynamicDataSource; -import cn.bootx.baseapi.core.dynamicsource.service.DynamicDataSourceService; -import cn.bootx.baseapi.core.sql.dao.QuerySqlManager; -import cn.bootx.baseapi.core.sql.entity.QuerySql; -import cn.bootx.baseapi.core.sql.entity.SqlParam; -import cn.bootx.baseapi.param.sql.QueryFieldParam; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.function.CollectorsFunction; -import cn.bootx.starter.auth.util.SecurityUtil; +package cn.bootx.platform.baseapi.core.sql.service; + +import cn.bootx.platform.baseapi.code.QuerySqlCode; +import cn.bootx.platform.baseapi.core.dynamicsource.dao.DynamicDataSourceManager; +import cn.bootx.platform.baseapi.core.dynamicsource.entity.DynamicDataSource; +import cn.bootx.platform.baseapi.core.dynamicsource.service.DynamicDataSourceService; +import cn.bootx.platform.baseapi.core.sql.dao.QuerySqlManager; +import cn.bootx.platform.baseapi.core.sql.entity.QuerySql; +import cn.bootx.platform.baseapi.core.sql.entity.SqlParam; +import cn.bootx.platform.baseapi.param.sql.QueryFieldParam; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.function.CollectorsFunction; +import cn.bootx.platform.starter.auth.util.SecurityUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.db.Entity; import cn.hutool.db.handler.EntityHandler; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/app/AppVersionDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/app/AppVersionDto.java similarity index 87% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/app/AppVersionDto.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/app/AppVersionDto.java index ab3790eec8fcd331470e9a2daaaf2c681832ddb6..daf3a20e1413b75cd21e5a3d9974964d7e8d70dd 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/app/AppVersionDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/app/AppVersionDto.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.dto.app; +package cn.bootx.platform.baseapi.dto.app; -import cn.bootx.common.core.rest.dto.BaseDto; +import cn.bootx.platform.common.core.rest.dto.BaseDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/captcha/CaptchaDataResult.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/captcha/CaptchaDataResult.java similarity index 91% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/captcha/CaptchaDataResult.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/captcha/CaptchaDataResult.java index 6a4cabb26ac0625e5694cee50609521c2c80fc37..9f8c052e747bd2ec5428fc63518058570b85f8e6 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/captcha/CaptchaDataResult.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/captcha/CaptchaDataResult.java @@ -1,4 +1,4 @@ -package cn.bootx.baseapi.dto.captcha; +package cn.bootx.platform.baseapi.dto.captcha; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/dict/DictionaryDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryDto.java similarity index 89% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/dict/DictionaryDto.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryDto.java index 8a2382578412bd078881b1249763a2f677e85c08..95c26c89d23d71003c52f072cb65511bcb168b73 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/dict/DictionaryDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryDto.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.dto.dict; +package cn.bootx.platform.baseapi.dto.dict; -import cn.bootx.common.core.rest.dto.BaseDto; +import cn.bootx.platform.common.core.rest.dto.BaseDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/dict/DictionaryItemDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryItemDto.java similarity index 90% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/dict/DictionaryItemDto.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryItemDto.java index e5e92ccb8acae0b92a8354b6dbd09d44ff80aada..5a2c60f63bc34ea04400d9cbaf228eff55ae3e57 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/dict/DictionaryItemDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryItemDto.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.dto.dict; +package cn.bootx.platform.baseapi.dto.dict; -import cn.bootx.common.core.rest.dto.BaseDto; +import cn.bootx.platform.common.core.rest.dto.BaseDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/dict/DictionaryItemSimpleDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryItemSimpleDto.java similarity index 93% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/dict/DictionaryItemSimpleDto.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryItemSimpleDto.java index 26cfd48215979432abf6c2bb4af8ec9d979bb34f..fcdc37f9825067951cea40389ca9bb823e250804 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/dict/DictionaryItemSimpleDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryItemSimpleDto.java @@ -1,4 +1,4 @@ -package cn.bootx.baseapi.dto.dict; +package cn.bootx.platform.baseapi.dto.dict; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/dynamicform/DynamicFormDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dynamicform/DynamicFormDto.java similarity index 85% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/dynamicform/DynamicFormDto.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dynamicform/DynamicFormDto.java index cb59901d9c1276c8190d6e35ad39ae25cbd1ee75..3556811c5c05b4454be0e7673d688d29b0e0d042 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/dynamicform/DynamicFormDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dynamicform/DynamicFormDto.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.dto.dynamicform; +package cn.bootx.platform.baseapi.dto.dynamicform; -import cn.bootx.common.core.rest.dto.BaseDto; +import cn.bootx.platform.common.core.rest.dto.BaseDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -30,4 +30,4 @@ public class DynamicFormDto extends BaseDto { @Schema(description = "备注") private String remark; -} \ No newline at end of file +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/dynamicsource/DynamicDataSourceDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dynamicsource/DynamicDataSourceDto.java similarity index 85% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/dynamicsource/DynamicDataSourceDto.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dynamicsource/DynamicDataSourceDto.java index 90238626d90b9271766941fcfafb52af61aa0d2a..559c1db5af2af8ba1b192d728f10ef4e933f94a3 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/dynamicsource/DynamicDataSourceDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dynamicsource/DynamicDataSourceDto.java @@ -1,7 +1,7 @@ -package cn.bootx.baseapi.dto.dynamicsource; +package cn.bootx.platform.baseapi.dto.dynamicsource; -import cn.bootx.common.core.rest.dto.BaseDto; -import cn.bootx.starter.data.perm.sensitive.SensitiveInfo; +import cn.bootx.platform.common.core.rest.dto.BaseDto; +import cn.bootx.platform.starter.data.perm.sensitive.SensitiveInfo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/parameter/SystemParameterDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/parameter/SystemParameterDto.java similarity index 89% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/parameter/SystemParameterDto.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/parameter/SystemParameterDto.java index 015e9fd5b7de46ef215f9ad2dbb4693f9ae6e90a..ad78445183dd8c9821e9e3d98e4a092b1f5b0d1e 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/parameter/SystemParameterDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/parameter/SystemParameterDto.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.dto.parameter; +package cn.bootx.platform.baseapi.dto.parameter; -import cn.bootx.common.core.rest.dto.BaseDto; +import cn.bootx.platform.common.core.rest.dto.BaseDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/region/RegionDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/region/RegionDto.java similarity index 94% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/region/RegionDto.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/region/RegionDto.java index fa96068f3e54cf5dad62fed4fc74d4be10f383cb..4191699e9151772c32d85c28bc6bd54e1a2d34d4 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/region/RegionDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/region/RegionDto.java @@ -1,4 +1,4 @@ -package cn.bootx.baseapi.dto.region; +package cn.bootx.platform.baseapi.dto.region; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/sql/QuerySqlDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/sql/QuerySqlDto.java similarity index 79% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/sql/QuerySqlDto.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/sql/QuerySqlDto.java index 635b601b84a5fa5e18f5e363db1c0ec65e146dbe..ef88e747da4bff70d357c33fa142d83bc9eb4722 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/dto/sql/QuerySqlDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/sql/QuerySqlDto.java @@ -1,8 +1,8 @@ -package cn.bootx.baseapi.dto.sql; +package cn.bootx.platform.baseapi.dto.sql; -import cn.bootx.baseapi.core.sql.entity.SqlField; -import cn.bootx.baseapi.core.sql.entity.SqlParam; -import cn.bootx.common.core.rest.dto.BaseDto; +import cn.bootx.platform.baseapi.core.sql.entity.SqlField; +import cn.bootx.platform.baseapi.core.sql.entity.SqlParam; +import cn.bootx.platform.common.core.rest.dto.BaseDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/exception/dict/DictAlreadyExistedException.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictAlreadyExistedException.java similarity index 47% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/exception/dict/DictAlreadyExistedException.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictAlreadyExistedException.java index d42f0a06fbfabcbf59fe36b72bafc8c68d4bed31..af538821aa5d5cc33ba7b48457ce55f5098a7637 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/exception/dict/DictAlreadyExistedException.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictAlreadyExistedException.java @@ -1,11 +1,10 @@ -package cn.bootx.baseapi.exception.dict; +package cn.bootx.platform.baseapi.exception.dict; -import cn.bootx.common.core.exception.BizException; +import cn.bootx.platform.baseapi.code.BspErrorCodes; +import cn.bootx.platform.common.core.exception.BizException; import java.io.Serializable; -import static cn.bootx.baseapi.code.BspErrorCodes.DICTIONARY_ALREADY_EXISTED; - /** * @author xxm * @date 2020/4/10 15:14 @@ -13,7 +12,7 @@ import static cn.bootx.baseapi.code.BspErrorCodes.DICTIONARY_ALREADY_EXISTED; public class DictAlreadyExistedException extends BizException implements Serializable { public DictAlreadyExistedException() { - super(DICTIONARY_ALREADY_EXISTED, "字典已经存在."); + super(BspErrorCodes.DICTIONARY_ALREADY_EXISTED, "字典已经存在."); } } diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/exception/dict/DictChildItemExistedException.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictChildItemExistedException.java similarity index 53% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/exception/dict/DictChildItemExistedException.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictChildItemExistedException.java index 592441c44475e4fb653736530b4fd8281c078f6a..f7e5bedc270ce81a51951c8e59ce9a41814e68ac 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/exception/dict/DictChildItemExistedException.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictChildItemExistedException.java @@ -1,11 +1,10 @@ -package cn.bootx.baseapi.exception.dict; +package cn.bootx.platform.baseapi.exception.dict; -import cn.bootx.common.core.exception.BizException; +import cn.bootx.platform.baseapi.code.BspErrorCodes; +import cn.bootx.platform.common.core.exception.BizException; import java.io.Serializable; -import static cn.bootx.baseapi.code.BspErrorCodes.CHILD_ITEM_EXISTED; - /** * @author xxm * @date 2020/4/16 22:08 @@ -15,7 +14,7 @@ public class DictChildItemExistedException extends BizException implements Seria private static final long serialVersionUID = -3964173905076738575L; public DictChildItemExistedException() { - super(CHILD_ITEM_EXISTED, "存在字典子项，您无法将其删除。"); + super(BspErrorCodes.CHILD_ITEM_EXISTED, "存在字典子项，您无法将其删除。"); } } diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/exception/dict/DictItemAlreadyExistedException.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemAlreadyExistedException.java similarity index 47% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/exception/dict/DictItemAlreadyExistedException.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemAlreadyExistedException.java index e9aeeec7f37e0e3a28941b42ee853db6b7cb70bc..be99f9e1c7b9d756649eeee2f59163488fa7c36e 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/exception/dict/DictItemAlreadyExistedException.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemAlreadyExistedException.java @@ -1,11 +1,10 @@ -package cn.bootx.baseapi.exception.dict; +package cn.bootx.platform.baseapi.exception.dict; -import cn.bootx.common.core.exception.BizException; +import cn.bootx.platform.baseapi.code.BspErrorCodes; +import cn.bootx.platform.common.core.exception.BizException; import java.io.Serializable; -import static cn.bootx.baseapi.code.BspErrorCodes.DICTIONARY_ITEM_ALREADY_EXISTED; - /** * @author xxm * @date 2020/4/21 11:53 @@ -13,7 +12,7 @@ import static cn.bootx.baseapi.code.BspErrorCodes.DICTIONARY_ITEM_ALREADY_EXISTE public class DictItemAlreadyExistedException extends BizException implements Serializable { public DictItemAlreadyExistedException() { - super(DICTIONARY_ITEM_ALREADY_EXISTED, "字典项目已存在."); + super(BspErrorCodes.DICTIONARY_ITEM_ALREADY_EXISTED, "字典项目已存在."); } } diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/exception/dict/DictItemAlreadyUsedException.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemAlreadyUsedException.java similarity index 46% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/exception/dict/DictItemAlreadyUsedException.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemAlreadyUsedException.java index 2e307553e8eaee8b3063e2f46b327d48c705e9a6..18a3681090e1db98e6c6ef5854edf6fe6638225c 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/exception/dict/DictItemAlreadyUsedException.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemAlreadyUsedException.java @@ -1,11 +1,10 @@ -package cn.bootx.baseapi.exception.dict; +package cn.bootx.platform.baseapi.exception.dict; -import cn.bootx.common.core.exception.BizException; +import cn.bootx.platform.baseapi.code.BspErrorCodes; +import cn.bootx.platform.common.core.exception.BizException; import java.io.Serializable; -import static cn.bootx.baseapi.code.BspErrorCodes.DICTIONARY_ITEM_ALREADY_USED; - /** * @author xxm * @date 2020/4/21 11:54 @@ -13,7 +12,7 @@ import static cn.bootx.baseapi.code.BspErrorCodes.DICTIONARY_ITEM_ALREADY_USED; public class DictItemAlreadyUsedException extends BizException implements Serializable { public DictItemAlreadyUsedException() { - super(DICTIONARY_ITEM_ALREADY_USED, "词典项目已被使用."); + super(BspErrorCodes.DICTIONARY_ITEM_ALREADY_USED, "词典项目已被使用."); } } diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/exception/dict/DictItemNotExistedException.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemNotExistedException.java similarity index 47% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/exception/dict/DictItemNotExistedException.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemNotExistedException.java index 6b6dc38cee6d4769e785a46f1623aeafa83c5bb6..b3fe17f51b51dd0a7033e9728d987651d66df713 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/exception/dict/DictItemNotExistedException.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemNotExistedException.java @@ -1,11 +1,10 @@ -package cn.bootx.baseapi.exception.dict; +package cn.bootx.platform.baseapi.exception.dict; -import cn.bootx.common.core.exception.BizException; +import cn.bootx.platform.baseapi.code.BspErrorCodes; +import cn.bootx.platform.common.core.exception.BizException; import java.io.Serializable; -import static cn.bootx.baseapi.code.BspErrorCodes.DICTIONARY_ITEM_NOT_EXISTED; - /** * @author xxm * @date 2020/4/21 11:54 @@ -13,7 +12,7 @@ import static cn.bootx.baseapi.code.BspErrorCodes.DICTIONARY_ITEM_NOT_EXISTED; public class DictItemNotExistedException extends BizException implements Serializable { public DictItemNotExistedException() { - super(DICTIONARY_ITEM_NOT_EXISTED, "字典项不存在."); + super(BspErrorCodes.DICTIONARY_ITEM_NOT_EXISTED, "字典项不存在."); } } diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/exception/dict/DictNotExistedException.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictNotExistedException.java similarity index 47% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/exception/dict/DictNotExistedException.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictNotExistedException.java index 7259b76ddab984b9a23104bd17526d7a3f0ac46b..ab64a684f957d3c36502ea9944cf6e5890fa36c4 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/exception/dict/DictNotExistedException.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictNotExistedException.java @@ -1,11 +1,10 @@ -package cn.bootx.baseapi.exception.dict; +package cn.bootx.platform.baseapi.exception.dict; -import cn.bootx.common.core.exception.BizException; +import cn.bootx.platform.baseapi.code.BspErrorCodes; +import cn.bootx.platform.common.core.exception.BizException; import java.io.Serializable; -import static cn.bootx.baseapi.code.BspErrorCodes.DICTIONARY_NOT_EXISTED; - /** * @author xxm * @date 2020/4/21 11:53 @@ -13,7 +12,7 @@ import static cn.bootx.baseapi.code.BspErrorCodes.DICTIONARY_NOT_EXISTED; public class DictNotExistedException extends BizException implements Serializable { public DictNotExistedException() { - super(DICTIONARY_NOT_EXISTED, "字典不存在."); + super(BspErrorCodes.DICTIONARY_NOT_EXISTED, "字典不存在."); } } diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/handler/mp/MpMetaObjectHandler.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/mp/MpMetaObjectHandler.java similarity index 86% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/handler/mp/MpMetaObjectHandler.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/mp/MpMetaObjectHandler.java index 634b601289b8b1445e53ce2795e96a7b51a0da47..1b67aff1093300a42754a6032a384891e7fb0e2b 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/handler/mp/MpMetaObjectHandler.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/mp/MpMetaObjectHandler.java @@ -1,8 +1,8 @@ -package cn.bootx.baseapi.handler.mp; +package cn.bootx.platform.baseapi.handler.mp; -import cn.bootx.common.core.code.CommonCode; -import cn.bootx.common.core.entity.UserDetail; -import cn.bootx.starter.auth.util.SecurityUtil; +import cn.bootx.platform.common.core.code.CommonCode; +import cn.bootx.platform.common.core.entity.UserDetail; +import cn.bootx.platform.starter.auth.util.SecurityUtil; import cn.hutool.core.util.DesensitizedUtil; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.apache.ibatis.reflection.MetaObject; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/handler/region/ChinaRegionInitSqlHandler.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/region/ChinaRegionInitSqlHandler.java similarity index 92% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/handler/region/ChinaRegionInitSqlHandler.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/region/ChinaRegionInitSqlHandler.java index 1dbf30226265f8d30a1e7477cb7433808f2feab9..05ad3b0a5bd001cf4c2b95a6bf0d2929f8bb1d5c 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/handler/region/ChinaRegionInitSqlHandler.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/region/ChinaRegionInitSqlHandler.java @@ -1,4 +1,4 @@ -package cn.bootx.baseapi.handler.region; +package cn.bootx.platform.baseapi.handler.region; import com.baomidou.mybatisplus.extension.ddl.SimpleDdl; import org.springframework.stereotype.Component; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/param/app/AppVersionParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/app/AppVersionParam.java similarity index 92% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/param/app/AppVersionParam.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/app/AppVersionParam.java index c84613fc46760d4c63a28399f17f8bd6d4e22dcc..d62cd06679af1b2c6ec95f60e4d4ca9780a1978d 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/param/app/AppVersionParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/app/AppVersionParam.java @@ -1,4 +1,4 @@ -package cn.bootx.baseapi.param.app; +package cn.bootx.platform.baseapi.param.app; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/param/dict/DictionaryItemParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dict/DictionaryItemParam.java similarity index 75% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/param/dict/DictionaryItemParam.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dict/DictionaryItemParam.java index c5969a37cd5d9c487461c48cc7f8abfd41ea0b14..aba346a7284981d8bca0abed1dd0e605e1606b5f 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/param/dict/DictionaryItemParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dict/DictionaryItemParam.java @@ -1,7 +1,6 @@ -package cn.bootx.baseapi.param.dict; +package cn.bootx.platform.baseapi.param.dict; -import cn.bootx.common.core.validation.ValidationGroup.add; -import cn.bootx.common.core.validation.ValidationGroup.edit; +import cn.bootx.platform.common.core.validation.ValidationGroup; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; @@ -24,8 +23,8 @@ public class DictionaryItemParam implements Serializable { private static final long serialVersionUID = -6847496213782805488L; - @Null(message = "Id需要为空", groups = add.class) - @NotNull(message = "Id不可为空", groups = edit.class) + @Null(message = "Id需要为空", groups = ValidationGroup.add.class) + @NotNull(message = "Id不可为空", groups = ValidationGroup.edit.class) @Schema(description = "主键") private Long id; @@ -36,15 +35,15 @@ public class DictionaryItemParam implements Serializable { @Schema(description = "字典编码") private String dictCode; - @NotEmpty(message = "字典项编码不可为空", groups = add.class) + @NotEmpty(message = "字典项编码不可为空", groups = ValidationGroup.add.class) @Schema(description = "字典项编码") private String code; - @NotEmpty(message = "字典项编码不可为空", groups = add.class) + @NotEmpty(message = "字典项编码不可为空", groups = ValidationGroup.add.class) @Schema(description = "名称") private String name; - @NotNull(message = "启用状态不可为空", groups = add.class) + @NotNull(message = "启用状态不可为空", groups = ValidationGroup.add.class) @Schema(description = "启用状态") private Boolean enable; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/param/dict/DictionaryParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dict/DictionaryParam.java similarity index 63% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/param/dict/DictionaryParam.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dict/DictionaryParam.java index cc52335bb19f2d0d5177d0da714ff1aca8c3db30..6a6dc4e80c09a850db6c5ec01c6e3a90da3fc781 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/param/dict/DictionaryParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dict/DictionaryParam.java @@ -1,7 +1,6 @@ -package cn.bootx.baseapi.param.dict; +package cn.bootx.platform.baseapi.param.dict; -import cn.bootx.common.core.validation.ValidationGroup.add; -import cn.bootx.common.core.validation.ValidationGroup.edit; +import cn.bootx.platform.common.core.validation.ValidationGroup; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; @@ -22,20 +21,20 @@ public class DictionaryParam implements Serializable { private static final long serialVersionUID = 8185789462442511856L; - @Null(message = "Id需要为空", groups = add.class) - @NotNull(message = "Id不可为空", groups = edit.class) + @Null(message = "Id需要为空", groups = ValidationGroup.add.class) + @NotNull(message = "Id不可为空", groups = ValidationGroup.edit.class) @Schema(description = "主键") private Long id; - @NotEmpty(message = "编码不可以为空", groups = add.class) + @NotEmpty(message = "编码不可以为空", groups = ValidationGroup.add.class) @Schema(description = "编码") private String code; - @NotEmpty(message = "编码不可以为空", groups = add.class) + @NotEmpty(message = "编码不可以为空", groups = ValidationGroup.add.class) @Schema(description = "名称") private String name; - @NotNull(message = "启用状态不可为空", groups = add.class) + @NotNull(message = "启用状态不可为空", groups = ValidationGroup.add.class) @Schema(description = "启用状态") private Boolean enable; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/param/dynamicform/DynamicFormParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dynamicform/DynamicFormParam.java similarity index 91% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/param/dynamicform/DynamicFormParam.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dynamicform/DynamicFormParam.java index f9771d5b87bea94a10f927d3e6e862db7892503d..ac1023476397040f53e536a62cf3ffada22ccb42 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/param/dynamicform/DynamicFormParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dynamicform/DynamicFormParam.java @@ -1,4 +1,4 @@ -package cn.bootx.baseapi.param.dynamicform; +package cn.bootx.platform.baseapi.param.dynamicform; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -30,4 +30,4 @@ public class DynamicFormParam { @Schema(description = "备注") private String remark; -} \ No newline at end of file +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/param/dynamicsource/DynamicDataSourceParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dynamicsource/DynamicDataSourceParam.java similarity index 94% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/param/dynamicsource/DynamicDataSourceParam.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dynamicsource/DynamicDataSourceParam.java index 12f7166ebc2736b3ec8dbbb6aed0d5622f9b3b5d..fa7f375add56808f841bc51e9b8f04a629a256da 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/param/dynamicsource/DynamicDataSourceParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dynamicsource/DynamicDataSourceParam.java @@ -1,4 +1,4 @@ -package cn.bootx.baseapi.param.dynamicsource; +package cn.bootx.platform.baseapi.param.dynamicsource; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/param/sql/QueryFieldParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/sql/QueryFieldParam.java similarity index 90% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/param/sql/QueryFieldParam.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/sql/QueryFieldParam.java index a942a1b8eac402f0aec472fd5bfc3afca654c458..a11d89725e9fb333d6e05dc825aee75ee1dd592d 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/param/sql/QueryFieldParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/sql/QueryFieldParam.java @@ -1,4 +1,4 @@ -package cn.bootx.baseapi.param.sql; +package cn.bootx.platform.baseapi.param.sql; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/param/sql/QuerySqlParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/sql/QuerySqlParam.java similarity index 83% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/param/sql/QuerySqlParam.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/sql/QuerySqlParam.java index 3309f3c806f3c4b6b09ebf6d40c899ed31833275..6a5d549e590f6a6a7861f4616c83b0df4089e521 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/param/sql/QuerySqlParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/sql/QuerySqlParam.java @@ -1,7 +1,7 @@ -package cn.bootx.baseapi.param.sql; +package cn.bootx.platform.baseapi.param.sql; -import cn.bootx.baseapi.core.sql.entity.SqlField; -import cn.bootx.baseapi.core.sql.entity.SqlParam; +import cn.bootx.platform.baseapi.core.sql.entity.SqlField; +import cn.bootx.platform.baseapi.core.sql.entity.SqlParam; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/param/system/SystemParameterParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/system/SystemParameterParam.java similarity index 92% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/param/system/SystemParameterParam.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/system/SystemParameterParam.java index 1f20a12b8301286858c409f2a565c6c42c86102a..0b2a1a993c99f56142430c949cf8fe85d64dae70 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/baseapi/param/system/SystemParameterParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/system/SystemParameterParam.java @@ -1,6 +1,6 @@ -package cn.bootx.baseapi.param.system; +package cn.bootx.platform.baseapi.param.system; -import cn.bootx.common.core.validation.ValidationGroup; +import cn.bootx.platform.common.core.validation.ValidationGroup; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-services/service-baseapi/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-services/service-baseapi/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 784c645321e54f44e2d7a51aab1b81adac4b9952..01825cbce4d3c903103e113293397d1b82e85d37 100644 --- a/bootx-services/service-baseapi/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-services/service-baseapi/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.baseapi.BaseApiApplication \ No newline at end of file +cn.bootx.platform.baseapi.BaseApiApplication diff --git a/bootx-services/service-iam/pom.xml b/bootx-services/service-iam/pom.xml index 510cea2f095477a9bda2cd11dad74a70d9414d85..c4348825011d28dc0b5e7c69a716e2d20f90cc41 100644 --- a/bootx-services/service-iam/pom.xml +++ b/bootx-services/service-iam/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-services - 1.2.3 + 1.3.0 4.0.0 @@ -48,11 +48,6 @@ cn.bootx.platform common-super-query - - - cn.bootx.platform - common-lock - cn.bootx.platform diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/IamApplication.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/IamApplication.java similarity index 91% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/IamApplication.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/IamApplication.java index a63c10d3bb864003168b3e67ce62930fabaa23dd..33566bd6230d155d83b8ed42e8c3e781861e0442 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/IamApplication.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/IamApplication.java @@ -1,4 +1,4 @@ -package cn.bootx.iam; +package cn.bootx.platform.iam; import org.apache.ibatis.annotations.Mapper; import org.mybatis.spring.annotation.MapperScan; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/code/CachingCode.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/CachingCode.java similarity index 92% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/code/CachingCode.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/CachingCode.java index 6d7e77a99c73abb810399e35631e1444e65143a2..3a7db05ec6b0244501dcc3149446f1fb3321fac9 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/code/CachingCode.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/CachingCode.java @@ -1,4 +1,4 @@ -package cn.bootx.iam.code; +package cn.bootx.platform.iam.code; /** * 缓存名称 diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/code/IamErrorCode.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/IamErrorCode.java similarity index 96% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/code/IamErrorCode.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/IamErrorCode.java index 89997a10a42e47da34ea2dd1f127b54a701a235b..236f4566d0ec1f6a2879fe5ecfa14c95b64aa4ef 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/code/IamErrorCode.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/IamErrorCode.java @@ -1,4 +1,4 @@ -package cn.bootx.iam.code; +package cn.bootx.platform.iam.code; /** * 用户中心错误码(21000-21999) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/code/OrgCategoryCode.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/OrgCategoryCode.java similarity index 86% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/code/OrgCategoryCode.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/OrgCategoryCode.java index 2f513acbb5da02c31246a8e6cfa375d0abc64fd8..3f85fe41301491540621c87ceb4752e764112aa5 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/code/OrgCategoryCode.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/OrgCategoryCode.java @@ -1,4 +1,4 @@ -package cn.bootx.iam.code; +package cn.bootx.platform.iam.code; /** * 部门组织机构类型 diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/code/PermissionCode.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/PermissionCode.java similarity index 90% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/code/PermissionCode.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/PermissionCode.java index acda5c438eeb1d1fa5d174f99a5758d594490052..55be6a732d6b7c237fb177366e8418a67883a7df 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/code/PermissionCode.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/PermissionCode.java @@ -1,4 +1,4 @@ -package cn.bootx.iam.code; +package cn.bootx.platform.iam.code; /** * 权限相关编码 diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/code/UserStatusCode.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/UserStatusCode.java similarity index 86% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/code/UserStatusCode.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/UserStatusCode.java index 6decdb3a209ef31ac2b7557eca7cc85e458cf934..25490690f2f3f204cc9bd4a34ca77fd1e0ab25cb 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/code/UserStatusCode.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/UserStatusCode.java @@ -1,4 +1,4 @@ -package cn.bootx.iam.code; +package cn.bootx.platform.iam.code; /** * 用户状态码 diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/AuthAssistController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/AuthAssistController.java similarity index 74% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/AuthAssistController.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/AuthAssistController.java index 191eefb1b34d380a949332f3495058add16e695a..3040af5a5b651c9d17767e73e84df4d82e1d4aa3 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/AuthAssistController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/AuthAssistController.java @@ -1,9 +1,9 @@ -package cn.bootx.iam.controller; +package cn.bootx.platform.iam.controller; -import cn.bootx.common.core.annotation.IgnoreAuth; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.iam.core.auth.service.AuthAssistService; +import cn.bootx.platform.common.core.annotation.IgnoreAuth; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.iam.core.auth.service.AuthAssistService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/ClientController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/ClientController.java similarity index 83% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/ClientController.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/ClientController.java index 45de1595bcb118ef91bf0c5e7d292638930d3a2a..46b778172b81c1853e25708aa9e12bb4e360b293 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/ClientController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/ClientController.java @@ -1,12 +1,12 @@ -package cn.bootx.iam.controller; +package cn.bootx.platform.iam.controller; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.iam.core.client.service.ClientService; -import cn.bootx.iam.dto.client.ClientDto; -import cn.bootx.iam.param.client.ClientParam; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.iam.core.client.service.ClientService; +import cn.bootx.platform.iam.dto.client.ClientDto; +import cn.bootx.platform.iam.param.client.ClientParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -79,4 +79,4 @@ public class ClientController { return Res.ok(clientService.existsByCode(code, id)); } -} \ No newline at end of file +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/DataScopeController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/DataScopeController.java similarity index 83% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/DataScopeController.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/DataScopeController.java index f04e4d057440cb249dcd916fde2a5480ae0e65ea..ed1560a7e329dda13b844abce451c216e37072e0 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/DataScopeController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/DataScopeController.java @@ -1,16 +1,16 @@ -package cn.bootx.iam.controller; - -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.iam.core.scope.service.DataScopeService; -import cn.bootx.iam.core.scope.service.DataScopeUserService; -import cn.bootx.iam.dto.scope.DataScopeDto; -import cn.bootx.iam.dto.scope.DataScopeUserInfoDto; -import cn.bootx.iam.param.scope.DataScopeDeptParam; -import cn.bootx.iam.param.scope.DataScopeParam; -import cn.bootx.iam.param.scope.DataScopeUserParam; +package cn.bootx.platform.iam.controller; + +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.iam.core.scope.service.DataScopeService; +import cn.bootx.platform.iam.core.scope.service.DataScopeUserService; +import cn.bootx.platform.iam.dto.scope.DataScopeDto; +import cn.bootx.platform.iam.dto.scope.DataScopeUserInfoDto; +import cn.bootx.platform.iam.param.scope.DataScopeDeptParam; +import cn.bootx.platform.iam.param.scope.DataScopeParam; +import cn.bootx.platform.iam.param.scope.DataScopeUserParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -100,7 +100,7 @@ public class DataScopeController { @Operation(summary = "分页") @GetMapping("/page") public ResResult> page(@ParameterObject PageParam pageParam, - @ParameterObject DataScopeParam param) { + @ParameterObject DataScopeParam param) { return Res.ok(dataScopeService.page(pageParam, param)); } diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/DeptController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/DeptController.java similarity index 80% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/DeptController.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/DeptController.java index ef7c4b08adba3fe37a4529f8c6922e4cad865539..061d3613785dc33e20d8315afa391f6f01363254 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/DeptController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/DeptController.java @@ -1,11 +1,11 @@ -package cn.bootx.iam.controller; +package cn.bootx.platform.iam.controller; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.iam.core.dept.service.DeptService; -import cn.bootx.iam.dto.dept.DeptDto; -import cn.bootx.iam.dto.dept.DeptTreeResult; -import cn.bootx.iam.param.dept.DeptParam; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.iam.core.dept.service.DeptService; +import cn.bootx.platform.iam.dto.dept.DeptDto; +import cn.bootx.platform.iam.dto.dept.DeptTreeResult; +import cn.bootx.platform.iam.param.dept.DeptParam; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import lombok.AllArgsConstructor; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/LoginTypeController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/LoginTypeController.java similarity index 83% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/LoginTypeController.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/LoginTypeController.java index 2810380c837e84c13996db2ad5034fca2e3e1f3b..429eae8d44b18aef2ea53d049a36e2c6de0d1e43 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/LoginTypeController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/LoginTypeController.java @@ -1,14 +1,14 @@ -package cn.bootx.iam.controller; +package cn.bootx.platform.iam.controller; -import cn.bootx.common.core.annotation.IgnoreAuth; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.query.entity.QueryParams; -import cn.bootx.iam.core.client.service.LoginTypeService; -import cn.bootx.iam.dto.client.LoginTypeDto; -import cn.bootx.iam.param.client.LoginTypeParam; +import cn.bootx.platform.common.core.annotation.IgnoreAuth; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.query.entity.QueryParams; +import cn.bootx.platform.iam.core.client.service.LoginTypeService; +import cn.bootx.platform.iam.dto.client.LoginTypeDto; +import cn.bootx.platform.iam.param.client.LoginTypeParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/PermMenuController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/PermMenuController.java similarity index 86% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/PermMenuController.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/PermMenuController.java index f09f768d59d2dacb3331d7abf0a7e330638e466e..a695dfa642e8f90bc44c93ea724453dbe05748fa 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/PermMenuController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/PermMenuController.java @@ -1,11 +1,11 @@ -package cn.bootx.iam.controller; +package cn.bootx.platform.iam.controller; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.iam.core.permission.service.PermMenuService; -import cn.bootx.iam.core.upms.service.RolePermService; -import cn.bootx.iam.dto.permission.PermMenuDto; -import cn.bootx.iam.param.permission.PermMenuParam; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.iam.core.permission.service.PermMenuService; +import cn.bootx.platform.iam.core.upms.service.RolePermService; +import cn.bootx.platform.iam.dto.permission.PermMenuDto; +import cn.bootx.platform.iam.param.permission.PermMenuParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/PermPathController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/PermPathController.java similarity index 81% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/PermPathController.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/PermPathController.java index 4908bb6b2879b8db114c07d60f678d8176d811a9..5951759c296f0bb10163533b8037d51fcda92242 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/PermPathController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/PermPathController.java @@ -1,14 +1,14 @@ -package cn.bootx.iam.controller; +package cn.bootx.platform.iam.controller; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.core.util.ValidationUtil; -import cn.bootx.iam.core.permission.service.PermPathService; -import cn.bootx.iam.dto.permission.PermPathDto; -import cn.bootx.iam.param.permission.PermPathBatchEnableParam; -import cn.bootx.iam.param.permission.PermPathParam; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.ValidationUtil; +import cn.bootx.platform.iam.core.permission.service.PermPathService; +import cn.bootx.platform.iam.dto.permission.PermPathDto; +import cn.bootx.platform.iam.param.permission.PermPathBatchEnableParam; +import cn.bootx.platform.iam.param.permission.PermPathParam; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/RoleController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleController.java similarity index 84% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/RoleController.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleController.java index 5611277d10a92a820ac98654f105fb6b83261df1..7f9e1d98815e4031b3627c1be5ca8910058a8824 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/RoleController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleController.java @@ -1,14 +1,14 @@ -package cn.bootx.iam.controller; - -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.dto.KeyValue; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.core.util.ValidationUtil; -import cn.bootx.iam.core.role.service.RoleService; -import cn.bootx.iam.dto.role.RoleDto; -import cn.bootx.iam.param.role.RoleParam; +package cn.bootx.platform.iam.controller; + +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.dto.KeyValue; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.ValidationUtil; +import cn.bootx.platform.iam.core.role.service.RoleService; +import cn.bootx.platform.iam.dto.role.RoleDto; +import cn.bootx.platform.iam.param.role.RoleParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/RoleMenuController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleMenuController.java similarity index 79% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/RoleMenuController.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleMenuController.java index 8732d8615da7b1dd9ec23f6d8f83e67d725a11b0..c80d60aa28f758626d71f9fce70081baa5588c81 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/RoleMenuController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleMenuController.java @@ -1,13 +1,12 @@ -package cn.bootx.iam.controller; - -import cn.bootx.common.core.annotation.IgnoreAuth; -import cn.bootx.common.core.annotation.PermCode; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.util.ValidationUtil; -import cn.bootx.iam.core.upms.service.RolePermService; -import cn.bootx.iam.dto.upms.MenuAndResourceDto; -import cn.bootx.iam.param.upms.RolePermissionParam; +package cn.bootx.platform.iam.controller; + +import cn.bootx.platform.common.core.annotation.IgnoreAuth; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.util.ValidationUtil; +import cn.bootx.platform.iam.core.upms.service.RolePermService; +import cn.bootx.platform.iam.dto.upms.MenuAndResourceDto; +import cn.bootx.platform.iam.param.upms.RolePermissionParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/RolePathController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RolePathController.java similarity index 76% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/RolePathController.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RolePathController.java index 0c93abbd38af53a1bfacc246892c1465d1895e5d..07cc8d299dc7cd50365ac7ae0112e705b4657e0a 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/RolePathController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RolePathController.java @@ -1,11 +1,11 @@ -package cn.bootx.iam.controller; - -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.util.ValidationUtil; -import cn.bootx.iam.core.upms.service.RolePathService; -import cn.bootx.iam.dto.permission.PermPathDto; -import cn.bootx.iam.param.upms.RolePermissionParam; +package cn.bootx.platform.iam.controller; + +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.util.ValidationUtil; +import cn.bootx.platform.iam.core.upms.service.RolePathService; +import cn.bootx.platform.iam.dto.permission.PermPathDto; +import cn.bootx.platform.iam.param.upms.RolePermissionParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/ThirdLoginController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/ThirdLoginController.java similarity index 87% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/ThirdLoginController.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/ThirdLoginController.java index 2c6bebcee2ca559934d3e6e93191edfe919d9154..2f78fe3eb03136b9ba474b3f545ff283644860b6 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/ThirdLoginController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/ThirdLoginController.java @@ -1,8 +1,8 @@ -package cn.bootx.iam.controller; +package cn.bootx.platform.iam.controller; -import cn.bootx.common.core.annotation.IgnoreAuth; -import cn.bootx.iam.core.auth.service.ThirdLoginService; -import cn.bootx.starter.auth.entity.ThirdAuthCode; +import cn.bootx.platform.common.core.annotation.IgnoreAuth; +import cn.bootx.platform.starter.auth.entity.ThirdAuthCode; +import cn.bootx.platform.iam.core.auth.service.ThirdLoginService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/UserAdminController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAdminController.java similarity index 87% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/UserAdminController.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAdminController.java index 325d29259b1329cd1b7b91a09cb1edcaecf57e9c..c4013a5e9345164aaff8bbfb7e6d440105695abd 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/UserAdminController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAdminController.java @@ -1,15 +1,15 @@ -package cn.bootx.iam.controller; - -import cn.bootx.common.core.annotation.OperateLog; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.iam.core.user.service.UserAdminService; -import cn.bootx.iam.core.user.service.UserQueryService; -import cn.bootx.iam.dto.user.UserInfoDto; -import cn.bootx.iam.dto.user.UserInfoWhole; -import cn.bootx.iam.param.user.UserInfoParam; +package cn.bootx.platform.iam.controller; + +import cn.bootx.platform.common.core.annotation.OperateLog; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.iam.core.user.service.UserAdminService; +import cn.bootx.platform.iam.core.user.service.UserQueryService; +import cn.bootx.platform.iam.dto.user.UserInfoDto; +import cn.bootx.platform.iam.dto.user.UserInfoWhole; +import cn.bootx.platform.iam.param.user.UserInfoParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/UserAssistController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAssistController.java similarity index 94% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/UserAssistController.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAssistController.java index 14d656cc91c89cac4e2ee91299933d15154c7930..d0666b27c010b3ea642d576d3d54531566f88b9a 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/UserAssistController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAssistController.java @@ -1,9 +1,9 @@ -package cn.bootx.iam.controller; +package cn.bootx.platform.iam.controller; -import cn.bootx.common.core.annotation.IgnoreAuth; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.iam.core.user.service.UserAssistService; +import cn.bootx.platform.common.core.annotation.IgnoreAuth; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.iam.core.user.service.UserAssistService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/UserDataScopeController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserDataScopeController.java similarity index 77% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/UserDataScopeController.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserDataScopeController.java index da61cc0a8a3c5ca8ad0d0be24356f73857ca7940..217eea3732c91d20fb9eb69df5e44d0fd8def110 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/UserDataScopeController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserDataScopeController.java @@ -1,12 +1,12 @@ -package cn.bootx.iam.controller; - -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.util.ValidationUtil; -import cn.bootx.iam.core.upms.service.UserDataScopeService; -import cn.bootx.iam.dto.scope.DataScopeDto; -import cn.bootx.iam.param.upms.UserDataScopeBatchParam; -import cn.bootx.iam.param.upms.UserDataScopeParam; +package cn.bootx.platform.iam.controller; + +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.util.ValidationUtil; +import cn.bootx.platform.iam.core.upms.service.UserDataScopeService; +import cn.bootx.platform.iam.dto.scope.DataScopeDto; +import cn.bootx.platform.iam.param.upms.UserDataScopeBatchParam; +import cn.bootx.platform.iam.param.upms.UserDataScopeParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/UserDeptController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserDeptController.java similarity index 78% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/UserDeptController.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserDeptController.java index a4fb9e053843e75cd595858fd655e082efaa0f1f..fcc851840286aec6960d204e5e0d85ef8163bfab 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/UserDeptController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserDeptController.java @@ -1,12 +1,12 @@ -package cn.bootx.iam.controller; - -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.util.ValidationUtil; -import cn.bootx.iam.core.user.service.UserDeptService; -import cn.bootx.iam.dto.dept.DeptDto; -import cn.bootx.iam.param.user.UserDeptBatchParam; -import cn.bootx.iam.param.user.UserDeptParam; +package cn.bootx.platform.iam.controller; + +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.util.ValidationUtil; +import cn.bootx.platform.iam.core.user.service.UserDeptService; +import cn.bootx.platform.iam.dto.dept.DeptDto; +import cn.bootx.platform.iam.param.user.UserDeptBatchParam; +import cn.bootx.platform.iam.param.user.UserDeptParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/UserInfoController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserInfoController.java similarity index 90% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/UserInfoController.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserInfoController.java index 5d76c43c6b8ae0e5e29b05e2be19dc3e5677a36c..98d83c8dad5635bdf4cf91e0cee958e926d592ce 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/UserInfoController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserInfoController.java @@ -1,16 +1,16 @@ -package cn.bootx.iam.controller; - -import cn.bootx.common.core.annotation.IgnoreAuth; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.util.ValidationUtil; -import cn.bootx.iam.core.user.service.UserAdminService; -import cn.bootx.iam.core.user.service.UserInfoService; -import cn.bootx.iam.core.user.service.UserQueryService; -import cn.bootx.iam.dto.user.LoginAfterUserInfo; -import cn.bootx.iam.dto.user.UserBaseInfoDto; -import cn.bootx.iam.dto.user.UserInfoDto; -import cn.bootx.iam.param.user.*; +package cn.bootx.platform.iam.controller; + +import cn.bootx.platform.common.core.annotation.IgnoreAuth; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.util.ValidationUtil; +import cn.bootx.platform.iam.core.user.service.UserAdminService; +import cn.bootx.platform.iam.core.user.service.UserInfoService; +import cn.bootx.platform.iam.core.user.service.UserQueryService; +import cn.bootx.platform.iam.dto.user.LoginAfterUserInfo; +import cn.bootx.platform.iam.dto.user.UserBaseInfoDto; +import cn.bootx.platform.iam.dto.user.UserInfoDto; +import cn.bootx.platform.iam.param.user.*; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/UserRoleController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserRoleController.java similarity index 78% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/UserRoleController.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserRoleController.java index be01eb1e4aa144c5ad481776f6cb6dee2dab92d5..147089fa17cf6c1d15196977b2baa3c7919f37f6 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/UserRoleController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserRoleController.java @@ -1,12 +1,12 @@ -package cn.bootx.iam.controller; - -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.util.ValidationUtil; -import cn.bootx.iam.core.upms.service.UserRoleService; -import cn.bootx.iam.dto.role.RoleDto; -import cn.bootx.iam.param.upms.UserRoleBatchParam; -import cn.bootx.iam.param.upms.UserRoleParam; +package cn.bootx.platform.iam.controller; + +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.util.ValidationUtil; +import cn.bootx.platform.iam.core.upms.service.UserRoleService; +import cn.bootx.platform.iam.dto.role.RoleDto; +import cn.bootx.platform.iam.param.upms.UserRoleBatchParam; +import cn.bootx.platform.iam.param.upms.UserRoleParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/UserThirdController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserThirdController.java similarity index 73% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/UserThirdController.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserThirdController.java index ee00f0b821c768b7ffed9653c16d7cd6d861dab9..8e1b580d457ddcd76e28696629875890b5ad2bf0 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/controller/UserThirdController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserThirdController.java @@ -1,16 +1,16 @@ -package cn.bootx.iam.controller; +package cn.bootx.platform.iam.controller; -import cn.bootx.common.core.annotation.IgnoreAuth; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.core.util.ValidationUtil; -import cn.bootx.iam.core.third.service.UserThirdBindService; -import cn.bootx.iam.core.third.service.UserThirdQueryService; -import cn.bootx.iam.dto.user.UserThirdBindInfo; -import cn.bootx.iam.dto.user.UserThirdDto; -import cn.bootx.iam.param.user.UserBindThirdParam; +import cn.bootx.platform.common.core.annotation.IgnoreAuth; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.ValidationUtil; +import cn.bootx.platform.iam.core.third.service.UserThirdBindService; +import cn.bootx.platform.iam.core.third.service.UserThirdQueryService; +import cn.bootx.platform.iam.dto.user.UserThirdBindInfo; +import cn.bootx.platform.iam.dto.user.UserThirdDto; +import cn.bootx.platform.iam.param.user.UserBindThirdParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/handler/GetAuthClientServiceImpl.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthClientServiceImpl.java similarity index 65% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/handler/GetAuthClientServiceImpl.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthClientServiceImpl.java index b8eb87c61f1ce9cffa0d633991a204ba8da61c92..041d82d17614badb442d7b3961aa5ab5e2b43d16 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/handler/GetAuthClientServiceImpl.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthClientServiceImpl.java @@ -1,10 +1,10 @@ -package cn.bootx.iam.core.auth.handler; +package cn.bootx.platform.iam.core.auth.handler; -import cn.bootx.iam.core.client.dao.ClientManager; -import cn.bootx.iam.core.client.entity.Client; -import cn.bootx.starter.auth.authentication.GetAuthClientService; -import cn.bootx.starter.auth.entity.AuthClient; -import cn.bootx.starter.auth.exception.ApplicationNotFoundException; +import cn.bootx.platform.iam.core.client.dao.ClientManager; +import cn.bootx.platform.iam.core.client.entity.Client; +import cn.bootx.platform.starter.auth.authentication.GetAuthClientService; +import cn.bootx.platform.starter.auth.entity.AuthClient; +import cn.bootx.platform.starter.auth.exception.ApplicationNotFoundException; import cn.hutool.core.bean.BeanUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/handler/GetAuthLoginTypeServiceImpl.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthLoginTypeServiceImpl.java similarity index 67% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/handler/GetAuthLoginTypeServiceImpl.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthLoginTypeServiceImpl.java index f848ad19c19d7a09ec5a280c6886748d8cada111..b2e7875e731c7eb0b01bec75e9028778b4d523c3 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/handler/GetAuthLoginTypeServiceImpl.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthLoginTypeServiceImpl.java @@ -1,10 +1,10 @@ -package cn.bootx.iam.core.auth.handler; +package cn.bootx.platform.iam.core.auth.handler; -import cn.bootx.iam.core.client.dao.LoginTypeManager; -import cn.bootx.iam.core.client.entity.LonginType; -import cn.bootx.starter.auth.authentication.GetAuthLoginTypeService; -import cn.bootx.starter.auth.entity.AuthLoginType; -import cn.bootx.starter.auth.exception.ClientNotFoundException; +import cn.bootx.platform.iam.core.client.dao.LoginTypeManager; +import cn.bootx.platform.iam.core.client.entity.LonginType; +import cn.bootx.platform.starter.auth.authentication.GetAuthLoginTypeService; +import cn.bootx.platform.starter.auth.entity.AuthLoginType; +import cn.bootx.platform.starter.auth.exception.ClientNotFoundException; import cn.hutool.core.bean.BeanUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/handler/LoginFailureHandlerImpl.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/LoginFailureHandlerImpl.java similarity index 42% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/handler/LoginFailureHandlerImpl.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/LoginFailureHandlerImpl.java index c142b5a992620bd3aed9951468e4efa6c88862a7..c0304631769d8537ad69a0c32ea108ef50bf6621 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/handler/LoginFailureHandlerImpl.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/LoginFailureHandlerImpl.java @@ -1,11 +1,13 @@ -package cn.bootx.iam.core.auth.handler; - -import cn.bootx.common.core.code.WebHeaderCode; -import cn.bootx.starter.audit.log.param.LoginLogParam; -import cn.bootx.starter.audit.log.service.LoginLogService; -import cn.bootx.starter.auth.exception.LoginFailureException; -import cn.bootx.starter.auth.handler.LoginFailureHandler; -import cn.bootx.starter.auth.util.SecurityUtil; +package cn.bootx.platform.iam.core.auth.handler; + +import cn.bootx.platform.common.core.code.WebHeaderCode; +import cn.bootx.platform.starter.audit.log.param.LoginLogParam; +import cn.bootx.platform.starter.audit.log.service.LoginLogService; +import cn.bootx.platform.starter.auth.exception.LoginFailureException; +import cn.bootx.platform.starter.auth.handler.LoginFailureHandler; +import cn.bootx.platform.starter.auth.util.SecurityUtil; +import cn.bootx.platform.common.spring.util.WebServletUtil; +import cn.bootx.platform.starter.audit.log.ip2region.IpToRegionService; import cn.hutool.extra.servlet.ServletUtil; import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; @@ -15,6 +17,7 @@ import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.time.LocalDateTime; +import java.util.Optional; /** * 登录失败 @@ -28,22 +31,33 @@ public class LoginFailureHandlerImpl implements LoginFailureHandler { private final LoginLogService loginLogService; + private final IpToRegionService ipToRegionService; + @Override public void onLoginFailure(HttpServletRequest request, HttpServletResponse response, LoginFailureException e) { UserAgent userAgent = UserAgentUtil.parse(request.getHeader(WebHeaderCode.USER_AGENT)); - String ip = ServletUtil.getClientIP(request); + // ip信息 + String ip = "未知"; + String location = "未知"; + Optional ipOpt = Optional.ofNullable(WebServletUtil.getRequest()).map(ServletUtil::getClientIP); + if (ipOpt.isPresent()){ + ip = ipOpt.get(); + location = ipToRegionService.getRegionStrByIp(ip); + } + String loginType = SecurityUtil.getLoginType(request); String client = SecurityUtil.getClient(request); LoginLogParam loginLog = new LoginLogParam().setAccount(e.getUsername()) - .setLogin(false) - .setClient(client) - .setLoginType(loginType) - .setMsg(e.getMessage()) - .setIp(ip) - .setOs(userAgent.getOs().getName()) - .setBrowser(userAgent.getBrowser().getName() + " " + userAgent.getVersion()) - .setLoginTime(LocalDateTime.now()); + .setLogin(false) + .setClient(client) + .setLoginType(loginType) + .setMsg(e.getMessage()) + .setIp(ip) + .setLoginLocation(location) + .setOs(userAgent.getOs().getName()) + .setBrowser(userAgent.getBrowser().getName() + " " + userAgent.getVersion()) + .setLoginTime(LocalDateTime.now()); loginLogService.add(loginLog); } diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/handler/LoginSuccessHandlerImpl.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/LoginSuccessHandlerImpl.java similarity index 39% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/handler/LoginSuccessHandlerImpl.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/LoginSuccessHandlerImpl.java index 9756582d188006a3a632496ca58d473dfa523a53..d7236e810cc3dbf6cffb15df8e94d9590de0bbf1 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/handler/LoginSuccessHandlerImpl.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/LoginSuccessHandlerImpl.java @@ -1,11 +1,13 @@ -package cn.bootx.iam.core.auth.handler; - -import cn.bootx.common.core.code.WebHeaderCode; -import cn.bootx.iam.core.user.service.UserExpandInfoService; -import cn.bootx.starter.audit.log.param.LoginLogParam; -import cn.bootx.starter.audit.log.service.LoginLogService; -import cn.bootx.starter.auth.entity.AuthInfoResult; -import cn.bootx.starter.auth.handler.LoginSuccessHandler; +package cn.bootx.platform.iam.core.auth.handler; + +import cn.bootx.platform.common.core.code.WebHeaderCode; +import cn.bootx.platform.iam.core.user.service.UserExpandInfoService; +import cn.bootx.platform.starter.audit.log.param.LoginLogParam; +import cn.bootx.platform.starter.audit.log.service.LoginLogService; +import cn.bootx.platform.starter.auth.entity.AuthInfoResult; +import cn.bootx.platform.starter.auth.handler.LoginSuccessHandler; +import cn.bootx.platform.common.spring.util.WebServletUtil; +import cn.bootx.platform.starter.audit.log.ip2region.IpToRegionService; import cn.hutool.extra.servlet.ServletUtil; import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; @@ -15,6 +17,7 @@ import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.time.LocalDateTime; +import java.util.Optional; /** * 登录成功处理 @@ -30,20 +33,31 @@ public class LoginSuccessHandlerImpl implements LoginSuccessHandler { private final UserExpandInfoService userExpandInfoService; + private final IpToRegionService ipToRegionService; + + @Override public void onLoginSuccess(HttpServletRequest request, HttpServletResponse response, - AuthInfoResult authInfoResult) { + AuthInfoResult authInfoResult) { UserAgent userAgent = UserAgentUtil.parse(request.getHeader(WebHeaderCode.USER_AGENT)); - String ip = ServletUtil.getClientIP(request); + // ip信息 + String ip = "未知"; + String location = "未知"; + Optional ipOpt = Optional.ofNullable(WebServletUtil.getRequest()).map(ServletUtil::getClientIP); + if (ipOpt.isPresent()){ + ip = ipOpt.get(); + location = ipToRegionService.getRegionStrByIp(ip); + } LoginLogParam loginLog = new LoginLogParam().setLogin(true) - .setUserId(authInfoResult.getUserDetail().getId()) - .setClient(authInfoResult.getClient()) - .setLoginType(authInfoResult.getLoginType()) - .setAccount(authInfoResult.getUserDetail().getUsername()) - .setIp(ip) - .setOs(userAgent.getOs().getName()) - .setBrowser(userAgent.getBrowser().getName() + " " + userAgent.getVersion()) - .setLoginTime(LocalDateTime.now()); + .setUserId(authInfoResult.getUserDetail().getId()) + .setClient(authInfoResult.getClient()) + .setLoginType(authInfoResult.getLoginType()) + .setAccount(authInfoResult.getUserDetail().getUsername()) + .setIp(ip) + .setLoginLocation(location) + .setOs(userAgent.getOs().getName()) + .setBrowser(userAgent.getBrowser().getName() + " " + userAgent.getVersion()) + .setLoginTime(LocalDateTime.now()); loginLogService.add(loginLog); userExpandInfoService.updateLoginTime(loginLog.getUserId()); } diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/login/DingTalkLoginHandler.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/DingTalkLoginHandler.java similarity index 76% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/login/DingTalkLoginHandler.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/DingTalkLoginHandler.java index a2fd2a944df8b41c0fddf7bdaecb604cad0a82bd..193508766add3bcdb54a33155b825cb5129fdd8a 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/login/DingTalkLoginHandler.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/DingTalkLoginHandler.java @@ -1,20 +1,20 @@ -package cn.bootx.iam.core.auth.login; - -import cn.bootx.common.core.exception.BizException; -import cn.bootx.starter.auth.code.AuthLoginTypeCode; -import cn.bootx.iam.core.third.dao.UserThirdManager; -import cn.bootx.iam.core.third.entity.UserThird; -import cn.bootx.iam.core.third.entity.UserThirdInfo; -import cn.bootx.iam.core.third.service.UserTiredOperateService; -import cn.bootx.iam.core.user.dao.UserInfoManager; -import cn.bootx.iam.core.user.entity.UserInfo; -import cn.bootx.starter.auth.authentication.OpenIdAuthentication; -import cn.bootx.starter.auth.configuration.AuthProperties; -import cn.bootx.starter.auth.entity.AuthInfoResult; -import cn.bootx.starter.auth.entity.LoginAuthContext; -import cn.bootx.starter.auth.exception.LoginFailureException; -import cn.bootx.starter.auth.util.SecurityUtil; -import cn.bootx.starter.dingtalk.core.user.service.DingUserService; +package cn.bootx.platform.iam.core.auth.login; + +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.iam.core.third.dao.UserThirdManager; +import cn.bootx.platform.iam.core.third.entity.UserThird; +import cn.bootx.platform.iam.core.third.entity.UserThirdInfo; +import cn.bootx.platform.iam.core.third.service.UserTiredOperateService; +import cn.bootx.platform.iam.core.user.dao.UserInfoManager; +import cn.bootx.platform.iam.core.user.entity.UserInfo; +import cn.bootx.platform.starter.auth.authentication.OpenIdAuthentication; +import cn.bootx.platform.starter.auth.code.AuthLoginTypeCode; +import cn.bootx.platform.starter.auth.configuration.AuthProperties; +import cn.bootx.platform.starter.auth.entity.AuthInfoResult; +import cn.bootx.platform.starter.auth.entity.LoginAuthContext; +import cn.bootx.platform.starter.auth.exception.LoginFailureException; +import cn.bootx.platform.starter.auth.util.SecurityUtil; +import cn.bootx.platform.starter.dingtalk.core.user.service.DingUserService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import lombok.val; @@ -29,8 +29,6 @@ import org.springframework.stereotype.Component; import java.util.Objects; -import static cn.bootx.starter.auth.code.AuthLoginTypeCode.*; - /** * 钉钉登录 * @@ -57,7 +55,7 @@ public class DingTalkLoginHandler implements OpenIdAuthentication { */ @Override public String getLoginType() { - return DING_TALK; + return AuthLoginTypeCode.DING_TALK; } /** @@ -65,8 +63,8 @@ public class DingTalkLoginHandler implements OpenIdAuthentication { */ @Override public AuthInfoResult attemptAuthentication(LoginAuthContext context) { - String authCode = context.getRequest().getParameter(AUTH_CODE); - String state = context.getRequest().getParameter(STATE); + String authCode = context.getRequest().getParameter(AuthLoginTypeCode.AUTH_CODE); + String state = context.getRequest().getParameter(AuthLoginTypeCode.STATE); AuthUser authUser = this.getAuthUser(authCode, state); // 获取钉钉关联的用户id @@ -122,7 +120,7 @@ public class DingTalkLoginHandler implements OpenIdAuthentication { } UserThirdInfo userThirdInfo = new UserThirdInfo().setUserId(userId) - .setClientCode(DING_TALK) + .setClientCode(AuthLoginTypeCode.DING_TALK) .setUsername(authUser.getUsername()) .setNickname(authUser.getNickname()) .setAvatar(authUser.getAvatar()) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/login/PasswordLoginHandler.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PasswordLoginHandler.java similarity index 84% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/login/PasswordLoginHandler.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PasswordLoginHandler.java index aec2e5acf33d4438a9f5387f824810c1a6525c4a..7b488c0d9ac7595d4520a782188978c9852ca29e 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/login/PasswordLoginHandler.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PasswordLoginHandler.java @@ -1,20 +1,20 @@ -package cn.bootx.iam.core.auth.login; - -import cn.bootx.baseapi.core.captcha.service.CaptchaService; -import cn.bootx.common.core.entity.UserDetail; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.util.RegexUtil; -import cn.bootx.iam.code.UserStatusCode; -import cn.bootx.iam.core.user.service.UserAdminService; -import cn.bootx.iam.core.user.service.UserQueryService; -import cn.bootx.iam.dto.user.UserInfoDto; -import cn.bootx.starter.auth.authentication.UsernamePasswordAuthentication; -import cn.bootx.starter.auth.entity.LoginAuthContext; -import cn.bootx.starter.auth.entity.AuthLoginType; -import cn.bootx.starter.auth.entity.AuthInfoResult; -import cn.bootx.starter.auth.exception.LoginFailureException; -import cn.bootx.starter.auth.exception.UserNotFoundException; -import cn.bootx.starter.auth.util.PasswordEncoder; +package cn.bootx.platform.iam.core.auth.login; + +import cn.bootx.platform.common.core.entity.UserDetail; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.util.RegexUtil; +import cn.bootx.platform.iam.core.user.service.UserAdminService; +import cn.bootx.platform.iam.core.user.service.UserQueryService; +import cn.bootx.platform.starter.auth.authentication.UsernamePasswordAuthentication; +import cn.bootx.platform.starter.auth.entity.AuthInfoResult; +import cn.bootx.platform.starter.auth.entity.AuthLoginType; +import cn.bootx.platform.starter.auth.entity.LoginAuthContext; +import cn.bootx.platform.starter.auth.exception.LoginFailureException; +import cn.bootx.platform.starter.auth.exception.UserNotFoundException; +import cn.bootx.platform.starter.auth.util.PasswordEncoder; +import cn.bootx.platform.baseapi.core.captcha.service.CaptchaService; +import cn.bootx.platform.iam.code.UserStatusCode; +import cn.bootx.platform.iam.dto.user.UserInfoDto; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/login/PhoneLoginHandler.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PhoneLoginHandler.java similarity index 74% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/login/PhoneLoginHandler.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PhoneLoginHandler.java index 63a11a6914db1e9ab007c50e5b5261887656e9fd..326bf5a7fb28105f9bab95c928a3a7e1bb562968 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/login/PhoneLoginHandler.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PhoneLoginHandler.java @@ -1,13 +1,13 @@ -package cn.bootx.iam.core.auth.login; +package cn.bootx.platform.iam.core.auth.login; -import cn.bootx.baseapi.core.captcha.service.CaptchaService; -import cn.bootx.iam.core.user.dao.UserInfoManager; -import cn.bootx.iam.core.user.entity.UserInfo; -import cn.bootx.starter.auth.authentication.AbstractAuthentication; -import cn.bootx.starter.auth.code.AuthLoginTypeCode; -import cn.bootx.starter.auth.entity.AuthInfoResult; -import cn.bootx.starter.auth.entity.LoginAuthContext; -import cn.bootx.starter.auth.exception.LoginFailureException; +import cn.bootx.platform.iam.core.user.dao.UserInfoManager; +import cn.bootx.platform.iam.core.user.entity.UserInfo; +import cn.bootx.platform.starter.auth.authentication.AbstractAuthentication; +import cn.bootx.platform.starter.auth.code.AuthLoginTypeCode; +import cn.bootx.platform.starter.auth.entity.AuthInfoResult; +import cn.bootx.platform.starter.auth.entity.LoginAuthContext; +import cn.bootx.platform.starter.auth.exception.LoginFailureException; +import cn.bootx.platform.baseapi.core.captcha.service.CaptchaService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/login/WeChatLoginHandler.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatLoginHandler.java similarity index 70% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/login/WeChatLoginHandler.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatLoginHandler.java index 046ecc432b24d3a04be227cb2f536d2efef7aa6b..15a9116e42eaf661764d82924930ef350fe8e7ab 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/login/WeChatLoginHandler.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatLoginHandler.java @@ -1,25 +1,22 @@ -package cn.bootx.iam.core.auth.login; +package cn.bootx.platform.iam.core.auth.login; -import cn.bootx.iam.core.third.dao.UserThirdManager; -import cn.bootx.iam.core.third.entity.UserThird; -import cn.bootx.iam.core.third.service.UserTiredOperateService; -import cn.bootx.iam.core.user.dao.UserInfoManager; -import cn.bootx.iam.core.user.entity.UserInfo; -import cn.bootx.starter.auth.authentication.OpenIdAuthentication; -import cn.bootx.starter.auth.code.AuthLoginTypeCode; -import cn.bootx.starter.auth.entity.AuthInfoResult; -import cn.bootx.starter.auth.entity.LoginAuthContext; -import cn.bootx.starter.auth.exception.LoginFailureException; -import cn.bootx.starter.auth.util.SecurityUtil; -import cn.bootx.starter.wechat.core.login.service.WeChatQrLoginService; +import cn.bootx.platform.iam.core.third.dao.UserThirdManager; +import cn.bootx.platform.iam.core.third.entity.UserThird; +import cn.bootx.platform.iam.core.third.service.UserTiredOperateService; +import cn.bootx.platform.iam.core.user.dao.UserInfoManager; +import cn.bootx.platform.iam.core.user.entity.UserInfo; +import cn.bootx.platform.starter.auth.authentication.OpenIdAuthentication; +import cn.bootx.platform.starter.auth.code.AuthLoginTypeCode; +import cn.bootx.platform.starter.auth.entity.AuthInfoResult; +import cn.bootx.platform.starter.auth.entity.LoginAuthContext; +import cn.bootx.platform.starter.auth.exception.LoginFailureException; +import cn.bootx.platform.starter.auth.util.SecurityUtil; +import cn.bootx.platform.starter.wechat.core.login.service.WeChatQrLoginService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.zhyd.oauth.model.AuthUser; import org.springframework.stereotype.Component; -import static cn.bootx.starter.auth.code.AuthLoginTypeCode.AUTH_CODE; -import static cn.bootx.starter.auth.code.AuthLoginTypeCode.WE_CHAT; - /** * 微信登录(公众号) * @@ -49,7 +46,7 @@ public class WeChatLoginHandler implements OpenIdAuthentication { */ @Override public AuthInfoResult attemptAuthentication(LoginAuthContext context) { - String authCode = context.getRequest().getParameter(AUTH_CODE); + String authCode = context.getRequest().getParameter(AuthLoginTypeCode.AUTH_CODE); AuthUser authUser = this.getAuthUser(authCode, null); // 获取微信公众号关联的用户id @@ -89,7 +86,7 @@ public class WeChatLoginHandler implements OpenIdAuthentication { AuthUser authUser = this.getAuthUser(authCode, state); userTiredOperateService.checkOpenIdBind(authUser.getUuid(), UserThird::getWeChatId); userTiredOperateService.bindOpenId(userId, authUser.getUuid(), UserThird::setWeChatId); - userTiredOperateService.bindOpenInfo(userId, authUser, WE_CHAT); + userTiredOperateService.bindOpenInfo(userId, authUser, AuthLoginTypeCode.WE_CHAT); } } diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/login/WeChatOpenLoginHandler.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatOpenLoginHandler.java similarity index 75% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/login/WeChatOpenLoginHandler.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatOpenLoginHandler.java index 8e30532c3d5770b120f8f82f92c8f09340b4271a..b851d1bcb23509fabee53ff7e3a940ab45bb2d59 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/login/WeChatOpenLoginHandler.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatOpenLoginHandler.java @@ -1,17 +1,17 @@ -package cn.bootx.iam.core.auth.login; - -import cn.bootx.iam.core.third.dao.UserThirdManager; -import cn.bootx.iam.core.third.entity.UserThird; -import cn.bootx.iam.core.third.service.UserTiredOperateService; -import cn.bootx.iam.core.user.dao.UserInfoManager; -import cn.bootx.iam.core.user.entity.UserInfo; -import cn.bootx.starter.auth.authentication.OpenIdAuthentication; -import cn.bootx.starter.auth.code.AuthLoginTypeCode; -import cn.bootx.starter.auth.configuration.AuthProperties; -import cn.bootx.starter.auth.entity.AuthInfoResult; -import cn.bootx.starter.auth.entity.LoginAuthContext; -import cn.bootx.starter.auth.exception.LoginFailureException; -import cn.bootx.starter.auth.util.SecurityUtil; +package cn.bootx.platform.iam.core.auth.login; + +import cn.bootx.platform.iam.core.third.dao.UserThirdManager; +import cn.bootx.platform.iam.core.third.entity.UserThird; +import cn.bootx.platform.iam.core.third.service.UserTiredOperateService; +import cn.bootx.platform.iam.core.user.dao.UserInfoManager; +import cn.bootx.platform.iam.core.user.entity.UserInfo; +import cn.bootx.platform.starter.auth.authentication.OpenIdAuthentication; +import cn.bootx.platform.starter.auth.code.AuthLoginTypeCode; +import cn.bootx.platform.starter.auth.configuration.AuthProperties; +import cn.bootx.platform.starter.auth.entity.AuthInfoResult; +import cn.bootx.platform.starter.auth.entity.LoginAuthContext; +import cn.bootx.platform.starter.auth.exception.LoginFailureException; +import cn.bootx.platform.starter.auth.util.SecurityUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import lombok.val; @@ -26,9 +26,6 @@ import org.springframework.stereotype.Component; import java.util.Objects; -import static cn.bootx.starter.auth.code.AuthLoginTypeCode.*; -import static cn.bootx.starter.auth.code.AuthLoginTypeCode.WE_CHAT; - /** * 微信开放平台登录 * @@ -50,7 +47,7 @@ public class WeChatOpenLoginHandler implements OpenIdAuthentication { @Override public String getLoginType() { - return WE_CHAT_OPEN; + return AuthLoginTypeCode.WE_CHAT_OPEN; } /** @@ -58,8 +55,8 @@ public class WeChatOpenLoginHandler implements OpenIdAuthentication { */ @Override public AuthInfoResult attemptAuthentication(LoginAuthContext context) { - String authCode = context.getRequest().getParameter(AUTH_CODE); - String state = context.getRequest().getParameter(STATE); + String authCode = context.getRequest().getParameter(AuthLoginTypeCode.AUTH_CODE); + String state = context.getRequest().getParameter(AuthLoginTypeCode.STATE); AuthUser authUser = this.getAuthUser(authCode, state); @@ -108,7 +105,7 @@ public class WeChatOpenLoginHandler implements OpenIdAuthentication { AuthUser authUser = this.getAuthUser(authCode, state); userTiredOperateService.checkOpenIdBind(authUser.getUuid(), UserThird::getWeChatOpenId); userTiredOperateService.bindOpenId(userId, authUser.getUuid(), UserThird::setWeChatOpenId); - userTiredOperateService.bindOpenInfo(userId, authUser, WE_CHAT); + userTiredOperateService.bindOpenInfo(userId, authUser, AuthLoginTypeCode.WE_CHAT); } /** diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/login/WeComLoginHandler.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeComLoginHandler.java similarity index 76% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/login/WeComLoginHandler.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeComLoginHandler.java index c93a6e94a0f13325bcc5b0a091c0c6beecf47fcf..bf99f0d39ad43705023b15811beae88d28c03d11 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/login/WeComLoginHandler.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeComLoginHandler.java @@ -1,17 +1,17 @@ -package cn.bootx.iam.core.auth.login; - -import cn.bootx.starter.auth.code.AuthLoginTypeCode; -import cn.bootx.iam.core.third.dao.UserThirdManager; -import cn.bootx.iam.core.third.entity.UserThird; -import cn.bootx.iam.core.third.service.UserTiredOperateService; -import cn.bootx.iam.core.user.dao.UserInfoManager; -import cn.bootx.iam.core.user.entity.UserInfo; -import cn.bootx.starter.auth.authentication.OpenIdAuthentication; -import cn.bootx.starter.auth.configuration.AuthProperties; -import cn.bootx.starter.auth.entity.AuthInfoResult; -import cn.bootx.starter.auth.entity.LoginAuthContext; -import cn.bootx.starter.auth.exception.LoginFailureException; -import cn.bootx.starter.auth.util.SecurityUtil; +package cn.bootx.platform.iam.core.auth.login; + +import cn.bootx.platform.iam.core.third.dao.UserThirdManager; +import cn.bootx.platform.iam.core.third.entity.UserThird; +import cn.bootx.platform.iam.core.third.service.UserTiredOperateService; +import cn.bootx.platform.iam.core.user.dao.UserInfoManager; +import cn.bootx.platform.iam.core.user.entity.UserInfo; +import cn.bootx.platform.starter.auth.authentication.OpenIdAuthentication; +import cn.bootx.platform.starter.auth.code.AuthLoginTypeCode; +import cn.bootx.platform.starter.auth.configuration.AuthProperties; +import cn.bootx.platform.starter.auth.entity.AuthInfoResult; +import cn.bootx.platform.starter.auth.entity.LoginAuthContext; +import cn.bootx.platform.starter.auth.exception.LoginFailureException; +import cn.bootx.platform.starter.auth.util.SecurityUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import lombok.val; @@ -26,8 +26,6 @@ import org.springframework.stereotype.Service; import java.util.Objects; -import static cn.bootx.starter.auth.code.AuthLoginTypeCode.*; - /** * 企业微信登录 * @@ -49,13 +47,13 @@ public class WeComLoginHandler implements OpenIdAuthentication { @Override public String getLoginType() { - return WE_COM; + return AuthLoginTypeCode.WE_COM; } @Override public AuthInfoResult attemptAuthentication(LoginAuthContext context) { - String authCode = context.getRequest().getParameter(AUTH_CODE); - String state = context.getRequest().getParameter(STATE); + String authCode = context.getRequest().getParameter(AuthLoginTypeCode.AUTH_CODE); + String state = context.getRequest().getParameter(AuthLoginTypeCode.STATE); AuthUser authUser = this.getAuthUser(authCode, state); @@ -104,7 +102,7 @@ public class WeComLoginHandler implements OpenIdAuthentication { AuthUser authUser = this.getAuthUser(authCode, state); userTiredOperateService.checkOpenIdBind(authUser.getUuid(), UserThird::getWeComId); userTiredOperateService.bindOpenId(userId, authUser.getUuid(), UserThird::setWeComId); - userTiredOperateService.bindOpenInfo(userId, authUser, WE_COM); + userTiredOperateService.bindOpenInfo(userId, authUser, AuthLoginTypeCode.WE_COM); } /** diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/service/AuthAssistService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/AuthAssistService.java similarity index 68% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/service/AuthAssistService.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/AuthAssistService.java index 782426537194bbb5ca2509e1f2b0fdfe2319e6e7..e901edacfb1b16700848995cbbff2415a7398752 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/service/AuthAssistService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/AuthAssistService.java @@ -1,11 +1,11 @@ -package cn.bootx.iam.core.auth.service; - -import cn.bootx.baseapi.core.captcha.service.CaptchaService; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.iam.code.UserStatusCode; -import cn.bootx.iam.core.user.dao.UserInfoManager; -import cn.bootx.iam.core.user.entity.UserInfo; -import cn.bootx.iam.exception.user.UserInfoNotExistsException; +package cn.bootx.platform.iam.core.auth.service; + +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.iam.core.user.dao.UserInfoManager; +import cn.bootx.platform.iam.core.user.entity.UserInfo; +import cn.bootx.platform.iam.exception.user.UserInfoNotExistsException; +import cn.bootx.platform.baseapi.core.captcha.service.CaptchaService; +import cn.bootx.platform.iam.code.UserStatusCode; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/service/ThirdLoginService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/ThirdLoginService.java similarity index 83% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/service/ThirdLoginService.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/ThirdLoginService.java index 5b3f3bd3e8091f2bf855e0ce078003eaa1387700..416336195bb569e02bfa4f7218a0ecd8e5f1406c 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/auth/service/ThirdLoginService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/ThirdLoginService.java @@ -1,8 +1,8 @@ -package cn.bootx.iam.core.auth.service; +package cn.bootx.platform.iam.core.auth.service; -import cn.bootx.starter.auth.authentication.OpenIdAuthentication; -import cn.bootx.starter.auth.entity.ThirdAuthCode; -import cn.bootx.starter.auth.exception.LoginFailureException; +import cn.bootx.platform.starter.auth.authentication.OpenIdAuthentication; +import cn.bootx.platform.starter.auth.entity.ThirdAuthCode; +import cn.bootx.platform.starter.auth.exception.LoginFailureException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.zhyd.oauth.model.AuthCallback; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/convert/ClientConvert.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/convert/ClientConvert.java similarity index 59% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/convert/ClientConvert.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/convert/ClientConvert.java index 82c508f13a567d2bcea6c85eb80058ae67936a79..571a7fe2ab49a31ebdf3afd39feee677880f31b5 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/convert/ClientConvert.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/convert/ClientConvert.java @@ -1,8 +1,8 @@ -package cn.bootx.iam.core.client.convert; +package cn.bootx.platform.iam.core.client.convert; -import cn.bootx.iam.core.client.entity.Client; -import cn.bootx.iam.dto.client.ClientDto; -import cn.bootx.iam.param.client.ClientParam; +import cn.bootx.platform.iam.param.client.ClientParam; +import cn.bootx.platform.iam.core.client.entity.Client; +import cn.bootx.platform.iam.dto.client.ClientDto; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; @@ -21,4 +21,4 @@ public interface ClientConvert { ClientDto convert(Client in); -} \ No newline at end of file +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/convert/LoginTypeConvert.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/convert/LoginTypeConvert.java similarity index 60% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/convert/LoginTypeConvert.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/convert/LoginTypeConvert.java index 37dc4599864440eb58818e45b5dbd1008b63a3fb..0c3af1ac80ac08c490b6f4cd363852781cb5fe22 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/convert/LoginTypeConvert.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/convert/LoginTypeConvert.java @@ -1,8 +1,8 @@ -package cn.bootx.iam.core.client.convert; +package cn.bootx.platform.iam.core.client.convert; -import cn.bootx.iam.core.client.entity.LonginType; -import cn.bootx.iam.dto.client.LoginTypeDto; -import cn.bootx.iam.param.client.LoginTypeParam; +import cn.bootx.platform.iam.param.client.LoginTypeParam; +import cn.bootx.platform.iam.core.client.entity.LonginType; +import cn.bootx.platform.iam.dto.client.LoginTypeDto; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; @@ -21,4 +21,4 @@ public interface LoginTypeConvert { LoginTypeDto convert(LonginType in); -} \ No newline at end of file +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/dao/ClientManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientManager.java similarity index 74% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/dao/ClientManager.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientManager.java index 683f84d0774b9c60304a63833c09edb40dfcd5c6..af97690aa182aa0874e41861c86c6502f0435809 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/dao/ClientManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientManager.java @@ -1,11 +1,11 @@ -package cn.bootx.iam.core.client.dao; - -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.iam.core.client.entity.Client; -import cn.bootx.iam.param.client.ClientParam; +package cn.bootx.platform.iam.core.client.dao; + +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.iam.core.client.entity.Client; +import cn.bootx.platform.iam.param.client.ClientParam; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; @@ -46,4 +46,4 @@ public class ClientManager extends BaseManager { return existedByField(Client::getCode, code, id); } -} \ No newline at end of file +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/dao/ClientMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientMapper.java similarity index 68% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/dao/ClientMapper.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientMapper.java index 0e02c79ccfd6bbfcd43810b7b7190882d025ff7a..089967f9b1e16b9c3929731cd6a60441c4a8ed09 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/dao/ClientMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.iam.core.client.dao; +package cn.bootx.platform.iam.core.client.dao; -import cn.bootx.iam.core.client.entity.Client; +import cn.bootx.platform.iam.core.client.entity.Client; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -13,4 +13,4 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface ClientMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/dao/LoginTypeManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/LoginTypeManager.java similarity index 77% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/dao/LoginTypeManager.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/LoginTypeManager.java index a1269e063e40cc27d8ae456c3943f5cbf937ae0d..7d517633aa70a07fa68f9886d7950e8035fca73f 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/dao/LoginTypeManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/LoginTypeManager.java @@ -1,12 +1,12 @@ -package cn.bootx.iam.core.client.dao; - -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.common.query.entity.QueryParams; -import cn.bootx.common.query.generator.QueryGenerator; -import cn.bootx.iam.core.client.entity.LonginType; -import cn.bootx.iam.param.client.LoginTypeParam; +package cn.bootx.platform.iam.core.client.dao; + +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.common.query.entity.QueryParams; +import cn.bootx.platform.common.query.generator.QueryGenerator; +import cn.bootx.platform.iam.core.client.entity.LonginType; +import cn.bootx.platform.iam.param.client.LoginTypeParam; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/dao/LoginTypeMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/LoginTypeMapper.java similarity index 68% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/dao/LoginTypeMapper.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/LoginTypeMapper.java index 33eb0f8b2797c8689fbdd63861094c71506672f3..d281c48da5391f2fdebb9e0a530fbd59022d11a0 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/dao/LoginTypeMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/LoginTypeMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.iam.core.client.dao; +package cn.bootx.platform.iam.core.client.dao; -import cn.bootx.iam.core.client.entity.LonginType; +import cn.bootx.platform.iam.core.client.entity.LonginType; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/entity/Client.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/Client.java similarity index 82% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/entity/Client.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/Client.java index 8e65e17624307137bd4d2867c682a92860793670..3f56b6241b9d0955d384f5310bf019144b09d670 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/entity/Client.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/Client.java @@ -1,10 +1,10 @@ -package cn.bootx.iam.core.client.entity; +package cn.bootx.platform.iam.core.client.entity; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.iam.core.client.convert.ClientConvert; -import cn.bootx.iam.dto.client.ClientDto; -import cn.bootx.iam.param.client.ClientParam; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.iam.core.client.convert.ClientConvert; +import cn.bootx.platform.iam.param.client.ClientParam; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.iam.dto.client.ClientDto; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/entity/LonginType.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/LonginType.java similarity index 77% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/entity/LonginType.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/LonginType.java index cb002261792e8b74f8a3127e6803eb27009670ae..5400b74fa15d40d8068ba7a444ed433413c5b543 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/entity/LonginType.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/LonginType.java @@ -1,10 +1,10 @@ -package cn.bootx.iam.core.client.entity; +package cn.bootx.platform.iam.core.client.entity; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.iam.core.client.convert.LoginTypeConvert; -import cn.bootx.iam.dto.client.LoginTypeDto; -import cn.bootx.iam.param.client.LoginTypeParam; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.iam.core.client.convert.LoginTypeConvert; +import cn.bootx.platform.iam.param.client.LoginTypeParam; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.iam.dto.client.LoginTypeDto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/service/ClientService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/service/ClientService.java similarity index 78% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/service/ClientService.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/service/ClientService.java index 8a5e8d2a961d4fd8eae3fee7d185337620cd80a6..7f00ccb770c43d8f71c808884ff77170533522df 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/service/ClientService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/service/ClientService.java @@ -1,14 +1,14 @@ -package cn.bootx.iam.core.client.service; +package cn.bootx.platform.iam.core.client.service; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.core.util.ResultConvertUtil; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.iam.core.client.dao.ClientManager; -import cn.bootx.iam.core.client.entity.Client; -import cn.bootx.iam.dto.client.ClientDto; -import cn.bootx.iam.param.client.ClientParam; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.ResultConvertUtil; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.iam.param.client.ClientParam; +import cn.bootx.platform.iam.core.client.dao.ClientManager; +import cn.bootx.platform.iam.core.client.entity.Client; +import cn.bootx.platform.iam.dto.client.ClientDto; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.collection.CollUtil; @@ -96,4 +96,4 @@ public class ClientService { return clientManager.existsByCode(code, id); } -} \ No newline at end of file +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/service/LoginTypeService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/service/LoginTypeService.java similarity index 81% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/service/LoginTypeService.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/service/LoginTypeService.java index 4f49b5a9462b911e44753a7a845df332f56a58a0..ff6d9a9ddf03ed4bf947744d9b5ce4ae5839838e 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/client/service/LoginTypeService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/service/LoginTypeService.java @@ -1,16 +1,16 @@ -package cn.bootx.iam.core.client.service; +package cn.bootx.platform.iam.core.client.service; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.core.util.ResultConvertUtil; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.common.query.entity.QueryParams; -import cn.bootx.iam.core.client.dao.LoginTypeManager; -import cn.bootx.iam.core.client.entity.LonginType; -import cn.bootx.iam.dto.client.LoginTypeDto; -import cn.bootx.iam.param.client.LoginTypeParam; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.ResultConvertUtil; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.common.query.entity.QueryParams; +import cn.bootx.platform.iam.param.client.LoginTypeParam; +import cn.bootx.platform.iam.core.client.dao.LoginTypeManager; +import cn.bootx.platform.iam.core.client.entity.LonginType; +import cn.bootx.platform.iam.dto.client.LoginTypeDto; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/dept/convert/DeptConvert.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/convert/DeptConvert.java similarity index 62% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/dept/convert/DeptConvert.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/convert/DeptConvert.java index 649be8267b3881b0d2e8d74e923872e675523c14..5adda6a95053f9920364a58c91603f697a83354a 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/dept/convert/DeptConvert.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/convert/DeptConvert.java @@ -1,10 +1,9 @@ -package cn.bootx.iam.core.dept.convert; +package cn.bootx.platform.iam.core.dept.convert; -import cn.bootx.iam.core.dept.entity.Dept; -import cn.bootx.iam.dto.dept.DeptDto; -import cn.bootx.iam.param.dept.DeptParam; +import cn.bootx.platform.iam.param.dept.DeptParam; +import cn.bootx.platform.iam.core.dept.entity.Dept; +import cn.bootx.platform.iam.dto.dept.DeptDto; import org.mapstruct.Mapper; -import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; /** diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/dept/dao/DeptManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/dao/DeptManager.java similarity index 72% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/dept/dao/DeptManager.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/dao/DeptManager.java index 1acba2a33ac3f8345ff022510be1ec7af1803519..82fc6958b451a787bb82155e448f436a395c88e3 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/dept/dao/DeptManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/dao/DeptManager.java @@ -1,7 +1,7 @@ -package cn.bootx.iam.core.dept.dao; +package cn.bootx.platform.iam.core.dept.dao; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.iam.core.dept.entity.Dept; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.iam.core.dept.entity.Dept; import org.springframework.stereotype.Repository; /** diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/dept/dao/DeptMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/dao/DeptMapper.java similarity index 70% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/dept/dao/DeptMapper.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/dao/DeptMapper.java index 17e27eef709e4f812f4bc00bf8d242a54dc20c15..b8235f20cc55ac63765d887ae5c6f18222c78248 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/dept/dao/DeptMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/dao/DeptMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.iam.core.dept.dao; +package cn.bootx.platform.iam.core.dept.dao; -import cn.bootx.iam.core.dept.entity.Dept; +import cn.bootx.platform.iam.core.dept.entity.Dept; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/dept/entity/Dept.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/entity/Dept.java similarity index 71% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/dept/entity/Dept.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/entity/Dept.java index 84a573346e5f607e8d4e29f7c22f035b740f2c13..221d8c007403eb56926834a72269c76fcbf34f40 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/dept/entity/Dept.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/entity/Dept.java @@ -1,10 +1,11 @@ -package cn.bootx.iam.core.dept.entity; +package cn.bootx.platform.iam.core.dept.entity; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.iam.core.dept.convert.DeptConvert; -import cn.bootx.iam.dto.dept.DeptDto; -import cn.bootx.iam.param.dept.DeptParam; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.iam.core.dept.convert.DeptConvert; +import cn.bootx.platform.iam.param.dept.DeptParam; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.iam.code.OrgCategoryCode; +import cn.bootx.platform.iam.dto.dept.DeptDto; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -33,7 +34,7 @@ public class Dept extends MpBaseEntity implements EntityBaseFunction { /** * 机构类别 - * @see cn.bootx.iam.code.OrgCategoryCode + * @see OrgCategoryCode */ private Integer orgCategory; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/dept/event/DeptDeleteEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/event/DeptDeleteEvent.java similarity index 89% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/dept/event/DeptDeleteEvent.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/event/DeptDeleteEvent.java index ba7311fc4a7d5e7ba417ccc32cdc7802374bfdd4..ea5a7be0bdcf66a5dd75cc0da1f19d44a176f4e3 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/dept/event/DeptDeleteEvent.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/event/DeptDeleteEvent.java @@ -1,4 +1,4 @@ -package cn.bootx.iam.core.dept.event; +package cn.bootx.platform.iam.core.dept.event; import lombok.Getter; import org.springframework.context.ApplicationEvent; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/dept/service/DeptRuleService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/service/DeptRuleService.java similarity index 91% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/dept/service/DeptRuleService.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/service/DeptRuleService.java index c212fadf81254d74e14d80f61cbf98e04a2e65cb..0340babf6b9c7b22def3c9c10e2c6e4d2efdac9a 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/dept/service/DeptRuleService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/service/DeptRuleService.java @@ -1,10 +1,10 @@ -package cn.bootx.iam.core.dept.service; +package cn.bootx.platform.iam.core.dept.service; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.iam.core.dept.dao.DeptManager; -import cn.bootx.iam.core.dept.entity.Dept; -import cn.bootx.iam.dto.dept.DeptTreeResult; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.iam.core.dept.dao.DeptManager; +import cn.bootx.platform.iam.core.dept.entity.Dept; +import cn.bootx.platform.iam.dto.dept.DeptTreeResult; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.lock.annotation.Lock4j; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/dept/service/DeptService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/service/DeptService.java similarity index 84% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/dept/service/DeptService.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/service/DeptService.java index b7ecd49fe09d8f287cd5b2926063279d8e5bb6c8..c7bf4f0633d9d295dff8d43a2f6ff400647c932c 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/dept/service/DeptService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/service/DeptService.java @@ -1,13 +1,13 @@ -package cn.bootx.iam.core.dept.service; - -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.iam.core.dept.dao.DeptManager; -import cn.bootx.iam.core.dept.entity.Dept; -import cn.bootx.iam.core.dept.event.DeptDeleteEvent; -import cn.bootx.iam.dto.dept.DeptDto; -import cn.bootx.iam.dto.dept.DeptTreeResult; -import cn.bootx.iam.param.dept.DeptParam; +package cn.bootx.platform.iam.core.dept.service; + +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.iam.param.dept.DeptParam; +import cn.bootx.platform.iam.core.dept.dao.DeptManager; +import cn.bootx.platform.iam.core.dept.entity.Dept; +import cn.bootx.platform.iam.core.dept.event.DeptDeleteEvent; +import cn.bootx.platform.iam.dto.dept.DeptDto; +import cn.bootx.platform.iam.dto.dept.DeptTreeResult; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import lombok.AllArgsConstructor; @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import java.util.Objects; -import static cn.bootx.iam.code.CachingCode.USER_DATA_SCOPE; +import static cn.bootx.platform.iam.code.CachingCode.USER_DATA_SCOPE; /** * @author xxm diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/permission/convert/PermConvert.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/convert/PermConvert.java similarity index 49% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/permission/convert/PermConvert.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/convert/PermConvert.java index c6cbd4dc7a3de89a2bd46a8b67572c5da80bfc2a..78e3a3ab870f3378cf1348497aa605fd9039015b 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/permission/convert/PermConvert.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/convert/PermConvert.java @@ -1,14 +1,13 @@ -package cn.bootx.iam.core.permission.convert; - -import cn.bootx.iam.core.permission.entity.PermMenu; -import cn.bootx.iam.core.permission.entity.PermPath; -import cn.bootx.iam.core.permission.entity.RequestPath; -import cn.bootx.iam.dto.permission.PermMenuDto; -import cn.bootx.iam.dto.permission.PermPathDto; -import cn.bootx.iam.param.permission.PermMenuParam; -import cn.bootx.iam.param.permission.PermPathParam; +package cn.bootx.platform.iam.core.permission.convert; + +import cn.bootx.platform.iam.param.permission.PermMenuParam; +import cn.bootx.platform.iam.param.permission.PermPathParam; +import cn.bootx.platform.iam.core.permission.entity.PermMenu; +import cn.bootx.platform.iam.core.permission.entity.PermPath; +import cn.bootx.platform.iam.core.permission.entity.RequestPath; +import cn.bootx.platform.iam.dto.permission.PermMenuDto; +import cn.bootx.platform.iam.dto.permission.PermPathDto; import org.mapstruct.Mapper; -import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; /** diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/permission/dao/PermMenuManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermMenuManager.java similarity index 83% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/permission/dao/PermMenuManager.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermMenuManager.java index 7d34228c5331b397385e3cad4dff54362b5b0cd0..eb468c859b73f88d02d3b11ecd56b23aa2c45426 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/permission/dao/PermMenuManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermMenuManager.java @@ -1,8 +1,8 @@ -package cn.bootx.iam.core.permission.dao; +package cn.bootx.platform.iam.core.permission.dao; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.iam.code.PermissionCode; -import cn.bootx.iam.core.permission.entity.PermMenu; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.iam.core.permission.entity.PermMenu; +import cn.bootx.platform.iam.code.PermissionCode; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/permission/dao/PermMenuMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermMenuMapper.java similarity index 67% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/permission/dao/PermMenuMapper.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermMenuMapper.java index 110c2af1b7cf1051f97375fc77ef0921b2f5fe87..c33cb1a92042d9ca88f5552a500cef799d49ec45 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/permission/dao/PermMenuMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermMenuMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.iam.core.permission.dao; +package cn.bootx.platform.iam.core.permission.dao; -import cn.bootx.iam.core.permission.entity.PermMenu; +import cn.bootx.platform.iam.core.permission.entity.PermMenu; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/permission/dao/PermPathManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermPathManager.java similarity index 77% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/permission/dao/PermPathManager.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermPathManager.java index 37f7013f98d2ac49694053c243a77ccfdf9100e6..f9614f674cc84dd95b970f60a4ab7335c6044935 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/permission/dao/PermPathManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermPathManager.java @@ -1,12 +1,12 @@ -package cn.bootx.iam.core.permission.dao; - -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.iam.core.permission.entity.PermPath; -import cn.bootx.iam.param.permission.PermPathParam; -import cn.bootx.starter.auth.util.SecurityUtil; +package cn.bootx.platform.iam.core.permission.dao; + +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.iam.core.permission.entity.PermPath; +import cn.bootx.platform.iam.param.permission.PermPathParam; +import cn.bootx.platform.starter.auth.util.SecurityUtil; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/permission/dao/PermPathMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermPathMapper.java similarity index 76% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/permission/dao/PermPathMapper.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermPathMapper.java index 7bba71e659b3ef4a72950192faa630a9e93174ae..d3f7942037a9ba361ec6273e12cd624573a765e7 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/permission/dao/PermPathMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermPathMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.iam.core.permission.dao; +package cn.bootx.platform.iam.core.permission.dao; -import cn.bootx.iam.core.permission.entity.PermPath; +import cn.bootx.platform.iam.core.permission.entity.PermPath; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/permission/entity/PermMenu.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/PermMenu.java similarity index 80% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/permission/entity/PermMenu.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/PermMenu.java index 7734e9d308d6a1afbf8bae0c5a2c5ae6070576f1..c587757a3ad6523d6e2c0b5b6d75fdb2f9f8a3ce 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/permission/entity/PermMenu.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/PermMenu.java @@ -1,10 +1,11 @@ -package cn.bootx.iam.core.permission.entity; - -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.iam.core.permission.convert.PermConvert; -import cn.bootx.iam.dto.permission.PermMenuDto; -import cn.bootx.iam.param.permission.PermMenuParam; +package cn.bootx.platform.iam.core.permission.entity; + +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.iam.core.permission.convert.PermConvert; +import cn.bootx.platform.iam.param.permission.PermMenuParam; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.iam.code.PermissionCode; +import cn.bootx.platform.iam.dto.permission.PermMenuDto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -71,7 +72,7 @@ public class PermMenu extends MpBaseEntity implements EntityBaseFunction { -} \ No newline at end of file +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/third/dao/UserThirdManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdManager.java similarity index 76% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/third/dao/UserThirdManager.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdManager.java index eb883a1dc5a7e2d5cfe9002fce8fb74316f312d6..1b72142863ada71139506280a1c6d1c52632f62b 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/third/dao/UserThirdManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdManager.java @@ -1,10 +1,10 @@ -package cn.bootx.iam.core.third.dao; +package cn.bootx.platform.iam.core.third.dao; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.iam.core.third.entity.UserThird; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.iam.core.third.entity.UserThird; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/third/dao/UserThirdMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdMapper.java similarity index 69% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/third/dao/UserThirdMapper.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdMapper.java index 992e053e5804ccbebe22a61590c7005252dc059f..c6750b01622c75615499d5117ce6e21528e9edfe 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/third/dao/UserThirdMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.iam.core.third.dao; +package cn.bootx.platform.iam.core.third.dao; -import cn.bootx.iam.core.third.entity.UserThird; +import cn.bootx.platform.iam.core.third.entity.UserThird; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/third/entity/UserThird.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/entity/UserThird.java similarity index 75% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/third/entity/UserThird.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/entity/UserThird.java index 2c26098765e53e331cee7dfce6bc7186a2e63a4c..7af2611e98c1ba205b027a10bc741fc15931a9ac 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/third/entity/UserThird.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/entity/UserThird.java @@ -1,9 +1,9 @@ -package cn.bootx.iam.core.third.entity; +package cn.bootx.platform.iam.core.third.entity; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.iam.core.third.convert.UserThirdConvert; -import cn.bootx.iam.dto.user.UserThirdDto; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.iam.core.third.convert.UserThirdConvert; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.iam.dto.user.UserThirdDto; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/third/entity/UserThirdInfo.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/entity/UserThirdInfo.java similarity index 76% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/third/entity/UserThirdInfo.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/entity/UserThirdInfo.java index 8df3512d25c9953d9a86225e8cf2c8b0fe428304..9e06dff528c63bccca25606097cff5aaa16bb98b 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/third/entity/UserThirdInfo.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/entity/UserThirdInfo.java @@ -1,9 +1,9 @@ -package cn.bootx.iam.core.third.entity; +package cn.bootx.platform.iam.core.third.entity; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpDelEntity; -import cn.bootx.iam.core.third.convert.UserThirdInfoConvert; -import cn.bootx.iam.dto.user.UserThirdInfoDto; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.iam.core.third.convert.UserThirdInfoConvert; +import cn.bootx.platform.common.mybatisplus.base.MpDelEntity; +import cn.bootx.platform.iam.dto.user.UserThirdInfoDto; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/third/service/UserThirdBindService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdBindService.java similarity index 76% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/third/service/UserThirdBindService.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdBindService.java index 3f629782af896e90c12e49437cb2be4738f3f54b..4e17591baa447b3b978b8292df4d512e349d2e08 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/third/service/UserThirdBindService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdBindService.java @@ -1,14 +1,14 @@ -package cn.bootx.iam.core.third.service; +package cn.bootx.platform.iam.core.third.service; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.starter.auth.code.AuthLoginTypeCode; -import cn.bootx.iam.core.third.dao.UserThirdInfoManager; -import cn.bootx.iam.core.third.dao.UserThirdManager; -import cn.bootx.iam.core.third.entity.UserThird; -import cn.bootx.starter.auth.authentication.OpenIdAuthentication; -import cn.bootx.starter.auth.exception.LoginFailureException; -import cn.bootx.starter.auth.util.SecurityUtil; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.starter.auth.authentication.OpenIdAuthentication; +import cn.bootx.platform.starter.auth.code.AuthLoginTypeCode; +import cn.bootx.platform.starter.auth.exception.LoginFailureException; +import cn.bootx.platform.starter.auth.util.SecurityUtil; +import cn.bootx.platform.iam.core.third.dao.UserThirdInfoManager; +import cn.bootx.platform.iam.core.third.dao.UserThirdManager; +import cn.bootx.platform.iam.core.third.entity.UserThird; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -16,8 +16,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; -import static cn.bootx.starter.auth.code.AuthLoginTypeCode.WE_CHAT; - /** * 三方账号绑定 * @@ -55,7 +53,7 @@ public class UserThirdBindService { } userThirdInfoManager.deleteByUserAndClientCode(userId, loginType); switch (loginType) { - case WE_CHAT: { + case AuthLoginTypeCode.WE_CHAT: { userThirdManager.unbind(userId, UserThird::getWeChatId); break; } diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/third/service/UserThirdQueryService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdQueryService.java similarity index 64% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/third/service/UserThirdQueryService.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdQueryService.java index b4975a3fd48c2eeac23895aaa3cdf69fc80b259d..c7af1983936c239c73e8d009dc8f37cd15117baa 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/third/service/UserThirdQueryService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdQueryService.java @@ -1,17 +1,18 @@ -package cn.bootx.iam.core.third.service; +package cn.bootx.platform.iam.core.third.service; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.iam.core.third.dao.UserThirdInfoManager; -import cn.bootx.iam.core.third.dao.UserThirdManager; -import cn.bootx.iam.core.third.entity.UserThird; -import cn.bootx.iam.core.third.entity.UserThirdInfo; -import cn.bootx.iam.dto.user.UserThirdBindInfo; -import cn.bootx.iam.dto.user.UserThirdBindInfo.BindInfo; -import cn.bootx.iam.dto.user.UserThirdDto; -import cn.bootx.starter.auth.util.SecurityUtil; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.starter.auth.code.AuthLoginTypeCode; +import cn.bootx.platform.starter.auth.util.SecurityUtil; +import cn.bootx.platform.iam.core.third.dao.UserThirdInfoManager; +import cn.bootx.platform.iam.core.third.dao.UserThirdManager; +import cn.bootx.platform.iam.core.third.entity.UserThird; +import cn.bootx.platform.iam.core.third.entity.UserThirdInfo; +import cn.bootx.platform.iam.dto.user.UserThirdBindInfo; +import cn.bootx.platform.iam.dto.user.UserThirdBindInfo.BindInfo; +import cn.bootx.platform.iam.dto.user.UserThirdDto; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -21,8 +22,6 @@ import java.util.Objects; import java.util.function.Function; import java.util.stream.Collectors; -import static cn.bootx.starter.auth.code.AuthLoginTypeCode.*; - /** * 用户三方账号查询 * @@ -61,10 +60,10 @@ public class UserThirdQueryService { Map thirdInfoMap = userThirdInfoManager.findAllByUser(userId) .stream() .collect(Collectors.toMap(UserThirdInfo::getClientCode, Function.identity())); - userThirdBindInfo.setWeChat(getBindInfo(thirdInfoMap, WE_CHAT)); - userThirdBindInfo.setWeChatOpen(getBindInfo(thirdInfoMap, WE_CHAT_OPEN)); - userThirdBindInfo.setWeCom(getBindInfo(thirdInfoMap, WE_COM)); - userThirdBindInfo.setDingTalk(getBindInfo(thirdInfoMap, DING_TALK)); + userThirdBindInfo.setWeChat(getBindInfo(thirdInfoMap, AuthLoginTypeCode.WE_CHAT)); + userThirdBindInfo.setWeChatOpen(getBindInfo(thirdInfoMap, AuthLoginTypeCode.WE_CHAT_OPEN)); + userThirdBindInfo.setWeCom(getBindInfo(thirdInfoMap, AuthLoginTypeCode.WE_COM)); + userThirdBindInfo.setDingTalk(getBindInfo(thirdInfoMap, AuthLoginTypeCode.DING_TALK)); return userThirdBindInfo; } diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/third/service/UserTiredOperateService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserTiredOperateService.java similarity index 82% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/third/service/UserTiredOperateService.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserTiredOperateService.java index 468648f96b95e46ebb57066283f4efbe8f3aff96..95822a937d4aa89216543a7d9f7e1c41c731dea4 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/third/service/UserTiredOperateService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserTiredOperateService.java @@ -1,13 +1,13 @@ -package cn.bootx.iam.core.third.service; +package cn.bootx.platform.iam.core.third.service; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.iam.core.third.dao.UserThirdInfoManager; -import cn.bootx.iam.core.third.dao.UserThirdManager; -import cn.bootx.iam.core.third.entity.UserThird; -import cn.bootx.iam.core.third.entity.UserThirdInfo; -import cn.bootx.iam.core.user.dao.UserInfoManager; -import cn.bootx.iam.core.user.entity.UserInfo; -import cn.bootx.iam.exception.user.UserInfoNotExistsException; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.iam.exception.user.UserInfoNotExistsException; +import cn.bootx.platform.iam.core.third.dao.UserThirdInfoManager; +import cn.bootx.platform.iam.core.third.dao.UserThirdManager; +import cn.bootx.platform.iam.core.third.entity.UserThird; +import cn.bootx.platform.iam.core.third.entity.UserThirdInfo; +import cn.bootx.platform.iam.core.user.dao.UserInfoManager; +import cn.bootx.platform.iam.core.user.entity.UserInfo; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/dao/RoleMenuManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RoleMenuManager.java similarity index 84% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/dao/RoleMenuManager.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RoleMenuManager.java index 975410255aece5f0ba58a8cd0490174f33669cc8..8a5d6d03a1af2552659c00b7d27841efeb3d4395 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/dao/RoleMenuManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RoleMenuManager.java @@ -1,8 +1,8 @@ -package cn.bootx.iam.core.upms.dao; +package cn.bootx.platform.iam.core.upms.dao; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.iam.core.upms.entity.RoleMenu; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.iam.core.upms.entity.RoleMenu; import cn.hutool.core.util.IdUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/dao/RoleMenuMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RoleMenuMapper.java similarity index 78% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/dao/RoleMenuMapper.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RoleMenuMapper.java index 495322d299fe2b0c3322de5d41262a21fcba8774..ab7d31ff1a7c635f10f3ac58575117d9b0d2d10e 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/dao/RoleMenuMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RoleMenuMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.iam.core.upms.dao; +package cn.bootx.platform.iam.core.upms.dao; -import cn.bootx.iam.core.upms.entity.RoleMenu; +import cn.bootx.platform.iam.core.upms.entity.RoleMenu; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/dao/RolePathManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RolePathManager.java similarity index 85% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/dao/RolePathManager.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RolePathManager.java index a04161cc1bc5197c7f91f990907f3601ad25e718..0d6da544989002d12aaeec621ed530d25c69461f 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/dao/RolePathManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RolePathManager.java @@ -1,8 +1,8 @@ -package cn.bootx.iam.core.upms.dao; +package cn.bootx.platform.iam.core.upms.dao; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.iam.core.upms.entity.RolePath; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.iam.core.upms.entity.RolePath; import cn.hutool.core.util.IdUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/dao/RolePathMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RolePathMapper.java similarity index 78% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/dao/RolePathMapper.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RolePathMapper.java index d20d4785bb5ee52138149e93d70aa10c813d911b..6b4cb485af681d9d976dd34d94d465bef10b0032 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/dao/RolePathMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RolePathMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.iam.core.upms.dao; +package cn.bootx.platform.iam.core.upms.dao; -import cn.bootx.iam.core.upms.entity.RolePath; +import cn.bootx.platform.iam.core.upms.entity.RolePath; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/dao/UserDataScopeManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserDataScopeManager.java similarity index 82% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/dao/UserDataScopeManager.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserDataScopeManager.java index b69dbd38398c3cd911fb6cbb034eef4d4fae8391..27f9e7f38ff3d4cc20a7a374fd7b117227c602c5 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/dao/UserDataScopeManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserDataScopeManager.java @@ -1,9 +1,9 @@ -package cn.bootx.iam.core.upms.dao; +package cn.bootx.platform.iam.core.upms.dao; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.iam.core.upms.entity.UserDataScope; -import cn.bootx.starter.auth.util.SecurityUtil; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.iam.core.upms.entity.UserDataScope; +import cn.bootx.platform.starter.auth.util.SecurityUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/dao/UserDataScopeMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserDataScopeMapper.java similarity index 78% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/dao/UserDataScopeMapper.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserDataScopeMapper.java index 037e98b4cbc41086f216edfa48cf36b6b0031440..702ee2ff2538752fe91cf232df6cb4160cb4f081 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/dao/UserDataScopeMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserDataScopeMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.iam.core.upms.dao; +package cn.bootx.platform.iam.core.upms.dao; -import cn.bootx.iam.core.upms.entity.UserDataScope; +import cn.bootx.platform.iam.core.upms.entity.UserDataScope; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/dao/UserRoleManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserRoleManager.java similarity index 82% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/dao/UserRoleManager.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserRoleManager.java index d9f5e0b3a892192fad871b949f7f46f09f41bd2c..712c6dc588399ace6842aa9011cb07a0a2247f63 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/dao/UserRoleManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserRoleManager.java @@ -1,9 +1,9 @@ -package cn.bootx.iam.core.upms.dao; +package cn.bootx.platform.iam.core.upms.dao; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.iam.core.upms.entity.UserRole; -import cn.bootx.starter.auth.util.SecurityUtil; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.iam.core.upms.entity.UserRole; +import cn.bootx.platform.starter.auth.util.SecurityUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/dao/UserRoleMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserRoleMapper.java similarity index 78% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/dao/UserRoleMapper.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserRoleMapper.java index ab468ea8be49ff005fc37f37a516b037e4a6c785..73ec012e41b3b51611263abe212e18c0fc958b7c 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/dao/UserRoleMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserRoleMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.iam.core.upms.dao; +package cn.bootx.platform.iam.core.upms.dao; -import cn.bootx.iam.core.upms.entity.UserRole; +import cn.bootx.platform.iam.core.upms.entity.UserRole; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/entity/RoleMenu.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/RoleMenu.java similarity index 87% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/entity/RoleMenu.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/RoleMenu.java index 51a887feabef243ad4734642cb1af3dcc066dcb9..e2cd3165ac2ebe7843c24e84307018bf184a6b13 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/entity/RoleMenu.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/RoleMenu.java @@ -1,6 +1,6 @@ -package cn.bootx.iam.core.upms.entity; +package cn.bootx.platform.iam.core.upms.entity; -import cn.bootx.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/entity/RolePath.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/RolePath.java similarity index 86% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/entity/RolePath.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/RolePath.java index 2c159c3c0fa27de6386bdd73036849daba5e2e25..d479e472e40f315f66c9af380dae207aae6a7633 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/entity/RolePath.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/RolePath.java @@ -1,6 +1,6 @@ -package cn.bootx.iam.core.upms.entity; +package cn.bootx.platform.iam.core.upms.entity; -import cn.bootx.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/entity/UserDataScope.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/UserDataScope.java similarity index 84% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/entity/UserDataScope.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/UserDataScope.java index e5d6c431ee4b286012e2f41abaf7ed989af4a07d..f50f7af108761d111e14ddcad41c138b4d27a15b 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/entity/UserDataScope.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/UserDataScope.java @@ -1,6 +1,6 @@ -package cn.bootx.iam.core.upms.entity; +package cn.bootx.platform.iam.core.upms.entity; -import cn.bootx.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/entity/UserRole.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/UserRole.java similarity index 82% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/entity/UserRole.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/UserRole.java index e1b1c0c9c0dfce0b4ff7ddecff0ce58e267ded3e..19fe395d3067717ee0aea5288e1df8cfd4bfd599 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/entity/UserRole.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/UserRole.java @@ -1,6 +1,6 @@ -package cn.bootx.iam.core.upms.entity; +package cn.bootx.platform.iam.core.upms.entity; -import cn.bootx.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/service/RolePathService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/RolePathService.java similarity index 85% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/service/RolePathService.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/RolePathService.java index adc1e1ed754a6f1b4b5e15fecb541f0e99ff6505..12b23fcf8d97f2b0ec7b611f8cdc6cacb5c9757e 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/service/RolePathService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/RolePathService.java @@ -1,15 +1,15 @@ -package cn.bootx.iam.core.upms.service; - -import cn.bootx.common.core.annotation.CountTime; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.iam.core.permission.service.PermPathService; -import cn.bootx.iam.core.upms.dao.RolePathManager; -import cn.bootx.iam.core.upms.entity.RolePath; -import cn.bootx.iam.core.user.dao.UserInfoManager; -import cn.bootx.iam.core.user.entity.UserInfo; -import cn.bootx.iam.dto.permission.PermPathDto; -import cn.bootx.iam.exception.user.UserInfoNotExistsException; -import cn.bootx.starter.auth.util.SecurityUtil; +package cn.bootx.platform.iam.core.upms.service; + +import cn.bootx.platform.common.core.annotation.CountTime; +import cn.bootx.platform.iam.core.permission.service.PermPathService; +import cn.bootx.platform.iam.core.user.dao.UserInfoManager; +import cn.bootx.platform.iam.core.user.entity.UserInfo; +import cn.bootx.platform.iam.exception.user.UserInfoNotExistsException; +import cn.bootx.platform.starter.auth.util.SecurityUtil; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.iam.core.upms.dao.RolePathManager; +import cn.bootx.platform.iam.core.upms.entity.RolePath; +import cn.bootx.platform.iam.dto.permission.PermPathDto; import cn.hutool.core.collection.CollUtil; import cn.hutool.extra.spring.SpringUtil; import lombok.RequiredArgsConstructor; @@ -24,7 +24,7 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import static cn.bootx.iam.code.CachingCode.USER_PATH; +import static cn.bootx.platform.iam.code.CachingCode.USER_PATH; /** * 角色请求权限关系 diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/service/RolePermService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/RolePermService.java similarity index 88% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/service/RolePermService.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/RolePermService.java index ddc10d5691f1421a5802d6f55ac11f999cfe0c5a..cebada4c54f81c4406ea031d9bd4ad29ae1e24b7 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/service/RolePermService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/RolePermService.java @@ -1,18 +1,18 @@ -package cn.bootx.iam.core.upms.service; - -import cn.bootx.common.core.annotation.NestedPermission; -import cn.bootx.common.core.entity.UserDetail; -import cn.bootx.common.core.rest.dto.BaseDto; -import cn.bootx.common.core.util.TreeBuildUtil; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.iam.code.PermissionCode; -import cn.bootx.iam.core.permission.service.PermMenuService; -import cn.bootx.iam.core.upms.dao.RoleMenuManager; -import cn.bootx.iam.core.upms.entity.RoleMenu; -import cn.bootx.iam.dto.permission.PermMenuDto; -import cn.bootx.iam.dto.upms.MenuAndResourceDto; -import cn.bootx.starter.auth.exception.NotLoginException; -import cn.bootx.starter.auth.util.SecurityUtil; +package cn.bootx.platform.iam.core.upms.service; + +import cn.bootx.platform.common.core.annotation.NestedPermission; +import cn.bootx.platform.common.core.entity.UserDetail; +import cn.bootx.platform.common.core.rest.dto.BaseDto; +import cn.bootx.platform.common.core.util.TreeBuildUtil; +import cn.bootx.platform.iam.core.permission.service.PermMenuService; +import cn.bootx.platform.starter.auth.exception.NotLoginException; +import cn.bootx.platform.starter.auth.util.SecurityUtil; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.iam.code.PermissionCode; +import cn.bootx.platform.iam.core.upms.dao.RoleMenuManager; +import cn.bootx.platform.iam.core.upms.entity.RoleMenu; +import cn.bootx.platform.iam.dto.permission.PermMenuDto; +import cn.bootx.platform.iam.dto.upms.MenuAndResourceDto; import cn.hutool.core.collection.CollUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -27,7 +27,7 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import static cn.bootx.iam.code.CachingCode.USER_PERM_CODE; +import static cn.bootx.platform.iam.code.CachingCode.USER_PERM_CODE; /** * 角色权限菜单关系 diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/service/UserDataScopeService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserDataScopeService.java similarity index 83% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/service/UserDataScopeService.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserDataScopeService.java index b5969dc1eda225dbe856bf3356206059f840cd28..375c48d6e5c81e16ae8c936849b8f04fd08dcf71 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/service/UserDataScopeService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserDataScopeService.java @@ -1,25 +1,25 @@ -package cn.bootx.iam.core.upms.service; - -import cn.bootx.common.core.annotation.CountTime; -import cn.bootx.common.core.annotation.NestedPermission; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.iam.core.dept.dao.DeptManager; -import cn.bootx.iam.core.dept.entity.Dept; -import cn.bootx.iam.core.scope.dao.DataScopeDeptManager; -import cn.bootx.iam.core.scope.dao.DataScopeManager; -import cn.bootx.iam.core.scope.dao.DataScopeUserManager; -import cn.bootx.iam.core.scope.entity.DataScope; -import cn.bootx.iam.core.scope.entity.DataScopeDept; -import cn.bootx.iam.core.scope.entity.DataScopeUser; -import cn.bootx.iam.core.upms.dao.UserDataScopeManager; -import cn.bootx.iam.core.upms.entity.UserDataScope; -import cn.bootx.iam.core.user.dao.UserDeptManager; -import cn.bootx.iam.core.user.entity.UserDept; -import cn.bootx.iam.dto.scope.DataScopeDto; -import cn.bootx.starter.data.perm.code.DataScopeEnum; -import cn.bootx.starter.data.perm.scope.DataPermScope; +package cn.bootx.platform.iam.core.upms.service; + +import cn.bootx.platform.common.core.annotation.CountTime; +import cn.bootx.platform.common.core.annotation.NestedPermission; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.iam.core.scope.dao.DataScopeDeptManager; +import cn.bootx.platform.iam.core.scope.dao.DataScopeManager; +import cn.bootx.platform.iam.core.scope.dao.DataScopeUserManager; +import cn.bootx.platform.iam.core.scope.entity.DataScope; +import cn.bootx.platform.iam.core.scope.entity.DataScopeDept; +import cn.bootx.platform.iam.core.scope.entity.DataScopeUser; +import cn.bootx.platform.iam.core.user.dao.UserDeptManager; +import cn.bootx.platform.iam.core.user.entity.UserDept; +import cn.bootx.platform.starter.data.perm.code.DataScopeEnum; +import cn.bootx.platform.starter.data.perm.scope.DataPermScope; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.iam.core.dept.dao.DeptManager; +import cn.bootx.platform.iam.core.dept.entity.Dept; +import cn.bootx.platform.iam.core.upms.dao.UserDataScopeManager; +import cn.bootx.platform.iam.core.upms.entity.UserDataScope; +import cn.bootx.platform.iam.dto.scope.DataScopeDto; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; @@ -36,7 +36,7 @@ import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; -import static cn.bootx.iam.code.CachingCode.USER_DATA_SCOPE; +import static cn.bootx.platform.iam.code.CachingCode.USER_DATA_SCOPE; /** * 用户数据权限关联关系 diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/service/UserRoleService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserRoleService.java similarity index 80% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/service/UserRoleService.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserRoleService.java index 9e3f32f91132f521fc5ed3afbe461d2f758bbb9a..606e784563aa86768632c0a63868b3767ae61d21 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/upms/service/UserRoleService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserRoleService.java @@ -1,13 +1,13 @@ -package cn.bootx.iam.core.upms.service; +package cn.bootx.platform.iam.core.upms.service; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.util.ResultConvertUtil; -import cn.bootx.iam.core.role.dao.RoleManager; -import cn.bootx.iam.core.upms.dao.UserRoleManager; -import cn.bootx.iam.core.upms.entity.UserRole; -import cn.bootx.iam.core.user.dao.UserInfoManager; -import cn.bootx.iam.core.user.entity.UserInfo; -import cn.bootx.iam.dto.role.RoleDto; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.util.ResultConvertUtil; +import cn.bootx.platform.iam.core.user.dao.UserInfoManager; +import cn.bootx.platform.iam.core.user.entity.UserInfo; +import cn.bootx.platform.iam.core.role.dao.RoleManager; +import cn.bootx.platform.iam.core.upms.dao.UserRoleManager; +import cn.bootx.platform.iam.core.upms.entity.UserRole; +import cn.bootx.platform.iam.dto.role.RoleDto; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.cache.annotation.CacheEvict; @@ -18,8 +18,8 @@ import java.util.Collection; import java.util.List; import java.util.stream.Collectors; -import static cn.bootx.iam.code.CachingCode.USER_PATH; -import static cn.bootx.iam.code.CachingCode.USER_PERM_CODE; +import static cn.bootx.platform.iam.code.CachingCode.USER_PATH; +import static cn.bootx.platform.iam.code.CachingCode.USER_PERM_CODE; /** * 用户角色关系 diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/convert/UserConvert.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/convert/UserConvert.java similarity index 48% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/convert/UserConvert.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/convert/UserConvert.java index 48bd624b60456e64ee29a4e932865997c1626d3d..06368e77b4cab0bacdfa09763446136682bbf54f 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/convert/UserConvert.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/convert/UserConvert.java @@ -1,10 +1,10 @@ -package cn.bootx.iam.core.user.convert; +package cn.bootx.platform.iam.core.user.convert; -import cn.bootx.iam.core.user.entity.UserExpandInfo; -import cn.bootx.iam.core.user.entity.UserInfo; -import cn.bootx.iam.dto.user.UserExpandInfoDto; -import cn.bootx.iam.dto.user.UserInfoDto; -import cn.bootx.iam.param.user.UserInfoParam; +import cn.bootx.platform.iam.param.user.UserInfoParam; +import cn.bootx.platform.iam.core.user.entity.UserExpandInfo; +import cn.bootx.platform.iam.core.user.entity.UserInfo; +import cn.bootx.platform.iam.dto.user.UserExpandInfoDto; +import cn.bootx.platform.iam.dto.user.UserInfoDto; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/dao/UserDeptManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserDeptManager.java similarity index 82% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/dao/UserDeptManager.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserDeptManager.java index ec98086da56c5e4df69f21516970ba2b32fc931a..a0a7c013cf81be32e6c358250fb55698063afa0b 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/dao/UserDeptManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserDeptManager.java @@ -1,9 +1,9 @@ -package cn.bootx.iam.core.user.dao; +package cn.bootx.platform.iam.core.user.dao; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.iam.core.user.entity.UserDept; -import cn.bootx.starter.auth.util.SecurityUtil; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.iam.core.user.entity.UserDept; +import cn.bootx.platform.starter.auth.util.SecurityUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/dao/UserDeptMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserDeptMapper.java similarity index 78% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/dao/UserDeptMapper.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserDeptMapper.java index 8a881300972c7ba9beff783e4faca606121c4dc8..d8e03d01b764471bcda95bb6c21a47400f2e3c53 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/dao/UserDeptMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserDeptMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.iam.core.user.dao; +package cn.bootx.platform.iam.core.user.dao; -import cn.bootx.iam.core.user.entity.UserDept; +import cn.bootx.platform.iam.core.user.entity.UserDept; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/dao/UserExpandInfoManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserExpandInfoManager.java similarity index 66% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/dao/UserExpandInfoManager.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserExpandInfoManager.java index f054c98a511ceed7cc53a6833c3879b39ca58311..ef7749e81ccec099717e5acb6a0c08c3c060c2b7 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/dao/UserExpandInfoManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserExpandInfoManager.java @@ -1,7 +1,7 @@ -package cn.bootx.iam.core.user.dao; +package cn.bootx.platform.iam.core.user.dao; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.iam.core.user.entity.UserExpandInfo; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.iam.core.user.entity.UserExpandInfo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/dao/UserExpandInfoMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserExpandInfoMapper.java similarity index 68% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/dao/UserExpandInfoMapper.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserExpandInfoMapper.java index 7bb0af1ace0ad097e3e8cd2cfd6b1fa4d977785d..51316d9937e053d1d36c68776d55a0c6b334f1c4 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/dao/UserExpandInfoMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserExpandInfoMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.iam.core.user.dao; +package cn.bootx.platform.iam.core.user.dao; -import cn.bootx.iam.core.user.entity.UserExpandInfo; +import cn.bootx.platform.iam.core.user.entity.UserExpandInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/dao/UserInfoManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserInfoManager.java similarity index 85% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/dao/UserInfoManager.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserInfoManager.java index de33d4e50f56f749fd1e37521b8315a93d50204c..644cfa0b0cc0ac1500c53ba28a07422bf2fc25b3 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/dao/UserInfoManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserInfoManager.java @@ -1,11 +1,11 @@ -package cn.bootx.iam.core.user.dao; - -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.iam.core.user.entity.UserInfo; -import cn.bootx.iam.param.user.UserInfoParam; +package cn.bootx.platform.iam.core.user.dao; + +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.iam.core.user.entity.UserInfo; +import cn.bootx.platform.iam.param.user.UserInfoParam; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/dao/UserInfoMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserInfoMapper.java similarity index 70% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/dao/UserInfoMapper.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserInfoMapper.java index d553a7b90940977a06ca35aa245feb29af14d49d..089f906c98d4bb27967bb74c80549c7f5a62bf50 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/dao/UserInfoMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserInfoMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.iam.core.user.dao; +package cn.bootx.platform.iam.core.user.dao; -import cn.bootx.iam.core.user.entity.UserInfo; +import cn.bootx.platform.iam.core.user.entity.UserInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/entity/UserDept.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserDept.java similarity index 83% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/entity/UserDept.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserDept.java index fb2da7052369fc7403af79816d0eb465809263fc..d555f2e62b226178dc08dfa1169de4833ef1e931 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/entity/UserDept.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserDept.java @@ -1,6 +1,6 @@ -package cn.bootx.iam.core.user.entity; +package cn.bootx.platform.iam.core.user.entity; -import cn.bootx.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/entity/UserExpandInfo.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserExpandInfo.java similarity index 77% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/entity/UserExpandInfo.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserExpandInfo.java index 96677eb58353d9d77de7cee642e08575aabf3ab0..737ac56309435881e66e01faeb9cf4caef15278d 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/entity/UserExpandInfo.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserExpandInfo.java @@ -1,9 +1,9 @@ -package cn.bootx.iam.core.user.entity; +package cn.bootx.platform.iam.core.user.entity; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.iam.core.user.convert.UserConvert; -import cn.bootx.iam.dto.user.UserExpandInfoDto; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.iam.core.user.convert.UserConvert; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.iam.dto.user.UserExpandInfoDto; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/entity/UserInfo.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserInfo.java similarity index 80% rename from bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/entity/UserInfo.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserInfo.java index 405c00d8dc969aa5002a41841d3fa3fca8af2098..2d42ee66160e22c17d6d05cf95587cd30c815407 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/iam/core/user/entity/UserInfo.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserInfo.java @@ -1,14 +1,15 @@ -package cn.bootx.iam.core.user.entity; - -import cn.bootx.common.core.entity.UserDetail; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.iam.code.UserStatusCode; -import cn.bootx.iam.core.user.convert.UserConvert; -import cn.bootx.iam.dto.user.UserInfoDto; -import cn.bootx.iam.param.user.UserInfoParam; +package cn.bootx.platform.iam.core.user.entity; + +import cn.bootx.platform.common.core.entity.UserDetail; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.iam.core.user.convert.UserConvert; +import cn.bootx.platform.iam.param.user.UserInfoParam; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.iam.code.UserStatusCode; +import cn.bootx.platform.iam.dto.user.UserInfoDto; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -53,6 +54,7 @@ public class UserInfo extends MpBaseEntity implements EntityBaseFunction - + INSERT INTO iam_perm_path @@ -27,4 +27,4 @@ - \ No newline at end of file + diff --git a/bootx-services/service-iam/src/main/resources/mapper/RoleMenuMapper.xml b/bootx-services/service-iam/src/main/resources/mapper/RoleMenuMapper.xml index d6b2dc7d2d9783d376237adf92d22d8c7621d8a2..6fc319abacd0295532cbec207f201478b7e88b6c 100644 --- a/bootx-services/service-iam/src/main/resources/mapper/RoleMenuMapper.xml +++ b/bootx-services/service-iam/src/main/resources/mapper/RoleMenuMapper.xml @@ -1,6 +1,6 @@ - + INSERT INTO iam_role_menu @@ -16,4 +16,4 @@ - \ No newline at end of file + diff --git a/bootx-services/service-iam/src/main/resources/mapper/RolePathMapper.xml b/bootx-services/service-iam/src/main/resources/mapper/RolePathMapper.xml index 334870b68ac3e60e442bdc404c5539fc5e8fb491..bb98be3b1f63e3d35565a1a9e1638d87d7d41e49 100644 --- a/bootx-services/service-iam/src/main/resources/mapper/RolePathMapper.xml +++ b/bootx-services/service-iam/src/main/resources/mapper/RolePathMapper.xml @@ -1,6 +1,6 @@ - + INSERT INTO iam_role_path @@ -15,4 +15,4 @@ - \ No newline at end of file + diff --git a/bootx-services/service-iam/src/main/resources/mapper/UserDataScopeMapper.xml b/bootx-services/service-iam/src/main/resources/mapper/UserDataScopeMapper.xml index 6eb03de71f86ff8ef73409494c1bfe70e0c0c3b1..a97704024bbf33f7d385693736e05bb051580e5d 100644 --- a/bootx-services/service-iam/src/main/resources/mapper/UserDataScopeMapper.xml +++ b/bootx-services/service-iam/src/main/resources/mapper/UserDataScopeMapper.xml @@ -1,6 +1,6 @@ - + INSERT INTO iam_user_data_scope @@ -14,4 +14,4 @@ ) - \ No newline at end of file + diff --git a/bootx-services/service-iam/src/main/resources/mapper/UserDeptMapper.xml b/bootx-services/service-iam/src/main/resources/mapper/UserDeptMapper.xml index 38d71f3d2698fca478675ce17a657a28368f20f6..0b5815bb5c04898a6315dc2db009bcadf9888e74 100644 --- a/bootx-services/service-iam/src/main/resources/mapper/UserDeptMapper.xml +++ b/bootx-services/service-iam/src/main/resources/mapper/UserDeptMapper.xml @@ -1,6 +1,6 @@ - + INSERT INTO iam_user_dept @@ -14,4 +14,4 @@ ) - \ No newline at end of file + diff --git a/bootx-services/service-iam/src/main/resources/mapper/UserRoleMapper.xml b/bootx-services/service-iam/src/main/resources/mapper/UserRoleMapper.xml index be9fab6b475453dd0548a06d1c49887c2d4e4867..32c19388bf268d53bf5a49f46064b6eda84a3f6b 100644 --- a/bootx-services/service-iam/src/main/resources/mapper/UserRoleMapper.xml +++ b/bootx-services/service-iam/src/main/resources/mapper/UserRoleMapper.xml @@ -1,6 +1,6 @@ - + INSERT INTO iam_user_role @@ -14,4 +14,4 @@ ) - \ No newline at end of file + diff --git a/bootx-services/service-notice/pom.xml b/bootx-services/service-notice/pom.xml index 9c168d0326d3345fc6f6951d841e4ca0e5a6c2b5..dafb6f38fc411898e3eba1c4ad49e856cf50db0b 100644 --- a/bootx-services/service-notice/pom.xml +++ b/bootx-services/service-notice/pom.xml @@ -5,7 +5,7 @@ bootx-services cn.bootx.platform - 1.2.3 + 1.3.0 4.0.0 diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/NoticeApplication.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/NoticeApplication.java similarity index 90% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/NoticeApplication.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/NoticeApplication.java index d5f7ee08a7d82beef2b6b64126a7cd06fafe8073..abb5d9bfdbfce62b8c450087b2b6718ae42bf55e 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/NoticeApplication.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/NoticeApplication.java @@ -1,4 +1,4 @@ -package cn.bootx.notice; +package cn.bootx.platform.notice; import org.apache.ibatis.annotations.Mapper; import org.mybatis.spring.annotation.MapperScan; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/code/MailCode.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MailCode.java similarity index 88% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/code/MailCode.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MailCode.java index 2dd1ec46fcea9bc8b37b896cef945b365fad338d..b42df65d5bb4215131db2c2cee3189dac489bfbc 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/code/MailCode.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MailCode.java @@ -1,4 +1,4 @@ -package cn.bootx.notice.code; +package cn.bootx.platform.notice.code; /** * 邮箱常量 diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/code/MessageTemplateCode.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MessageTemplateCode.java similarity index 90% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/code/MessageTemplateCode.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MessageTemplateCode.java index 7b1adb5075d191ca9593e3e52bb335db1dc7779b..cf14766151383b07631ba2978566c4bbd422f61f 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/code/MessageTemplateCode.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MessageTemplateCode.java @@ -1,4 +1,4 @@ -package cn.bootx.notice.code; +package cn.bootx.platform.notice.code; /** * 消息模板类型 diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/code/NoticeCenterErrorCode.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/NoticeCenterErrorCode.java similarity index 96% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/code/NoticeCenterErrorCode.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/NoticeCenterErrorCode.java index cc6f9db41f530c19e35c1b8f91b48cec9736ec08..1c19838a55c7a4381ee0e6ab524776dc261e90aa 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/code/NoticeCenterErrorCode.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/NoticeCenterErrorCode.java @@ -1,4 +1,4 @@ -package cn.bootx.notice.code; +package cn.bootx.platform.notice.code; /** * 通知中心错误码 diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/code/SiteMessageCode.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/SiteMessageCode.java similarity index 93% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/code/SiteMessageCode.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/SiteMessageCode.java index 42e8ceaf4c4096b2239d7213ef27c3cd0fb70527..0c68ceb86c671a7fb8f5136c438c722d04bca1d2 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/code/SiteMessageCode.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/SiteMessageCode.java @@ -1,4 +1,4 @@ -package cn.bootx.notice.code; +package cn.bootx.platform.notice.code; /** * 站内信编码 diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/controller/MailConfigController.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/MailConfigController.java similarity index 82% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/controller/MailConfigController.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/MailConfigController.java index 9d153418b58af6892dfdad21aede4cb6a3b304ed..f3247086d8d5172fc0a7f5289cf28ff8a260c094 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/controller/MailConfigController.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/MailConfigController.java @@ -1,13 +1,13 @@ -package cn.bootx.notice.controller; +package cn.bootx.platform.notice.controller; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.core.util.ValidationUtil; -import cn.bootx.notice.core.mail.service.MailConfigService; -import cn.bootx.notice.dto.mail.MailConfigDto; -import cn.bootx.notice.param.mail.MailConfigParam; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.ValidationUtil; +import cn.bootx.platform.notice.core.mail.service.MailConfigService; +import cn.bootx.platform.notice.dto.mail.MailConfigDto; +import cn.bootx.platform.notice.param.mail.MailConfigParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/controller/MessageTemplateController.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/MessageTemplateController.java similarity index 82% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/controller/MessageTemplateController.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/MessageTemplateController.java index 957342e14869fe903b36286016553c1b779ef544..cfe43bdcfff385368826de95a43a70ef0b9c0bb8 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/controller/MessageTemplateController.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/MessageTemplateController.java @@ -1,12 +1,12 @@ -package cn.bootx.notice.controller; +package cn.bootx.platform.notice.controller; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.notice.core.template.service.MessageTemplateService; -import cn.bootx.notice.dto.template.MessageTemplateDto; -import cn.bootx.notice.param.template.MessageTemplateParam; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.notice.core.template.service.MessageTemplateService; +import cn.bootx.platform.notice.dto.template.MessageTemplateDto; +import cn.bootx.platform.notice.param.template.MessageTemplateParam; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/controller/NcDemoController.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/NcDemoController.java similarity index 84% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/controller/NcDemoController.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/NcDemoController.java index 298bc252a53dd3346c6cedb0397ba43fae89c99d..8d9ed21929e1cce3604d2a0d513ba2f5474308c5 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/controller/NcDemoController.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/NcDemoController.java @@ -1,16 +1,16 @@ -package cn.bootx.notice.controller; - -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.notice.core.dingtalk.entity.corp.DingCorpNoticeReceive; -import cn.bootx.notice.core.dingtalk.entity.msg.DingTextMsg; -import cn.bootx.notice.core.template.service.MessageTemplateService; -import cn.bootx.notice.core.wecom.entity.WeComNoticeReceive; -import cn.bootx.notice.core.wecom.entity.msg.WeComTextMsg; -import cn.bootx.notice.service.DingTalkNoticeSender; -import cn.bootx.notice.service.EmailNoticeSender; -import cn.bootx.notice.service.WeComNoticeSender; -import cn.bootx.notice.service.WeComRobotNoticeSender; +package cn.bootx.platform.notice.controller; + +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.notice.core.dingtalk.entity.corp.DingCorpNoticeReceive; +import cn.bootx.platform.notice.core.dingtalk.entity.msg.DingTextMsg; +import cn.bootx.platform.notice.core.template.service.MessageTemplateService; +import cn.bootx.platform.notice.core.wecom.entity.WeComNoticeReceive; +import cn.bootx.platform.notice.core.wecom.entity.msg.WeComTextMsg; +import cn.bootx.platform.notice.service.DingTalkNoticeSender; +import cn.bootx.platform.notice.service.EmailNoticeSender; +import cn.bootx.platform.notice.service.WeComNoticeSender; +import cn.bootx.platform.notice.service.WeComRobotNoticeSender; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/controller/SiteMessageController.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SiteMessageController.java similarity index 82% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/controller/SiteMessageController.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SiteMessageController.java index 5b79092a22cdebb88e1f761839ea012ce17c3cdc..5e16e6bdb69320b2ebc8a986c72cf837344d5037 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/controller/SiteMessageController.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SiteMessageController.java @@ -1,13 +1,13 @@ -package cn.bootx.notice.controller; +package cn.bootx.platform.notice.controller; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.notice.core.site.domain.SiteMessageInfo; -import cn.bootx.notice.core.site.service.SiteMessageService; -import cn.bootx.notice.dto.site.SiteMessageDto; -import cn.bootx.notice.param.site.SendSiteMessageParam; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.notice.core.site.domain.SiteMessageInfo; +import cn.bootx.platform.notice.core.site.service.SiteMessageService; +import cn.bootx.platform.notice.dto.site.SiteMessageDto; +import cn.bootx.platform.notice.param.site.SendSiteMessageParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/chat/DingChatNoticeParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/chat/DingChatNoticeParam.java similarity index 74% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/chat/DingChatNoticeParam.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/chat/DingChatNoticeParam.java index ae253a91c74b4175c307a6bfb0579c5f639ff833..d13db094f764eb982643982c7c6f5a836be3aa3f 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/chat/DingChatNoticeParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/chat/DingChatNoticeParam.java @@ -1,7 +1,7 @@ -package cn.bootx.notice.core.dingtalk.entity.chat; +package cn.bootx.platform.notice.core.dingtalk.entity.chat; -import cn.bootx.notice.core.dingtalk.entity.msg.DingMsg; -import cn.bootx.starter.dingtalk.param.notice.ChatNotice; +import cn.bootx.platform.starter.dingtalk.param.notice.ChatNotice; +import cn.bootx.platform.notice.core.dingtalk.entity.msg.DingMsg; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/corp/DingCorpNoticeParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeParam.java similarity index 82% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/corp/DingCorpNoticeParam.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeParam.java index d0751b850ee33a18de680c6d7bb944444cd92aa0..32dc74c9b4b59a2e7219aaec0e18359fc135c3d2 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/corp/DingCorpNoticeParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeParam.java @@ -1,7 +1,7 @@ -package cn.bootx.notice.core.dingtalk.entity.corp; +package cn.bootx.platform.notice.core.dingtalk.entity.corp; -import cn.bootx.notice.core.dingtalk.entity.msg.DingMsg; -import cn.bootx.starter.dingtalk.param.notice.CorpNotice; +import cn.bootx.platform.starter.dingtalk.param.notice.CorpNotice; +import cn.bootx.platform.notice.core.dingtalk.entity.msg.DingMsg; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/corp/DingCorpNoticeReceive.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeReceive.java similarity index 93% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/corp/DingCorpNoticeReceive.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeReceive.java index 0d780ac0f3ec1f620946e987a022663105a84770..40fa72c1a3e4d0be146b80f12784324bcb04c7b5 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/corp/DingCorpNoticeReceive.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeReceive.java @@ -1,4 +1,4 @@ -package cn.bootx.notice.core.dingtalk.entity.corp; +package cn.bootx.platform.notice.core.dingtalk.entity.corp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/corp/DingCorpNoticeUpdate.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeUpdate.java similarity index 85% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/corp/DingCorpNoticeUpdate.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeUpdate.java index 4a6baca3f1f7ada4562a151154d3cddf8b6bacf8..290498bc0ad6ae9f491969a4d8c8e48c40647633 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/corp/DingCorpNoticeUpdate.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeUpdate.java @@ -1,6 +1,6 @@ -package cn.bootx.notice.core.dingtalk.entity.corp; +package cn.bootx.platform.notice.core.dingtalk.entity.corp; -import cn.bootx.starter.dingtalk.param.notice.UpdateCorpNotice; +import cn.bootx.platform.starter.dingtalk.param.notice.UpdateCorpNotice; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingActionCardMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingActionCardMsg.java similarity index 77% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingActionCardMsg.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingActionCardMsg.java index 182a5c3f0a4b754a8f6b3ca0f5c9cabe634a0e09..bf60c14c1ebf4ddcbcdac7a3c3b1d16ac26b7059 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingActionCardMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingActionCardMsg.java @@ -1,9 +1,8 @@ -package cn.bootx.notice.core.dingtalk.entity.msg; +package cn.bootx.platform.notice.core.dingtalk.entity.msg; -import cn.bootx.common.core.util.CollUtil; -import cn.bootx.starter.dingtalk.param.notice.msg.ActionCardMsg; -import cn.bootx.starter.dingtalk.param.notice.msg.ActionCardMsg.ActionCard; -import cn.bootx.starter.dingtalk.param.notice.msg.Msg; +import cn.bootx.platform.common.core.util.CollUtil; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.ActionCardMsg; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.Msg; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -59,14 +58,14 @@ public class DingActionCardMsg implements DingMsg { * 转换成钉钉消息 */ public Msg toDingMsg() { - ActionCard actionCard = new ActionCard().setTitle(title) + ActionCardMsg.ActionCard actionCard = new ActionCardMsg.ActionCard().setTitle(title) .setMarkdown(markdown) .setSingleTitle(singleTitle) .setSingleUrl(singleUrl) .setBtnOrientation(btnOrientation); if (CollUtil.isNotEmpty(orientationBtnList)) { - List btnJsons = orientationBtnList.stream() - .map(o -> new ActionCard.BtnJson().setTitle(o.title).setActionUrl(o.actionUrl)) + List btnJsons = orientationBtnList.stream() + .map(o -> new ActionCardMsg.ActionCard.BtnJson().setTitle(o.title).setActionUrl(o.actionUrl)) .collect(Collectors.toList()); actionCard.setBtnJsonList(btnJsons); } diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingFileMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingFileMsg.java similarity index 76% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingFileMsg.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingFileMsg.java index 7c2b2b387aaadf2f0e9fdb9ff8894e88e3056c67..76d58c4907a6ea1366757eb275e8b5fd4cbd4c2c 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingFileMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingFileMsg.java @@ -1,7 +1,7 @@ -package cn.bootx.notice.core.dingtalk.entity.msg; +package cn.bootx.platform.notice.core.dingtalk.entity.msg; -import cn.bootx.starter.dingtalk.param.notice.msg.FileMsg; -import cn.bootx.starter.dingtalk.param.notice.msg.Msg; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.FileMsg; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.Msg; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingImageMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingImageMsg.java similarity index 77% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingImageMsg.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingImageMsg.java index 4f7b17a844dd6aa66a9f04b4bdb9fafc3dd69951..fa935b6310918401138e67ba843683706527e11f 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingImageMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingImageMsg.java @@ -1,7 +1,7 @@ -package cn.bootx.notice.core.dingtalk.entity.msg; +package cn.bootx.platform.notice.core.dingtalk.entity.msg; -import cn.bootx.starter.dingtalk.param.notice.msg.ImageMsg; -import cn.bootx.starter.dingtalk.param.notice.msg.Msg; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.ImageMsg; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.Msg; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingLinkMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingLinkMsg.java similarity index 79% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingLinkMsg.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingLinkMsg.java index 0da19a4ca7ba1a129548fe9602e433751832f100..837a9c1b00628a0f9f9f2a6b7ae409f4d45326d1 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingLinkMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingLinkMsg.java @@ -1,7 +1,7 @@ -package cn.bootx.notice.core.dingtalk.entity.msg; +package cn.bootx.platform.notice.core.dingtalk.entity.msg; -import cn.bootx.starter.dingtalk.param.notice.msg.LinkMsg; -import cn.bootx.starter.dingtalk.param.notice.msg.Msg; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.LinkMsg; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.Msg; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingMarkDownMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingMarkDownMsg.java similarity index 72% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingMarkDownMsg.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingMarkDownMsg.java index 12f8e67f0573c3c770319c80b7d68f7d59e6cd23..7096f616bbabbbaa024c0c846df485b65b968385 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingMarkDownMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingMarkDownMsg.java @@ -1,7 +1,7 @@ -package cn.bootx.notice.core.dingtalk.entity.msg; +package cn.bootx.platform.notice.core.dingtalk.entity.msg; -import cn.bootx.starter.dingtalk.param.notice.msg.MarkdownMsg; -import cn.bootx.starter.dingtalk.param.notice.msg.Msg; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.MarkdownMsg; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.Msg; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingMsg.java similarity index 57% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingMsg.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingMsg.java index b3b80352ea7efc58207691813847d0cd7671b4f1..a77d85ac28ad97e4d6dc13dd7b749285be1586c7 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingMsg.java @@ -1,6 +1,6 @@ -package cn.bootx.notice.core.dingtalk.entity.msg; +package cn.bootx.platform.notice.core.dingtalk.entity.msg; -import cn.bootx.starter.dingtalk.param.notice.msg.Msg; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.Msg; /** * 钉钉消息接口 diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingOaMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingOaMsg.java similarity index 70% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingOaMsg.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingOaMsg.java index 294399a2cfdeb23e0f0674e5b4b322bbbcadc9b9..873f3bbcd07b5bdf9c3a1e295f68b7132289708b 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingOaMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingOaMsg.java @@ -1,15 +1,12 @@ -package cn.bootx.notice.core.dingtalk.entity.msg; +package cn.bootx.platform.notice.core.dingtalk.entity.msg; -import cn.bootx.starter.dingtalk.param.notice.msg.Msg; -import cn.bootx.starter.dingtalk.param.notice.msg.OaMsg; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.Msg; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.OaMsg; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; -import static cn.bootx.starter.dingtalk.param.notice.msg.OaMsg.*; -import static cn.bootx.starter.dingtalk.param.notice.msg.OaMsg.Oa.*; - /** * @author xxm * @date 2022/7/19 @@ -28,21 +25,21 @@ public class DingOaMsg implements DingMsg { private String pcMessageUrl; @Schema(description = "消息头部内容") - private Head head; + private OaMsg.Oa.Head head; @Schema(description = "消息体") - private Body body; + private OaMsg.Oa.Body body; @JsonProperty("status_bar") @Schema(description = "消息状态栏") - private StatusBar statusBar; + private OaMsg.Oa.StatusBar statusBar; /** * 转换成钉钉消息 */ @Override public Msg toDingMsg() { - Oa oa = new Oa().setMessageUrl(messageUrl) + OaMsg.Oa oa = new OaMsg.Oa().setMessageUrl(messageUrl) .setPcMessageUrl(pcMessageUrl) .setHead(head) .setBody(body) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingTextMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingTextMsg.java similarity index 76% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingTextMsg.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingTextMsg.java index cb9ce333a182724aca0a01dcd0146c82f7852162..5f5f525040211384d70fdcaec96b482463b6c6d7 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingTextMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingTextMsg.java @@ -1,7 +1,7 @@ -package cn.bootx.notice.core.dingtalk.entity.msg; +package cn.bootx.platform.notice.core.dingtalk.entity.msg; -import cn.bootx.starter.dingtalk.param.notice.msg.Msg; -import cn.bootx.starter.dingtalk.param.notice.msg.TextMsg; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.Msg; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.TextMsg; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingVoiceMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingVoiceMsg.java similarity index 77% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingVoiceMsg.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingVoiceMsg.java index 5b1d5afd75e0172da3cc3bfce4a2d731b6e0cf9e..2aaa68322d85f810832b32d45ae6bd89aaf3d835 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/entity/msg/DingVoiceMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingVoiceMsg.java @@ -1,7 +1,7 @@ -package cn.bootx.notice.core.dingtalk.entity.msg; +package cn.bootx.platform.notice.core.dingtalk.entity.msg; -import cn.bootx.starter.dingtalk.param.notice.msg.Msg; -import cn.bootx.starter.dingtalk.param.notice.msg.VoiceMsg; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.Msg; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.VoiceMsg; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/service/DingRobotNoticeSenderImpl.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/service/DingRobotNoticeSenderImpl.java similarity index 70% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/service/DingRobotNoticeSenderImpl.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/service/DingRobotNoticeSenderImpl.java index a7fcc93c8fe4fa91c959d4d2e1d7542a06aef7eb..fcdb76fd41fd4d022da3d923fa926c24291cd980 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/service/DingRobotNoticeSenderImpl.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/service/DingRobotNoticeSenderImpl.java @@ -1,10 +1,10 @@ -package cn.bootx.notice.core.dingtalk.service; +package cn.bootx.platform.notice.core.dingtalk.service; -import cn.bootx.notice.service.DingRobotNoticeSender; -import cn.bootx.starter.dingtalk.core.robot.service.DingRobotSendService; -import cn.bootx.starter.dingtalk.param.notice.msg.LinkMsg; -import cn.bootx.starter.dingtalk.param.notice.msg.MarkdownMsg; -import cn.bootx.starter.dingtalk.param.notice.msg.TextMsg; +import cn.bootx.platform.notice.service.DingRobotNoticeSender; +import cn.bootx.platform.starter.dingtalk.core.robot.service.DingRobotSendService; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.LinkMsg; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.MarkdownMsg; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.TextMsg; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/service/DingTalkNoticeSenderImpl.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/service/DingTalkNoticeSenderImpl.java similarity index 83% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/service/DingTalkNoticeSenderImpl.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/service/DingTalkNoticeSenderImpl.java index 9be42dcf25dce62dd0f77a756fea765c514cbc4e..1b000ba9953a18a6f82082170a529e5c34fa441e 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/dingtalk/service/DingTalkNoticeSenderImpl.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/service/DingTalkNoticeSenderImpl.java @@ -1,21 +1,22 @@ -package cn.bootx.notice.core.dingtalk.service; - -import cn.bootx.common.core.exception.BizException; -import cn.bootx.notice.core.dingtalk.entity.corp.DingCorpNoticeParam; -import cn.bootx.notice.core.dingtalk.entity.corp.DingCorpNoticeReceive; -import cn.bootx.notice.core.dingtalk.entity.corp.DingCorpNoticeUpdate; -import cn.bootx.notice.core.dingtalk.entity.msg.*; -import cn.bootx.notice.service.DingTalkNoticeSender; -import cn.bootx.starter.dingtalk.configuration.DingTalkProperties; -import cn.bootx.starter.dingtalk.core.base.result.DingTalkResult; -import cn.bootx.starter.dingtalk.core.media.service.DingMediaService; -import cn.bootx.starter.dingtalk.core.notice.result.ChatNoticeResult; -import cn.bootx.starter.dingtalk.core.notice.result.CorpNoticeResult; -import cn.bootx.starter.dingtalk.core.notice.service.DingNoticeService; -import cn.bootx.starter.dingtalk.param.notice.ChatNotice; -import cn.bootx.starter.dingtalk.param.notice.CorpNotice; -import cn.bootx.starter.dingtalk.param.notice.RecallCorpNotice; -import cn.bootx.starter.dingtalk.param.notice.UpdateCorpNotice; +package cn.bootx.platform.notice.core.dingtalk.service; + +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.notice.core.dingtalk.entity.msg.*; +import cn.bootx.platform.notice.service.DingTalkNoticeSender; +import cn.bootx.platform.starter.dingtalk.code.DingTalkCode; +import cn.bootx.platform.starter.dingtalk.configuration.DingTalkProperties; +import cn.bootx.platform.starter.dingtalk.core.base.result.DingTalkResult; +import cn.bootx.platform.starter.dingtalk.core.media.service.DingMediaService; +import cn.bootx.platform.starter.dingtalk.core.notice.result.ChatNoticeResult; +import cn.bootx.platform.starter.dingtalk.core.notice.result.CorpNoticeResult; +import cn.bootx.platform.starter.dingtalk.core.notice.service.DingNoticeService; +import cn.bootx.platform.starter.dingtalk.param.notice.ChatNotice; +import cn.bootx.platform.starter.dingtalk.param.notice.CorpNotice; +import cn.bootx.platform.starter.dingtalk.param.notice.RecallCorpNotice; +import cn.bootx.platform.starter.dingtalk.param.notice.UpdateCorpNotice; +import cn.bootx.platform.notice.core.dingtalk.entity.corp.DingCorpNoticeParam; +import cn.bootx.platform.notice.core.dingtalk.entity.corp.DingCorpNoticeReceive; +import cn.bootx.platform.notice.core.dingtalk.entity.corp.DingCorpNoticeUpdate; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -23,8 +24,6 @@ import org.springframework.stereotype.Service; import java.io.InputStream; import java.util.Objects; -import static cn.bootx.starter.dingtalk.code.DingTalkCode.*; - /** * 钉钉消息通知 * @@ -66,7 +65,7 @@ public class DingTalkNoticeSenderImpl implements DingTalkNoticeSender { */ @Override public Long sendImageCorpNotice(InputStream inputStream, DingCorpNoticeReceive receive) { - String mediaId = dingMediaService.uploadMedia(inputStream, MEDIA_IMAGE); + String mediaId = dingMediaService.uploadMedia(inputStream, DingTalkCode.MEDIA_IMAGE); DingImageMsg dingImageMsg = new DingImageMsg(mediaId); return this.sendCorpNotice(dingImageMsg, receive); } @@ -77,7 +76,7 @@ public class DingTalkNoticeSenderImpl implements DingTalkNoticeSender { */ @Override public Long sendImageCorpNotice(InputStream inputStream, String filename, DingCorpNoticeReceive receive) { - String mediaId = dingMediaService.uploadMedia(inputStream, filename, MEDIA_IMAGE); + String mediaId = dingMediaService.uploadMedia(inputStream, filename, DingTalkCode.MEDIA_IMAGE); DingImageMsg dingImageMsg = new DingImageMsg(mediaId); return this.sendCorpNotice(dingImageMsg, receive); } @@ -97,7 +96,7 @@ public class DingTalkNoticeSenderImpl implements DingTalkNoticeSender { */ @Override public Long sendVoiceCorpNotice(InputStream inputStream, DingCorpNoticeReceive receive) { - String mediaId = dingMediaService.uploadMedia(inputStream, MEDIA_VOICE); + String mediaId = dingMediaService.uploadMedia(inputStream, DingTalkCode.MEDIA_VOICE); DingVoiceMsg dingVoiceMsg = new DingVoiceMsg(mediaId, "10"); return this.sendCorpNotice(dingVoiceMsg, receive); } @@ -108,7 +107,7 @@ public class DingTalkNoticeSenderImpl implements DingTalkNoticeSender { */ @Override public Long sendVoiceCorpNotice(InputStream inputStream, String filename, DingCorpNoticeReceive receive) { - String mediaId = dingMediaService.uploadMedia(inputStream, filename, MEDIA_VOICE); + String mediaId = dingMediaService.uploadMedia(inputStream, filename, DingTalkCode.MEDIA_VOICE); DingVoiceMsg dingVoiceMsg = new DingVoiceMsg(mediaId, "10"); return this.sendCorpNotice(dingVoiceMsg, receive); } @@ -128,7 +127,7 @@ public class DingTalkNoticeSenderImpl implements DingTalkNoticeSender { */ @Override public Long sendFileCorpNotice(InputStream inputStream, DingCorpNoticeReceive receive) { - String mediaId = dingMediaService.uploadMedia(inputStream, MEDIA_FILE); + String mediaId = dingMediaService.uploadMedia(inputStream, DingTalkCode.MEDIA_FILE); DingFileMsg dingFileMsg = new DingFileMsg(mediaId); return this.sendCorpNotice(dingFileMsg, receive); } @@ -139,7 +138,7 @@ public class DingTalkNoticeSenderImpl implements DingTalkNoticeSender { */ @Override public Long sendFileCorpNotice(InputStream inputStream, String filename, DingCorpNoticeReceive receive) { - String mediaId = dingMediaService.uploadMedia(inputStream, filename, MEDIA_FILE); + String mediaId = dingMediaService.uploadMedia(inputStream, filename, DingTalkCode.MEDIA_FILE); DingFileMsg dingFileMsg = new DingFileMsg(mediaId); return this.sendCorpNotice(dingFileMsg, receive); } @@ -187,7 +186,7 @@ public class DingTalkNoticeSenderImpl implements DingTalkNoticeSender { corpNotice.setAgentId(dingTalkProperties.getAgentId()); CorpNoticeResult result = dingNoticeService.sendCorpNotice(corpNotice); - if (!Objects.equals(result.getCode(), SUCCESS_CODE)) { + if (!Objects.equals(result.getCode(), DingTalkCode.SUCCESS_CODE)) { throw new BizException(result.getMsg()); } return result.getTaskId(); @@ -201,7 +200,7 @@ public class DingTalkNoticeSenderImpl implements DingTalkNoticeSender { UpdateCorpNotice dingUpdateCorpNotice = updateCorpNotice.toDingUpdateCorpNotice(); dingUpdateCorpNotice.setAgentId(dingTalkProperties.getAgentId()); CorpNoticeResult result = dingNoticeService.updateCorpNotice(dingUpdateCorpNotice); - if (!Objects.equals(result.getCode(), SUCCESS_CODE)) { + if (!Objects.equals(result.getCode(), DingTalkCode.SUCCESS_CODE)) { throw new BizException(result.getMsg()); } } @@ -213,7 +212,7 @@ public class DingTalkNoticeSenderImpl implements DingTalkNoticeSender { public void recallCorpNotice(Long msgTaskId) { RecallCorpNotice recallCorpNotice = new RecallCorpNotice(dingTalkProperties.getAgentId(), msgTaskId); DingTalkResult result = dingNoticeService.recallCorpNotice(recallCorpNotice); - if (!Objects.equals(result.getCode(), SUCCESS_CODE)) { + if (!Objects.equals(result.getCode(), DingTalkCode.SUCCESS_CODE)) { throw new BizException(result.getMsg()); } } @@ -307,7 +306,7 @@ public class DingTalkNoticeSenderImpl implements DingTalkNoticeSender { ChatNotice chatNotice = new ChatNotice(chatId, dingMsg.toDingMsg()); ChatNoticeResult result = dingNoticeService.sendChatNotice(chatNotice); - if (!Objects.equals(result.getCode(), SUCCESS_CODE)) { + if (!Objects.equals(result.getCode(), DingTalkCode.SUCCESS_CODE)) { throw new BizException(result.getMsg()); } return result.getMessageId(); diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/mail/convert/MailConvert.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/convert/MailConvert.java similarity index 62% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/mail/convert/MailConvert.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/convert/MailConvert.java index de05c29dfad3f900cb65656f5c7fa52938db5efc..b971bc1e4acf3329f5a1dcf50d0e7d3ab7a30b4c 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/mail/convert/MailConvert.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/convert/MailConvert.java @@ -1,8 +1,8 @@ -package cn.bootx.notice.core.mail.convert; +package cn.bootx.platform.notice.core.mail.convert; -import cn.bootx.notice.core.mail.entity.MailConfig; -import cn.bootx.notice.dto.mail.MailConfigDto; -import cn.bootx.notice.param.mail.MailConfigParam; +import cn.bootx.platform.notice.param.mail.MailConfigParam; +import cn.bootx.platform.notice.core.mail.entity.MailConfig; +import cn.bootx.platform.notice.dto.mail.MailConfigDto; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/mail/dao/MailConfigManager.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/dao/MailConfigManager.java similarity index 79% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/mail/dao/MailConfigManager.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/dao/MailConfigManager.java index 5006b1008ccb40b4f0d757ebd5343b952c2c748c..054bfe587d5d322ea45a8c3ea18c5ab7a640b84a 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/mail/dao/MailConfigManager.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/dao/MailConfigManager.java @@ -1,11 +1,11 @@ -package cn.bootx.notice.core.mail.dao; - -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.notice.core.mail.entity.MailConfig; -import cn.bootx.notice.param.mail.MailConfigParam; +package cn.bootx.platform.notice.core.mail.dao; + +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.notice.core.mail.entity.MailConfig; +import cn.bootx.platform.notice.param.mail.MailConfigParam; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/mail/dao/MailConfigMapper.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/dao/MailConfigMapper.java similarity index 69% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/mail/dao/MailConfigMapper.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/dao/MailConfigMapper.java index 78590135d20ab561666bafd16a8dca175b451c5c..432f2c42732cb00e6c80649c57c23469fa0580e2 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/mail/dao/MailConfigMapper.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/dao/MailConfigMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.notice.core.mail.dao; +package cn.bootx.platform.notice.core.mail.dao; -import cn.bootx.notice.core.mail.entity.MailConfig; +import cn.bootx.platform.notice.core.mail.entity.MailConfig; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/mail/entity/MailConfig.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/entity/MailConfig.java similarity index 76% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/mail/entity/MailConfig.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/entity/MailConfig.java index 97805efdf2b61c51247314beff18f24302d53220..0d5e2681de590e89f07bfe01c45f88a155e26c0e 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/mail/entity/MailConfig.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/entity/MailConfig.java @@ -1,11 +1,11 @@ -package cn.bootx.notice.core.mail.entity; +package cn.bootx.platform.notice.core.mail.entity; -import cn.bootx.common.core.annotation.EncryptionField; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.notice.core.mail.convert.MailConvert; -import cn.bootx.notice.dto.mail.MailConfigDto; -import cn.bootx.notice.param.mail.MailConfigParam; +import cn.bootx.platform.common.core.annotation.EncryptionField; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.notice.core.mail.convert.MailConvert; +import cn.bootx.platform.notice.param.mail.MailConfigParam; +import cn.bootx.platform.notice.dto.mail.MailConfigDto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/mail/service/EmailNoticeSenderImpl.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/service/EmailNoticeSenderImpl.java similarity index 95% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/mail/service/EmailNoticeSenderImpl.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/service/EmailNoticeSenderImpl.java index ef0e6dba448bfe6418dde18715a95ab0087e9b3f..dc3566a32d20b5d50c3ed74e40a648e334f9368b 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/mail/service/EmailNoticeSenderImpl.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/service/EmailNoticeSenderImpl.java @@ -1,11 +1,11 @@ -package cn.bootx.notice.core.mail.service; - -import cn.bootx.notice.code.MailCode; -import cn.bootx.notice.dto.mail.MailConfigDto; -import cn.bootx.notice.dto.mail.MailFileParam; -import cn.bootx.notice.dto.mail.SendMailParam; -import cn.bootx.notice.exception.MailConfigNotExistException; -import cn.bootx.notice.service.EmailNoticeSender; +package cn.bootx.platform.notice.core.mail.service; + +import cn.bootx.platform.notice.exception.MailConfigNotExistException; +import cn.bootx.platform.notice.service.EmailNoticeSender; +import cn.bootx.platform.notice.code.MailCode; +import cn.bootx.platform.notice.dto.mail.MailConfigDto; +import cn.bootx.platform.notice.dto.mail.MailFileParam; +import cn.bootx.platform.notice.dto.mail.SendMailParam; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ArrayUtil; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/mail/service/MailConfigService.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/service/MailConfigService.java similarity index 81% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/mail/service/MailConfigService.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/service/MailConfigService.java index 67aacbb3b66fbbdee0d3865411c5a7d8ff666ad8..e31394e322497d1ac86ba472b96357deeaca1413 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/mail/service/MailConfigService.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/service/MailConfigService.java @@ -1,15 +1,15 @@ -package cn.bootx.notice.core.mail.service; - -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.core.util.ResultConvertUtil; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.notice.core.mail.dao.MailConfigManager; -import cn.bootx.notice.core.mail.entity.MailConfig; -import cn.bootx.notice.dto.mail.MailConfigDto; -import cn.bootx.notice.exception.MailConfigCodeAlreadyExistedException; -import cn.bootx.notice.exception.MailConfigNotExistException; -import cn.bootx.notice.param.mail.MailConfigParam; +package cn.bootx.platform.notice.core.mail.service; + +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.ResultConvertUtil; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.notice.exception.MailConfigCodeAlreadyExistedException; +import cn.bootx.platform.notice.exception.MailConfigNotExistException; +import cn.bootx.platform.notice.param.mail.MailConfigParam; +import cn.bootx.platform.notice.core.mail.dao.MailConfigManager; +import cn.bootx.platform.notice.core.mail.entity.MailConfig; +import cn.bootx.platform.notice.dto.mail.MailConfigDto; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import lombok.AllArgsConstructor; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/convert/SiteMessageConvert.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/convert/SiteMessageConvert.java similarity index 64% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/convert/SiteMessageConvert.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/convert/SiteMessageConvert.java index 60f4763c08e95403d5af36211443bec769c42b0a..89184dd5fe8cea962a097aa250839e3216b07cbd 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/convert/SiteMessageConvert.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/convert/SiteMessageConvert.java @@ -1,7 +1,7 @@ -package cn.bootx.notice.core.site.convert; +package cn.bootx.platform.notice.core.site.convert; -import cn.bootx.notice.core.site.entity.SiteMessage; -import cn.bootx.notice.dto.site.SiteMessageDto; +import cn.bootx.platform.notice.core.site.entity.SiteMessage; +import cn.bootx.platform.notice.dto.site.SiteMessageDto; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/dao/SiteMessageManager.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageManager.java similarity index 87% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/dao/SiteMessageManager.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageManager.java index c8d97fcf96f7c74dd30c9568166be6575e1d0083..84fa6108592d12c5733d76b8ab69ddebeda4718f 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/dao/SiteMessageManager.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageManager.java @@ -1,11 +1,11 @@ -package cn.bootx.notice.core.site.dao; +package cn.bootx.platform.notice.core.site.dao; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.notice.code.SiteMessageCode; -import cn.bootx.notice.core.site.domain.SiteMessageInfo; -import cn.bootx.notice.core.site.entity.SiteMessage; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.notice.core.site.domain.SiteMessageInfo; +import cn.bootx.platform.notice.core.site.entity.SiteMessage; +import cn.bootx.platform.notice.code.SiteMessageCode; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -17,7 +17,7 @@ import org.springframework.stereotype.Repository; import java.time.LocalDate; import java.util.Objects; -import static cn.bootx.notice.code.SiteMessageCode.STATE_SENT; +import static cn.bootx.platform.notice.code.SiteMessageCode.STATE_SENT; /** * 站内信 diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/dao/SiteMessageMapper.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageMapper.java similarity index 69% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/dao/SiteMessageMapper.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageMapper.java index 531abbbd7f6727a9fd5be3bdec82d752b89a941b..41605d215051082de8b4796f2973cdd95f7e1d15 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/dao/SiteMessageMapper.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageMapper.java @@ -1,7 +1,7 @@ -package cn.bootx.notice.core.site.dao; +package cn.bootx.platform.notice.core.site.dao; -import cn.bootx.notice.core.site.domain.SiteMessageInfo; -import cn.bootx.notice.core.site.entity.SiteMessage; +import cn.bootx.platform.notice.core.site.domain.SiteMessageInfo; +import cn.bootx.platform.notice.core.site.entity.SiteMessage; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; @@ -19,7 +19,7 @@ import org.apache.ibatis.annotations.Param; public interface SiteMessageMapper extends BaseMapper { Page pageMassage(Page page, - @Param(Constants.WRAPPER) Wrapper wrapper); + @Param(Constants.WRAPPER) Wrapper wrapper); Integer countMassage(@Param(Constants.WRAPPER) Wrapper wrapper); diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/dao/SiteMessageUserManager.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageUserManager.java similarity index 80% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/dao/SiteMessageUserManager.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageUserManager.java index c2dbb6b4081e48e4908a3ec7419e10ee30b755aa..ad0d30f689e53c40e64fa141ff607e8ec3d49625 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/dao/SiteMessageUserManager.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageUserManager.java @@ -1,8 +1,8 @@ -package cn.bootx.notice.core.site.dao; +package cn.bootx.platform.notice.core.site.dao; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.notice.core.site.entity.SiteMessageUser; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.notice.core.site.entity.SiteMessageUser; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/dao/SiteMessageUserMapper.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageUserMapper.java similarity index 67% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/dao/SiteMessageUserMapper.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageUserMapper.java index c79a01ae5697f193233708b2dbb3458a410b1853..7d42e33b863292addeb9ba224edb30a1966f58b8 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/dao/SiteMessageUserMapper.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageUserMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.notice.core.site.dao; +package cn.bootx.platform.notice.core.site.dao; -import cn.bootx.notice.core.site.entity.SiteMessageUser; +import cn.bootx.platform.notice.core.site.entity.SiteMessageUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/domain/SiteMessageInfo.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/domain/SiteMessageInfo.java similarity index 96% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/domain/SiteMessageInfo.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/domain/SiteMessageInfo.java index 5a681afdf661a031f0e24260b18f7e66aee44f9e..c79362c32c9ba74598ba544f51d41aa7b6cff692 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/domain/SiteMessageInfo.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/domain/SiteMessageInfo.java @@ -1,4 +1,4 @@ -package cn.bootx.notice.core.site.domain; +package cn.bootx.platform.notice.core.site.domain; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/domain/SiteMessageInfoMapper.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/domain/SiteMessageInfoMapper.java similarity index 83% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/domain/SiteMessageInfoMapper.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/domain/SiteMessageInfoMapper.java index b56c2100d1e2adcf6089ad3f5feb264b16b882bf..806cb66c6cc8d5e8df0d378526e84e5d26c1fe6a 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/domain/SiteMessageInfoMapper.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/domain/SiteMessageInfoMapper.java @@ -1,4 +1,4 @@ -package cn.bootx.notice.core.site.domain; +package cn.bootx.platform.notice.core.site.domain; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/entity/SiteMessage.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/entity/SiteMessage.java similarity index 75% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/entity/SiteMessage.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/entity/SiteMessage.java index b7dc80ed45a7f51a2a215f1cccf9c7b043c1379c..feb247dbe9987c92e6cf69398337ec96104bf6f8 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/entity/SiteMessage.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/entity/SiteMessage.java @@ -1,11 +1,11 @@ -package cn.bootx.notice.core.site.entity; +package cn.bootx.platform.notice.core.site.entity; -import cn.bootx.common.core.annotation.BigField; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.notice.code.SiteMessageCode; -import cn.bootx.notice.core.site.convert.SiteMessageConvert; -import cn.bootx.notice.dto.site.SiteMessageDto; +import cn.bootx.platform.common.core.annotation.BigField; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.notice.core.site.convert.SiteMessageConvert; +import cn.bootx.platform.notice.code.SiteMessageCode; +import cn.bootx.platform.notice.dto.site.SiteMessageDto; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/entity/SiteMessageUser.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/entity/SiteMessageUser.java similarity index 84% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/entity/SiteMessageUser.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/entity/SiteMessageUser.java index 6442470fe1a78d5c0fd2d86d206bbc39562e35eb..1573cef2ec39051d60dafa5dc601427dac4ae75f 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/entity/SiteMessageUser.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/entity/SiteMessageUser.java @@ -1,6 +1,6 @@ -package cn.bootx.notice.core.site.entity; +package cn.bootx.platform.notice.core.site.entity; -import cn.bootx.common.mybatisplus.base.MpCreateEntity; +import cn.bootx.platform.common.mybatisplus.base.MpCreateEntity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/service/SiteMessageService.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/service/SiteMessageService.java similarity index 84% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/service/SiteMessageService.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/service/SiteMessageService.java index b9045b88f4acb689c0b2cdbc2f98b55eb3c885d8..c3483d214b06d58e2e6b23aabd2ae719b24e0771 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/site/service/SiteMessageService.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/service/SiteMessageService.java @@ -1,22 +1,23 @@ -package cn.bootx.notice.core.site.service; - -import cn.bootx.common.core.entity.UserDetail; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.core.util.CollUtil; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.common.websocket.entity.WsRes; -import cn.bootx.common.websocket.service.UserWsNoticeService; -import cn.bootx.notice.core.site.dao.SiteMessageManager; -import cn.bootx.notice.core.site.dao.SiteMessageUserManager; -import cn.bootx.notice.core.site.domain.SiteMessageInfo; -import cn.bootx.notice.core.site.entity.SiteMessage; -import cn.bootx.notice.core.site.entity.SiteMessageUser; -import cn.bootx.notice.dto.site.SiteMessageDto; -import cn.bootx.notice.param.site.SendSiteMessageParam; -import cn.bootx.starter.auth.util.SecurityUtil; +package cn.bootx.platform.notice.core.site.service; + +import cn.bootx.platform.common.core.code.CommonCode; +import cn.bootx.platform.common.core.entity.UserDetail; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.CollUtil; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.common.websocket.entity.WsRes; +import cn.bootx.platform.common.websocket.service.UserWsNoticeService; +import cn.bootx.platform.notice.param.site.SendSiteMessageParam; +import cn.bootx.platform.starter.auth.util.SecurityUtil; +import cn.bootx.platform.notice.core.site.dao.SiteMessageManager; +import cn.bootx.platform.notice.core.site.dao.SiteMessageUserManager; +import cn.bootx.platform.notice.core.site.domain.SiteMessageInfo; +import cn.bootx.platform.notice.core.site.entity.SiteMessage; +import cn.bootx.platform.notice.core.site.entity.SiteMessageUser; +import cn.bootx.platform.notice.dto.site.SiteMessageDto; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.util.DesensitizedUtil; @@ -32,9 +33,7 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import static cn.bootx.common.core.code.CommonCode.SYSTEM_DEFAULT_USERID; -import static cn.bootx.common.core.code.CommonCode.SYSTEM_DEFAULT_USERNAME; -import static cn.bootx.notice.code.SiteMessageCode.*; +import static cn.bootx.platform.notice.code.SiteMessageCode.*; /** * 站内信 @@ -141,8 +140,8 @@ public class SiteMessageService { public void sendSingleUserBySystem(String title, String content, Long userId) { val param = new SendSiteMessageParam().setTitle(title) .setContent(content) - .setSenderId(SYSTEM_DEFAULT_USERID) - .setSenderName(SYSTEM_DEFAULT_USERNAME) + .setSenderId(CommonCode.SYSTEM_DEFAULT_USERID) + .setSenderName(CommonCode.SYSTEM_DEFAULT_USERNAME) .setReceiveType(RECEIVE_USER) .setReceiveIds(Collections.singletonList(userId)); this.send(param); @@ -154,8 +153,8 @@ public class SiteMessageService { public void sendMultiUserBySystem(String title, String content, List userIds) { val param = new SendSiteMessageParam().setTitle(title) .setContent(content) - .setSenderId(SYSTEM_DEFAULT_USERID) - .setSenderName(SYSTEM_DEFAULT_USERNAME) + .setSenderId(CommonCode.SYSTEM_DEFAULT_USERID) + .setSenderName(CommonCode.SYSTEM_DEFAULT_USERNAME) .setReceiveType(RECEIVE_USER) .setReceiveIds(userIds); this.send(param); diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/sms/dao/SmsChannelConfigManager.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsChannelConfigManager.java similarity index 60% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/sms/dao/SmsChannelConfigManager.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsChannelConfigManager.java index 908bc3aaf8c1b0cab2e706e44936613d36432e12..cfe4b8507a0e13689024f358afe60c39b1e8f81e 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/sms/dao/SmsChannelConfigManager.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsChannelConfigManager.java @@ -1,7 +1,7 @@ -package cn.bootx.notice.core.sms.dao; +package cn.bootx.platform.notice.core.sms.dao; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.notice.core.sms.entity.SmsChannelConfig; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.notice.core.sms.entity.SmsChannelConfig; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/sms/dao/SmsChannelConfigMapper.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsChannelConfigMapper.java similarity index 67% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/sms/dao/SmsChannelConfigMapper.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsChannelConfigMapper.java index 4c7e3b04e7026108400db2c12f1b0d35a1522166..aacead01e4bfb7373e3f8124250416cd6e76bf32 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/sms/dao/SmsChannelConfigMapper.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsChannelConfigMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.notice.core.sms.dao; +package cn.bootx.platform.notice.core.sms.dao; -import cn.bootx.notice.core.sms.entity.SmsChannelConfig; +import cn.bootx.platform.notice.core.sms.entity.SmsChannelConfig; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/sms/entity/SmsChannelConfig.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java similarity index 59% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/sms/entity/SmsChannelConfig.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java index c38e98e2f2a04997761edda449b3efe572dbd083..62469e77fe8f8df2543da2011d09db7e247f7093 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/sms/entity/SmsChannelConfig.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java @@ -1,8 +1,6 @@ -package cn.bootx.notice.core.sms.entity; +package cn.bootx.platform.notice.core.sms.entity; -import cn.bootx.common.core.annotation.actable.Column; -import cn.bootx.common.core.annotation.actable.Table; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,23 +15,17 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) @TableName("notice_sms_channel_config") -@Table(comment = "短信渠道配置") public class SmsChannelConfig extends MpBaseEntity { /** 渠道编码 */ - @Column(comment = "渠道编码") private String code; /** 短信签名 */ - @Column(comment = "短信签名") private String signature; /** 短信ApiKey */ - @Column(comment = "短信ApiKey") private String apiKey; /** 短信Api秘钥 */ - @Column(comment = "短信Api秘钥") private String apiSecret; /** 回调地址 */ - @Column(comment = "回调地址") private String url; } diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/template/convert/MessageTemplateConvert.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/convert/MessageTemplateConvert.java similarity index 62% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/template/convert/MessageTemplateConvert.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/convert/MessageTemplateConvert.java index a6ec88fd2c8fb5c150f84ac863a58cb1df5314e8..75bd7afbf9944a2b3fd175481a4a911eba76778c 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/template/convert/MessageTemplateConvert.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/convert/MessageTemplateConvert.java @@ -1,10 +1,9 @@ -package cn.bootx.notice.core.template.convert; +package cn.bootx.platform.notice.core.template.convert; -import cn.bootx.notice.core.template.entity.MessageTemplate; -import cn.bootx.notice.dto.template.MessageTemplateDto; -import cn.bootx.notice.param.template.MessageTemplateParam; +import cn.bootx.platform.notice.param.template.MessageTemplateParam; +import cn.bootx.platform.notice.core.template.entity.MessageTemplate; +import cn.bootx.platform.notice.dto.template.MessageTemplateDto; import org.mapstruct.Mapper; -import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; /** diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/template/dao/MessageTemplateManager.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/dao/MessageTemplateManager.java similarity index 75% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/template/dao/MessageTemplateManager.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/dao/MessageTemplateManager.java index e8674be38cc6e31398131b68fa086e6fc6b58772..f879acab73c761d113a3002c0b4f83531e4c5420 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/template/dao/MessageTemplateManager.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/dao/MessageTemplateManager.java @@ -1,11 +1,11 @@ -package cn.bootx.notice.core.template.dao; - -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.notice.core.template.entity.MessageTemplate; -import cn.bootx.notice.param.template.MessageTemplateParam; +package cn.bootx.platform.notice.core.template.dao; + +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.notice.core.template.entity.MessageTemplate; +import cn.bootx.platform.notice.param.template.MessageTemplateParam; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/template/dao/MessageTemplateMapper.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/dao/MessageTemplateMapper.java similarity index 65% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/template/dao/MessageTemplateMapper.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/dao/MessageTemplateMapper.java index bb503b9e690488725df09afa2e0dd00b213d31ad..1bd5c72507573ceca29db52b7a7d9f2a8bae3664 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/template/dao/MessageTemplateMapper.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/dao/MessageTemplateMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.notice.core.template.dao; +package cn.bootx.platform.notice.core.template.dao; -import cn.bootx.notice.core.template.entity.MessageTemplate; +import cn.bootx.platform.notice.core.template.entity.MessageTemplate; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/template/entity/MessageTemplate.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/entity/MessageTemplate.java similarity index 66% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/template/entity/MessageTemplate.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/entity/MessageTemplate.java index f1dc0f27dcbc445b49042828d694f396d0d058fb..a0cd526b64d743391dfd83a6273c1cdaef7b47da 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/template/entity/MessageTemplate.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/entity/MessageTemplate.java @@ -1,11 +1,11 @@ -package cn.bootx.notice.core.template.entity; - -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.notice.code.MessageTemplateCode; -import cn.bootx.notice.core.template.convert.MessageTemplateConvert; -import cn.bootx.notice.dto.template.MessageTemplateDto; -import cn.bootx.notice.param.template.MessageTemplateParam; +package cn.bootx.platform.notice.core.template.entity; + +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.notice.core.template.convert.MessageTemplateConvert; +import cn.bootx.platform.notice.param.template.MessageTemplateParam; +import cn.bootx.platform.notice.code.MessageTemplateCode; +import cn.bootx.platform.notice.dto.template.MessageTemplateDto; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/template/service/MessageTemplateService.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/service/MessageTemplateService.java similarity index 82% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/template/service/MessageTemplateService.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/service/MessageTemplateService.java index b5f850ad686f31f1ef7d0d0377c862a2c340b9e8..cfbc66db520a7ab2fc688109934843cf631f70fb 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/template/service/MessageTemplateService.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/service/MessageTemplateService.java @@ -1,14 +1,14 @@ -package cn.bootx.notice.core.template.service; +package cn.bootx.platform.notice.core.template.service; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.notice.core.template.dao.MessageTemplateManager; -import cn.bootx.notice.core.template.entity.MessageTemplate; -import cn.bootx.notice.dto.template.MessageTemplateDto; -import cn.bootx.notice.param.template.MessageTemplateParam; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.notice.param.template.MessageTemplateParam; +import cn.bootx.platform.notice.core.template.dao.MessageTemplateManager; +import cn.bootx.platform.notice.core.template.entity.MessageTemplate; +import cn.bootx.platform.notice.dto.template.MessageTemplateDto; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.extra.template.Template; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wechat/dao/WeChatNoticeConfigManager.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/dao/WeChatNoticeConfigManager.java similarity index 65% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wechat/dao/WeChatNoticeConfigManager.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/dao/WeChatNoticeConfigManager.java index fa67fcee812e220cdd31fe708ebf0f123adf2b79..426492ced6bd09107b2739d3f995340eebffe51e 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wechat/dao/WeChatNoticeConfigManager.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/dao/WeChatNoticeConfigManager.java @@ -1,7 +1,7 @@ -package cn.bootx.notice.core.wechat.dao; +package cn.bootx.platform.notice.core.wechat.dao; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.notice.core.wechat.entity.WeChatNoticeConfig; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.notice.core.wechat.entity.WeChatNoticeConfig; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wechat/dao/WeChatNoticeConfigMapper.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/dao/WeChatNoticeConfigMapper.java similarity index 66% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wechat/dao/WeChatNoticeConfigMapper.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/dao/WeChatNoticeConfigMapper.java index 6d161f15a26a074729a27f0100a1047ecc06b1cc..88103ba3ce37f74498325d911f48ba39bdae48d1 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wechat/dao/WeChatNoticeConfigMapper.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/dao/WeChatNoticeConfigMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.notice.core.wechat.dao; +package cn.bootx.platform.notice.core.wechat.dao; -import cn.bootx.notice.core.wechat.entity.WeChatNoticeConfig; +import cn.bootx.platform.notice.core.wechat.entity.WeChatNoticeConfig; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wechat/entity/WeChatNoticeConfig.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/entity/WeChatNoticeConfig.java similarity index 76% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wechat/entity/WeChatNoticeConfig.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/entity/WeChatNoticeConfig.java index fd89786820d46435b52870e66c1767ff033d324b..3ec399f227244402b6e7c720eed4363fcc57dae8 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wechat/entity/WeChatNoticeConfig.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/entity/WeChatNoticeConfig.java @@ -1,6 +1,6 @@ -package cn.bootx.notice.core.wechat.entity; +package cn.bootx.platform.notice.core.wechat.entity; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/WeComNoticeParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/WeComNoticeParam.java similarity index 87% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/WeComNoticeParam.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/WeComNoticeParam.java index f852a08fabd445721668bdcba5853bdab78b3c42..9dc077fc0b3a50afeb6aefe644bc3345e2f36503 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/WeComNoticeParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/WeComNoticeParam.java @@ -1,6 +1,6 @@ -package cn.bootx.notice.core.wecom.entity; +package cn.bootx.platform.notice.core.wecom.entity; -import cn.bootx.notice.core.wecom.entity.msg.WeComMsg; +import cn.bootx.platform.notice.core.wecom.entity.msg.WeComMsg; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/WeComNoticeReceive.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/WeComNoticeReceive.java similarity index 93% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/WeComNoticeReceive.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/WeComNoticeReceive.java index 33f66c1d9114c0cd892df9fb8316c15470fddaf8..abfcff26690806f3fdacdeba33aab6476a25e160 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/WeComNoticeReceive.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/WeComNoticeReceive.java @@ -1,6 +1,6 @@ -package cn.bootx.notice.core.wecom.entity; +package cn.bootx.platform.notice.core.wecom.entity; -import cn.bootx.common.core.util.CollUtil; +import cn.bootx.platform.common.core.util.CollUtil; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComFileMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComFileMsg.java similarity index 90% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComFileMsg.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComFileMsg.java index ca474f8bd125883d4063ce5c0169c79b1a9602fa..20b0ed7b40cf266e22e6333fe8541dee1a7523b3 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComFileMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComFileMsg.java @@ -1,4 +1,4 @@ -package cn.bootx.notice.core.wecom.entity.msg; +package cn.bootx.platform.notice.core.wecom.entity.msg; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComImageMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComImageMsg.java similarity index 91% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComImageMsg.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComImageMsg.java index 96ec9da192641a05d7f53b2cd4eb1c06f2246c80..e431a829acfe2e359a1977fbf381807f71f04b0b 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComImageMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComImageMsg.java @@ -1,4 +1,4 @@ -package cn.bootx.notice.core.wecom.entity.msg; +package cn.bootx.platform.notice.core.wecom.entity.msg; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComMarkdownMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMarkdownMsg.java similarity index 91% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComMarkdownMsg.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMarkdownMsg.java index cc6e592586797ca35f460737969d65d03063fb70..731dfee96d34f22c88a30710451d40d37ca45b99 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComMarkdownMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMarkdownMsg.java @@ -1,4 +1,4 @@ -package cn.bootx.notice.core.wecom.entity.msg; +package cn.bootx.platform.notice.core.wecom.entity.msg; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComMpNewsMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMpNewsMsg.java similarity index 86% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComMpNewsMsg.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMpNewsMsg.java index 2bd4f6b78e55d169c4c823a628aefd9c41875d1d..fd3f9b35c54032e19163d53c2b80736229b2b836 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComMpNewsMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMpNewsMsg.java @@ -1,7 +1,7 @@ -package cn.bootx.notice.core.wecom.entity.msg; +package cn.bootx.platform.notice.core.wecom.entity.msg; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.util.CollUtil; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.util.CollUtil; import cn.hutool.core.util.ArrayUtil; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMsg.java similarity index 82% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComMsg.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMsg.java index 6a17afeed85d8fb5b85fb94d48b076e0138623d6..29652ffab8344d73c6b99c62f0c4b49a54358162 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMsg.java @@ -1,4 +1,4 @@ -package cn.bootx.notice.core.wecom.entity.msg; +package cn.bootx.platform.notice.core.wecom.entity.msg; import me.chanjar.weixin.cp.bean.message.WxCpMessage; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComNewsMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComNewsMsg.java similarity index 83% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComNewsMsg.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComNewsMsg.java index eef40f181754aefca47ed684b614d16a343c9cb1..e29daa1f093c1bd24c34308828e21651e51e58c7 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComNewsMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComNewsMsg.java @@ -1,7 +1,7 @@ -package cn.bootx.notice.core.wecom.entity.msg; +package cn.bootx.platform.notice.core.wecom.entity.msg; -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.util.CollUtil; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.util.CollUtil; import cn.hutool.core.util.ArrayUtil; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComRobotReceive.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComRobotReceive.java similarity index 87% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComRobotReceive.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComRobotReceive.java index 45baac92db38cc994046a006027fbb1266e06a00..a9bbe438d578e7fb36cd47f18cd924290e59c558 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComRobotReceive.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComRobotReceive.java @@ -1,4 +1,4 @@ -package cn.bootx.notice.core.wecom.entity.msg; +package cn.bootx.platform.notice.core.wecom.entity.msg; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComTextCardMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComTextCardMsg.java similarity index 93% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComTextCardMsg.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComTextCardMsg.java index fdad47d2396e8d90a9aec154db2bebc1575e52a9..9e94ed3b975d6dfa74d9cc8b0843c81e0f5ad5ea 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComTextCardMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComTextCardMsg.java @@ -1,4 +1,4 @@ -package cn.bootx.notice.core.wecom.entity.msg; +package cn.bootx.platform.notice.core.wecom.entity.msg; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComTextMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComTextMsg.java similarity index 91% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComTextMsg.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComTextMsg.java index e892a73c3cc7ef33e13c89ca7a777df0e468c0ac..54d4789ae06493c0dbc863cc680951a2c2f627e6 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComTextMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComTextMsg.java @@ -1,4 +1,4 @@ -package cn.bootx.notice.core.wecom.entity.msg; +package cn.bootx.platform.notice.core.wecom.entity.msg; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComVideoMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComVideoMsg.java similarity index 93% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComVideoMsg.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComVideoMsg.java index 67ce2c15dd764197195947671770c05c45a4f0ad..a03ec2c8eb04d6303c259068723a704bd64e804d 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComVideoMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComVideoMsg.java @@ -1,4 +1,4 @@ -package cn.bootx.notice.core.wecom.entity.msg; +package cn.bootx.platform.notice.core.wecom.entity.msg; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComVoiceMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComVoiceMsg.java similarity index 91% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComVoiceMsg.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComVoiceMsg.java index 96d0fbe941ad5a1c22bd72fbb21c623e2efa0094..a3ead5f71e8d84de257b9926e09df6383ae5163e 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/entity/msg/WeComVoiceMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComVoiceMsg.java @@ -1,4 +1,4 @@ -package cn.bootx.notice.core.wecom.entity.msg; +package cn.bootx.platform.notice.core.wecom.entity.msg; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/service/WeComNoticeSenderImpl.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/service/WeComNoticeSenderImpl.java similarity index 90% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/service/WeComNoticeSenderImpl.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/service/WeComNoticeSenderImpl.java index 9ad0b21e776e99dba8296c2428c44c0b45137004..9b4e952cffb2edd6960d53158acace407590000f 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/service/WeComNoticeSenderImpl.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/service/WeComNoticeSenderImpl.java @@ -1,10 +1,10 @@ -package cn.bootx.notice.core.wecom.service; +package cn.bootx.platform.notice.core.wecom.service; -import cn.bootx.notice.core.wecom.entity.WeComNoticeParam; -import cn.bootx.notice.core.wecom.entity.WeComNoticeReceive; -import cn.bootx.notice.core.wecom.entity.msg.*; -import cn.bootx.notice.service.WeComNoticeSender; -import cn.bootx.starter.wecom.core.notice.service.WeComNoticeService; +import cn.bootx.platform.notice.core.wecom.entity.msg.*; +import cn.bootx.platform.notice.service.WeComNoticeSender; +import cn.bootx.platform.starter.wecom.core.notice.service.WeComNoticeService; +import cn.bootx.platform.notice.core.wecom.entity.WeComNoticeParam; +import cn.bootx.platform.notice.core.wecom.entity.WeComNoticeReceive; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.api.WxConsts; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/service/WeComRobotNoticeSenderImpl.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/service/WeComRobotNoticeSenderImpl.java similarity index 92% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/service/WeComRobotNoticeSenderImpl.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/service/WeComRobotNoticeSenderImpl.java index 2650006c94df9a17aaaa18920094bdaf660652f9..f116388994e74e54851c9312cacdad8188da55c0 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/core/wecom/service/WeComRobotNoticeSenderImpl.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/service/WeComRobotNoticeSenderImpl.java @@ -1,7 +1,7 @@ -package cn.bootx.notice.core.wecom.service; +package cn.bootx.platform.notice.core.wecom.service; -import cn.bootx.notice.service.WeComRobotNoticeSender; -import cn.bootx.starter.wecom.core.robot.service.WeComRobotNoticeService; +import cn.bootx.platform.notice.service.WeComRobotNoticeSender; +import cn.bootx.platform.starter.wecom.core.robot.service.WeComRobotNoticeService; import cn.hutool.core.codec.Base64; import cn.hutool.core.io.IoUtil; import cn.hutool.crypto.digest.DigestUtil; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/mail/BaseMailParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/BaseMailParam.java similarity index 88% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/mail/BaseMailParam.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/BaseMailParam.java index 5dd3bedebd3520d5652aef346950e083868d8fa5..bd0c6f1d81fb43576d41767c3915a267a99697a4 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/mail/BaseMailParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/BaseMailParam.java @@ -1,4 +1,4 @@ -package cn.bootx.notice.dto.mail; +package cn.bootx.platform.notice.dto.mail; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/mail/MailConfigDto.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailConfigDto.java similarity index 83% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/mail/MailConfigDto.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailConfigDto.java index b98878ba28749da1a5cc4859382ef6d5543c5e12..c77ead5939ac2f4d2ad27445f08a6fd500ac6a7d 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/mail/MailConfigDto.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailConfigDto.java @@ -1,7 +1,8 @@ -package cn.bootx.notice.dto.mail; +package cn.bootx.platform.notice.dto.mail; -import cn.bootx.common.core.rest.dto.BaseDto; -import cn.bootx.starter.data.perm.sensitive.SensitiveInfo; +import cn.bootx.platform.common.core.rest.dto.BaseDto; +import cn.bootx.platform.notice.code.MailCode; +import cn.bootx.platform.starter.data.perm.sensitive.SensitiveInfo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -51,7 +52,7 @@ public class MailConfigDto extends BaseDto implements Serializable { private Boolean activity = false; /** - * @see cn.bootx.notice.code.MailCode + * @see MailCode */ @Schema(description = "安全方式") private Integer securityType; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/mail/MailFileParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailFileParam.java similarity index 91% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/mail/MailFileParam.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailFileParam.java index c8a4056ac8e1f8c4b6cc6830defd0db3edfce79a..544a008abd78ba73c31e3c4df67e1d6a4e136353 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/mail/MailFileParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailFileParam.java @@ -1,4 +1,4 @@ -package cn.bootx.notice.dto.mail; +package cn.bootx.platform.notice.dto.mail; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/mail/MailTemplateDto.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailTemplateDto.java similarity index 82% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/mail/MailTemplateDto.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailTemplateDto.java index f1450ad69c0982a17e5e68ad08f659b9288f0d69..2344a3d6142a47d2580a8d92189956f83c7c8031 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/mail/MailTemplateDto.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailTemplateDto.java @@ -1,7 +1,6 @@ -package cn.bootx.notice.dto.mail; +package cn.bootx.platform.notice.dto.mail; -import cn.bootx.common.core.rest.dto.BaseDto; -import io.swagger.v3.oas.annotations.media.Schema; +import cn.bootx.platform.common.core.rest.dto.BaseDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/mail/NoticeReceiverDto.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/NoticeReceiverDto.java similarity index 90% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/mail/NoticeReceiverDto.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/NoticeReceiverDto.java index b1397aa198ff0c4396948c2841f0b66c72a308ae..aed897a547b63839c3269e531ca5144ec7733231 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/mail/NoticeReceiverDto.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/NoticeReceiverDto.java @@ -1,6 +1,6 @@ -package cn.bootx.notice.dto.mail; +package cn.bootx.platform.notice.dto.mail; -import cn.bootx.common.core.rest.dto.BaseDto; +import cn.bootx.platform.common.core.rest.dto.BaseDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/mail/SendMailParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/SendMailParam.java similarity index 96% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/mail/SendMailParam.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/SendMailParam.java index 8efdbfff5500910fe7e8539f34336b427221ecf7..5abb3f75177f0d1d0677005806a3e6ed4bbed445 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/mail/SendMailParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/SendMailParam.java @@ -1,4 +1,4 @@ -package cn.bootx.notice.dto.mail; +package cn.bootx.platform.notice.dto.mail; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/mail/ToUserRequiredMailParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/ToUserRequiredMailParam.java similarity index 89% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/mail/ToUserRequiredMailParam.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/ToUserRequiredMailParam.java index 3dffa4af5304810be636caa2d60d3009e12a62e9..367c98ad41fe4a106430c08b9f0c31e12ba63d4d 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/mail/ToUserRequiredMailParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/ToUserRequiredMailParam.java @@ -1,4 +1,4 @@ -package cn.bootx.notice.dto.mail; +package cn.bootx.platform.notice.dto.mail; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/site/SiteMessageDto.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/site/SiteMessageDto.java similarity index 89% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/site/SiteMessageDto.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/site/SiteMessageDto.java index 00f76d0e1ab14457083141bb9d9ba02ba9976d35..0beb5f831d077ba98283b304f50927ebdb33fbad 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/site/SiteMessageDto.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/site/SiteMessageDto.java @@ -1,7 +1,7 @@ -package cn.bootx.notice.dto.site; +package cn.bootx.platform.notice.dto.site; -import cn.bootx.common.core.rest.dto.BaseDto; -import cn.bootx.notice.code.SiteMessageCode; +import cn.bootx.platform.common.core.rest.dto.BaseDto; +import cn.bootx.platform.notice.code.SiteMessageCode; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/template/MessageTemplateDto.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/template/MessageTemplateDto.java similarity index 79% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/template/MessageTemplateDto.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/template/MessageTemplateDto.java index ea3d5c79fd8bb702fb7bf583ccb63d51813623e6..1847818cadbe0cbd59eda420e069bf001d688bad 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/template/MessageTemplateDto.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/template/MessageTemplateDto.java @@ -1,6 +1,7 @@ -package cn.bootx.notice.dto.template; +package cn.bootx.platform.notice.dto.template; -import cn.bootx.common.core.rest.dto.BaseDto; +import cn.bootx.platform.common.core.rest.dto.BaseDto; +import cn.bootx.platform.notice.code.MessageTemplateCode; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -36,7 +37,7 @@ public class MessageTemplateDto extends BaseDto implements Serializable { /** * 模板类型 - * @see cn.bootx.notice.code.MessageTemplateCode + * @see MessageTemplateCode */ private Integer type; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/wechat/WeChatNoticeConfigDto.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/wechat/WeChatNoticeConfigDto.java similarity index 83% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/wechat/WeChatNoticeConfigDto.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/wechat/WeChatNoticeConfigDto.java index b20b45c45870b19342fea38b14b26d4bba299940..eadfae0069220454661e306e88187271c328fbb7 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/dto/wechat/WeChatNoticeConfigDto.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/wechat/WeChatNoticeConfigDto.java @@ -1,6 +1,6 @@ -package cn.bootx.notice.dto.wechat; +package cn.bootx.platform.notice.dto.wechat; -import cn.bootx.common.core.rest.dto.BaseDto; +import cn.bootx.platform.common.core.rest.dto.BaseDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/exception/CodeTemplateExistedException.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/CodeTemplateExistedException.java similarity index 66% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/exception/CodeTemplateExistedException.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/CodeTemplateExistedException.java index 908b356f21cb4dbd2f10b60b49305051198c288d..05bd2a96c1e2f92e1dda68352280b916fe12e687 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/exception/CodeTemplateExistedException.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/CodeTemplateExistedException.java @@ -1,10 +1,10 @@ -package cn.bootx.notice.exception; +package cn.bootx.platform.notice.exception; -import cn.bootx.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.BizException; import java.io.Serializable; -import static cn.bootx.notice.code.NoticeCenterErrorCode.MAIL_CONFIG_CODE_ALREADY_EXISTED; +import static cn.bootx.platform.notice.code.NoticeCenterErrorCode.MAIL_CONFIG_CODE_ALREADY_EXISTED; /** * 邮箱代码已经存在 diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/exception/DefaultMailConfigAlreadyExistedException.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/DefaultMailConfigAlreadyExistedException.java similarity index 68% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/exception/DefaultMailConfigAlreadyExistedException.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/DefaultMailConfigAlreadyExistedException.java index fd13f9be5327be6fe4b52b329a30f1c8d846657d..0d67bf4a317830976b112ff9bd7ebdaa81f84a3f 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/exception/DefaultMailConfigAlreadyExistedException.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/DefaultMailConfigAlreadyExistedException.java @@ -1,10 +1,10 @@ -package cn.bootx.notice.exception; +package cn.bootx.platform.notice.exception; -import cn.bootx.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.BizException; import java.io.Serializable; -import static cn.bootx.notice.code.NoticeCenterErrorCode.DEFAULT_MAIL_CONFIG_ALREADY_EXISTED; +import static cn.bootx.platform.notice.code.NoticeCenterErrorCode.DEFAULT_MAIL_CONFIG_ALREADY_EXISTED; /** * 默认邮箱配置 已存在异常 diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/exception/MailConfigCodeAlreadyExistedException.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailConfigCodeAlreadyExistedException.java similarity index 68% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/exception/MailConfigCodeAlreadyExistedException.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailConfigCodeAlreadyExistedException.java index 281c40c193e4798fe808610dc30c07ebaf73a03a..02f83f0302f24fccc71cbddb75260a10828f13ad 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/exception/MailConfigCodeAlreadyExistedException.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailConfigCodeAlreadyExistedException.java @@ -1,10 +1,10 @@ -package cn.bootx.notice.exception; +package cn.bootx.platform.notice.exception; -import cn.bootx.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.BizException; import java.io.Serializable; -import static cn.bootx.notice.code.NoticeCenterErrorCode.MAIL_CONFIG_CODE_ALREADY_EXISTED; +import static cn.bootx.platform.notice.code.NoticeCenterErrorCode.MAIL_CONFIG_CODE_ALREADY_EXISTED; /** * 邮箱配置编号 已存在异常 diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/exception/MailConfigNotExistException.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailConfigNotExistException.java similarity index 53% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/exception/MailConfigNotExistException.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailConfigNotExistException.java index c4e22ce14eaf2d687783535b2b2fc171bd52d079..a1ee1c4b1315c35d1512cce0b4da2b733d427a9e 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/exception/MailConfigNotExistException.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailConfigNotExistException.java @@ -1,8 +1,8 @@ -package cn.bootx.notice.exception; +package cn.bootx.platform.notice.exception; -import cn.bootx.common.core.exception.FatalException; +import cn.bootx.platform.common.core.exception.FatalException; -import static cn.bootx.notice.code.NoticeCenterErrorCode.MAIL_CONFIG_NOT_EXIST; +import static cn.bootx.platform.notice.code.NoticeCenterErrorCode.MAIL_CONFIG_NOT_EXIST; /** * 邮箱配置不存在异常 diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/exception/MailTemplateNotExistException.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailTemplateNotExistException.java similarity index 56% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/exception/MailTemplateNotExistException.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailTemplateNotExistException.java index e35ab936dde9fecd11798ac3529dd4bb92a27c9c..9f5433945e3d39c86fd269d07b723117f752905c 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/exception/MailTemplateNotExistException.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailTemplateNotExistException.java @@ -1,8 +1,8 @@ -package cn.bootx.notice.exception; +package cn.bootx.platform.notice.exception; -import cn.bootx.common.core.exception.FatalException; +import cn.bootx.platform.common.core.exception.FatalException; -import static cn.bootx.notice.code.NoticeCenterErrorCode.MAIL_TEMPLATE_NOT_EXIST; +import static cn.bootx.platform.notice.code.NoticeCenterErrorCode.MAIL_TEMPLATE_NOT_EXIST; /** * 模板不存在 diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/param/mail/MailConfigParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/mail/MailConfigParam.java similarity index 92% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/param/mail/MailConfigParam.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/mail/MailConfigParam.java index c928d62677c9651d96150d9ec384b59bc8dd0b86..144b222c2d2b80d64da591a0db48739731c86eb3 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/param/mail/MailConfigParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/mail/MailConfigParam.java @@ -1,6 +1,6 @@ -package cn.bootx.notice.param.mail; +package cn.bootx.platform.notice.param.mail; -import cn.bootx.notice.code.MailCode; +import cn.bootx.platform.notice.code.MailCode; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/param/mail/MailTemplateParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/mail/MailTemplateParam.java similarity index 93% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/param/mail/MailTemplateParam.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/mail/MailTemplateParam.java index 870843cae64e3490c84e9e86e9505d4e2f993dfb..81b2deb17592130653058db80e0ae79b5fd7fac6 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/param/mail/MailTemplateParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/mail/MailTemplateParam.java @@ -1,4 +1,4 @@ -package cn.bootx.notice.param.mail; +package cn.bootx.platform.notice.param.mail; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/param/site/SendSiteMessageParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/site/SendSiteMessageParam.java similarity index 89% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/param/site/SendSiteMessageParam.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/site/SendSiteMessageParam.java index 3ae3c0e5374c07e915768e1097718de75aefcc99..1975c4d7b0e6b984c2b16d1ea39365fdedd07c4d 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/param/site/SendSiteMessageParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/site/SendSiteMessageParam.java @@ -1,5 +1,6 @@ -package cn.bootx.notice.param.site; +package cn.bootx.platform.notice.param.site; +import cn.bootx.platform.notice.code.SiteMessageCode; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; @@ -35,7 +36,7 @@ public class SendSiteMessageParam { /** * 接收者类型 - * @see cn.bootx.notice.code.SiteMessageCode#RECEIVE_ALL + * @see SiteMessageCode#RECEIVE_ALL */ private String receiveType; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/param/template/MessageTemplateParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/template/MessageTemplateParam.java similarity index 83% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/param/template/MessageTemplateParam.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/template/MessageTemplateParam.java index c7f85e680f34134c8f1c2d4fa92bddd97390922f..3722b779ca1b8f39643ce1a8289543070ea1c1bc 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/param/template/MessageTemplateParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/template/MessageTemplateParam.java @@ -1,6 +1,6 @@ -package cn.bootx.notice.param.template; +package cn.bootx.platform.notice.param.template; -import io.swagger.v3.oas.annotations.media.Schema; +import cn.bootx.platform.notice.code.MessageTemplateCode; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; @@ -43,7 +43,7 @@ public class MessageTemplateParam implements Serializable { /** * 模板类型 - * @see cn.bootx.notice.code.MessageTemplateCode + * @see MessageTemplateCode */ private Integer type; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/service/DingRobotNoticeSender.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/DingRobotNoticeSender.java similarity index 67% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/service/DingRobotNoticeSender.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/DingRobotNoticeSender.java index 5def7740b2560faabfa386abd23c0e4acdf44bf2..50f8ba3a70f8478cbdc6d09b22e519b878e1459e 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/service/DingRobotNoticeSender.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/DingRobotNoticeSender.java @@ -1,8 +1,8 @@ -package cn.bootx.notice.service; +package cn.bootx.platform.notice.service; -import cn.bootx.starter.dingtalk.param.notice.msg.LinkMsg; -import cn.bootx.starter.dingtalk.param.notice.msg.MarkdownMsg; -import cn.bootx.starter.dingtalk.param.notice.msg.TextMsg; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.LinkMsg; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.MarkdownMsg; +import cn.bootx.platform.starter.dingtalk.param.notice.msg.TextMsg; /** * 钉钉机器人消息通知 diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/service/DingTalkNoticeSender.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/DingTalkNoticeSender.java similarity index 93% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/service/DingTalkNoticeSender.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/DingTalkNoticeSender.java index 6db2e6fcca92e7ff3ebd6f8d60398d85fbada9de..22f09aaa77a4a4fa52970573b6879d2793fda59f 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/service/DingTalkNoticeSender.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/DingTalkNoticeSender.java @@ -1,8 +1,8 @@ -package cn.bootx.notice.service; +package cn.bootx.platform.notice.service; -import cn.bootx.notice.core.dingtalk.entity.corp.DingCorpNoticeReceive; -import cn.bootx.notice.core.dingtalk.entity.corp.DingCorpNoticeUpdate; -import cn.bootx.notice.core.dingtalk.entity.msg.*; +import cn.bootx.platform.notice.core.dingtalk.entity.corp.DingCorpNoticeReceive; +import cn.bootx.platform.notice.core.dingtalk.entity.corp.DingCorpNoticeUpdate; +import cn.bootx.platform.notice.core.dingtalk.entity.msg.*; import java.io.InputStream; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/service/EmailNoticeSender.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/EmailNoticeSender.java similarity index 80% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/service/EmailNoticeSender.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/EmailNoticeSender.java index a5d68fed9102bf24bfc74125263d289b6b80e955..8f34bbf5a483dbcf2a722702f8dbf314088429b7 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/service/EmailNoticeSender.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/EmailNoticeSender.java @@ -1,6 +1,6 @@ -package cn.bootx.notice.service; +package cn.bootx.platform.notice.service; -import cn.bootx.notice.dto.mail.SendMailParam; +import cn.bootx.platform.notice.dto.mail.SendMailParam; /** * 邮件发送服务 diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/service/SmsNoticeSender.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/SmsNoticeSender.java similarity index 71% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/service/SmsNoticeSender.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/SmsNoticeSender.java index cf073632e65b5b0ec7ab2d26e90df6ef319b3263..498d111d12d28fa9b691c6632e311acacd2edc3b 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/service/SmsNoticeSender.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/SmsNoticeSender.java @@ -1,4 +1,4 @@ -package cn.bootx.notice.service; +package cn.bootx.platform.notice.service; /** * 短信通知服务 diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/service/WeChatNoticeSender.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeChatNoticeSender.java similarity index 72% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/service/WeChatNoticeSender.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeChatNoticeSender.java index dd4922af96ae054216938447c7e7b9fc161e380f..164543a3e9cf11b45e9f3ea9090ebd2b0d80be97 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/service/WeChatNoticeSender.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeChatNoticeSender.java @@ -1,4 +1,4 @@ -package cn.bootx.notice.service; +package cn.bootx.platform.notice.service; /** * 微信消息服务 diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/service/WeComNoticeSender.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeComNoticeSender.java similarity index 90% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/service/WeComNoticeSender.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeComNoticeSender.java index 4e966687da8a20e0a5b08f71c88d611b9fde38b0..f9e1ffc0dc014439041e13b9a58aa690750baa41 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/service/WeComNoticeSender.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeComNoticeSender.java @@ -1,7 +1,7 @@ -package cn.bootx.notice.service; +package cn.bootx.platform.notice.service; -import cn.bootx.notice.core.wecom.entity.WeComNoticeReceive; -import cn.bootx.notice.core.wecom.entity.msg.*; +import cn.bootx.platform.notice.core.wecom.entity.WeComNoticeReceive; +import cn.bootx.platform.notice.core.wecom.entity.msg.*; import java.io.InputStream; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/notice/service/WeComRobotNoticeSender.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeComRobotNoticeSender.java similarity index 96% rename from bootx-services/service-notice/src/main/java/cn/bootx/notice/service/WeComRobotNoticeSender.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeComRobotNoticeSender.java index d5ae19c86654a4bb83f7e378831cb8639b47a388..b95307dab4cf8ebceb022950a82be474b3dfd693 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/notice/service/WeComRobotNoticeSender.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeComRobotNoticeSender.java @@ -1,4 +1,4 @@ -package cn.bootx.notice.service; +package cn.bootx.platform.notice.service; import me.chanjar.weixin.cp.bean.article.NewArticle; diff --git a/bootx-services/service-notice/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-services/service-notice/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index b7932d2013822cb4d6f607688bdd7e9b5c699ac8..ffdfb163ca8278e41a02ae852563e211d8c6549f 100644 --- a/bootx-services/service-notice/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bootx-services/service-notice/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.bootx.notice.NoticeApplication \ No newline at end of file +cn.bootx.platform.notice.NoticeApplication diff --git a/bootx-services/service-notice/src/main/resources/mapper/SiteMessageMapper.xml b/bootx-services/service-notice/src/main/resources/mapper/SiteMessageMapper.xml index 7524d35b17641cfb04ca1f704e0101ffa9d0c01a..2dedc17d5383bc02e62e30171950a6bd1ed23dd9 100644 --- a/bootx-services/service-notice/src/main/resources/mapper/SiteMessageMapper.xml +++ b/bootx-services/service-notice/src/main/resources/mapper/SiteMessageMapper.xml @@ -1,8 +1,8 @@ - + - select nsm.id as id, nsm.title as title, @@ -28,4 +28,4 @@ ${ew.customSqlSegment} - \ No newline at end of file + diff --git a/bootx-services/service-office/README.md b/bootx-services/service-office/README.md deleted file mode 100644 index 98dd8af8494d3dbe38e64bdf6903f39e707f814a..0000000000000000000000000000000000000000 --- a/bootx-services/service-office/README.md +++ /dev/null @@ -1 +0,0 @@ -# 办公服务 \ No newline at end of file diff --git a/bootx-services/service-office/pom.xml b/bootx-services/service-office/pom.xml deleted file mode 100644 index 6baef7d7bb8b6b3b77456c86e15c8a24de7c33c1..0000000000000000000000000000000000000000 --- a/bootx-services/service-office/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - bootx-services - cn.bootx.platform - 1.2.3 - - 4.0.0 - - service-office - 办公模块 - - - - - com.mysql - mysql-connector-j - runtime - - - - - com.baomidou - mybatis-plus-boot-starter - - - - - cn.bootx.platform - service-iam - ${bootx-platform.version} - - - - - cn.bootx.platform - service-notice - ${bootx-platform.version} - - - - - cn.bootx.platform - service-baseapi - ${bootx-platform.version} - - - - - cn.bootx.platform - common-starter-flowable - - - - diff --git a/bootx-services/service-office/src/main/java/cn/bootx/office/OfficeApplication.java b/bootx-services/service-office/src/main/java/cn/bootx/office/OfficeApplication.java deleted file mode 100644 index e071d0a290b2404cde3fad8fa48de095ff5fd57e..0000000000000000000000000000000000000000 --- a/bootx-services/service-office/src/main/java/cn/bootx/office/OfficeApplication.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.bootx.office; - -import org.apache.ibatis.annotations.Mapper; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.context.annotation.ComponentScan; - -/** - * 办公服务 - * - * @author xxm - * @date 2022/8/23 - */ -@ComponentScan -@MapperScan(annotationClass = Mapper.class) -public class OfficeApplication { - -} diff --git a/bootx-services/service-office/src/main/java/cn/bootx/office/code/NoticeMessageCode.java b/bootx-services/service-office/src/main/java/cn/bootx/office/code/NoticeMessageCode.java deleted file mode 100644 index 51e45be14ec648d905a5d5557845363ace1ccdaa..0000000000000000000000000000000000000000 --- a/bootx-services/service-office/src/main/java/cn/bootx/office/code/NoticeMessageCode.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.bootx.office.code; - -/** - * 消息通知 - * - * @author xxm - * @date 2022/9/18 - */ -public interface NoticeMessageCode { - - String BPM_TASK_CREATED = "BpmTaskCreated"; - - String BPM_TASK_ASSIGN_CREATED = "BpmTaskAssignCreated"; - - String BPM_TASK_ASSIGN_CANCEL = "BpmTaskAssignCancel"; - - String BPM_TASK_COMPLETED = "BpmTaskCompleted"; - - String BPM_TASK_CANCEL = "BpmTaskCancel"; - - String BPM_TASK_REJECT = "BpmTaskReject"; - - String BPM_TASK_BACK = "BpmTaskBack"; - - String BPM_INSTANCE_COMPLETED = "BpmInstanceCompleted"; - - String BPM_INSTANCE_CANCEL = "BpmInstanceCancel"; - -} diff --git a/bootx-services/service-office/src/main/java/cn/bootx/office/handler/behavior/BpmMultiInstanceBehaviorServiceImpl.java b/bootx-services/service-office/src/main/java/cn/bootx/office/handler/behavior/BpmMultiInstanceBehaviorServiceImpl.java deleted file mode 100644 index 94d2dfeca962438e4a0ad73fea802f2ce532657c..0000000000000000000000000000000000000000 --- a/bootx-services/service-office/src/main/java/cn/bootx/office/handler/behavior/BpmMultiInstanceBehaviorServiceImpl.java +++ /dev/null @@ -1,197 +0,0 @@ -package cn.bootx.office.handler.behavior; - -import cn.bootx.common.core.util.CollUtil; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.iam.core.upms.dao.UserRoleManager; -import cn.bootx.iam.core.upms.entity.UserRole; -import cn.bootx.starter.flowable.core.instance.dao.BpmInstanceManager; -import cn.bootx.starter.flowable.core.instance.dao.BpmTaskManager; -import cn.bootx.starter.flowable.core.instance.entity.BpmInstance; -import cn.bootx.starter.flowable.core.instance.entity.BpmTask; -import cn.bootx.starter.flowable.core.model.dao.BpmModelNodeManager; -import cn.bootx.starter.flowable.core.model.entity.BpmModelNode; -import cn.bootx.starter.flowable.exception.ModelNodeNotExistException; -import cn.bootx.starter.flowable.handler.behavior.BpmMultiInstanceBehaviorService; -import cn.bootx.starter.flowable.local.BpmContext; -import cn.bootx.starter.flowable.local.BpmContextLocal; -import cn.hutool.core.util.NumberUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.impl.bpmn.behavior.MultiInstanceActivityBehavior; -import org.springframework.stereotype.Service; - -import java.util.*; -import java.util.stream.Collectors; - -import static cn.bootx.starter.flowable.code.ModelNodeCode.*; -import static cn.bootx.starter.flowable.code.TaskCode.RESULT_PASS; -import static cn.bootx.starter.flowable.code.TaskCode.STATE_REJECT; - -/** - * 重写 flowable 多实例行为服务 - * - * @author xxm - * @date 2022/9/4 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class BpmMultiInstanceBehaviorServiceImpl implements BpmMultiInstanceBehaviorService { - - private final BpmModelNodeManager bpmModelNodeManager; - - private final BpmInstanceManager bpmInstanceManager; - - private final BpmTaskManager bpmTaskManager; - - private final UserRoleManager userRoleManager; - - /** - * 人员分配 - * @return - */ - @Override - public List getTaskUsers(DelegateExecution execution, MultiInstanceActivityBehavior behavior) { - BpmContext bpmContext = BpmContextLocal.get(); - - // 获取节点配置并设置处理人 - BpmModelNode modelNode = bpmModelNodeManager - .findByDefIdAndNodeId(execution.getProcessDefinitionId(), execution.getCurrentActivityId()) - .orElseThrow(ModelNodeNotExistException::new); - - // 处理驳回情况的人员分配 - if (Objects.equals(bpmContext.getTaskState(), STATE_REJECT)) { - return this.rejectOrBack(execution, modelNode, bpmContext, behavior); - } - // 正常获取配置的处理人 - return this.getUserIds(execution, modelNode, bpmContext); - - } - - /** - * 获取处理人 - */ - public List getUserIds(DelegateExecution execution, BpmModelNode modelNode, BpmContext bpmContext) { - List userIds = new ArrayList<>(0); - // 发起人 - if (Objects.equals(modelNode.getAssignType(), ASSIGN_SPONSOR)) { - Long startUserId = this.getStartUserId(execution.getProcessInstanceId()); - userIds = Collections.singletonList(String.valueOf(startUserId)); - } - // 用户手动选择 - if (Objects.equals(modelNode.getAssignType(), ASSIGN_SELECT)) { - // noinspection unchecked - userIds = (List) bpmContext.getNextAssign(); - } - - // 指定用户组 - if (Objects.equals(modelNode.getAssignType(), ASSIGN_USER_GROUP)) { - // noinspection unchecked - userIds = (List) modelNode.getAssignRaw(); - } - - // 指定角色 - if (Objects.equals(modelNode.getAssignType(), ASSIGN_GROUP)) { - // noinspection unchecked - List roleIds = (List) modelNode.getAssignRaw(); - userIds = getUserIdsByRole(roleIds); - } - - return userIds; - } - - /** - * 驳回处理 - */ - private List rejectOrBack(DelegateExecution execution, BpmModelNode modelNode, BpmContext bpmContext, - MultiInstanceActivityBehavior behavior) { - // 查询当前环节的任务 - List tasks = bpmTaskManager.findByInstanceIdAndNodeId(execution.getProcessInstanceId(), - execution.getCurrentActivityId()); - // noinspection OptionalGetWithoutIsPresent - Long multiId = tasks.stream().max(Comparator.comparingLong(MpIdEntity::getId)).map(BpmTask::getMultiId).get(); - // 会签和串签处理方式不同 - if (Objects.equals(modelNode.getSequential(), true)) { - // 串签只能拿到之前执行了的任务, 未执行到的不会进行生成 - List processedUserIds = tasks.stream() - .filter(task -> Objects.equals(multiId, task.getMultiId())) - .map(BpmTask::getUserId) - .map(String::valueOf) - .collect(Collectors.toList()); - - // 补全未执行到的任务信息 - List userIds = this.getUserIds(execution, modelNode, bpmContext); - if (processedUserIds.size() >= userIds.size()) { - return processedUserIds; - } - else { - int size = processedUserIds.size(); - // 例如角色一类的分配规则, 重新分配变动了, 可能会出问题, 但我暂时不打算解决 - return CollUtil.sub(userIds, size, userIds.size()); - } - } - else { - // 会签可以拿到之前所有的任务 - return tasks.stream() - .filter(task -> Objects.equals(multiId, task.getMultiId())) - .map(BpmTask::getUserId) - .map(String::valueOf) - .collect(Collectors.toList()); - } - } - - /** - * 获取发起人id - */ - private Long getStartUserId(String processInstanceId) { - return bpmInstanceManager.findByInstanceId(processInstanceId).map(BpmInstance::getStartUserId).orElse(null); - } - - /** - * 根据角色获取人员id集合 - */ - private List getUserIdsByRole(List roleIds) { - return userRoleManager.findAllByRoles(roleIds) - .stream() - .map(UserRole::getUserId) - .map(String::valueOf) - .collect(Collectors.toList()); - } - - /** - * 是否满足结束条件 - */ - @Override - public boolean completionConditionSatisfied(DelegateExecution execution, MultiInstanceActivityBehavior behavior) { - BpmContext bpmContext = BpmContextLocal.get(); - - // 获取节点配置 - BpmModelNode node = bpmModelNodeManager - .findByDefIdAndNodeId(execution.getProcessDefinitionId(), execution.getCurrentActivityId()) - .orElseThrow(ModelNodeNotExistException::new); - // 判断是否是或签 - if (Objects.equals(node.getOrSign(), true)) { - // 获取当前人是否是通过选择了通过 - execution.getId(); - if (Objects.equals(RESULT_PASS, bpmContext.getTaskResult())) { - return true; - } - } - // 判断是否是比例通过 - if (Objects.equals(node.getRatioPass(), true)) { - double passRatio = Optional.ofNullable(node.getPassRatio()).orElse(50.0); - // 查询当前任务完成的个数 - List tasks = bpmTaskManager.findByInstanceIdAndNodeId(execution.getProcessInstanceId(), - execution.getCurrentActivityId()); - long passCount = tasks.stream().filter(o -> Objects.equals(o.getResult(), RESULT_PASS)).count(); - double ratio = NumberUtil.div(passCount, tasks.size()) * 100; - if (ratio >= passRatio) { - return true; - } - } - - return false; - } - -} diff --git a/bootx-services/service-office/src/main/java/cn/bootx/office/handler/behavior/BpmUserTaskAssignServiceImpl.java b/bootx-services/service-office/src/main/java/cn/bootx/office/handler/behavior/BpmUserTaskAssignServiceImpl.java deleted file mode 100644 index 9a3b43d2cfc1d2002cd0c80d55c2e9b6635fb622..0000000000000000000000000000000000000000 --- a/bootx-services/service-office/src/main/java/cn/bootx/office/handler/behavior/BpmUserTaskAssignServiceImpl.java +++ /dev/null @@ -1,143 +0,0 @@ -package cn.bootx.office.handler.behavior; - -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.iam.core.upms.dao.UserRoleManager; -import cn.bootx.iam.core.upms.entity.UserRole; -import cn.bootx.starter.flowable.core.instance.dao.BpmInstanceManager; -import cn.bootx.starter.flowable.core.instance.dao.BpmTaskManager; -import cn.bootx.starter.flowable.core.instance.entity.BpmInstance; -import cn.bootx.starter.flowable.core.instance.entity.BpmTask; -import cn.bootx.starter.flowable.core.model.dao.BpmModelNodeManager; -import cn.bootx.starter.flowable.core.model.entity.BpmModelNode; -import cn.bootx.starter.flowable.exception.ModelNodeNotExistException; -import cn.bootx.starter.flowable.handler.behavior.BpmUserTaskAssignService; -import cn.bootx.starter.flowable.local.BpmContext; -import cn.bootx.starter.flowable.local.BpmContextLocal; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import lombok.val; -import org.flowable.common.engine.impl.el.ExpressionManager; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.impl.bpmn.behavior.UserTaskActivityBehavior; -import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl; -import org.flowable.engine.impl.util.TaskHelper; -import org.flowable.task.service.TaskService; -import org.flowable.task.service.impl.persistence.entity.TaskEntity; -import org.springframework.stereotype.Service; - -import java.util.Comparator; -import java.util.List; -import java.util.Objects; - -import static cn.bootx.starter.flowable.code.BpmnCode.MULTI_TASK_ID; -import static cn.bootx.starter.flowable.code.ModelNodeCode.*; -import static cn.bootx.starter.flowable.code.TaskCode.STATE_REJECT; - -/** - * 处理普通任务人员分配 - * - * @author xxm - * @date 2022/9/4 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class BpmUserTaskAssignServiceImpl implements BpmUserTaskAssignService { - - private final BpmModelNodeManager bpmModelNodeManager; - - private final BpmInstanceManager bpmInstanceManager; - - private final BpmTaskManager bpmTaskManager; - - private final UserRoleManager userRoleManager; - - @Override - public void handleAssignments(TaskService taskService, String assignee, String owner, List candidateUsers, - List candidateGroups, TaskEntity task, ExpressionManager expressionManager, - DelegateExecution execution, ProcessEngineConfigurationImpl processEngineConfiguration, - UserTaskActivityBehavior userTaskActivityBehavior) { - Long userId = null; - BpmContext bpmContext = BpmContextLocal.get(); - - // 情况一，如果是多实例的任务，例如说会签、串签等情况，已经被分配完毕, 直接从 Variable 中获取。 - val multiInstanceActivityBehavior = userTaskActivityBehavior.getMultiInstanceActivityBehavior(); - if (Objects.nonNull(userTaskActivityBehavior.getMultiInstanceActivityBehavior())) { - Object multiId = execution.getVariable(MULTI_TASK_ID); - if (Objects.nonNull(multiId)) { - bpmContext.setTaskMultiId((Long) multiId); - } - - val userIdStr = execution.getVariable(multiInstanceActivityBehavior.getCollectionElementVariable()); - TaskHelper.changeTaskAssignee(task, userIdStr.toString()); - return; - } - - // 情况二，驳回/退回处理 - if (Objects.equals(bpmContext.getTaskState(), STATE_REJECT)) { - Long rejectUserId = this.getRejectOrBackUserId(task); - TaskHelper.changeTaskAssignee(task, String.valueOf(rejectUserId)); - return; - } - - // 情况三，如果非多实例的任务，则获取节点配置并设置处理人 - BpmModelNode modelTask = bpmModelNodeManager - .findByDefIdAndNodeId(task.getProcessDefinitionId(), task.getTaskDefinitionKey()) - .orElseThrow(ModelNodeNotExistException::new); - // 发起人 - if (Objects.equals(modelTask.getAssignType(), ASSIGN_SPONSOR)) { - userId = this.getStartUserId(execution.getProcessInstanceId()); - } - // 用户手动选择 - if (Objects.equals(modelTask.getAssignType(), ASSIGN_SELECT)) { - userId = Long.valueOf(bpmContext.getNextAssign().toString()); - } - - // 指定用户 - if (Objects.equals(modelTask.getAssignType(), ASSIGN_USER)) { - userId = Long.valueOf(modelTask.getAssignRaw().toString()); - } - - // 指定角色 角色有多个, 只会从里面抽一个人 - if (Objects.equals(modelTask.getAssignType(), ASSIGN_ROLE)) { - Long roleId = Long.valueOf(modelTask.getAssignRaw().toString()); - userId = this.getUserIdByRole(roleId); - } - // 部门负责人 负责人有多个, 只会从里面抽一个人 - if (Objects.equals(modelTask.getAssignType(), ASSIGN_DEPT_LEADER)) { - Long deptId = Long.valueOf(modelTask.getAssignRaw().toString()); - - } - TaskHelper.changeTaskAssignee(task, String.valueOf(userId)); - } - - /** - * 获取被驳回/退回人的用户id - */ - private Long getRejectOrBackUserId(TaskEntity task) { - // 查询当前环节的历史任务 - List tasks = bpmTaskManager.findByInstanceIdAndNodeId(task.getProcessInstanceId(), - task.getTaskDefinitionKey()); - // noinspection OptionalGetWithoutIsPresent - return tasks.stream() - .filter(o -> Objects.nonNull(o.getEndTime())) - .max(Comparator.comparingLong(MpIdEntity::getId)) - .map(BpmTask::getUserId) - .get(); - } - - /** - * 获取发起人id - */ - private Long getStartUserId(String processInstanceId) { - return bpmInstanceManager.findByInstanceId(processInstanceId).map(BpmInstance::getStartUserId).orElse(null); - } - - /** - * 根据角色获取人员id集合 - */ - private Long getUserIdByRole(Long roleId) { - return userRoleManager.findAllByRole(roleId).stream().map(UserRole::getUserId).findAny().orElse(null); - } - -} diff --git a/bootx-services/service-office/src/main/java/cn/bootx/office/handler/message/BpmInstanceNoticeService.java b/bootx-services/service-office/src/main/java/cn/bootx/office/handler/message/BpmInstanceNoticeService.java deleted file mode 100644 index b3479b9baf0a8f1185c067089f43383c415802eb..0000000000000000000000000000000000000000 --- a/bootx-services/service-office/src/main/java/cn/bootx/office/handler/message/BpmInstanceNoticeService.java +++ /dev/null @@ -1,60 +0,0 @@ -package cn.bootx.office.handler.message; - -import cn.bootx.notice.core.site.service.SiteMessageService; -import cn.bootx.notice.core.template.service.MessageTemplateService; -import cn.bootx.starter.flowable.core.instance.entity.BpmInstance; -import cn.bootx.starter.flowable.event.ProcessCancelEvent; -import cn.bootx.starter.flowable.event.ProcessCompletedEvent; -import cn.hutool.core.util.StrUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.event.EventListener; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.Map; - -import static cn.bootx.office.code.NoticeMessageCode.BPM_INSTANCE_CANCEL; -import static cn.bootx.office.code.NoticeMessageCode.BPM_INSTANCE_COMPLETED; - -/** - * 流程实例消息发送 - * - * @author xxm - * @date 2022/9/18 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class BpmInstanceNoticeService { - - private final SiteMessageService messageService; - - private final MessageTemplateService messageTemplateService; - - /** - * 流程完成时通知发起人 - */ - @EventListener - public void ProcessCompleted(ProcessCompletedEvent event) { - BpmInstance bpmInstance = event.getBpmInstance(); - // 发送完成消息 - String title = StrUtil.format("{} 流程执行完成", bpmInstance.getInstanceName()); - Map map = new HashMap<>(); - String content = messageTemplateService.rendering(BPM_INSTANCE_COMPLETED, map); - messageService.sendSingleUserBySystem(title, content, bpmInstance.getStartUserId()); - } - - /** - * 流程取消时通知发起人 - */ - @EventListener - public void ProcessCancel(ProcessCancelEvent event) { - BpmInstance bpmInstance = event.getBpmInstance(); - String title = StrUtil.format("{} 流程被取消", bpmInstance.getInstanceName()); - Map map = new HashMap<>(); - String content = messageTemplateService.rendering(BPM_INSTANCE_CANCEL, map); - messageService.sendSingleUserBySystem(title, content, bpmInstance.getStartUserId()); - } - -} diff --git a/bootx-services/service-office/src/main/java/cn/bootx/office/handler/message/BpmTaskNoticeService.java b/bootx-services/service-office/src/main/java/cn/bootx/office/handler/message/BpmTaskNoticeService.java deleted file mode 100644 index 2f95b7868d5f83028e9278fc6efcbba01560086d..0000000000000000000000000000000000000000 --- a/bootx-services/service-office/src/main/java/cn/bootx/office/handler/message/BpmTaskNoticeService.java +++ /dev/null @@ -1,123 +0,0 @@ -package cn.bootx.office.handler.message; - -import cn.bootx.notice.core.site.service.SiteMessageService; -import cn.bootx.notice.core.template.service.MessageTemplateService; -import cn.bootx.office.code.NoticeMessageCode; -import cn.bootx.starter.flowable.core.instance.entity.BpmTask; -import cn.bootx.starter.flowable.event.*; -import cn.hutool.core.util.StrUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.event.EventListener; -import org.springframework.retry.annotation.Backoff; -import org.springframework.retry.annotation.Retryable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.HashMap; -import java.util.Map; - -/** - * 消息发送 - * - * @author xxm - * @date 2022/9/18 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class BpmTaskNoticeService { - - private final SiteMessageService messageService; - - private final MessageTemplateService messageTemplateService; - - /** - * 流程任务创建事件 - */ - @EventListener - public void taskCreated(TaskCreatedEvent event) { - BpmTask bpmTask = event.getBpmTask(); - Map map = new HashMap<>(); - String title = StrUtil.format("{} 的 {} 需要处理", bpmTask.getInstanceName(), bpmTask.getNodeName()); - String content = messageTemplateService.rendering(NoticeMessageCode.BPM_TASK_CREATED, map); - messageService.sendSingleUserBySystem(title, content, bpmTask.getUserId()); - } - - /** - * 流程任务更改处理人事件 - */ - @EventListener - @Transactional(rollbackFor = Exception.class) - @Retryable(value = Exception.class, maxAttempts = 2, backoff = @Backoff(value = 2000L)) - public void taskAssign(TaskAssignEvent event) { - // 发送给原处理人 - BpmTask bpmTask = event.getBpmTask(); - Map oldMap = new HashMap<>(); - String oldTitle = StrUtil.format("{} 的 {} 任务已成功被委派给 {}", bpmTask.getInstanceName(), bpmTask.getNodeName(), - event.getNewAssignName()); - String oldContent = messageTemplateService.rendering(NoticeMessageCode.BPM_TASK_ASSIGN_CANCEL, oldMap); - messageService.sendSingleUserBySystem(oldTitle, oldContent, event.getOldAssign()); - // 发送给新处理人 - Map newMap = new HashMap<>(); - String newTitle = StrUtil.format("{} 的 {} {} 任务已经委派给您", event.getOldAssignName(), bpmTask.getInstanceName(), - bpmTask.getNodeName()); - String newContent = messageTemplateService.rendering(NoticeMessageCode.BPM_TASK_ASSIGN_CREATED, newMap); - messageService.sendSingleUserBySystem(newTitle, newContent, event.getNewAssign()); - } - - /** - * 流程任务完成事件 - */ - @EventListener - public void taskCompleted(TaskCompletedEvent event) { - if (!event.isMulti()) { - return; - } - for (BpmTask bpmTask : event.getBpmTasks()) { - // 发送给新处理人 - Map newMap = new HashMap<>(); - String newTitle = StrUtil.format("{} {} 任务已经被完成", bpmTask.getInstanceName(), bpmTask.getNodeName()); - String newContent = messageTemplateService.rendering(NoticeMessageCode.BPM_TASK_COMPLETED, newMap); - messageService.sendSingleUserBySystem(newTitle, newContent, bpmTask.getUserId()); - } - } - - /** - * 流程任务取消事件 - */ - @EventListener - public void taskCancel(TaskCancelEvent event) { - for (BpmTask bpmTask : event.getBpmTasks()) { - Map map = new HashMap<>(); - String title = StrUtil.format("{} {} 任务已经被完成", bpmTask.getInstanceName(), bpmTask.getNodeName()); - String content = messageTemplateService.rendering(NoticeMessageCode.BPM_TASK_CANCEL, map); - messageService.sendSingleUserBySystem(title, content, bpmTask.getUserId()); - } - } - - /** - * 流程任务驳回事件 - */ - @EventListener - public void taskReject(TaskRejectEvent event) { - BpmTask bpmTask = event.getBpmTask(); - Map map = new HashMap<>(); - String title = StrUtil.format("{} {} 任务已经被驳回", bpmTask.getInstanceName(), bpmTask.getNodeName()); - String content = messageTemplateService.rendering(NoticeMessageCode.BPM_TASK_REJECT, map); - messageService.sendSingleUserBySystem(title, content, bpmTask.getUserId()); - } - - /** - * 流程任务驳回事件 - */ - @EventListener - public void taskBack(TaskBackEvent event) { - BpmTask bpmTask = event.getBpmTask(); - Map map = new HashMap<>(); - String title = StrUtil.format("{} {} 任务已经被退回", bpmTask.getInstanceName(), bpmTask.getNodeName()); - String content = messageTemplateService.rendering(NoticeMessageCode.BPM_TASK_BACK, map); - messageService.sendSingleUserBySystem(title, content, bpmTask.getUserId()); - } - -} diff --git a/bootx-services/service-office/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-services/service-office/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index d307106db63aca376ba22b9f08a1d8dbe1594f85..0000000000000000000000000000000000000000 --- a/bootx-services/service-office/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.bootx.office.OfficeApplication \ No newline at end of file diff --git a/bootx-services/service-payment/README.md b/bootx-services/service-payment/README.md deleted file mode 100644 index c352cbf3d154393e27d1f1be5161ce5b19120e3e..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/README.md +++ /dev/null @@ -1,38 +0,0 @@ -# 支付中心 - -## 介绍 - -## 能力 -1. 支付 - - 支付宝 - - 微信 - - 银联云闪付 - - 电子钱包 - - 现金支付 -2. 组合支付，支持三方支付和自有（钱包、现金等）共同使用 -4. 聚合支付，支持微信支付宝的聚合扫码和付款码支付 -5. 支付记录 -6. 支付回调记录 -7. 分账 - -## 核心概念 -### 对象 -- Payment 主支付记录: 用于记录当前支付的公共信息，同时每个不同的支付方式都有对应的子payment，比如：AliPayPayment，WeChatPayment，PointPayment等 -- PayChannel 支付通道，例如支付宝、微信、钱包、现金等，包含通道网关地址，支持具体支付方式等 -- PayMode 支付方式 与支付通道相对应，支付方式会更细化，PayMode包含具体支付类型（扫码、付款码）和支付金额,以及支付扩展参数。 -- OrderBilling 账单，每个PayMode生成一个账单。 -- OrderBillingItem 账单项 每个支付的项都会在其支持的PayMode下面生成一个对应的账单项。 -###其他 -- 同步支付 调用支付后直接就完成支付的支付方式 -- 异步支付 调用支付后，需要支付通道网关回调才能确认支付完成的支付方式，如支付宝、微信、云闪付等三方支付 -## 使用 - -### 支付路由 - -### 支付调用 -> 通常支付前会先下订单，然后再进行支付，订单号做为业务单号。演示DEMO参见shop-engine文档 - -1. 根据传入请求，组装出PayMode支付方式参数， -2. 组装请求参数，调用pay方法，根据返回值进行下一步操作 -3. 如果是同步支付，直接根据返回的payment对象进行处理 -4. 如果是异步支付方式，获取返回异步支付参数，根据异步支付参数调起支付 diff --git a/bootx-services/service-payment/pom.xml b/bootx-services/service-payment/pom.xml deleted file mode 100644 index f42c4963cefa6ff9b5b5d25010b0a2caf098d2e0..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/pom.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - cn.bootx.platform - bootx-services - 1.2.3 - - - 4.0.0 - - service-payment - jar - - - - - - com.mysql - mysql-connector-j - runtime - - - - - com.baomidou - mybatis-plus-boot-starter - - - - - com.github.javen205 - IJPay-AliPay - ${IJPay.version} - - - cn.hutool - hutool-all - - - xml-apis - xml-apis - - - fastjson - com.alibaba - - - - - - - com.github.javen205 - IJPay-WxPay - ${IJPay.version} - - - - - com.github.javen205 - IJPay-UnionPay - ${IJPay.version} - - - - - cn.bootx.platform - service-iam - ${bootx-platform.version} - - - - - cn.bootx.platform - common-starter-auth - - - - - cn.bootx.platform - common-starter-file - - - - - cn.bootx.platform - common-super-query - - - - - cn.bootx.platform - common-rabbitmq - - - - - cn.bootx.platform - common-starter-quartz - - - - - - diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/PaymentApplication.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/PaymentApplication.java deleted file mode 100644 index 576fd2ac98e0c6f71f4270913f9554b984d4f6fc..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/PaymentApplication.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.bootx.payment; - -import org.apache.ibatis.annotations.Mapper; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.context.properties.ConfigurationPropertiesScan; -import org.springframework.context.annotation.ComponentScan; - -/** - * 支付中心 - * - * @author xxm - * @date 2021/7/27 - */ -@ComponentScan -@ConfigurationPropertiesScan -@MapperScan(annotationClass = Mapper.class) -public class PaymentApplication { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/CachingCode.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/CachingCode.java deleted file mode 100644 index 7aa0a83d1a4d2f71c03f7a4851d321dc602e9adf..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/CachingCode.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.bootx.payment.code; - -/** - * 支付服务缓存 - * - * @author xxm - * @date 2022/7/11 - */ -public interface CachingCode { - - /** 支付单(主键) */ - String PAYMENT_ID = "pay:payment:id"; - - /** 支付单(业务号码) */ - String PAYMENT_BUSINESS_ID = "pay:payment:business"; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/PaymentCenterErrorCode.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/PaymentCenterErrorCode.java deleted file mode 100644 index 5183fc45281ff7998817670912e3bc632cd18ee9..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/PaymentCenterErrorCode.java +++ /dev/null @@ -1,77 +0,0 @@ -package cn.bootx.payment.code; - -/** - * 错误码 - * - * @author xxm - * @date 2020/12/7 - */ -public interface PaymentCenterErrorCode { - - // 支付过程相关 - /** - * 支付金额异常 - */ - int PAYMENT_AMOUNT_ABNORMAL = 28100; - - /** - * 支付记录不存在 - */ - int PAYMENT_RECORD_NOT_EXISTED = 28101; - - /** - * 支付在进行中 - */ - int PAYMENT_IS_PROCESSING = 28102; - - /** - * 支付失败 - */ - int PAY_FAILURE = 28103; - - /** - * 支付已经存在 - */ - int PAYMENT_HAS_EXISTED = 28104; - - /** - * 支付手动取消 - */ - int PAYMENT_CANCEL = 28105; - - /** - * 不支持的支付方式 - */ - int PAYMENT_METHOD_UNSUPPORT = 28106; - - /** - * 钱包已存在 - */ - int WALLET_ALREADY_EXISTS = 28814; - - /** - * 钱包不存在 - */ - int WALLET_NOT_EXISTS = 28815; - - /** - * 钱包已被禁用 - */ - int WALLET_BANNED = 28816; - - /** - * 钱包余额不足 - */ - int WALLET_BALANCE_NOT_ENOUGH = 28817; - - /** - * wallet 信息不存在 - */ - int WALLET_INFO_NOT_EXISTS = 28819; - - /** - * 钱包日志异常(类型不正确，或者充值金额小于0等场景) - */ - int WALLET_LOG_ERROR = 28827; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/PaymentEventCode.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/PaymentEventCode.java deleted file mode 100644 index 07cb8c14cc0c356ca56b1d7d47d4461b5ce48582..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/PaymentEventCode.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.bootx.payment.code; - -public interface PaymentEventCode { - - /** 支付中心交换机 */ - String EXCHANGE_PAYMENT = "service.payment"; - - /** 支付完成 */ - String PAY_COMPLETE = "pay.complete"; - - /** 支付取消 */ - String PAY_CANCEL = "pay.cancel"; - - /** 支付退款 */ - String PAY_REFUND = "pay.refund"; - - /** 支付单超时 */ - String PAYMENT_EXPIRED_TIME = "payment.expired:time"; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/pay/PayChannelCode.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/pay/PayChannelCode.java deleted file mode 100644 index e4e11205a8c54281fbab0b3ba4dfe87672318213..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/pay/PayChannelCode.java +++ /dev/null @@ -1,46 +0,0 @@ -package cn.bootx.payment.code.pay; - -import java.util.Arrays; -import java.util.List; - -/** - * 支付通道 - * - * @author xxm - * @date 2021/2/24 - */ -public interface PayChannelCode { - - /** - * 支付通道类型 1.支付宝 2.微信 3.云闪付 4.现金 5.钱包 6.储值卡 8.信用卡 9.ApplePay 10.渠道方支付 99.聚合支付 - */ - int ALI = 1; - - int WECHAT = 2; - - int UNION_PAY = 3; - - int CASH = 4; - - int WALLET = 5; - - int VOUCHER = 6; - - int CREDIT_CARD = 8; - - int APPLE_PAY = 9; - - int CHANNEL_PAY = 10; - - int AGGREGATION = 99; - - /** 支付宝 UA */ - String UA_ALI_PAY = "Alipay"; - - /** 微信 UA */ - String UA_WECHAT_PAY = "MicroMessenger"; - - /** 异步支付通道 */ - List ASYNC_TYPE = Arrays.asList(ALI, WECHAT, UNION_PAY, APPLE_PAY); - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/pay/PayChannelEnum.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/pay/PayChannelEnum.java deleted file mode 100644 index cb8d47a9469b43459d34abce35591389b95f520f..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/pay/PayChannelEnum.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.bootx.payment.code.pay; - -import cn.bootx.payment.exception.payment.PayFailureException; -import lombok.AllArgsConstructor; -import lombok.Getter; - -import java.util.Arrays; -import java.util.Objects; - -/** - * 支付通道枚举 - * - * @author xxm - * @date 2021/7/26 - */ -@Getter -@AllArgsConstructor -public enum PayChannelEnum { - - ALI(PayChannelCode.ALI, "ALI"), WECHAT(PayChannelCode.WECHAT, "WECHAT"), - UNION_PAY(PayChannelCode.UNION_PAY, "UNION_PAY"), CASH(PayChannelCode.CASH, "CASH"), - WALLET(PayChannelCode.WALLET, "WALLET"), VOUCHER(PayChannelCode.VOUCHER, "VOUCHER"), - CREDIT_CARD(PayChannelCode.CREDIT_CARD, "CREDIT"), APPLE_PAY(PayChannelCode.APPLE_PAY, "APPLE"), - CHANNEL_PAY(PayChannelCode.CHANNEL_PAY, "CHANNEL"), AGGREGATION(PayChannelCode.AGGREGATION, "AGGREGATION"); - - /** 支付通道数字编码 */ - private final int no; - - /** 支付通道字符编码 */ - private final String code; - - /** - * 根据数字编号获取 - */ - public static PayChannelEnum findByNo(int no) { - return Arrays.stream(PayChannelEnum.values()) - .filter(e -> e.getNo() == no) - .findFirst() - .orElseThrow(() -> new PayFailureException("不存在的支付通道")); - } - - /** - * 根据字符编码获取 - */ - public static PayChannelEnum findByCode(String code) { - return Arrays.stream(PayChannelEnum.values()) - .filter(e -> Objects.equals(code, e.getCode())) - .findFirst() - .orElseThrow(() -> new PayFailureException("不存在的支付通道")); - } - - public static boolean existsByCode(String code) { - return Arrays.stream(PayChannelEnum.values()) - .anyMatch(payChannelEnum -> Objects.equals(payChannelEnum.getCode(), code)); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/pay/PayModelExtraCode.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/pay/PayModelExtraCode.java deleted file mode 100644 index 06c043b8afc07d1fc50a12e9aaa2cc970a1d51b2..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/pay/PayModelExtraCode.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.bootx.payment.code.pay; - -/** - * 支付方式扩展字段 - * - * @author xxm - * @date 2022/2/27 - */ -public interface PayModelExtraCode { - - /** 付款码 */ - String AUTH_CODE = "authCode"; - - /** openId */ - String OPEN_ID = "openId"; - - /** 单张储值卡 */ - String VOUCHER_NO = "voucherNo"; - - /** 同步通知路径 支付完成跳转的页面地址 */ - String RETURN_URL = "returnUrl"; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/pay/PayStatusCode.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/pay/PayStatusCode.java deleted file mode 100644 index 8ac68f1157a26ced0facb4d482b3f33906abb24c..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/pay/PayStatusCode.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.bootx.payment.code.pay; - -/** - * 支付状态 - * - * @author xxm - * @date 2021/3/1 - */ -public interface PayStatusCode { - - /** - * 支付状态 0.支付中 1.成功 2.失败 3.支付取消(超时/手动取消/订单已经关闭,撤销支付单) 4.退款中 5.已退款 - */ - int TRADE_PROGRESS = 0; - - int TRADE_SUCCESS = 1; - - int TRADE_FAIL = 2; - - int TRADE_CANCEL = 3; - - int TRADE_REFUNDING = 4; - - int TRADE_REFUNDED = 5; - - /** - * 回调信息支付状态 0.失败 1.成功 - */ - int NOTIFY_TRADE_FAIL = 0; - - int NOTIFY_TRADE_SUCCESS = 1; - - /** 回调处理状态 */ - int NOTIFY_PROCESS_FAIL = 0; - - int NOTIFY_PROCESS_SUCCESS = 1; - - int NOTIFY_PROCESS_IGNORE = 2; - - /** 退款处理状态 0.失败 1.成功 */ - int REFUND_PROCESS_FAIL = 0; - - int REFUND_PROCESS_SUCCESS = 1; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/pay/PaySyncStatus.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/pay/PaySyncStatus.java deleted file mode 100644 index a1464a6dfcaea68b49afdcbb3151a560699a2baa..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/pay/PaySyncStatus.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.bootx.payment.code.pay; - -/** - * 支付网关同步状态 - * - * @author xxm - * @date 2021/4/21 - */ -public interface PaySyncStatus { - - /** -1 不需要同步 */ - int NOT_SYNC = -1; - - /** 1 远程支付成功 */ - int TRADE_SUCCESS = 1; - - /** 2 交易创建，等待买家付款 */ - int WAIT_BUYER_PAY = 2; - - /** 3 已关闭 */ - int TRADE_CLOSED = 3; - - /** 4 已退款 */ - int TRADE_REFUND = 4; - - /** 5 查询不到订单 */ - int NOT_FOUND = 5; - - /** 4 查询失败 */ - int FAIL = 6; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/pay/PayWayCode.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/pay/PayWayCode.java deleted file mode 100644 index 8e407db58c396368158c9f8a012f67169631423f..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/pay/PayWayCode.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.bootx.payment.code.pay; - -/** - * 支付方式 1-10 通用支付方式 10 以上是各支付通道特色支付方式, 规则 {通道代码}+{特色支付方式代码}, 如微信小程序支付, 23 微信代码2, 小程序3 - * - * @author xxm - * @date 2021/7/26 - */ -public interface PayWayCode { - - /** - * 常规支付. 钱包/积分等 - */ - int NORMAL = 0; - - /** wap支付 */ - int WAP = 1; - - /** 应用支付 */ - int APP = 2; - - /** web支付 */ - int WEB = 3; - - /** 二维码扫码支付 */ - int QRCODE = 4; - - /** 付款码支付 */ - int BARCODE = 5; - - /** - * 微信公众号支付或者小程序支付 - */ - int JSAPI = 23; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/pay/PayWayEnum.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/pay/PayWayEnum.java deleted file mode 100644 index c1b550d01f7820cc0fc327c21d69f8af73ed028f..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/pay/PayWayEnum.java +++ /dev/null @@ -1,56 +0,0 @@ -package cn.bootx.payment.code.pay; - -import cn.bootx.common.core.exception.BizException; -import cn.bootx.payment.exception.payment.PayFailureException; -import lombok.AllArgsConstructor; -import lombok.Getter; - -import java.util.Arrays; -import java.util.Objects; - -/** - * 支付方式 - * - * @author xxm - * @date 2021/7/26 - */ -@Getter -@AllArgsConstructor -public enum PayWayEnum { - - NORMAL(PayWayCode.NORMAL, "NORMAL", "常规支付"), WAP(PayWayCode.WAP, "WAP", "wap支付"), - APP(PayWayCode.APP, "APP", "应用支付"), WEB(PayWayCode.WEB, "WEB", "web支付"), - QRCODE(PayWayCode.QRCODE, "QRCODE", "扫码支付"), BARCODE(PayWayCode.BARCODE, "BARCODE", "付款码"), - - JSAPI(PayWayCode.JSAPI, "JSAPI", "公众号/小程序支付"); - - /** 支付方式数字编码 */ - private final int no; - - /** 支付方式字符编码 */ - private final String code; - - /** 名称 */ - private final String name; - - /** - * 根据数字编号获取 - */ - public static PayWayEnum findByNo(int no) { - return Arrays.stream(PayWayEnum.values()) - .filter(e -> e.getNo() == no) - .findFirst() - .orElseThrow(() -> new PayFailureException("不存在的支付方式")); - } - - /** - * 根据字符编码获取 - */ - public static PayWayEnum findByCode(String code) { - return Arrays.stream(PayWayEnum.values()) - .filter(e -> Objects.equals(code, e.getCode())) - .findFirst() - .orElseThrow(() -> new PayFailureException("不存在的支付方式")); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/paymodel/AliPayCode.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/paymodel/AliPayCode.java deleted file mode 100644 index 9f31b34f67c082a7ce36d6aa6b0dc6e820411414..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/paymodel/AliPayCode.java +++ /dev/null @@ -1,86 +0,0 @@ -package cn.bootx.payment.code.paymodel; - -/** - * 支付宝支付参数 - * - * @author xxm - * @date 2021/2/27 - */ -public interface AliPayCode { - - // 认证类型 - /** 公钥 */ - int AUTH_TYPE_KEY = 1; - - /** 证书 */ - int AUTH_TYPE_CART = 2; - - // 渠道枚举 - /** 目前PC支付必填 */ - String FAST_INSTANT_TRADE_PAY = "FAST_INSTANT_TRADE_PAY"; - - /** WAP支付必填 手机网站支付产品 */ - String QUICK_WAP_PAY = "QUICK_WAP_WAY"; - - /** APP支付必填 APP支付产品 */ - String QUICK_MSECURITY_PAY = "QUICK_MSECURITY_PAY"; - - /** 付款码支付 */ - String BAR_CODE = "bar_code"; - - // 响应字段 - /** 支付状态 */ - String TRADE_STATUS = "trade_status"; - - /** 公用回传参数 */ - String PASS_BACK_PARAMS = "passback_params"; - - /** 对交易或商品的描述(在没有公用回传参数的时候, 这个作为公用回传参数) */ - String BODY = "body"; - - /** 外部订单号-paymentId */ - String OUT_TRADE_NO = "out_trade_no"; - - /** 支付宝流水号 */ - String TRADE_NO = "trade_no"; - - /** appId */ - String APP_ID = "app_id"; - - // 交易状态说明 - /** 交易创建，等待买家付款 */ - String PAYMENT_WAIT_BUYER_PAY = "WAIT_BUYER_PAY"; - - /** 未付款交易超时关闭，或支付完成后全额退款 */ - String PAYMENT_TRADE_CLOSED = "TRADE_CLOSED"; - - /** 交易支付成功 */ - String PAYMENT_TRADE_SUCCESS = "TRADE_SUCCESS"; - - /** 交易结束，不可退款 */ - String PAYMENT_TRADE_FINISHED = "TRADE_FINISHED"; - - // 通知触发条件 - /** 交易完成 */ - String NOTIFY_TRADE_FINISHED = "TRADE_FINISHED"; - - /** 支付成功 */ - String NOTIFY_TRADE_SUCCESS = "TRADE_SUCCESS"; - - /** 交易创建,不触发通知 */ - String NOTIFY_WAIT_BUYER_PAY = "WAIT_BUYER_PAY"; - - /** 交易关闭 */ - String NOTIFY_TRADE_CLOSED = "TRADE_CLOSED"; - - // 错误提示 - /** 交易不存在 */ - String ACQ_TRADE_NOT_EXIST = "ACQ.TRADE_NOT_EXIST"; - - // 网关返回码 - String SUCCESS = "10000"; - - // 网关返回码 支付进行中 order success pay inprocess - String INPROCESS = "10003"; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/paymodel/AliPayWay.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/paymodel/AliPayWay.java deleted file mode 100644 index 0649b3bb2da29ecd0c1f24b8bd87da764a448ee6..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/paymodel/AliPayWay.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.bootx.payment.code.paymodel; - -import cn.bootx.common.core.exception.BizException; -import cn.bootx.payment.code.pay.PayWayEnum; -import cn.bootx.payment.exception.payment.PayFailureException; -import lombok.experimental.UtilityClass; - -import java.util.Arrays; -import java.util.List; -import java.util.Objects; - -/** - * 支付宝支付方式 - * - * @author xxm - * @date 2021/7/2 - */ -@UtilityClass -public class AliPayWay { - - // 支付方式 - private static final List PAY_WAYS = Arrays.asList(PayWayEnum.WAP, PayWayEnum.APP, PayWayEnum.WEB, - PayWayEnum.QRCODE, PayWayEnum.BARCODE); - - /** - * 根据数字编号获取 - */ - public PayWayEnum findByNo(int no) { - return PAY_WAYS.stream() - .filter(e -> e.getNo() == no) - .findFirst() - .orElseThrow(() -> new PayFailureException("不存在的支付方式")); - } - - /** - * 根据数字编号获取 - */ - public PayWayEnum findByCode(String code) { - return PAY_WAYS.stream() - .filter(e -> Objects.equals(code, e.getCode())) - .findFirst() - .orElseThrow(() -> new PayFailureException("不存在的支付方式")); - } - - /** - * 获取支持的支付方式 - */ - public List getPayWays() { - return PAY_WAYS; - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/paymodel/VoucherCode.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/paymodel/VoucherCode.java deleted file mode 100644 index 55a1929dd6196e3254a45759bb861d21e7d67a18..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/paymodel/VoucherCode.java +++ /dev/null @@ -1,46 +0,0 @@ -package cn.bootx.payment.code.paymodel; - -/** - * 储值卡常量 - * - * @author xxm - * @date 2022/3/14 - */ -public interface VoucherCode { - - /** - * 状态-启用 - */ - int STATUS_NORMAL = 1; - - /** - * 状态-停用 - */ - int STATUS_FORBIDDEN = 2; - - /** - * 储值卡日志-开通 - */ - int LOG_ACTIVE = 1; - - /** - * 储值卡日志-支付 - */ - int LOG_PAY = 2; - - /** - * 储值卡日志-退款 - */ - int LOG_CLOSE = 3; - - /** - * 储值卡日志-退款 - */ - int LOG_REFUND = 4; - - /** - * 储值卡日志-Admin余额变动 - */ - int LOG_ADMIN_CHANGER = 4; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/paymodel/WalletCode.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/paymodel/WalletCode.java deleted file mode 100644 index 96ff4cbc49514e8584cf06dde8cab97395d879e5..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/paymodel/WalletCode.java +++ /dev/null @@ -1,76 +0,0 @@ -package cn.bootx.payment.code.paymodel; - -/** - * 钱包涉及到的常量 - * - * @author xxm - * @date 2020/12/8 - */ -public interface WalletCode { - - /** - * 系统操作 - */ - int OPERATION_SOURCE_SYSTEM = 1; - - /** - * 管理员操作 - */ - int OPERATION_SOURCE_ADMIN = 2; - - /** - * 用户操作 - */ - int OPERATION_SOURCE_USER = 3; - - /** - * 钱包状态-正常 - */ - int STATUS_NORMAL = 1; - - /** - * 钱包状态-禁用 - */ - int STATUS_FORBIDDEN = 2; - - /** - * 钱包日志-开通 - */ - int LOG_ACTIVE = 1; - - /** - * 钱包日志-主动充值 - */ - int LOG_RECHARGE = 2; - - /** - * 钱包日志-自动充值 - */ - int LOG_AUTO_RECHARGE = 3; - - /** - * 钱包日志-Admin余额变动 - */ - int LOG_ADMIN_CHANGER = 4; - - /** - * 钱包日志-支付 - */ - int LOG_PAY = 5; - - /** - * 钱包日志-系统扣除余额的日志 - */ - int LOG_SYSTEM_REDUCE_BALANCE = 6; - - /** - * 钱包日志-退款 - */ - int LOG_REFUND = 7; - - /** - * 钱包日志-取消支付返还 - */ - int LOG_PAY_CLOSE = 8; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/paymodel/WeChatPayCode.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/paymodel/WeChatPayCode.java deleted file mode 100644 index cee0d3409be6d72bd0e7bdef67f7e356d5d5389d..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/paymodel/WeChatPayCode.java +++ /dev/null @@ -1,88 +0,0 @@ -package cn.bootx.payment.code.paymodel; - -/** - * 微信参数 - * - * @author xxm - * @date 2021/6/21 - */ -public interface WeChatPayCode { - - // 版本 - String API_V2 = "api_v2"; - - String API_V3 = "api_v3"; - - // 请求参数 - /** jsapi发起获取AuthCode时的重定向参数 */ - String JSAPI_REDIRECT_URL = "JsapiRedirectUrl"; - - // 返回参数 - /** 二维码链接 */ - String CODE_URL = "code_url"; - - /** 支付跳转链接 */ - String MWEB_URL = "mweb_url"; - - /** 预支付交易会话ID */ - String PREPAY_ID = "prepay_id"; - - /** 返回状态码 */ - String RETURN_CODE = "return_code"; - - /** 返回信息 */ - String RETURN_MSG = "return_msg"; - - /** 返回错误代码(例如付款码返回的支付中状态就在这里面) */ - String ERR_CODE = "err_code"; - - /** 返回错误信息 */ - String ERR_CODE_DES = "err_code_des"; - - /** 业务结果(部分结果不在这个参数里, 例如付款码的响应码) */ - String RESULT_CODE = "result_code"; - - /** 交易类型 */ - String TRADE_TYPE = "trade_type"; - - /** appid */ - String APPID = "appid"; - - /** 交易状态 */ - String TRADE_STATE = "trade_state"; - - /** 商户订单号 */ - String OUT_TRADE_NO = "out_trade_no"; - - /** 微信交易单号 */ - String TRANSACTION_ID = "transaction_id"; - - // 交易状态 - /** 支付成功 */ - String TRADE_SUCCESS = "SUCCESS"; - - /** 支付失败 */ - String TRADE_FAIL = "FAIL"; - - /** 退款 */ - String TRADE_REFUND = "REFUND"; - - /** 未支付 */ - String TRADE_NOTPAY = "NOTPAY"; - - /** 已关闭 */ - String TRADE_CLOSED = "CLOSED"; - - /** 已接收，等待扣款 */ - String TRADE_ACCEPT = "ACCEPT"; - - /** 已撤销(刷卡支付) */ - String TRADE_REVOKED = "REVOKED"; - - /** 用户支付中(刷卡支付) */ - String TRADE_USERPAYING = "USERPAYING"; - - /** 支付失败(刷卡支付) */ - String TRADE_PAYERROR = "PAYERROR"; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/paymodel/WeChatPayWay.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/paymodel/WeChatPayWay.java deleted file mode 100644 index c4c2c727f580060fae069c751052978d8fbf86cf..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/code/paymodel/WeChatPayWay.java +++ /dev/null @@ -1,50 +0,0 @@ -package cn.bootx.payment.code.paymodel; - -import cn.bootx.payment.code.pay.PayWayEnum; -import cn.bootx.payment.exception.payment.PayFailureException; -import lombok.experimental.UtilityClass; - -import java.util.Arrays; -import java.util.List; -import java.util.Objects; - -/** - * 微信支付方式 - * - * @author xxm - * @date 2021/7/2 - */ -@UtilityClass -public class WeChatPayWay { - - private static final List PAY_WAYS = Arrays.asList(PayWayEnum.WAP, PayWayEnum.APP, PayWayEnum.JSAPI, - PayWayEnum.QRCODE, PayWayEnum.BARCODE); - - /** - * 根据数字编号获取 - */ - public PayWayEnum findByNo(int no) { - return PAY_WAYS.stream() - .filter(e -> e.getNo() == no) - .findFirst() - .orElseThrow(() -> new PayFailureException("不存在的支付方式")); - } - - /** - * 根据数字编号获取 - */ - public PayWayEnum findByCode(String code) { - return PAY_WAYS.stream() - .filter(e -> Objects.equals(code, e.getCode())) - .findFirst() - .orElseThrow(() -> new PayFailureException("不存在的支付方式")); - } - - /** - * 获取支持的支付方式 - */ - public List getPayWays() { - return PAY_WAYS; - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/configuration/PaymentRabbitMqConfiguration.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/configuration/PaymentRabbitMqConfiguration.java deleted file mode 100644 index c8273e59164619972fd1b44ea29c424acd510042..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/configuration/PaymentRabbitMqConfiguration.java +++ /dev/null @@ -1,76 +0,0 @@ -package cn.bootx.payment.configuration; - -import cn.bootx.payment.code.PaymentEventCode; -import org.springframework.amqp.core.Binding; -import org.springframework.amqp.core.BindingBuilder; -import org.springframework.amqp.core.DirectExchange; -import org.springframework.amqp.core.Queue; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * 消息队列配置 - * - * @author xxm - * @date 2021/6/25 - */ -@Configuration -public class PaymentRabbitMqConfiguration { - - /** 支付完成队列 */ - @Bean - public Queue payComplete() { - return new Queue(PaymentEventCode.PAY_COMPLETE); - } - - /** 支付关闭/撤销队列 */ - @Bean - public Queue payCancel() { - return new Queue(PaymentEventCode.PAY_CANCEL); - } - - /** 支付退款队列 */ - @Bean - public Queue payRefund() { - return new Queue(PaymentEventCode.PAY_REFUND); - } - - /** 支付超时通知队列 */ - @Bean - public Queue paymentExpiredTime() { - return new Queue(PaymentEventCode.PAYMENT_EXPIRED_TIME); - } - - /** 交换机 */ - @Bean - public DirectExchange paymentExchange() { - return new DirectExchange(PaymentEventCode.EXCHANGE_PAYMENT); - } - - /** 绑定支付完成 */ - @Bean - public Binding bindPayComplete() { - return BindingBuilder.bind(payComplete()).to(paymentExchange()).with(PaymentEventCode.PAY_COMPLETE); - } - - /** 绑定支付关闭/撤销 */ - @Bean - public Binding bindPayCancel() { - return BindingBuilder.bind(payCancel()).to(paymentExchange()).with(PaymentEventCode.PAY_CANCEL); - } - - /** 绑定支付退款 */ - @Bean - public Binding bindPayRefund() { - return BindingBuilder.bind(payRefund()).to(paymentExchange()).with(PaymentEventCode.PAY_REFUND); - } - - /** 绑定支付超时通知 */ - @Bean - public Binding bindPaymentExpiredTime() { - return BindingBuilder.bind(paymentExpiredTime()) - .to(paymentExchange()) - .with(PaymentEventCode.PAYMENT_EXPIRED_TIME); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/AggregateController.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/AggregateController.java deleted file mode 100644 index 43e8dd17da3d7824aecf339cf0dacbc160553617..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/AggregateController.java +++ /dev/null @@ -1,37 +0,0 @@ -package cn.bootx.payment.controller; - -import cn.bootx.common.core.annotation.IgnoreAuth; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.payment.core.aggregate.service.AggregateService; -import cn.bootx.payment.param.cashier.CashierSinglePayParam; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 聚合支付 - * - * @author xxm - * @date 2022/3/6 - */ -@IgnoreAuth -@Tag(name = "聚合支付") -@RestController -@RequestMapping("/aggregate") -@RequiredArgsConstructor -public class AggregateController { - - private final AggregateService aggregateService; - - @Operation(summary = "创建聚合支付") - @PostMapping("/createAggregatePay") - public ResResult createAggregatePay(@RequestBody CashierSinglePayParam param) { - return Res.ok(aggregateService.createAggregatePay(param)); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/AlipayConfigController.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/AlipayConfigController.java deleted file mode 100644 index 83d20d23b0023b67730b889281f00e1e0c5966fc..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/AlipayConfigController.java +++ /dev/null @@ -1,77 +0,0 @@ -package cn.bootx.payment.controller; - -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.dto.KeyValue; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.payment.core.paymodel.alipay.service.AlipayConfigService; -import cn.bootx.payment.dto.paymodel.alipay.AlipayConfigDto; -import cn.bootx.payment.param.paymodel.alipay.AlipayConfigParam; -import cn.bootx.payment.param.paymodel.alipay.AlipayConfigQuery; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @author xxm - * @date 2021/2/26 - */ -@Tag(name = "支付宝配置") -@RestController -@RequestMapping("/alipay") -@AllArgsConstructor -public class AlipayConfigController { - - private final AlipayConfigService alipayConfigService; - - @Operation(summary = "添加") - @PostMapping("/add") - public ResResult add(@RequestBody AlipayConfigParam param) { - alipayConfigService.add(param); - return Res.ok(); - } - - @Operation(summary = "更新") - @PostMapping("/update") - public ResResult update(@RequestBody AlipayConfigParam param) { - alipayConfigService.update(param); - return Res.ok(); - } - - @Operation(summary = "启用指定的支付宝配置") - @PostMapping("/setUpActivity") - public ResResult setUpActivity(Long id) { - alipayConfigService.setUpActivity(id); - return Res.ok(); - } - - @Operation(summary = "清除指定的支付宝配置") - @PostMapping("/clearActivity") - public ResResult clearActivity(Long id) { - alipayConfigService.clearActivity(id); - return Res.ok(); - } - - @Operation(summary = "分页") - @GetMapping("/page") - public ResResult> page(PageParam pageParam, AlipayConfigQuery param) { - return Res.ok(alipayConfigService.page(pageParam, param)); - } - - @Operation(summary = "根据Id查询") - @GetMapping("/findById") - public ResResult findById(Long id) { - return Res.ok(alipayConfigService.findById(id)); - } - - @Operation(summary = "支付宝支持支付方式") - @GetMapping("/findPayWayList") - public ResResult> findPayWayList() { - return Res.ok(alipayConfigService.findPayWayList()); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/CashierController.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/CashierController.java deleted file mode 100644 index 17f8359dce8b750e7d60bbdf0f20c1d524b03a32..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/CashierController.java +++ /dev/null @@ -1,66 +0,0 @@ -package cn.bootx.payment.controller; - -import cn.bootx.common.core.annotation.IgnoreAuth; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.payment.core.cashier.service.CashierService; -import cn.bootx.payment.dto.pay.PayResult; -import cn.bootx.payment.exception.payment.PayUnsupportedMethodException; -import cn.bootx.payment.param.cashier.CashierCombinationPayParam; -import cn.bootx.payment.param.cashier.CashierSinglePayParam; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - -import java.util.Map; - -import static org.springframework.http.HttpHeaders.USER_AGENT; - -/** - * @author xxm - * @date 2022/2/23 - */ -@IgnoreAuth -@Tag(name = "结算台") -@RestController -@RequestMapping("/cashier") -@RequiredArgsConstructor -public class CashierController { - - private final CashierService cashierService; - - @Operation(summary = "发起支付(单渠道,包括聚合付款码方式)") - @PostMapping("/singlePay") - public ResResult singlePay(@RequestBody CashierSinglePayParam cashierSinglePayParam) { - return Res.ok(cashierService.singlePay(cashierSinglePayParam)); - } - - @Operation(summary = "发起支付(组合支付)") - @PostMapping("/combinationPay") - public ResResult combinationPay(@RequestBody CashierCombinationPayParam param) { - return Res.ok(cashierService.combinationPay(param)); - } - - @Operation(summary = "扫码聚合支付(单渠道)") - @GetMapping("/aggregatePay") - public ModelAndView aggregatePay(String key, @RequestHeader(USER_AGENT) String ua) { - try { - String url = cashierService.aggregatePay(key, ua); - return new ModelAndView("redirect:" + url); - } - catch (PayUnsupportedMethodException e) { - return new ModelAndView("errorCashier"); - } - } - - @Operation(summary = "微信jsapi支付(回调)") - @GetMapping("/wxJsapiPay") - public ModelAndView wxJsapiPay(String code, String state) { - Map map = cashierService.wxJsapiPay(code, state); - // 跳转页面, 调起微信jsapi支付 - return new ModelAndView("wechatJsapiPay").addAllObjects(map); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/PayCallbackController.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/PayCallbackController.java deleted file mode 100644 index 003b351820691804956174730f88e82c180409be..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/PayCallbackController.java +++ /dev/null @@ -1,54 +0,0 @@ -package cn.bootx.payment.controller; - -import cn.bootx.common.core.annotation.IgnoreAuth; -import cn.bootx.payment.core.paymodel.alipay.service.AliPayCallbackService; -import cn.bootx.payment.core.paymodel.wechat.service.WeChatPayCallbackService; -import com.ijpay.alipay.AliPayApi; -import com.ijpay.core.kit.HttpKit; -import com.ijpay.core.kit.WxPayKit; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import java.util.Map; - -/** - * @author xxm - * @date 2021/2/27 - */ -@IgnoreAuth -@Slf4j -@Tag(name = "支付回调") -@RestController -@RequestMapping("/pay/callback") -@AllArgsConstructor -public class PayCallbackController { - - private final AliPayCallbackService aliPayCallbackService; - - private final WeChatPayCallbackService weChatPayCallbackService; - - @SneakyThrows - @Operation(summary = "支付宝回调") - @PostMapping("/alipay") - public String aliPay(HttpServletRequest request) { - Map stringStringMap = AliPayApi.toMap(request); - return aliPayCallbackService.payCallback(stringStringMap); - } - - @SneakyThrows - @Operation(summary = "微信支付回调") - @PostMapping("/wechat") - public String wechat(HttpServletRequest request) { - String xmlMsg = HttpKit.readData(request); - Map params = WxPayKit.xmlToMap(xmlMsg); - return weChatPayCallbackService.payCallback(params); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/PayController.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/PayController.java deleted file mode 100644 index d4ea6523a7bb984e08f3197b80398949b956642e..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/PayController.java +++ /dev/null @@ -1,80 +0,0 @@ -package cn.bootx.payment.controller; - -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.payment.core.pay.service.PayCancelService; -import cn.bootx.payment.core.pay.service.PayRefundService; -import cn.bootx.payment.core.pay.service.PayService; -import cn.bootx.payment.core.pay.service.PaySyncService; -import cn.bootx.payment.dto.pay.PayResult; -import cn.bootx.payment.param.pay.PayParam; -import cn.bootx.payment.param.refund.RefundParam; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author xxm - * @date 2020/12/9 - */ -@Tag(name = "统一支付") -@RestController -@RequestMapping("/uni_pay") -@AllArgsConstructor -public class PayController { - - private final PayService payService; - - private final PayCancelService payCancelService; - - private final PayRefundService payRefundService; - - private final PaySyncService paySyncService; - - @Operation(summary = "支付") - @PostMapping("/pay") - public ResResult pay(@RequestBody PayParam payParam) { - return Res.ok(payService.pay(payParam)); - } - - @Operation(summary = "取消支付(支付id)") - @PostMapping("/cancelByPaymentId") - public ResResult cancelByPaymentId(@Parameter(description = "支付id") Long paymentId) { - payCancelService.cancelByPaymentId(paymentId); - return Res.ok(); - } - - @Operation(summary = "取消支付(业务id)") - @PostMapping("/cancelByBusinessId") - public ResResult cancelByBusinessId(@Parameter(description = "业务id") String businessId) { - payCancelService.cancelByBusinessId(businessId); - return Res.ok(); - } - - @Operation(summary = "刷新指定业务id的支付单状态") - @PostMapping("/syncByBusinessId") - public ResResult syncByBusinessId(@Parameter(description = "业务id") String businessId) { - paySyncService.syncByBusinessId(businessId); - return Res.ok(); - } - - @Operation(summary = "退款") - @PostMapping("/refund") - public ResResult refund(@RequestBody RefundParam refundParam) { - payRefundService.refund(refundParam); - return Res.ok(); - } - - @Operation(summary = "全额退款(业务id)") - @PostMapping("/refundByBusinessId") - public ResResult refundByBusinessId(@Parameter(description = "业务id") String businessId) { - payRefundService.refundByBusinessId(businessId); - return Res.ok(); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/PayNotifyRecordController.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/PayNotifyRecordController.java deleted file mode 100644 index 79a823ca26ff32bb99a164144ec80c617b2abac1..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/PayNotifyRecordController.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.bootx.payment.controller; - -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.payment.core.notify.service.PayNotifyRecordService; -import cn.bootx.payment.dto.notify.PayNotifyRecordDto; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 回调记录 - * - * @author xxm - * @date 2021/7/22 - */ -@Tag(name = "支付回调记录") -@RestController -@RequestMapping("/pay/notify/record") -@RequiredArgsConstructor -public class PayNotifyRecordController { - - private final PayNotifyRecordService notifyRecordService; - - @Operation(summary = "分页") - @GetMapping("/page") - public ResResult> page(PageParam pageParam, PayNotifyRecordDto param) { - return Res.ok(notifyRecordService.page(pageParam, param)); - } - - @Operation(summary = "根据id查询") - @GetMapping("/findById") - public ResResult findById(Long id) { - return Res.ok(notifyRecordService.findById(id)); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/PaymentController.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/PaymentController.java deleted file mode 100644 index 14d7b6c47d47c6c1262c70c94f8126e2299c89a6..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/PaymentController.java +++ /dev/null @@ -1,77 +0,0 @@ -package cn.bootx.payment.controller; - -import cn.bootx.common.core.annotation.IgnoreAuth; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.OrderParam; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.query.entity.QueryParams; -import cn.bootx.payment.core.payment.service.PaymentQueryService; -import cn.bootx.payment.dto.payment.PayChannelInfo; -import cn.bootx.payment.dto.payment.PaymentDto; -import cn.bootx.payment.param.payment.PaymentQuery; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @author xxm - * @date 2021/6/28 - */ -@Tag(name = "支付记录") -@RestController -@RequestMapping("/payment") -@RequiredArgsConstructor -public class PaymentController { - - private final PaymentQueryService paymentQueryService; - - @Operation(summary = "根据id获取") - @GetMapping("/findById") - public ResResult findById(Long id) { - return Res.ok(paymentQueryService.findById(id)); - } - - @Operation(summary = "根据userId获取列表") - @GetMapping("/findByUser") - public ResResult> findByUser(Long userid) { - return Res.ok(paymentQueryService.findByUser(userid)); - } - - @Operation(summary = "分页查询") - @GetMapping("/page") - public ResResult> page(PageParam pageParam, PaymentQuery param, OrderParam orderParam) { - return Res.ok(paymentQueryService.page(pageParam, param, orderParam)); - } - - @Operation(summary = "分页查询(超级查询)") - @PostMapping("/superPage") - public ResResult> superPage(PageParam pageParam, @RequestBody QueryParams queryParams) { - return Res.ok(paymentQueryService.superPage(pageParam, queryParams)); - } - - @IgnoreAuth - @Operation(summary = "根据业务ID获取支付状态`") - @GetMapping("/findStatusByBusinessId") - public ResResult findStatusByBusinessId(String businessId) { - return Res.ok(paymentQueryService.findStatusByBusinessId(businessId)); - } - - @IgnoreAuth - @Operation(summary = "根据businessId获取订单支付方式") - @GetMapping("/findPayTypeInfoByBusinessId") - public ResResult> findPayTypeInfoByBusinessId(String businessId) { - return Res.ok(paymentQueryService.findPayTypeInfoByBusinessId(businessId)); - } - - @Operation(summary = "根据id获取订单支付方式") - @GetMapping("/findPayTypeInfoById") - public ResResult> findPayTypeInfoById(Long id) { - return Res.ok(paymentQueryService.findPayTypeInfoById(id)); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/RefundRecordController.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/RefundRecordController.java deleted file mode 100644 index 5abf68bd60f04a6e72248bbdd0f037d2a224829f..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/RefundRecordController.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.bootx.payment.controller; - -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.payment.core.refund.service.RefundRecordService; -import cn.bootx.payment.dto.refund.RefundRecordDto; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 退款记录 - * - * @author xxm - * @date 2022/3/3 - */ -@Tag(name = "退款记录") -@RestController -@RequestMapping("/pay/refund") -@RequiredArgsConstructor -public class RefundRecordController { - - private final RefundRecordService refundRecordService; - - @Operation(summary = "分页") - @GetMapping("/page") - public ResResult> page(PageParam pageParam, RefundRecordDto param) { - return Res.ok(refundRecordService.page(pageParam, param)); - } - - @Operation(summary = "根据id查询") - @GetMapping("/findById") - public ResResult findById(Long id) { - return Res.ok(refundRecordService.findById(id)); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/VoucherController.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/VoucherController.java deleted file mode 100644 index d5ea74dff54a5898556256ff728805be46fc77ae..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/VoucherController.java +++ /dev/null @@ -1,86 +0,0 @@ -package cn.bootx.payment.controller; - -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.payment.core.paymodel.voucher.service.VoucherQueryService; -import cn.bootx.payment.core.paymodel.voucher.service.VoucherService; -import cn.bootx.payment.dto.paymodel.voucher.VoucherDto; -import cn.bootx.payment.param.paymodel.voucher.VoucherGenerationParam; -import cn.bootx.payment.param.paymodel.voucher.VoucherParam; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @author xxm - * @date 2022/3/14 - */ -@Tag(name = "储值卡") -@RestController -@RequestMapping("/voucher") -@RequiredArgsConstructor -public class VoucherController { - - private final VoucherService voucherService; - - private final VoucherQueryService voucherQueryService; - - @Operation(summary = "分页") - @GetMapping("/page") - public ResResult> page(PageParam pageParam, VoucherParam param) { - return Res.ok(voucherQueryService.page(pageParam, param)); - } - - @Operation(summary = "单条查询") - @GetMapping("/findById") - public ResResult findById(Long id) { - return Res.ok(voucherQueryService.findById(id)); - } - - @Operation(summary = "根据卡号查询") - @GetMapping("/findByCardNo") - public ResResult findByCardNo(String cardNo) { - return Res.ok(voucherQueryService.findByCardNo(cardNo)); - } - - @Operation(summary = "批量生成储值卡") - @PostMapping("/generationBatch") - public ResResult generationBatch(@RequestBody VoucherGenerationParam param) { - voucherService.generationBatch(param); - return Res.ok(); - } - - @Operation(summary = "冻结") - @PostMapping("/lock") - public ResResult lock(Long id) { - voucherService.lock(id); - return Res.ok(); - } - - @Operation(summary = "启用") - @PostMapping("/unlock") - public ResResult unlock(Long id) { - voucherService.unlock(id); - return Res.ok(); - } - - @Operation(summary = "批量冻结") - @PostMapping("/lockBatch") - public ResResult lockBatch(@RequestBody List ids) { - voucherService.lockBatch(ids); - return Res.ok(); - } - - @Operation(summary = "批量启用") - @PostMapping("/unlockBatch") - public ResResult unlockBatch(@RequestBody List ids) { - voucherService.unlockBatch(ids); - return Res.ok(); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/WalletController.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/WalletController.java deleted file mode 100644 index 22afe8366de0b77b880b1322eae3c7bfbe1d69f0..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/WalletController.java +++ /dev/null @@ -1,106 +0,0 @@ -package cn.bootx.payment.controller; - -import cn.bootx.common.core.annotation.OperateLog; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.iam.dto.user.UserInfoDto; -import cn.bootx.iam.param.user.UserInfoParam; -import cn.bootx.payment.core.paymodel.wallet.service.WalletQueryService; -import cn.bootx.payment.core.paymodel.wallet.service.WalletService; -import cn.bootx.payment.dto.paymodel.wallet.WalletDto; -import cn.bootx.payment.dto.paymodel.wallet.WalletInfoDto; -import cn.bootx.payment.param.paymodel.wallet.WalletPayParam; -import cn.bootx.payment.param.paymodel.wallet.WalletRechargeParam; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 钱包 - * - * @author xxm - * @date 2021/2/24 - */ -@Tag(name = "钱包相关的接口") -@RestController -@RequestMapping("wallet") -@AllArgsConstructor -public class WalletController { - - private final WalletService walletService; - - private final WalletQueryService walletQueryService; - - @Operation(summary = "开通用户钱包操作") - @PostMapping("createWallet") - public ResResult createWallet(Long userId) { - walletService.createWallet(userId); - return Res.ok(); - } - - @Operation(summary = "批量开通用户钱包操作") - @PostMapping("createWalletBatch") - public ResResult createWalletBatch(@RequestBody List userIds) { - walletService.createWalletBatch(userIds); - return Res.ok(); - } - - @Operation(summary = "解锁钱包") - @OperateLog(title = "解锁钱包", businessType = OperateLog.BusinessType.UPDATE, saveParam = true) - @PostMapping("/unlock") - public ResResult unlock(Long walletId) { - walletService.unlock(walletId); - return Res.ok(); - } - - @Operation(summary = "锁定钱包") - @OperateLog(title = "锁定钱包", businessType = OperateLog.BusinessType.UPDATE, saveParam = true) - @PostMapping("/lock") - public ResResult lock(Long walletId) { - walletService.lock(walletId); - return Res.ok(); - } - - @Operation(summary = "充值操作(增减余额)") - @PostMapping("/changerBalance") - public ResResult changerBalance(@RequestBody WalletRechargeParam param) { - walletService.changerBalance(param); - return Res.ok(); - } - - @Operation(summary = "分页") - @GetMapping("/page") - public ResResult> page(PageParam pageParam, WalletPayParam param) { - return Res.ok(walletQueryService.page(pageParam, param)); - } - - @Operation(summary = "分页") - @GetMapping("/pageByNotWallet") - public ResResult> pageByNotWallet(PageParam pageParam, UserInfoParam param) { - return Res.ok(walletQueryService.pageByNotWallet(pageParam, param)); - } - - @Operation(summary = "根据用户查询钱包") - @GetMapping("/findByUser") - public ResResult findByUser() { - return Res.ok(walletQueryService.findByUser()); - } - - @Operation(summary = "根据钱包ID查询钱包") - @GetMapping("/findById") - public ResResult findById(Long walletId) { - return Res.ok(walletQueryService.findById(walletId)); - } - - @Operation(summary = "获取钱包综合信息") - @GetMapping("/getWalletInfo") - public ResResult getWalletInfo(Long walletId) { - return Res.ok(walletQueryService.getWalletInfo(walletId)); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/WalletLogController.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/WalletLogController.java deleted file mode 100644 index ca131b404ecd4babce7dcb84de42f486aae6df36..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/WalletLogController.java +++ /dev/null @@ -1,54 +0,0 @@ -package cn.bootx.payment.controller; - -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.payment.core.paymodel.wallet.service.WalletLogService; -import cn.bootx.payment.dto.paymodel.wallet.WalletLogDto; -import cn.bootx.payment.param.paymodel.wallet.WalletLogQueryParam; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import org.springdoc.api.annotations.ParameterObject; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 钱包日志相关接口 - * - * @author xxm - * @date 2020/12/8 - */ -@Tag(name = "钱包日志相关的接口") -@RestController -@RequestMapping("/wallet/log") -@AllArgsConstructor -public class WalletLogController { - - private final WalletLogService walletLogService; - - @Operation(summary = "个人钱包日志") - @PostMapping("/pageByPersonal") - public ResResult> pageByPersonal(@ParameterObject PageParam pageParam, - @ParameterObject WalletLogQueryParam param) { - return Res.ok(walletLogService.pageByPersonal(pageParam, param)); - } - - @Operation(summary = "查询钱包日志(分页)") - @GetMapping("/page") - public ResResult> page(@ParameterObject PageParam pageParam, - @ParameterObject WalletLogQueryParam param) { - return Res.ok(walletLogService.page(pageParam, param)); - } - - @Operation(summary = "根据钱包id查询钱包日志(分页)") - @GetMapping("/pageByWalletId") - public ResResult> pageByWalletId(@ParameterObject PageParam pageParam, - @ParameterObject WalletLogQueryParam param) { - return Res.ok(walletLogService.pageByWalletId(pageParam, param)); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/WeChatPayConfigController.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/WeChatPayConfigController.java deleted file mode 100644 index 29162b78ef87741467726e866bd7a98f02c012dc..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/controller/WeChatPayConfigController.java +++ /dev/null @@ -1,76 +0,0 @@ -package cn.bootx.payment.controller; - -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.dto.KeyValue; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.payment.core.paymodel.wechat.service.WeChatPayConfigService; -import cn.bootx.payment.dto.paymodel.wechat.WeChatPayConfigDto; -import cn.bootx.payment.param.paymodel.wechat.WeChatPayConfigParam; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @author xxm - * @date 2021/3/19 - */ -@Tag(name = "微信支付配置") -@RestController -@RequestMapping("/wechat/pay") -@AllArgsConstructor -public class WeChatPayConfigController { - - private final WeChatPayConfigService weChatPayConfigService; - - @Operation(summary = "添加微信支付配置") - @PostMapping("/add") - public ResResult add(@RequestBody WeChatPayConfigParam param) { - weChatPayConfigService.add(param); - return Res.ok(); - } - - @Operation(summary = "更新") - @PostMapping("/update") - public ResResult update(@RequestBody WeChatPayConfigParam param) { - weChatPayConfigService.update(param); - return Res.ok(); - } - - @Operation(summary = "设置启用的微信支付配置") - @PostMapping("/setUpActivity") - public ResResult setUpActivity(Long id) { - weChatPayConfigService.setUpActivity(id); - return Res.ok(); - } - - @Operation(summary = "清除指定的微信支付配置") - @PostMapping("/clearActivity") - public ResResult clearActivity(Long id) { - weChatPayConfigService.clearActivity(id); - return Res.ok(); - } - - @Operation(summary = "分页") - @GetMapping("/page") - public ResResult> page(PageParam pageParam, WeChatPayConfigParam param) { - return Res.ok(weChatPayConfigService.page(pageParam, param)); - } - - @Operation(summary = "根据Id查询") - @GetMapping("/findById") - public ResResult findById(Long id) { - return Res.ok(weChatPayConfigService.findById(id)); - } - - @Operation(summary = "微信支持支付方式") - @GetMapping("/findPayWayList") - public ResResult> findPayWayList() { - return Res.ok(weChatPayConfigService.findPayWayList()); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/aggregate/entity/AggregatePayInfo.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/aggregate/entity/AggregatePayInfo.java deleted file mode 100644 index 2f1d7dfb5bc687e4f1ca17e7b05c5d3a2bd2ac26..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/aggregate/entity/AggregatePayInfo.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.bootx.payment.core.aggregate.entity; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * 聚合支付发起信息 - * - * @author xxm - * @date 2022/3/5 - */ -@Data -@Accessors(chain = true) -public class AggregatePayInfo { - - /** 标题 */ - private String title; - - /** 订单ID */ - private String businessId; - - /** 支付金额 */ - private BigDecimal amount; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/aggregate/service/AggregateService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/aggregate/service/AggregateService.java deleted file mode 100644 index 02c38f661ba555b353cf43b9f64a58a068542497..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/aggregate/service/AggregateService.java +++ /dev/null @@ -1,77 +0,0 @@ -package cn.bootx.payment.core.aggregate.service; - -import cn.bootx.common.redis.RedisClient; -import cn.bootx.payment.code.pay.PayChannelCode; -import cn.bootx.payment.core.aggregate.entity.AggregatePayInfo; -import cn.bootx.payment.exception.payment.PayFailureException; -import cn.bootx.payment.param.cashier.CashierSinglePayParam; -import cn.hutool.core.util.RandomUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.Optional; - -/** - * 聚合支付 - * - * @author xxm - * @date 2022/3/6 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class AggregateService { - - private final RedisClient redisClient; - - private final String PREFIX_KEY = "cashier:pay:aggregate:"; - - /** - * 创建聚合支付QR支付, 单渠道 - */ - public String createAggregatePay(CashierSinglePayParam param) { - // 保存并生成code - AggregatePayInfo aggregatePayInfo = new AggregatePayInfo().setAmount(param.getAmount()) - .setTitle(param.getTitle()) - .setBusinessId(param.getBusinessId()); - String key = RandomUtil.randomString(10); - redisClient.setWithTimeout(PREFIX_KEY + key, JSONUtil.toJsonStr(aggregatePayInfo), 5 * 60 * 1000); - return key; - } - - /** - * 获取聚合支付信息 - */ - public AggregatePayInfo getAggregateInfo(String key) { - String jsonStr = Optional.ofNullable(redisClient.get(PREFIX_KEY + key)) - .orElseThrow(() -> new PayFailureException("支付超时")); - return JSONUtil.toBean(jsonStr, AggregatePayInfo.class); - } - - /** - * 聚合付款码支付处理 - */ - public int getPayChannel(String authCode) { - if (StrUtil.isBlank(authCode)) { - throw new PayFailureException("付款码不可为空"); - } - String[] wx = { "10", "11", "12", "13", "14", "15" }; - String[] ali = { "25", "26", "27", "28", "29", "30" }; - - // 微信 - if (StrUtil.startWithAny(authCode.substring(0, 2), wx)) { - return PayChannelCode.WECHAT; - } - // 支付宝 - else if (StrUtil.startWithAny(authCode.substring(0, 2), ali)) { - return PayChannelCode.ALI; - } - else { - throw new PayFailureException("不支持的支付方式"); - } - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/cashier/service/CashierService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/cashier/service/CashierService.java deleted file mode 100644 index 06fcf45a5055521b774a7147f8212b61c0b977ba..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/cashier/service/CashierService.java +++ /dev/null @@ -1,197 +0,0 @@ -package cn.bootx.payment.core.cashier.service; - -import cn.bootx.baseapi.core.parameter.dao.SystemParamManager; -import cn.bootx.baseapi.core.parameter.entity.SystemParameter; -import cn.bootx.common.core.util.BigDecimalUtil; -import cn.bootx.payment.code.pay.PayChannelCode; -import cn.bootx.payment.code.pay.PayModelExtraCode; -import cn.bootx.payment.code.pay.PayStatusCode; -import cn.bootx.payment.code.pay.PayWayCode; -import cn.bootx.payment.code.paymodel.WeChatPayCode; -import cn.bootx.payment.core.aggregate.entity.AggregatePayInfo; -import cn.bootx.payment.core.aggregate.service.AggregateService; -import cn.bootx.payment.core.pay.service.PayService; -import cn.bootx.payment.core.paymodel.wechat.dao.WeChatPayConfigManager; -import cn.bootx.payment.core.paymodel.wechat.entity.WeChatPayConfig; -import cn.bootx.payment.dto.pay.PayResult; -import cn.bootx.payment.exception.payment.PayFailureException; -import cn.bootx.payment.exception.payment.PayUnsupportedMethodException; -import cn.bootx.payment.param.cashier.CashierCombinationPayParam; -import cn.bootx.payment.param.cashier.CashierSinglePayParam; -import cn.bootx.payment.param.pay.PayModeParam; -import cn.bootx.payment.param.pay.PayParam; -import cn.bootx.payment.util.PayModelUtil; -import cn.bootx.starter.auth.util.SecurityUtil; -import cn.hutool.core.collection.CollUtil; -import com.ijpay.core.enums.SignType; -import com.ijpay.core.kit.WxPayKit; -import lombok.RequiredArgsConstructor; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import me.chanjar.weixin.common.api.WxConsts; -import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken; -import me.chanjar.weixin.mp.api.WxMpService; -import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl; -import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.util.*; - -/** - * 结算台 - * - * @author xxm - * @date 2022/2/23 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class CashierService { - - private final PayService payService; - - private final AggregateService aggregateService; - - private final WeChatPayConfigManager weChatPayConfigManager; - - private final SystemParamManager systemParamManager; - - /** - * 发起支付(单渠道支付) - */ - public PayResult singlePay(CashierSinglePayParam param) { - - // 如果是聚合支付,存在付款码时特殊处理(聚合扫码支付不用额外处理) - if (Objects.equals(PayChannelCode.AGGREGATION, param.getPayChannel())) { - int payChannel = aggregateService.getPayChannel(param.getAuthCode()); - param.setPayChannel(payChannel); - } - // 构建支付方式参数 - PayModeParam payModeParam = new PayModeParam().setPayChannel(param.getPayChannel()) - .setPayWay(param.getPayWay()) - .setAmount(param.getAmount()); - - // 处理附加参数 - HashMap map = new HashMap<>(1); - map.put(PayModelExtraCode.AUTH_CODE, param.getAuthCode()); - map.put(PayModelExtraCode.OPEN_ID, param.getOpenId()); - map.put(PayModelExtraCode.VOUCHER_NO, param.getVoucherNo()); - String extraParamsJson = PayModelUtil.buildExtraParamsJson(param.getPayChannel(), map); - payModeParam.setExtraParamsJson(extraParamsJson); - - PayParam payParam = new PayParam().setTitle(param.getTitle()) - .setBusinessId(param.getBusinessId()) - .setUserId(SecurityUtil.getUserIdOrDefaultId()) - .setPayModeList(Collections.singletonList(payModeParam)); - PayResult payResult = payService.pay(payParam); - - if (PayStatusCode.TRADE_REFUNDED == payResult.getPayStatus()) { - throw new PayFailureException("已经退款"); - } - return payResult; - } - - /** - * 扫码发起自动支付 - */ - public String aggregatePay(String key, String ua) { - CashierSinglePayParam cashierSinglePayParam = new CashierSinglePayParam().setPayWay(PayWayCode.QRCODE); - // 判断是哪种支付方式 - if (ua.contains(PayChannelCode.UA_ALI_PAY)) { - cashierSinglePayParam.setPayChannel(PayChannelCode.ALI); - } - else if (ua.contains(PayChannelCode.UA_WECHAT_PAY)) { - // 跳转微信授权页面, 调用jsapi进行支付 - return this.wxJsapiAuth(key); - } - else { - throw new PayUnsupportedMethodException(); - } - - AggregatePayInfo aggregatePayInfo = aggregateService.getAggregateInfo(key); - cashierSinglePayParam.setTitle(aggregatePayInfo.getTitle()) - .setAmount(aggregatePayInfo.getAmount()) - .setBusinessId(aggregatePayInfo.getBusinessId()); - PayResult payResult = this.singlePay(cashierSinglePayParam); - return payResult.getAsyncPayInfo().getPayBody(); - } - - /** - * 微信jsapi支付 - 跳转到授权页面 - */ - private String wxJsapiAuth(String key) { - WeChatPayConfig config = weChatPayConfigManager.findActivity() - .orElseThrow(() -> new PayFailureException("未找到启用的微信支付配置")); - WxMpService wxMpService = getWxMpService(config.getAppId(), config.getAppSecret()); - // 回调地址为 结算台微信jsapi支付的回调地址 - SystemParameter systemParameter = systemParamManager.findByParamKey(WeChatPayCode.JSAPI_REDIRECT_URL) - .orElseThrow(() -> new PayFailureException("微信支付回调地址参数不存在")); - String url = systemParameter.getValue() + "cashier/wxJsapiPay"; - return wxMpService.getOAuth2Service().buildAuthorizationUrl(url, WxConsts.OAuth2Scope.SNSAPI_BASE, key); - } - - /** - * 微信jsapi支付 - 回调发起预支付, 同时调起微信页面jsapi支付 - * @param code 微信授权码, 用来获取id - * @param state 聚合支付参数记录的key - * @return 页面中调起jsapi支付的参数 - */ - @SneakyThrows - public Map wxJsapiPay(String code, String state) { - WeChatPayConfig config = weChatPayConfigManager.findActivity() - .orElseThrow(() -> new PayFailureException("未找到启用的微信支付配置")); - WxMpService wxMpService = this.getWxMpService(config.getAppId(), config.getAppSecret()); - WxOAuth2AccessToken accessToken = wxMpService.getOAuth2Service().getAccessToken(code); - String openId = accessToken.getOpenId(); - AggregatePayInfo aggregatePayInfo = aggregateService.getAggregateInfo(state); - // 构造微信API支付参数 - CashierSinglePayParam cashierSinglePayParam = new CashierSinglePayParam().setPayChannel(PayChannelCode.WECHAT) - .setPayWay(PayWayCode.JSAPI) - .setTitle(aggregatePayInfo.getTitle()) - .setAmount(aggregatePayInfo.getAmount()) - .setOpenId(openId) - .setBusinessId(aggregatePayInfo.getBusinessId()); - PayResult payResult = this.singlePay(cashierSinglePayParam); - - return WxPayKit.prepayIdCreateSign(payResult.getAsyncPayInfo().getPayBody(), config.getAppId(), - config.getApiKeyV2(), SignType.HMACSHA256); - } - - /** - * 获取微信公众号API的Service - */ - private WxMpService getWxMpService(String appId, String secret) { - WxMpService wxMpService = new WxMpServiceImpl(); - WxMpDefaultConfigImpl config = new WxMpDefaultConfigImpl(); - config.setAppId(appId); // 设置微信公众号的appid - config.setSecret(secret); // 设置微信公众号的app corpSecret - wxMpService.setWxMpConfigStorage(config); - return wxMpService; - } - - /** - * 组合支付 - */ - public PayResult combinationPay(CashierCombinationPayParam param) { - // 处理支付参数 - List payModeList = param.getPayModeList(); - // 删除小于等于零的 - payModeList.removeIf(payModeParam -> BigDecimalUtil.compareTo(payModeParam.getAmount(), BigDecimal.ZERO) < 1); - if (CollUtil.isEmpty(payModeList)) { - throw new PayFailureException("支付参数有误"); - } - // 发起支付 - PayParam payParam = new PayParam().setTitle(param.getTitle()) - .setBusinessId(param.getBusinessId()) - .setUserId(SecurityUtil.getUserIdOrDefaultId()) - .setPayModeList(param.getPayModeList()); - PayResult payResult = payService.pay(payParam); - - if (PayStatusCode.TRADE_REFUNDED == payResult.getPayStatus()) { - throw new PayFailureException("已经退款"); - } - return payResult; - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/notify/convert/PayNotifyConvert.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/notify/convert/PayNotifyConvert.java deleted file mode 100644 index 454043916f12589005545a684ad481873136a79a..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/notify/convert/PayNotifyConvert.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.bootx.payment.core.notify.convert; - -import cn.bootx.payment.core.notify.entity.PayNotifyRecord; -import cn.bootx.payment.dto.notify.PayNotifyRecordDto; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -/** - * 转换 - * - * @author xxm - * @date 2021/6/22 - */ -@Mapper -public interface PayNotifyConvert { - - PayNotifyConvert CONVERT = Mappers.getMapper(PayNotifyConvert.class); - - PayNotifyRecordDto convert(PayNotifyRecord in); - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/notify/dao/PayNotifyRecordManager.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/notify/dao/PayNotifyRecordManager.java deleted file mode 100644 index ca0319ae111cfeb4a9981785e1c3a8aa5a139b98..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/notify/dao/PayNotifyRecordManager.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.bootx.payment.core.notify.dao; - -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.payment.core.notify.entity.PayNotifyRecord; -import cn.bootx.payment.dto.notify.PayNotifyRecordDto; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Repository; - -import java.util.Objects; - -/** - * 支付消息通知回调 - * - * @author xxm - * @date 2021/6/22 - */ -@Slf4j -@Repository -@RequiredArgsConstructor -public class PayNotifyRecordManager extends BaseManager { - - public Page page(PageParam pageParam, PayNotifyRecordDto param) { - Page mpPage = MpUtil.getMpPage(pageParam, PayNotifyRecord.class); - return lambdaQuery().orderByDesc(MpIdEntity::getId) - .like(Objects.nonNull(param.getPaymentId()), PayNotifyRecord::getPaymentId, param.getPaymentId()) - .eq(Objects.nonNull(param.getPayChannel()), PayNotifyRecord::getPayChannel, param.getPayChannel()) - .eq(Objects.nonNull(param.getStatus()), PayNotifyRecord::getStatus, param.getStatus()) - .page(mpPage); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/notify/dao/PayNotifyRecordMapper.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/notify/dao/PayNotifyRecordMapper.java deleted file mode 100644 index abfc042d9a90420475bbb82977ba09afa7dd2b78..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/notify/dao/PayNotifyRecordMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package cn.bootx.payment.core.notify.dao; - -import cn.bootx.payment.core.notify.entity.PayNotifyRecord; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface PayNotifyRecordMapper extends BaseMapper { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/notify/entity/PayNotifyRecord.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/notify/entity/PayNotifyRecord.java deleted file mode 100644 index 8935368811dc0e3c75121a09a7b230d701260fd0..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/notify/entity/PayNotifyRecord.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.bootx.payment.core.notify.entity; - -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.payment.code.pay.PayChannelCode; -import cn.bootx.payment.code.pay.PayStatusCode; -import cn.bootx.payment.core.notify.convert.PayNotifyConvert; -import cn.bootx.payment.dto.notify.PayNotifyRecordDto; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.time.LocalDateTime; - -/** - * 回调记录 - * - * @author xxm - * @date 2021/6/22 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@TableName("pay_pay_notify_record") -public class PayNotifyRecord extends MpBaseEntity implements EntityBaseFunction { - - /** 支付记录id */ - private Long paymentId; - - /** - * 支付通道 - * @see PayChannelCode - */ - private int payChannel; - - /** 通知消息 */ - private String notifyInfo; - - /** - * 处理状态 - * @see PayStatusCode#NOTIFY_PROCESS_SUCCESS - */ - private int status; - - /** 提示信息 */ - private String msg; - - /** 回调时间 */ - private LocalDateTime notifyTime; - - @Override - public PayNotifyRecordDto toDto() { - return PayNotifyConvert.CONVERT.convert(this); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/notify/service/PayNotifyRecordService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/notify/service/PayNotifyRecordService.java deleted file mode 100644 index 1755ca3d85584ed5e49355c9a590c7daeb173682..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/notify/service/PayNotifyRecordService.java +++ /dev/null @@ -1,43 +0,0 @@ -package cn.bootx.payment.core.notify.service; - -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.payment.core.notify.dao.PayNotifyRecordManager; -import cn.bootx.payment.core.notify.entity.PayNotifyRecord; -import cn.bootx.payment.dto.notify.PayNotifyRecordDto; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * 回调记录 - * - * @author xxm - * @date 2021/7/5 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class PayNotifyRecordService { - - private final PayNotifyRecordManager payNotifyRecordManager; - - /** - * 分页查询 - */ - public PageResult page(PageParam pageParam, PayNotifyRecordDto param) { - Page page = payNotifyRecordManager.page(pageParam, param); - return MpUtil.convert2DtoPageResult(page); - } - - /** - * 根据id查询 - */ - public PayNotifyRecordDto findById(Long id) { - return payNotifyRecordManager.findById(id).map(PayNotifyRecord::toDto).orElseThrow(DataNotExistException::new); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/builder/PayEventBuilder.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/builder/PayEventBuilder.java deleted file mode 100644 index 5efd0814d2e6ac8d625e81cd8a162f0b2f129a55..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/builder/PayEventBuilder.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.bootx.payment.core.pay.builder; - -import cn.bootx.payment.core.payment.entity.Payment; -import cn.bootx.payment.event.PayCancelEvent; -import cn.bootx.payment.event.PayCompleteEvent; -import cn.bootx.payment.event.PayRefundEvent; -import lombok.experimental.UtilityClass; - -/** - * 支付事件生成器 - * - * @author xxm - * @date 2022/7/11 - */ -@UtilityClass -public class PayEventBuilder { - - /** - * 支付完成 - */ - public PayCompleteEvent buildPayComplete(Payment payment) { - PayCompleteEvent event = new PayCompleteEvent().setPaymentId(payment.getId()) - .setBusinessId(payment.getBusinessId()); - return event; - } - - /** - * 支付撤销/关闭 - */ - public PayCancelEvent buildPayCancel(Payment payment) { - PayCancelEvent event = new PayCancelEvent().setPaymentId(payment.getId()) - .setBusinessId(payment.getBusinessId()); - return event; - } - - /** - * 支付退款 - */ - public PayRefundEvent buildPayRefund(Payment payment) { - PayRefundEvent event = new PayRefundEvent().setPaymentId(payment.getId()) - .setBusinessId(payment.getBusinessId()); - return event; - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/builder/PaymentBuilder.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/builder/PaymentBuilder.java deleted file mode 100644 index 0bc8c29e34ae2ae78c1fa729e9ff89c578aaa14b..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/builder/PaymentBuilder.java +++ /dev/null @@ -1,135 +0,0 @@ -package cn.bootx.payment.core.pay.builder; - -import cn.bootx.common.spring.util.WebServletUtil; -import cn.bootx.payment.code.pay.PayChannelCode; -import cn.bootx.payment.code.pay.PayStatusCode; -import cn.bootx.payment.core.pay.local.AsyncPayInfoLocal; -import cn.bootx.payment.core.payment.entity.Payment; -import cn.bootx.payment.dto.pay.PayResult; -import cn.bootx.payment.dto.payment.PayChannelInfo; -import cn.bootx.payment.dto.payment.RefundableInfo; -import cn.bootx.payment.param.pay.PayModeParam; -import cn.bootx.payment.param.pay.PayParam; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.extra.servlet.ServletUtil; -import lombok.experimental.UtilityClass; - -import javax.servlet.http.HttpServletRequest; -import java.math.BigDecimal; -import java.util.Collections; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -/** - * 支付对象构建器 - * - * @author xxm - * @date 2021/2/25 - */ -@UtilityClass -public class PaymentBuilder { - - /** - * 构建payment记录 - */ - public Payment buildPayment(PayParam payParam) { - Payment payment = new Payment(); - - HttpServletRequest request = WebServletUtil.getRequest(); - String ip = ServletUtil.getClientIP(request); - // 基础信息 - payment.setBusinessId(payParam.getBusinessId()) - .setUserId(payParam.getUserId()) - .setTitle(payParam.getTitle()) - .setDescription(payParam.getDescription()); - - // 支付方式和状态 - List payTypeInfos = buildPayTypeInfo(payParam.getPayModeList()); - List refundableInfos = buildRefundableInfo(payParam.getPayModeList()); - // 计算总价 - BigDecimal sumAmount = payTypeInfos.stream() - .map(PayChannelInfo::getAmount) - .filter(Objects::nonNull) - .reduce(BigDecimal::add) - .orElse(BigDecimal.ZERO); - // 支付通道信息 - payment.setPayChannelInfo(payTypeInfos) - .setRefundableInfo(refundableInfos) - .setPayStatus(PayStatusCode.TRADE_PROGRESS) - .setAmount(sumAmount) - .setClientIp(ip) - .setRefundableBalance(sumAmount); - return payment; - } - - /** - * 构建PayTypeInfo - */ - private List buildPayTypeInfo(List payModeParamList) { - return CollectionUtil.isEmpty(payModeParamList) ? Collections.emptyList() - : payModeParamList.stream().map(PayModeParam::toPayTypeInfo).collect(Collectors.toList()); - } - - /** - * 构建RefundableInfo - */ - private List buildRefundableInfo(List payModeParamList) { - return CollectionUtil.isEmpty(payModeParamList) ? Collections.emptyList() - : payModeParamList.stream().map(PayModeParam::toRefundableInfo).collect(Collectors.toList()); - } - - /** - * 根据Payment构建PayParam支付参数 - */ - public PayParam buildPayParamByPayment(Payment payment) { - PayParam payParam = new PayParam(); - // 恢复 payModeList - List payModeParams = payment.getPayChannelInfo() - .stream() - .map(payTypeInfo -> new PayModeParam().setAmount(payTypeInfo.getAmount()) - .setPayChannel(payTypeInfo.getPayChannel()) - .setExtraParamsJson(payTypeInfo.getExtraParamsJson())) - .collect(Collectors.toList()); - payParam.setPayModeList(payModeParams) - .setBusinessId(payment.getBusinessId()) - .setUserId(payment.getUserId()) - .setTitle(payment.getTitle()) - .setTitle(payment.getTitle()) - .setDescription(payment.getDescription()); - return payParam; - } - - /** - * 根据Payment构建PaymentResult - * @param payment payment - * @return paymentVO - */ - public PayResult buildResultByPayment(Payment payment) { - PayResult paymentResult; - try { - paymentResult = new PayResult(); - // 异步支付信息 - paymentResult.setAsyncPayChannel(payment.getAsyncPayChannel()) - .setAsyncPayMode(payment.isAsyncPayMode()) - .setPayStatus(payment.getPayStatus()); - - List channelInfos = payment.getPayChannelInfo(); - - // 设置异步支付参数 - List moneyPayTypeInfos = channelInfos.stream() - .filter(payTypeInfo -> PayChannelCode.ASYNC_TYPE.contains(payTypeInfo.getPayChannel())) - .collect(Collectors.toList()); - if (!CollUtil.isEmpty(moneyPayTypeInfos)) { - paymentResult.setAsyncPayInfo(AsyncPayInfoLocal.get()); - } - // 清空线程变量 - } - finally { - AsyncPayInfoLocal.clear(); - } - return paymentResult; - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/convert/PayConvert.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/convert/PayConvert.java deleted file mode 100644 index 36fda91c44cafc11ffb24734fb04e8a12a90e18a..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/convert/PayConvert.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.bootx.payment.core.pay.convert; - -import cn.bootx.payment.dto.payment.PayChannelInfo; -import cn.bootx.payment.param.pay.PayModeParam; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -/** - * 支付对象转换 - * - * @author xxm - * @date 2022/3/2 - */ -@Mapper -public interface PayConvert { - - PayConvert CONVERT = Mappers.getMapper(PayConvert.class); - - PayChannelInfo convert(PayModeParam in); - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/exception/BaseException.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/exception/BaseException.java deleted file mode 100644 index 04c4907d83ce56f57aab35643e127505047e561b..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/exception/BaseException.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.bootx.payment.core.pay.exception; - -/** - * 支付异常信息 - * - * @author xxm - * @date 2020/12/9 - */ -public interface BaseException { - - /** - * 获取错误信息 - */ - ExceptionInfo getExceptionInfo(); - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/exception/ExceptionInfo.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/exception/ExceptionInfo.java deleted file mode 100644 index 73d8a9b97697eb0644ac434fa74138a027839053..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/exception/ExceptionInfo.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.bootx.payment.core.pay.exception; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * @author xxm - * @date 2021/5/24 - */ -@Data -@Accessors(chain = true) -@Schema(title = "异常信息") -public class ExceptionInfo { - - /** 错误码 */ - private int errorCode; - - /** 错误信息 */ - private String errorMsg; - - public ExceptionInfo(int errorCode, String errorMsg) { - this.errorCode = errorCode; - this.errorMsg = errorMsg; - } - -} \ No newline at end of file diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/factory/PayStrategyFactory.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/factory/PayStrategyFactory.java deleted file mode 100644 index d9b5e60ae906c4038931d5d54a13362324116b57..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/factory/PayStrategyFactory.java +++ /dev/null @@ -1,120 +0,0 @@ -package cn.bootx.payment.core.pay.factory; - -import cn.bootx.payment.code.pay.PayChannelCode; -import cn.bootx.payment.core.pay.func.AbsPayStrategy; -import cn.bootx.payment.core.pay.strategy.*; -import cn.bootx.payment.exception.payment.PayUnsupportedMethodException; -import cn.bootx.payment.param.pay.PayModeParam; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.extra.spring.SpringUtil; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -/** - * 支付策略工厂 - * - * @author xxm - * @date 2020/12/11 - */ -public class PayStrategyFactory { - - /** - * 根据传入的支付通道创建策略 - * @param payModeParam 支付类型 - * @return 支付策略 - */ - public static AbsPayStrategy create(PayModeParam payModeParam) { - - AbsPayStrategy strategy = null; - switch (payModeParam.getPayChannel()) { - case PayChannelCode.ALI: - strategy = SpringUtil.getBean(AliPayStrategy.class); - break; - case PayChannelCode.WECHAT: - strategy = SpringUtil.getBean(WeChatPayStrategy.class); - break; - case PayChannelCode.UNION_PAY: - strategy = SpringUtil.getBean(UnionPayStrategy.class); - break; - case PayChannelCode.CASH: - strategy = SpringUtil.getBean(CashPayStrategy.class); - break; - case PayChannelCode.WALLET: - strategy = SpringUtil.getBean(WalletPayStrategy.class); - break; - case PayChannelCode.VOUCHER: - strategy = SpringUtil.getBean(VoucherStrategy.class); - break; - case PayChannelCode.CREDIT_CARD: - break; - case PayChannelCode.APPLE_PAY: - break; - case PayChannelCode.CHANNEL_PAY: - break; - default: - throw new PayUnsupportedMethodException(); - } - // noinspection ConstantConditions - strategy.setPayMode(payModeParam); - return strategy; - } - - /** - * 根据传入的支付类型批量创建策略, 异步支付在后面 - */ - public static List createDesc(List payModeParamList) { - return create(payModeParamList, true); - } - - /** - * 根据传入的支付类型批量创建策略, 默认异步支付在前面 - */ - public static List create(List payModeParamList) { - return create(payModeParamList, false); - } - - /** - * 根据传入的支付类型批量创建策略 - * @param payModeParamList 支付类型 - * @return 支付策略 - */ - private static List create(List payModeParamList, boolean description) { - if (CollectionUtil.isEmpty(payModeParamList)) { - return Collections.emptyList(); - } - List list = new ArrayList<>(payModeParamList.size()); - - // 同步支付 - List syncPayModeParamList = payModeParamList.stream() - .filter(Objects::nonNull) - .filter(payModeParam -> !PayChannelCode.ASYNC_TYPE.contains(payModeParam.getPayChannel())) - .collect(Collectors.toList()); - - // 异步支付 - List asyncPayModeParamList = payModeParamList.stream() - .filter(Objects::nonNull) - .filter(payModeParam -> PayChannelCode.ASYNC_TYPE.contains(payModeParam.getPayChannel())) - .collect(Collectors.toList()); - - List sortList = new ArrayList<>(payModeParamList.size()); - - // 异步在后面 - if (description) { - sortList.addAll(syncPayModeParamList); - sortList.addAll(asyncPayModeParamList); - } - else { - sortList.addAll(asyncPayModeParamList); - sortList.addAll(syncPayModeParamList); - } - - // 此处有一个根据Type的反转排序， - sortList.stream().filter(Objects::nonNull).forEach(payMode -> list.add(create(payMode))); - return list; - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/func/AbsPayCallbackStrategy.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/func/AbsPayCallbackStrategy.java deleted file mode 100644 index 5b375ef61036d6723dce8c5e4da5d3669c5a0a62..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/func/AbsPayCallbackStrategy.java +++ /dev/null @@ -1,111 +0,0 @@ -package cn.bootx.payment.core.pay.func; - -import cn.bootx.common.redis.RedisClient; -import cn.bootx.payment.code.pay.PayChannelCode; -import cn.bootx.payment.code.pay.PayStatusCode; -import cn.bootx.payment.core.notify.dao.PayNotifyRecordManager; -import cn.bootx.payment.core.pay.result.PayCallbackResult; -import cn.bootx.payment.core.pay.service.PayCallbackService; -import cn.bootx.payment.core.notify.entity.PayNotifyRecord; -import cn.hutool.json.JSONUtil; -import com.alibaba.ttl.TransmittableThreadLocal; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; - -import java.time.LocalDateTime; -import java.util.Map; - -/** - * 支付回调处理抽象接口 - * - * @author xxm - * @date 2021/6/21 - */ -@Slf4j -@RequiredArgsConstructor -public abstract class AbsPayCallbackStrategy { - - protected static final ThreadLocal> PARAMS = new TransmittableThreadLocal<>(); - - private final RedisClient redisClient; - - private final PayNotifyRecordManager payNotifyRecordManager; - - private final PayCallbackService payCallbackService; - - /** - * 支付回调 - */ - public String payCallback(Map params) { - PARAMS.set(params); - try { - log.info("支付回调处理: {}", params); - // 验证消息 - if (!this.verifyNotify()) { - return null; - } - // 去重处理 - if (!this.duplicateChecker()) { - return this.getReturnMsg(); - } - // 调用统一回调处理 - PayCallbackResult result = payCallbackService.callback(this.getPaymentId(), this.getTradeStatus(), params); - // 记录回调记录 - this.saveNotifyRecord(result); - } - finally { - PARAMS.remove(); - } - return this.getReturnMsg(); - } - - /** - * 支付类型 - * @see PayChannelCode - */ - public abstract int getPayChannel(); - - /** - * 去重处理 - */ - public boolean duplicateChecker() { - // 判断10秒内是否已经回调处理 - String key = "payment:callback:duplicate:" + this.getPaymentId(); - return redisClient.setIfAbsent(key, "", 10 * 1000); - } - - /** - * 验证信息格式 - */ - public abstract boolean verifyNotify(); - - /** - * 获取paymentId - */ - public abstract Long getPaymentId(); - - /** - * 获取支付状态 - * @see PayStatusCode - */ - public abstract int getTradeStatus(); - - /** - * 返回响应结果 - */ - public abstract String getReturnMsg(); - - /** - * 保存回调记录 - */ - public void saveNotifyRecord(PayCallbackResult result) { - PayNotifyRecord payNotifyRecord = new PayNotifyRecord().setNotifyInfo(JSONUtil.toJsonStr(PARAMS.get())) - .setNotifyTime(LocalDateTime.now()) - .setPaymentId(this.getPaymentId()) - .setPayChannel(this.getPayChannel()) - .setStatus(result.getCode()) - .setMsg(result.getMsg()); - payNotifyRecordManager.save(payNotifyRecord); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/func/AbsPayStrategy.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/func/AbsPayStrategy.java deleted file mode 100644 index 5998c3a51b73102c3273bb2400c8ccd4ed73416a..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/func/AbsPayStrategy.java +++ /dev/null @@ -1,109 +0,0 @@ -package cn.bootx.payment.core.pay.func; - -import cn.bootx.payment.code.pay.PayChannelCode; -import cn.bootx.payment.code.pay.PaySyncStatus; -import cn.bootx.payment.core.pay.result.PaySyncResult; -import cn.bootx.payment.core.pay.exception.ExceptionInfo; -import cn.bootx.payment.core.payment.entity.Payment; -import cn.bootx.payment.param.pay.PayModeParam; -import cn.bootx.payment.param.pay.PayParam; -import lombok.Getter; -import lombok.Setter; - -import java.util.Map; - -/** - * 抽象支付策略基类 同步支付 异步支付 错误处理 关闭支付 撤销支付 支付网关同步 退款 - * - * @author xxm - * @date 2020/12/11 - */ -@Getter -@Setter -public abstract class AbsPayStrategy { - - /** 支付对象 */ - private Payment payment = null; - - /** 支付参数 */ - private PayParam payParam = null; - - /** 支付方式参数 支付参数中的与这个不一致, 以这个为准 */ - private PayModeParam payMode = null; - - /** - * 策略标示 - * @see PayChannelCode - */ - public abstract int getType(); - - /** - * 初始化支付的参数 - */ - public void initPayParam(Payment payment, PayParam payParam) { - this.payment = payment; - this.payParam = payParam; - } - - /** - * 支付前对处理 包含必要的校验以及对Payment对象的创建和保存操作 - */ - public void doBeforePayHandler() { - } - - /** - * 支付操作 - */ - public abstract void doPayHandler(); - - /** - * 支付成功的处理方式 - */ - public void doSuccessHandler() { - } - - /** - * 支付失败的处理方式 - */ - public void doErrorHandler(ExceptionInfo exceptionInfo) { - } - - /** - * 异步支付成功的处理方式 - */ - public void doAsyncSuccessHandler(Map map) { - } - - /** - * 异步支付失败的处理方式, 默认使用支付失败的处理方式 同步支付方式调用时同 this#doErrorHandler - */ - public void doAsyncErrorHandler(ExceptionInfo exceptionInfo) { - this.doErrorHandler(exceptionInfo); - } - - /** - * 撤销支付操作，支付交易返回失败或支付系统超时，调用该接口撤销交易 默认为关闭本地支付记录 - */ - public void doCancelHandler() { - this.doCloseHandler(); - } - - /** - * 关闭本地支付记录 - */ - public abstract void doCloseHandler(); - - /** - * 退款 - */ - public abstract void doRefundHandler(); - - /** - * 异步支付单与支付网关进行状态比对 - * @see PaySyncStatus - */ - public PaySyncResult doSyncPayStatusHandler() { - return new PaySyncResult(); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/func/PayStrategyConsumer.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/func/PayStrategyConsumer.java deleted file mode 100644 index 722668f54d40dcd746e7010c32ad55b2660f7c97..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/func/PayStrategyConsumer.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bootx.payment.core.pay.func; - -import cn.bootx.payment.core.payment.entity.Payment; - -import java.util.List; - -/** - * 支付策略接口 - * - * @author xxm - * @date 2020/12/9 - */ -@FunctionalInterface -public interface PayStrategyConsumer, S extends Payment> { - - void accept(T t, S s); - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/local/AsyncPayInfoLocal.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/local/AsyncPayInfoLocal.java deleted file mode 100644 index 920bb227bf64ba7acc6a375a921f7c6e5e413d99..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/local/AsyncPayInfoLocal.java +++ /dev/null @@ -1,37 +0,0 @@ -package cn.bootx.payment.core.pay.local; - -import cn.bootx.payment.dto.pay.AsyncPayInfo; -import com.alibaba.ttl.TransmittableThreadLocal; - -/** - * 异步支付线程变量 - * - * @author xxm - * @date 2021/4/21 - */ -public final class AsyncPayInfoLocal { - - private static final ThreadLocal THREAD_LOCAL = new TransmittableThreadLocal<>(); - - /** - * 设置 - */ - public static void set(AsyncPayInfo asyncPayInfo) { - THREAD_LOCAL.set(asyncPayInfo); - } - - /** - * 获取 - */ - public static AsyncPayInfo get() { - return THREAD_LOCAL.get(); - } - - /** - * 清除 - */ - public static void clear() { - THREAD_LOCAL.remove(); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/local/AsyncRefundLocal.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/local/AsyncRefundLocal.java deleted file mode 100644 index 0b4e2403ed991778bf18d3d12102082de18a7649..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/local/AsyncRefundLocal.java +++ /dev/null @@ -1,70 +0,0 @@ -package cn.bootx.payment.core.pay.local; - -import com.alibaba.ttl.TransmittableThreadLocal; - -/** - * 异步退款线程变量 - * - * @author xxm - * @date 2022/3/9 - */ -public final class AsyncRefundLocal { - - private static final ThreadLocal THREAD_LOCAL = new TransmittableThreadLocal<>(); - - private static final ThreadLocal ERROR_MSG = new TransmittableThreadLocal<>(); - - private static final ThreadLocal ERROR_CODE = new TransmittableThreadLocal<>(); - - /** - * 设置 退款号 - */ - public static void set(String refundId) { - THREAD_LOCAL.set(refundId); - } - - /** - * 获取 退款号 - */ - public static String get() { - return THREAD_LOCAL.get(); - } - - /** - * 设置 错误内容 - */ - public static void setErrorMsg(String errorMsg) { - ERROR_MSG.set(errorMsg); - } - - /** - * 获取 错误内容 - */ - public static String getErrorMsg() { - return ERROR_MSG.get(); - } - - /** - * 设置 错误码 - */ - public static void setErrorCode(String errorCode) { - ERROR_CODE.set(errorCode); - } - - /** - * 获取 错误码 - */ - public static String getErrorCode() { - return ERROR_CODE.get(); - } - - /** - * 清除 - */ - public static void clear() { - THREAD_LOCAL.remove(); - ERROR_MSG.remove(); - ERROR_CODE.remove(); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/result/PayCallbackResult.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/result/PayCallbackResult.java deleted file mode 100644 index 700057a45a3a4cfb5476a3b940d13818d13a15e9..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/result/PayCallbackResult.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.bootx.payment.core.pay.result; - -import cn.bootx.payment.code.pay.PayStatusCode; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * 支付回调处理结果 - * - * @author xxm - * @date 2021/6/22 - */ -@Data -@Accessors(chain = true) -public class PayCallbackResult { - - /** - * 处理状态 - * @see PayStatusCode#NOTIFY_PROCESS_SUCCESS - */ - private int code; - - /** 提示信息 */ - private String msg; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/result/PaySyncResult.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/result/PaySyncResult.java deleted file mode 100644 index 9d32cf39df7ceee354e1e953ef1ed7e1157031d6..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/result/PaySyncResult.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.bootx.payment.core.pay.result; - -import cn.bootx.payment.code.pay.PaySyncStatus; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.Map; - -/** - * 支付网关通知状态对象 - * - * @author xxm - * @date 2021/4/21 - */ -@Data -@Accessors(chain = true) -public class PaySyncResult { - - /** - * 支付网关同步状态 - * @see PaySyncStatus - */ - private int paySyncStatus = -1; - - /** 网关返回参数 */ - private Map map; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/service/PayCallbackService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/service/PayCallbackService.java deleted file mode 100644 index 8f0a85b64174d67863e4d90c26be68b7c2ecd17b..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/service/PayCallbackService.java +++ /dev/null @@ -1,224 +0,0 @@ -package cn.bootx.payment.core.pay.service; - -import cn.bootx.common.core.exception.ErrorCodeRuntimeException; -import cn.bootx.common.core.util.LocalDateTimeUtil; -import cn.bootx.payment.code.pay.PayChannelCode; -import cn.bootx.payment.code.pay.PayStatusCode; -import cn.bootx.payment.core.pay.builder.PayEventBuilder; -import cn.bootx.payment.core.pay.builder.PaymentBuilder; -import cn.bootx.payment.core.pay.exception.BaseException; -import cn.bootx.payment.core.pay.exception.ExceptionInfo; -import cn.bootx.payment.core.pay.factory.PayStrategyFactory; -import cn.bootx.payment.core.pay.func.AbsPayStrategy; -import cn.bootx.payment.core.pay.func.PayStrategyConsumer; -import cn.bootx.payment.core.pay.result.PayCallbackResult; -import cn.bootx.payment.core.payment.entity.Payment; -import cn.bootx.payment.core.payment.service.PaymentService; -import cn.bootx.payment.mq.PaymentEventSender; -import cn.bootx.payment.param.pay.PayParam; -import cn.hutool.core.collection.CollectionUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.time.LocalDateTime; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; - -/** - * 支付回调处理 - * - * @author xxm - * @date 2021/2/27 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class PayCallbackService { - - private final PaymentService paymentService; - - private final PaymentEventSender eventSender; - - /** - * 统一回调处理 - * @see PayStatusCode - * @param tradeStatus 支付状态 - */ - public PayCallbackResult callback(Long paymentId, int tradeStatus, Map map) { - - // 获取payment和paymentParam数据 - Payment payment = paymentService.findById(paymentId).orElse(null); - - // 支付单不存在,记录回调记录 - if (Objects.isNull(payment)) { - return new PayCallbackResult().setCode(PayStatusCode.NOTIFY_PROCESS_FAIL).setMsg("支付单不存在,记录回调记录"); - } - - // 回调时间超出了支付单超时时间, 记录一下, 不做处理 - if (Objects.nonNull(payment.getExpiredTime()) - && LocalDateTimeUtil.ge(LocalDateTime.now(), payment.getExpiredTime())) { - return new PayCallbackResult().setCode(PayStatusCode.NOTIFY_PROCESS_FAIL).setMsg("回调时间超出了支付单支付有效时间"); - } - - // 成功状态 - if (PayStatusCode.NOTIFY_TRADE_SUCCESS == tradeStatus) { - return this.success(payment, map); - } - else { - // 失败状态 - return this.fail(payment, map); - } - } - - /** - * 成功处理 - */ - private PayCallbackResult success(Payment payment, Map map) { - PayCallbackResult result = new PayCallbackResult().setCode(PayStatusCode.NOTIFY_PROCESS_SUCCESS); - - // payment已经被支付,不需要重复处理 - if (Objects.equals(payment.getPayStatus(), PayStatusCode.TRADE_SUCCESS)) { - return result.setCode(PayStatusCode.NOTIFY_PROCESS_IGNORE).setMsg("支付单已经是支付成功状态,不进行处理"); - } - - // payment已被取消,记录回调记录 - if (!Objects.equals(payment.getPayStatus(), PayStatusCode.TRADE_PROGRESS)) { - return result.setCode(PayStatusCode.NOTIFY_PROCESS_FAIL).setMsg("支付单不是待支付状态,记录回调记录"); - } - - // 2.通过工厂生成对应的策略组 - PayParam payParam = PaymentBuilder.buildPayParamByPayment(payment); - - List paymentStrategyList = PayStrategyFactory.create(payParam.getPayModeList()); - if (CollectionUtil.isEmpty(paymentStrategyList)) { - return result.setCode(PayStatusCode.NOTIFY_PROCESS_FAIL).setMsg("支付单数据非法,未找到对应的支付方式"); - } - - // 3.初始化支付的参数 - for (AbsPayStrategy paymentStrategy : paymentStrategyList) { - paymentStrategy.initPayParam(payment, payParam); - } - // 4.处理方法, 支付时只有一种payModel(异步支付), 失败时payment的所有payModel都会生效 - boolean handlerFlag = this.doHandler(payment, paymentStrategyList, (strategyList, paymentObj) -> { - // 执行异步支付方式的成功回调(不会有同步payModel) - strategyList.forEach(absPaymentStrategy -> absPaymentStrategy.doAsyncSuccessHandler(map)); - - // 修改payment支付状态为成功 - paymentObj.setPayStatus(PayStatusCode.TRADE_SUCCESS); - paymentObj.setPayTime(LocalDateTime.now()); - paymentService.updateById(paymentObj); - }); - - if (handlerFlag) { - // 5. 发送成功事件 - eventSender.sendPayComplete(PayEventBuilder.buildPayComplete(payment)); - } - else { - return result.setCode(PayStatusCode.NOTIFY_PROCESS_FAIL).setMsg("回调处理过程报错"); - } - return result; - } - - /** - * 失败处理, 关闭并退款 按说这块不会发生 - */ - private PayCallbackResult fail(Payment payment, Map map) { - PayCallbackResult result = new PayCallbackResult().setCode(PayStatusCode.NOTIFY_PROCESS_SUCCESS); - - // payment已被取消,记录回调记录,后期处理 - if (!Objects.equals(payment.getPayStatus(), PayStatusCode.TRADE_PROGRESS)) { - return result.setCode(PayStatusCode.NOTIFY_PROCESS_IGNORE).setMsg("支付单已经取消,记录回调记录"); - } - - // payment支付成功, 状态非法 - if (!Objects.equals(payment.getPayStatus(), PayStatusCode.TRADE_SUCCESS)) { - return result.setCode(PayStatusCode.NOTIFY_PROCESS_FAIL).setMsg("支付单状态非法,支付网关状态为失败,但支付单状态为已完成"); - } - - // 2.通过工厂生成对应的策略组 - PayParam payParam = PaymentBuilder.buildPayParamByPayment(payment); - List paymentStrategyList = PayStrategyFactory.create(payParam.getPayModeList()); - if (CollectionUtil.isEmpty(paymentStrategyList)) { - return result.setCode(PayStatusCode.NOTIFY_PROCESS_FAIL).setMsg("支付单数据非法,未找到对应的支付方式"); - } - // 3.初始化支付关闭的参数 - for (AbsPayStrategy paymentStrategy : paymentStrategyList) { - paymentStrategy.initPayParam(payment, payParam); - } - // 4.处理方法, 支付时只有一种payModel(异步支付), 失败时payment的所有payModel都会生效 - boolean handlerFlag = this.doHandler(payment, paymentStrategyList, (strategyList, paymentObj) -> { - // 执行异步支付方式的成功回调(不会有同步payModel) - strategyList.forEach(AbsPayStrategy::doCancelHandler); - - // 修改payment支付状态为成功 - paymentObj.setPayStatus(PayStatusCode.TRADE_CANCEL); - paymentService.updateById(paymentObj); - }); - - if (handlerFlag) { - // 5. 发送退款事件 - eventSender.sendPayRefund(PayEventBuilder.buildPayRefund(payment)); - } - else { - return result.setCode(PayStatusCode.NOTIFY_PROCESS_FAIL).setMsg("回调处理过程报错"); - } - - return result; - } - - /** - * 处理方法 - * @param payment 支付记录 - * @param strategyList 支付策略 - * @param successCallback 成功操作 - */ - private boolean doHandler(Payment payment, List strategyList, - PayStrategyConsumer, Payment> successCallback) { - - try { - // 1.获取异步支付方式，通过工厂生成对应的策略组 - List syncPaymentStrategyList = strategyList.stream() - .filter(paymentStrategy -> PayChannelCode.ASYNC_TYPE.contains(paymentStrategy.getType())) - .collect(Collectors.toList()); - // 执行成功方法 - successCallback.accept(syncPaymentStrategyList, payment); - } - catch (Exception e) { - // error事件的处理 - this.asyncErrorHandler(payment, strategyList, e); - return false; - } - return true; - } - - /** - * 对Error的处理 - */ - private void asyncErrorHandler(Payment payment, List strategyList, Exception e) { - - // 默认的错误信息 - ExceptionInfo exceptionInfo = new ExceptionInfo(PayStatusCode.TRADE_FAIL, e.getMessage()); - if (e instanceof BaseException) { - exceptionInfo = ((BaseException) e).getExceptionInfo(); - } - else if (e instanceof ErrorCodeRuntimeException) { - ErrorCodeRuntimeException ex = (ErrorCodeRuntimeException) e; - exceptionInfo = new ExceptionInfo(ex.getCode(), ex.getMessage()); - } - - // 更新Payment的状态 - payment.setErrorCode(String.valueOf(exceptionInfo.getErrorCode())); - payment.setErrorMsg(String.valueOf(exceptionInfo.getErrorMsg())); - payment.setPayStatus(PayStatusCode.TRADE_FAIL); - paymentService.updateById(payment); - - // 调用失败处理 - for (AbsPayStrategy paymentStrategy : strategyList) { - paymentStrategy.doAsyncErrorHandler(exceptionInfo); - } - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/service/PayCancelService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/service/PayCancelService.java deleted file mode 100644 index f979ecbb2ceac4e874896543911a42e9db8ccd81..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/service/PayCancelService.java +++ /dev/null @@ -1,122 +0,0 @@ -package cn.bootx.payment.core.pay.service; - -import cn.bootx.payment.code.pay.PayStatusCode; -import cn.bootx.payment.core.pay.builder.PayEventBuilder; -import cn.bootx.payment.core.pay.builder.PaymentBuilder; -import cn.bootx.payment.core.pay.factory.PayStrategyFactory; -import cn.bootx.payment.core.pay.func.AbsPayStrategy; -import cn.bootx.payment.core.pay.func.PayStrategyConsumer; -import cn.bootx.payment.core.payment.entity.Payment; -import cn.bootx.payment.core.payment.service.PaymentService; -import cn.bootx.payment.exception.payment.PayFailureException; -import cn.bootx.payment.exception.payment.PayNotExistedException; -import cn.bootx.payment.exception.payment.PayUnsupportedMethodException; -import cn.bootx.payment.mq.PaymentEventSender; -import cn.bootx.payment.param.pay.PayParam; -import cn.hutool.core.collection.CollectionUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; - -import static cn.bootx.payment.code.pay.PayStatusCode.*; -import static cn.bootx.payment.code.pay.PayStatusCode.TRADE_REFUNDED; - -/** - * 取消订单处理 - * - * @author xxm - * @date 2021/3/2 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class PayCancelService { - - private final PaymentService paymentService; - - private final PaymentEventSender paymentEventSender; - - /** - * 根据业务id取消支付记录 - */ - @Transactional(rollbackFor = Exception.class) - public void cancelByBusinessId(String businessId) { - Payment payment = paymentService.findByBusinessId(businessId) - .orElseThrow(() -> new PayFailureException("未找到支付单")); - this.cancelPayment(payment); - } - - /** - * 根据paymentId取消支付记录 - */ - @Transactional(rollbackFor = Exception.class) - public void cancelByPaymentId(Long paymentId) { - Payment payment = paymentService.findById(paymentId).orElseThrow(() -> new PayFailureException("未找到支付单")); - this.cancelPayment(payment); - } - - /** - * 取消支付记录 - */ - private void cancelPayment(Payment payment) { - // 状态检查, 成功/退款/退款中 不处理 - List trades = Arrays.asList(TRADE_SUCCESS, TRADE_REFUNDING, TRADE_REFUNDED); - if (trades.contains(payment.getPayStatus())) { - throw new PayFailureException("支付已完成, 无法撤销"); - } - - // 获取 paymentParam - PayParam payParam = PaymentBuilder.buildPayParamByPayment(payment); - - // 1.获取支付方式，通过工厂生成对应的策略组 - List paymentStrategyList = PayStrategyFactory.create(payParam.getPayModeList()); - if (CollectionUtil.isEmpty(paymentStrategyList)) { - throw new PayUnsupportedMethodException(); - } - - // 2.初始化支付的参数 - for (AbsPayStrategy paymentStrategy : paymentStrategyList) { - paymentStrategy.initPayParam(payment, payParam); - } - - // 3.执行取消订单 - this.doHandler(payment, paymentStrategyList, (strategyList, paymentObj) -> { - // 发起取消进行的执行方法 - strategyList.forEach(AbsPayStrategy::doCancelHandler); - // 取消订单 - paymentObj.setPayStatus(PayStatusCode.TRADE_CANCEL); - paymentService.updateById(paymentObj); - }); - - // 4. 获取支付记录信息 - payment = paymentService.findById(payment.getId()).orElseThrow(PayNotExistedException::new); - - // 5. 发布撤销事件 - paymentEventSender.sendPayCancel(PayEventBuilder.buildPayCancel(payment)); - } - - /** - * 处理方法 - * @param payment 支付记录 - * @param strategyList 支付策略 - * @param successCallback 成功操作 - */ - private void doHandler(Payment payment, List strategyList, - PayStrategyConsumer, Payment> successCallback) { - - try { - // 执行 - successCallback.accept(strategyList, payment); - } - catch (Exception e) { - // error事件的处理 - log.warn("取消订单失败"); - throw e; - } - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/service/PayExpiredTimeService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/service/PayExpiredTimeService.java deleted file mode 100644 index 0dd6260e7b63b707ae51f7a4171c653d15015b64..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/service/PayExpiredTimeService.java +++ /dev/null @@ -1,183 +0,0 @@ -package cn.bootx.payment.core.pay.service; - -import cn.bootx.payment.code.pay.PaySyncStatus; -import cn.bootx.payment.core.pay.builder.PayEventBuilder; -import cn.bootx.payment.core.pay.builder.PaymentBuilder; -import cn.bootx.payment.core.pay.factory.PayStrategyFactory; -import cn.bootx.payment.core.pay.func.AbsPayStrategy; -import cn.bootx.payment.core.pay.result.PaySyncResult; -import cn.bootx.payment.core.payment.entity.Payment; -import cn.bootx.payment.core.payment.service.PaymentService; -import cn.bootx.payment.exception.payment.PayFailureException; -import cn.bootx.payment.exception.payment.PayUnsupportedMethodException; -import cn.bootx.payment.mq.PaymentEventSender; -import cn.bootx.payment.param.pay.PayModeParam; -import cn.bootx.payment.param.pay.PayParam; -import cn.bootx.payment.util.PayModelUtil; -import cn.hutool.core.collection.CollUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Objects; - -import static cn.bootx.payment.code.pay.PayStatusCode.*; - -/** - * 支付超时处理 - * - * @author xxm - * @date 2022/7/13 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class PayExpiredTimeService { - - private final PaymentService paymentService; - - private final PaymentEventSender eventSender; - - /** - * 支付单超时支付单处理 - */ - @Async("bigExecutor") - @Transactional(rollbackFor = Exception.class) - public void expiredTime(Long paymentId) { - - Payment payment = paymentService.findById(paymentId).orElseThrow(() -> new PayFailureException("支付单未找到")); - // 只处理支付中 - if (!Objects.equals(payment.getPayStatus(), TRADE_PROGRESS)) { - return; - } - // 获取支付网关状态 - PayParam payParam = PaymentBuilder.buildPayParamByPayment(payment); - // 1.获取支付方式，通过工厂生成对应的策略组 - List paymentStrategyList = PayStrategyFactory.create(payParam.getPayModeList()); - if (CollUtil.isEmpty(paymentStrategyList)) { - throw new PayUnsupportedMethodException(); - } - - // 2.初始化支付的参数 - for (AbsPayStrategy paymentStrategy : paymentStrategyList) { - paymentStrategy.initPayParam(payment, payParam); - } - - // 3 拿到异步支付方法, 与支付网关进行同步 - PayModeParam asyncPayMode = PayModelUtil.getAsyncPayModeParam(payParam); - AbsPayStrategy syncPayStrategy = PayStrategyFactory.create(asyncPayMode); - syncPayStrategy.initPayParam(payment, payParam); - PaySyncResult paySyncResult = syncPayStrategy.doSyncPayStatusHandler(); - - // 4 对返回的支付网关各种状态进行处理 - int paySyncStatus = paySyncResult.getPaySyncStatus(); - switch (paySyncStatus) { - // 成功状态 - case PaySyncStatus.TRADE_SUCCESS: { - this.paySuccess(payment, syncPayStrategy, paySyncResult); - break; - } - // 待付款/ 支付中 - case PaySyncStatus.WAIT_BUYER_PAY: { - this.payCancel(payment, paymentStrategyList); - break; - } - // 超时关闭 和 网关没找到记录 - case PaySyncStatus.TRADE_CLOSED: - case PaySyncStatus.NOT_FOUND: { - this.payClose(payment, paymentStrategyList); - break; - } - // 交易退款 - case PaySyncStatus.TRADE_REFUND: { - log.info("交易退款不需要关闭: {}", payment.getId()); - break; - } - // 调用出错 进行重试 - case PaySyncStatus.FAIL: { - log.warn("支付状态同步接口调用出错"); - } - case PaySyncStatus.NOT_SYNC: - default: { - log.error("支付超时代码有问题"); - } - } - } - - /** - * 如果支付网关是支付中状态, 关闭网关支付, 然后再关闭本地支付单, 排除退款 - */ - private void payCancel(Payment payment, List payStrategies) { - try { - // 异常情况, 不继续进行处理 - if (!this.check(payment)) { - return; - } - // 撤销和关闭支付单 - payStrategies.forEach(AbsPayStrategy::doCancelHandler); - payment.setPayStatus(TRADE_CANCEL); - paymentService.updateById(payment); - // 发送事件 - eventSender.sendPayCancel(PayEventBuilder.buildPayCancel(payment)); - } - catch (Exception e) { - log.warn("支付状态同步后关闭支付单报错了", e); - } - } - - /** - * 如果支付网关是关闭或未找到, 关闭本地支付单 - */ - private void payClose(Payment payment, List absPayStrategies) { - try { - // 已关闭的不再进行关闭 - if (Objects.equals(payment.getPayStatus(), TRADE_CANCEL)) { - return; - } - // 退款状态则不进行更新 - if (Objects.equals(payment.getPayStatus(), TRADE_REFUNDED) - || Objects.equals(payment.getPayStatus(), TRADE_REFUNDING)) { - return; - } - // 异常情况, 不继续进行处理 - if (!this.check(payment)) { - return; - } - // 关闭支付单 - absPayStrategies.forEach(AbsPayStrategy::doCloseHandler); - payment.setPayStatus(TRADE_CANCEL); - paymentService.updateById(payment); - // 发送事件 - eventSender.sendPayCancel(PayEventBuilder.buildPayCancel(payment)); - } - catch (Exception e) { - log.warn("支付状态同步后关闭支付单报错了", e); - } - } - - /** - * 如果是支付网关是支付完成状态, 记录为异常支付单 - */ - private void paySuccess(Payment payment, AbsPayStrategy syncPayStrategy, PaySyncResult paySyncResult) { - // 修改payment支付状态为成功 - log.error("支付网关支付单已被支付, 需要线下处理: {}", payment.getId()); - } - - /** - * 校验状态, 处理在发起撤销与正式处理之间订单被完成的情况. 理论上不会发生 - */ - private boolean check(Payment payment) { - // 支付失败/撤销/退款不需要处理 - List trades = Arrays.asList(TRADE_FAIL, TRADE_CANCEL, TRADE_REFUNDING, TRADE_REFUNDED); - if (trades.contains(payment.getPayStatus())) { - log.info("订单在超时撤销期间发生了操作, 需要人工介入处理"); - return false; - } - return true; - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/service/PayRefundService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/service/PayRefundService.java deleted file mode 100644 index 53cb5f7b6fef7153c9292127c8a2a86a521fbc10..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/service/PayRefundService.java +++ /dev/null @@ -1,248 +0,0 @@ -package cn.bootx.payment.core.pay.service; - -import cn.bootx.common.core.util.BigDecimalUtil; -import cn.bootx.common.spring.util.WebServletUtil; -import cn.bootx.payment.code.pay.PayStatusCode; -import cn.bootx.payment.core.pay.builder.PaymentBuilder; -import cn.bootx.payment.core.pay.factory.PayStrategyFactory; -import cn.bootx.payment.core.pay.func.AbsPayStrategy; -import cn.bootx.payment.core.pay.func.PayStrategyConsumer; -import cn.bootx.payment.core.pay.local.AsyncRefundLocal; -import cn.bootx.payment.core.payment.dao.PaymentManager; -import cn.bootx.payment.core.payment.entity.Payment; -import cn.bootx.payment.core.payment.service.PaymentService; -import cn.bootx.payment.core.refund.dao.RefundRecordManager; -import cn.bootx.payment.core.refund.entity.RefundRecord; -import cn.bootx.payment.dto.payment.RefundableInfo; -import cn.bootx.payment.exception.payment.PayAmountAbnormalException; -import cn.bootx.payment.exception.payment.PayFailureException; -import cn.bootx.payment.exception.payment.PayUnsupportedMethodException; -import cn.bootx.payment.param.pay.PayModeParam; -import cn.bootx.payment.param.pay.PayParam; -import cn.bootx.payment.param.refund.RefundModeParam; -import cn.bootx.payment.param.refund.RefundParam; -import cn.bootx.starter.auth.util.SecurityUtil; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.extra.servlet.ServletUtil; -import cn.hutool.extra.spring.SpringUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -import javax.servlet.http.HttpServletRequest; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - -import static cn.bootx.payment.code.pay.PayStatusCode.*; - -/** - * 支付退款 - * - * @author xxm - * @date 2022/2/26 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class PayRefundService { - - private final PaymentService paymentService; - - private final PaymentManager paymentManager; - - private final RefundRecordManager refundRecordManager; - - /** - * 退款 - */ - @Transactional(rollbackFor = Exception.class) - public void refund(RefundParam refundParam) { - Payment payment = paymentService.findByBusinessId(refundParam.getBusinessId()) - .orElseThrow(() -> new PayFailureException("未找到支付单")); - - this.refundPayment(payment, refundParam.getRefundModeParams()); - } - - /** - * 根据业务id取消支付记录 - */ - @Transactional(rollbackFor = Exception.class) - public void refundByBusinessId(String businessId) { - Payment payment = paymentService.findByBusinessId(businessId) - .orElseThrow(() -> new PayFailureException("未找到支付单")); - List refundModeParams = payment.getRefundableInfo() - .stream() - .map(o -> new RefundModeParam().setPayChannel(o.getPayChannel()).setAmount(o.getAmount())) - .collect(Collectors.toList()); - this.refundPayment(payment, refundModeParams); - - } - - /** - * 退款 - */ - private void refundPayment(Payment payment, List refundModeParams) { - // 状态判断, 支付中/失败/撤销不处理 - List trades = Arrays.asList(TRADE_PROGRESS, TRADE_CANCEL, TRADE_FAIL); - if (trades.contains(payment.getPayStatus())) { - throw new PayFailureException("状态非法, 无法退款"); - } - - // 过滤退款金额为0的支付通道参数 - refundModeParams - .removeIf(refundModeParam -> BigDecimalUtil.compareTo(refundModeParam.getAmount(), BigDecimal.ZERO) == 0); - // 获取 paymentParam - PayParam payParam = PaymentBuilder.buildPayParamByPayment(payment); - // 退款参数检查 - this.payModeCheck(refundModeParams, payment.getRefundableInfo()); - - // 1.获取退款参数方式，通过工厂生成对应的策略组 - List payModeParams = refundModeParams.stream() - .map(RefundModeParam::toPayModeParam) - .collect(Collectors.toList()); - List paymentStrategyList = PayStrategyFactory.create(payModeParams); - if (CollectionUtil.isEmpty(paymentStrategyList)) { - throw new PayUnsupportedMethodException(); - } - - // 2.初始化支付的参数 - for (AbsPayStrategy paymentStrategy : paymentStrategyList) { - paymentStrategy.initPayParam(payment, payParam); - } - - // 3.执行退款 - this.doHandler(payment, paymentStrategyList, (strategyList, paymentObj) -> { - // 发起支付成功进行的执行方法 - try { - strategyList.forEach(AbsPayStrategy::doRefundHandler); - } - catch (Exception e) { - // 记录退款失败的记录 - BigDecimal amount = refundModeParams.stream() - .map(RefundModeParam::getAmount) - .reduce(BigDecimal.ZERO, BigDecimal::add); - SpringUtil.getBean(this.getClass()).saveRefund(payment, amount, refundModeParams); - throw e; - } - // 处理支付单 - this.paymentHandler(paymentObj, refundModeParams); - }); - } - - /** - * 支付单处理 - */ - private void paymentHandler(Payment payment, List refundModeParams) { - BigDecimal amount = refundModeParams.stream() - .map(RefundModeParam::getAmount) - .reduce(BigDecimal.ZERO, BigDecimal::add); - // 剩余可退款余额 - BigDecimal refundableBalance = payment.getRefundableBalance().subtract(amount); - - // 退款完成 - if (BigDecimalUtil.compareTo(refundableBalance, BigDecimal.ZERO) < 1) { - payment.setPayStatus(PayStatusCode.TRADE_REFUNDED); - } - else { - payment.setPayStatus(PayStatusCode.TRADE_REFUNDING); - } - - payment.setRefundableBalance(refundableBalance); - paymentManager.updateById(payment); - // 记录退款成功的记录 - SpringUtil.getBean(this.getClass()).saveRefund(payment, amount, refundModeParams); - } - - /** - * 处理方法 - * @param payment 支付记录 - * @param strategyList 支付策略 - * @param successCallback 成功操作 - */ - private void doHandler(Payment payment, List strategyList, - PayStrategyConsumer, Payment> successCallback) { - - try { - // 执行 - successCallback.accept(strategyList, payment); - } - catch (Exception e) { - log.warn("退款失败"); - throw e; - } - finally { - // 清除 - AsyncRefundLocal.clear(); - } - } - - /** - * 支付方式检查 - * @param refundModeParams 退款参数 - * @param refundableInfos 可退款信息 - */ - private void payModeCheck(List refundModeParams, List refundableInfos) { - if (CollUtil.isEmpty(refundModeParams)) { - throw new PayFailureException("传入的退款参数不合法"); - } - Map payModeMap = refundableInfos.stream() - .collect(Collectors.toMap(RefundableInfo::getPayChannel, Function.identity())); - for (RefundModeParam refundPayMode : refundModeParams) { - this.payModeCheck(refundPayMode, payModeMap.get(refundPayMode.getPayChannel())); - } - } - - /** - * 支付方式检查 - * @param refundModeParam 退款参数 - * @param refundableInfo 可退款对象 - */ - public void payModeCheck(RefundModeParam refundModeParam, RefundableInfo refundableInfo) { - if (Objects.isNull(refundableInfo)) { - throw new PayFailureException("退款参数非法"); - } - // 退款金额为负数的 - if (BigDecimalUtil.compareTo(refundModeParam.getAmount(), BigDecimal.ZERO) < 1) { - throw new PayAmountAbnormalException(); - } - // 退款金额大于可退款金额 - if (BigDecimalUtil.compareTo(refundModeParam.getAmount(), refundableInfo.getAmount()) == 1) { - throw new PayAmountAbnormalException("退款金额大于可退款金额"); - } - - } - - /** - * 保存退款记录 成不成功都记录 - */ - @Transactional(propagation = Propagation.REQUIRES_NEW) - public void saveRefund(Payment payment, BigDecimal amount, List refundModeParams) { - List refundableInfos = refundModeParams.stream() - .map(RefundModeParam::toRefundableInfo) - .collect(Collectors.toList()); - HttpServletRequest request = WebServletUtil.getRequest(); - String ip = ServletUtil.getClientIP(request); - RefundRecord refundRecord = new RefundRecord().setRefundRequestNo(AsyncRefundLocal.get()) - .setRefundableInfo(refundableInfos) - .setAmount(amount) - .setRefundableBalance(payment.getRefundableBalance()) - .setClientIp(ip) - .setPaymentId(payment.getId()) - .setBusinessId(payment.getBusinessId()) - .setUserId(SecurityUtil.getUserIdOrDefaultId()) - .setRefundTime(LocalDateTime.now()) - .setTitle(payment.getTitle()) - .setErrorMsg(AsyncRefundLocal.getErrorMsg()) - .setErrorCode(AsyncRefundLocal.getErrorCode()) - .setRefundStatus(Objects.isNull(AsyncRefundLocal.getErrorCode()) ? PayStatusCode.REFUND_PROCESS_SUCCESS - : PayStatusCode.REFUND_PROCESS_FAIL); - refundRecordManager.save(refundRecord); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/service/PayService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/service/PayService.java deleted file mode 100644 index db90d5700f63d9b12e2905ff0766106a5dfa7a1e..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/service/PayService.java +++ /dev/null @@ -1,251 +0,0 @@ -package cn.bootx.payment.core.pay.service; - -import cn.bootx.common.core.util.LocalDateTimeUtil; -import cn.bootx.common.core.util.ValidationUtil; -import cn.bootx.payment.code.pay.PayChannelCode; -import cn.bootx.payment.core.pay.builder.PayEventBuilder; -import cn.bootx.payment.core.pay.builder.PaymentBuilder; -import cn.bootx.payment.core.pay.factory.PayStrategyFactory; -import cn.bootx.payment.core.pay.func.AbsPayStrategy; -import cn.bootx.payment.core.pay.func.PayStrategyConsumer; -import cn.bootx.payment.core.payment.entity.Payment; -import cn.bootx.payment.core.payment.service.PaymentService; -import cn.bootx.payment.dto.pay.PayResult; -import cn.bootx.payment.exception.payment.PayFailureException; -import cn.bootx.payment.exception.payment.PayNotExistedException; -import cn.bootx.payment.exception.payment.PayUnsupportedMethodException; -import cn.bootx.payment.mq.PaymentEventSender; -import cn.bootx.payment.param.pay.PayModeParam; -import cn.bootx.payment.param.pay.PayParam; -import cn.bootx.payment.util.PayModelUtil; -import cn.hutool.core.collection.CollectionUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; -import java.util.*; -import java.util.function.Consumer; - -import static cn.bootx.payment.code.pay.PayStatusCode.*; - -/** - * 支付流程 - * - * @author xxm - * @date 2020/12/9 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class PayService { - - private final PaymentService paymentService; - - private final PaymentEventSender eventSender; - - /** - * 支付方法(同步/异步/组合支付) 同步支付：都只会在第一次执行中就完成支付，例如钱包、积分都是调用完就进行了扣减，完成了支付记录 - * 异步支付：例如支付宝、微信，发起支付后还需要跳转第三方平台进行支付，支付后通常需要进行回调，之后才完成支付记录 - * 组合支付：主要是混合了同步支付和异步支付，同时异步支付只能有一个，在支付时先对同步支付进行扣减，然后异步支付回调结束后完成整个支付单 - * 组合支付在非第一次支付的时候，只对新传入的异步支付PayMode进行处理，PayMode的价格使用第一次发起的价格，旧的同步支付如果传入后也不做处理， - * Payment中PayModeList将会为 旧有的同步支付+新传入的异步支付方式(在具体支付实现中处理) - */ - @Transactional(rollbackFor = Exception.class) - public PayResult pay(PayParam payParam) { - ValidationUtil.validateParam(payParam); - // 异步支付方法检查 - PayModelUtil.validationAsyncPayMode(payParam); - - // 获取并校验支付状态 - Payment payment = this.getAndCheckPaymentByBusinessId(payParam.getBusinessId()); - - // 异步支付且非第一次支付 - if (Objects.nonNull(payment) && payment.isAsyncPayMode()) { - return this.paySyncNotFirst(payParam, payment); - } - else { - // 首次支付或同步支付 - return this.payFirst(payParam, payment); - } - } - - /** - * 发起的第一次支付请求(同步/异步) - */ - private PayResult payFirst(PayParam payParam, Payment payment) { - // 0. 支付成功直接返回 - if (Objects.nonNull(payment)) { - return PaymentBuilder.buildResultByPayment(payment); - } - - // 1. 价格检测 - PayModelUtil.validationAmount(payParam.getPayModeList()); - - // 2. 创建支付记录 - payment = this.createPayment(payParam); - - // 3. 调用支付方法进行发起支付 - this.payFirstMethod(payParam, payment); - - // 4. 获取支付记录信息 - payment = paymentService.findById(payment.getId()).orElseThrow(PayNotExistedException::new); - - // 5. 返回支付结果 - PayResult payResult = PaymentBuilder.buildResultByPayment(payment); - - // 如果是支付成功, 发送事件 - if (Objects.equals(payResult.getPayStatus(), TRADE_SUCCESS)) { - eventSender.sendPayComplete(PayEventBuilder.buildPayComplete(payment)); - } - return payResult; - } - - /** - * 执行支付方法 (第一次支付) - */ - private void payFirstMethod(PayParam payParam, Payment payment) { - - // 1.获取支付方式，通过工厂生成对应的策略组 - List paymentStrategyList = PayStrategyFactory.create(payParam.getPayModeList()); - if (CollectionUtil.isEmpty(paymentStrategyList)) { - throw new PayUnsupportedMethodException(); - } - - // 2.初始化支付的参数 - for (AbsPayStrategy paymentStrategy : paymentStrategyList) { - paymentStrategy.initPayParam(payment, payParam); - } - - // 3.支付前准备 - this.doHandler(payment, paymentStrategyList, AbsPayStrategy::doBeforePayHandler, null); - - // 4.支付 - this.doHandler(payment, paymentStrategyList, AbsPayStrategy::doPayHandler, (strategyList, paymentObj) -> { - // 发起支付成功进行的执行方法 - strategyList.forEach(AbsPayStrategy::doSuccessHandler); - // 所有支付方式都是同步时进行Payment处理 - if (PayModelUtil.isNotSync(payParam.getPayModeList())) { - // 修改payment支付状态为成功 - paymentObj.setPayStatus(TRADE_SUCCESS); - paymentObj.setPayTime(LocalDateTime.now()); - } - paymentService.updateById(paymentObj); - }); - } - - /** - * 异步支付执行(非第一次请求), 只执行异步支付策略, 报错不影响继续发起支付 - */ - private PayResult paySyncNotFirst(PayParam payParam, Payment payment) { - - // 0. 处理支付完成情况(完成/退款) - List trades = Arrays.asList(TRADE_SUCCESS, TRADE_CANCEL, TRADE_REFUNDING, TRADE_REFUNDED); - if (trades.contains(payment.getPayStatus())) { - return PaymentBuilder.buildResultByPayment(payment); - } - - // 1.获取 异步支付 通道，通过工厂生成对应的策略组 - PayParam oldPayParam = PaymentBuilder.buildPayParamByPayment(payment); - PayModeParam payModeParam = this.getAsyncPayModeParam(payParam, oldPayParam); - List paymentStrategyList = PayStrategyFactory.create(Collections.singletonList(payModeParam)); - - // 2.初始化支付的参数 - for (AbsPayStrategy paymentStrategy : paymentStrategyList) { - paymentStrategy.initPayParam(payment, payParam); - } - // 3.支付前准备 - this.doHandler(payment, paymentStrategyList, AbsPayStrategy::doBeforePayHandler, null); - - // 4. 发起支付 - this.doHandler(payment, paymentStrategyList, AbsPayStrategy::doPayHandler, (strategyList, paymentObj) -> { - // 发起支付成功进行的执行方法 - strategyList.forEach(AbsPayStrategy::doSuccessHandler); - paymentService.updateById(paymentObj); - }); - - // 5. 获取支付记录信息 - payment = paymentService.findById(payment.getId()).orElseThrow(PayNotExistedException::new); - - // 6. 组装返回参数 - return PaymentBuilder.buildResultByPayment(payment); - } - - /** - * 执行策略中不同的handler - * @param payment 主支付对象 - * @param strategyList 策略列表 - * @param payMethod 执行支付/支付前的函数 - * @param successMethod 执行成功的函数 - */ - private void doHandler(Payment payment, List strategyList, Consumer payMethod, - PayStrategyConsumer, Payment> successMethod) { - // 执行策略操作，如支付前/支付时 - // 等同strategyList.forEach(payMethod.accept(PaymentStrategy)) - strategyList.forEach(payMethod); - - // 执行操作成功的处理 - Optional.ofNullable(successMethod).ifPresent(fun -> fun.accept(strategyList, payment)); - } - - /** - * 获取异步支付参数 - */ - private PayModeParam getAsyncPayModeParam(PayParam payParam, PayParam oldPaymentParam) { - - List oldPayModes = oldPaymentParam.getPayModeList(); - // 旧的异步支付方式 - PayModeParam oldModeParam = oldPayModes.stream() - .filter(payMode -> PayChannelCode.ASYNC_TYPE.contains(payMode.getPayChannel())) - .findFirst() - .orElseThrow(() -> new PayFailureException("支付方式数据异常")); - - // 新的异步支付方式 - PayModeParam payModeParam = payParam.getPayModeList() - .stream() - .filter(payMode -> PayChannelCode.ASYNC_TYPE.contains(payMode.getPayChannel())) - .findFirst() - .orElseThrow(() -> new PayFailureException("支付方式数据异常")); - payModeParam.setAmount(oldModeParam.getAmount()); - - return payModeParam; - } - - /** - * 创建支付记录 - */ - private Payment createPayment(PayParam payParam) { - // 构建payment记录 并保存 - Payment payment = PaymentBuilder.buildPayment(payParam); - return paymentService.save(payment); - } - - /** - * 校验支付状态，支付成功则返回，支付失败则抛出对应的异常 - */ - private Payment getAndCheckPaymentByBusinessId(String businessId) { - // 根据订单查询支付记录 - Payment payment = paymentService.findByBusinessId(businessId).orElse(null); - if (Objects.nonNull(payment)) { - // 支付失败 - List trades = Arrays.asList(TRADE_FAIL, TRADE_CANCEL); - if (trades.contains(payment.getPayStatus())) { - throw new PayFailureException("支付失败或已经被撤销"); - } - // 退款状态 - trades = Arrays.asList(TRADE_REFUNDING, TRADE_REFUNDED); - if (trades.contains(payment.getPayStatus())) { - throw new PayFailureException("支付失败或已经被撤销"); - } - // 支付超时 - if (Objects.nonNull(payment.getExpiredTime()) - && LocalDateTimeUtil.ge(LocalDateTime.now(), payment.getExpiredTime())) { - throw new PayFailureException("支付已超时"); - } - return payment; - } - return null; - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/service/PaySyncService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/service/PaySyncService.java deleted file mode 100644 index 0850533533e0edbcdb1f93cdb80e9d70c17cae4c..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/service/PaySyncService.java +++ /dev/null @@ -1,183 +0,0 @@ -package cn.bootx.payment.core.pay.service; - -import cn.bootx.common.core.exception.BizException; -import cn.bootx.payment.code.pay.PaySyncStatus; -import cn.bootx.payment.core.pay.builder.PayEventBuilder; -import cn.bootx.payment.core.pay.builder.PaymentBuilder; -import cn.bootx.payment.core.pay.factory.PayStrategyFactory; -import cn.bootx.payment.core.pay.func.AbsPayStrategy; -import cn.bootx.payment.core.pay.result.PaySyncResult; -import cn.bootx.payment.core.payment.entity.Payment; -import cn.bootx.payment.core.payment.service.PaymentService; -import cn.bootx.payment.exception.payment.PayFailureException; -import cn.bootx.payment.exception.payment.PayUnsupportedMethodException; -import cn.bootx.payment.mq.PaymentEventSender; -import cn.bootx.payment.param.pay.PayModeParam; -import cn.bootx.payment.param.pay.PayParam; -import cn.bootx.payment.util.PayModelUtil; -import cn.hutool.core.collection.CollUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.time.LocalDateTime; -import java.util.List; -import java.util.Objects; - -import static cn.bootx.payment.code.pay.PayStatusCode.*; - -/** - * 未完成的异步支付单与支付网关进行对比 - * - * @author xxm - * @date 2021/4/21 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class PaySyncService { - - private final PaymentService paymentService; - - private final PaymentEventSender eventSender; - - /** - * 同步订单的支付状态 - */ - public void syncByPaymentId(Long id) { - Payment payment = paymentService.findById(id).orElse(null); - if (Objects.isNull(payment)) { - return; - } - this.syncPayment(payment); - } - - /** - * 同步订单的支付状态 - */ - public void syncByBusinessId(String businessId) { - Payment payment = paymentService.findByBusinessId(businessId).orElse(null); - if (Objects.isNull(payment)) { - return; - } - this.syncPayment(payment); - } - - /** - * 同步支付状态 传入 payment 对象 - */ - public void syncPayment(Payment payment) { - PayParam payParam = PaymentBuilder.buildPayParamByPayment(payment); - // 1.获取支付方式，通过工厂生成对应的策略组 - List paymentStrategyList = PayStrategyFactory.create(payParam.getPayModeList()); - if (CollUtil.isEmpty(paymentStrategyList)) { - throw new PayUnsupportedMethodException(); - } - - // 2.初始化支付的参数 - for (AbsPayStrategy paymentStrategy : paymentStrategyList) { - paymentStrategy.initPayParam(payment, payParam); - } - - // 3 拿到异步支付方法, 与支付网关进行同步 - PayModeParam asyncPayMode = PayModelUtil.getAsyncPayModeParam(payParam); - AbsPayStrategy syncPayStrategy = PayStrategyFactory.create(asyncPayMode); - syncPayStrategy.initPayParam(payment, payParam); - PaySyncResult paySyncResult = syncPayStrategy.doSyncPayStatusHandler(); - int paySyncStatus = paySyncResult.getPaySyncStatus(); - - switch (paySyncStatus) { - // 支付成功 支付宝退款时也是支付成功状态, 除非支付完成 - case PaySyncStatus.TRADE_SUCCESS: { - this.paymentSuccess(payment, syncPayStrategy, paySyncResult); - break; - } - // 待付款/ 支付中 - case PaySyncStatus.WAIT_BUYER_PAY: { - log.info("依然是付款状态"); - break; - } - // 订单已经关闭超时关闭 和 网关没找到记录, 支付宝退款完成也是这个状态 - case PaySyncStatus.TRADE_CLOSED: - case PaySyncStatus.NOT_FOUND: { - // 判断下是否超时, 同时payment 变更为取消支付 - this.paymentCancel(payment, paymentStrategyList); - break; - } - // 交易退款 支付宝没这个状态 - case PaySyncStatus.TRADE_REFUND: { - this.paymentRefund(payment, syncPayStrategy, paySyncResult); - break; - } - // 调用出错 - case PaySyncStatus.FAIL: { - // 不进行处理 - log.warn("支付状态同步接口调用出错"); - break; - } - case PaySyncStatus.NOT_SYNC: - default: { - throw new BizException("代码有问题"); - } - } - } - - /** - * payment 变更为已支付 - */ - private void paymentSuccess(Payment payment, AbsPayStrategy syncPayStrategy, PaySyncResult paySyncResult) { - - // 已支付不在重复处理 - if (Objects.equals(payment.getPayStatus(), TRADE_SUCCESS)) { - return; - } - // 退款的不处理 - if (Objects.equals(payment.getPayStatus(), TRADE_REFUNDED) - || Objects.equals(payment.getPayStatus(), TRADE_REFUNDING)) { - return; - } - // 修改payment支付状态为成功 - syncPayStrategy.doAsyncSuccessHandler(paySyncResult.getMap()); - payment.setPayStatus(TRADE_SUCCESS); - payment.setPayTime(LocalDateTime.now()); - paymentService.updateById(payment); - - // 发送成功事件 - eventSender.sendPayComplete(PayEventBuilder.buildPayComplete(payment)); - } - - /** - * payment 变更为取消支付 - */ - private void paymentCancel(Payment payment, List absPayStrategies) { - try { - // 已关闭的不再进行关闭 - if (Objects.equals(payment.getPayStatus(), TRADE_CANCEL)) { - return; - } - // 修改payment支付状态为取消, 退款状态则不进行更新 - if (Objects.equals(payment.getPayStatus(), TRADE_REFUNDED) - || Objects.equals(payment.getPayStatus(), TRADE_REFUNDING)) { - return; - } - payment.setPayStatus(TRADE_CANCEL); - // 执行策略的关闭方法 - absPayStrategies.forEach(AbsPayStrategy::doCloseHandler); - paymentService.updateById(payment); - // 发送事件 - eventSender.sendPayCancel(PayEventBuilder.buildPayCancel(payment)); - } - catch (Exception e) { - log.warn("支付状态同步后关闭支付单报错了", e); - throw new PayFailureException("支付状态同步后关闭支付单报错了"); - } - } - - /** - * payment 退款处理 TODO 需要考虑退款详情的合并处理 - */ - private void paymentRefund(Payment payment, AbsPayStrategy syncPayStrategy, PaySyncResult paySyncResult) { - - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/strategy/AliPayStrategy.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/strategy/AliPayStrategy.java deleted file mode 100644 index de7c92c95c933da8ceaa55a96583e174463089f2..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/strategy/AliPayStrategy.java +++ /dev/null @@ -1,230 +0,0 @@ -package cn.bootx.payment.core.pay.strategy; - -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.util.BigDecimalUtil; -import cn.bootx.payment.code.pay.PayChannelCode; -import cn.bootx.payment.code.pay.PayChannelEnum; -import cn.bootx.payment.code.paymodel.AliPayCode; -import cn.bootx.payment.core.pay.exception.ExceptionInfo; -import cn.bootx.payment.core.pay.func.AbsPayStrategy; -import cn.bootx.payment.core.pay.result.PaySyncResult; -import cn.bootx.payment.core.payment.service.PaymentService; -import cn.bootx.payment.core.paymodel.alipay.dao.AlipayConfigManager; -import cn.bootx.payment.core.paymodel.alipay.entity.AlipayConfig; -import cn.bootx.payment.core.paymodel.alipay.service.*; -import cn.bootx.payment.exception.payment.PayAmountAbnormalException; -import cn.bootx.payment.exception.payment.PayFailureException; -import cn.bootx.payment.param.pay.PayModeParam; -import cn.bootx.payment.param.paymodel.alipay.AliPayParam; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONException; -import cn.hutool.json.JSONUtil; -import com.ijpay.alipay.AliPayApiConfig; -import com.ijpay.alipay.AliPayApiConfigKit; -import lombok.RequiredArgsConstructor; -import lombok.SneakyThrows; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Component; - -import java.math.BigDecimal; -import java.util.Map; -import java.util.Objects; - -import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROTOTYPE; - -/** - * 支付宝支付 - * - * @author xxm - * @date 2021/2/27 - */ -@Scope(SCOPE_PROTOTYPE) -@Component -@RequiredArgsConstructor -public class AliPayStrategy extends AbsPayStrategy { - - private final AliPaymentService aliPaymentService; - - private final AlipaySyncService alipaySyncService; - - private final AliPayService aliPayService; - - private final AliPayCancelService aliPayCancelService; - - private final AlipayConfigManager alipayConfigManager; - - private final PaymentService paymentService; - - private AlipayConfig alipayConfig; - - private AliPayParam aliPayParam; - - @Override - public int getType() { - return PayChannelCode.ALI; - } - - /** - * 支付前操作 - */ - @Override - public void doBeforePayHandler() { - try { - // 支付宝参数验证 - String extraParamsJson = this.getPayMode().getExtraParamsJson(); - if (StrUtil.isNotBlank(extraParamsJson)) { - this.aliPayParam = JSONUtil.toBean(extraParamsJson, AliPayParam.class); - } - else { - this.aliPayParam = new AliPayParam(); - } - } - catch (JSONException e) { - throw new PayFailureException("支付参数错误"); - } - // 检查金额 - PayModeParam payMode = this.getPayMode(); - if (BigDecimalUtil.compareTo(payMode.getAmount(), BigDecimal.ZERO) < 1) { - throw new PayAmountAbnormalException(); - } - // 检查并获取支付宝支付配置 - this.initAlipayConfig(); - aliPayService.validation(this.getPayMode(), alipayConfig); - // 如果没有显式传入同步回调地址, 使用默认配置 - if (StrUtil.isBlank(aliPayParam.getReturnUrl())) { - aliPayParam.setReturnUrl(alipayConfig.getReturnUrl()); - } - this.initAlipayConfig(); - } - - /** - * 发起支付操作 - */ - @Override - public void doPayHandler() { - aliPayService.pay(this.getPayMode().getAmount(), this.getPayment(), this.aliPayParam, this.getPayMode(), - this.alipayConfig); - } - - /** - * 支付调起成功 - */ - @Override - public void doSuccessHandler() { - aliPaymentService.updatePaySuccess(this.getPayment(), this.getPayMode()); - } - - /** - * 发起支付失败 - */ - @Override - public void doErrorHandler(ExceptionInfo exceptionInfo) { - this.doCloseHandler(); - } - - /** - * 异步支付成功 - */ - @Override - public void doAsyncSuccessHandler(Map map) { - String tradeNo = map.get(AliPayCode.TRADE_NO); - aliPaymentService.updateAsyncSuccess(this.getPayment().getId(), this.getPayMode(), tradeNo); - } - - /** - * 异步支付失败 - */ - @Override - public void doAsyncErrorHandler(ExceptionInfo exceptionInfo) { - // 调用撤销支付 - this.doCancelHandler(); - } - - /** - * 撤销支付 - */ - @Override - public void doCancelHandler() { - this.initAlipayConfig(); - // 撤销支付 - aliPayCancelService.cancelRemote(this.getPayment()); - // 调用关闭本地支付记录 - this.doCloseHandler(); - } - - /** - * 关闭本地支付记录 - */ - @Override - public void doCloseHandler() { - aliPaymentService.updateClose(this.getPayment().getId()); - } - - /** - * 退款 - */ - @Override - public void doRefundHandler() { - this.initAlipayConfig(); - aliPayCancelService.refund(this.getPayment(), this.getPayMode().getAmount()); - aliPaymentService.updatePayRefund(this.getPayment().getId(), this.getPayMode().getAmount()); - paymentService.updateRefundSuccess(this.getPayment(), this.getPayMode().getAmount(), PayChannelEnum.ALI); - } - - /** - * 异步支付单与支付网关进行状态比对 - */ - @Override - public PaySyncResult doSyncPayStatusHandler() { - this.initAlipayConfig(); - return alipaySyncService.syncPayStatus(this.getPayment()); - } - - /** - * 初始化支付宝配置信息 - */ - private void initAlipayConfig() { - // 检查并获取支付宝支付配置 - this.alipayConfig = alipayConfigManager.findActivity().orElseThrow(() -> new PayFailureException("支付配置不存在")); - this.initApiConfig(this.alipayConfig); - } - - /** - * 初始化IJPay 服务 - */ - @SneakyThrows - private void initApiConfig(AlipayConfig alipayConfig) { - - AliPayApiConfig aliPayApiConfig; - // 公钥 - if (Objects.equals(alipayConfig.getAuthType(), AliPayCode.AUTH_TYPE_KEY)) { - aliPayApiConfig = AliPayApiConfig.builder() - .setAppId(alipayConfig.getAppId()) - .setPrivateKey(alipayConfig.getPrivateKey()) - .setAliPayPublicKey(alipayConfig.getAlipayPublicKey()) - .setCharset(CharsetUtil.UTF_8) - .setServiceUrl(alipayConfig.getServerUrl()) - .setSignType(alipayConfig.getSignType()) - .build(); - } - // 证书 - else if (Objects.equals(alipayConfig.getAuthType(), AliPayCode.AUTH_TYPE_CART)) { - aliPayApiConfig = AliPayApiConfig.builder() - .setAppId(alipayConfig.getAppId()) - .setPrivateKey(alipayConfig.getPrivateKey()) - .setAppCertContent(alipayConfig.getAppCert()) - .setAliPayCertContent(alipayConfig.getAlipayCert()) - .setAliPayRootCertContent(alipayConfig.getAlipayRootCert()) - .setCharset(CharsetUtil.UTF_8) - .setServiceUrl(alipayConfig.getServerUrl()) - .setSignType(alipayConfig.getSignType()) - .buildByCertContent(); - } - else { - throw new BizException("支付宝认证方式不可为空"); - } - AliPayApiConfigKit.setThreadLocalAliPayApiConfig(aliPayApiConfig); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/strategy/CashPayStrategy.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/strategy/CashPayStrategy.java deleted file mode 100644 index e19e9014a8fe58b3d6c92f9488356dfbb5ab7b71..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/strategy/CashPayStrategy.java +++ /dev/null @@ -1,81 +0,0 @@ -package cn.bootx.payment.core.pay.strategy; - -import cn.bootx.common.core.util.BigDecimalUtil; -import cn.bootx.payment.code.pay.PayChannelCode; -import cn.bootx.payment.code.pay.PayChannelEnum; -import cn.bootx.payment.core.pay.func.AbsPayStrategy; -import cn.bootx.payment.core.payment.service.PaymentService; -import cn.bootx.payment.core.paymodel.cash.service.CashService; -import cn.bootx.payment.exception.payment.PayAmountAbnormalException; -import cn.bootx.payment.param.pay.PayModeParam; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; - -import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROTOTYPE; - -/** - * 现金支付 - * - * @author xxm - * @date 2021/6/23 - */ -@Slf4j -@Scope(SCOPE_PROTOTYPE) -@Service -@RequiredArgsConstructor -public class CashPayStrategy extends AbsPayStrategy { - - private final CashService cashService; - - private final PaymentService paymentService; - - /** - * 现金支付 - */ - @Override - public int getType() { - return PayChannelCode.CASH; - } - - /** - * 支付前检查 - */ - @Override - public void doBeforePayHandler() { - // 检查金额 - PayModeParam payMode = this.getPayMode(); - if (BigDecimalUtil.compareTo(payMode.getAmount(), BigDecimal.ZERO) < 1) { - throw new PayAmountAbnormalException(); - } - } - - /** - * 支付操作 - */ - @Override - public void doPayHandler() { - cashService.pay(this.getPayMode(), this.getPayment(), this.getPayParam()); - } - - /** - * 关闭本地支付记录 - */ - @Override - public void doCloseHandler() { - cashService.close(this.getPayment().getId()); - } - - /** - * 退款 - */ - @Override - public void doRefundHandler() { - cashService.refund(this.getPayment().getId(), this.getPayMode().getAmount()); - paymentService.updateRefundSuccess(this.getPayment(), this.getPayMode().getAmount(), PayChannelEnum.CASH); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/strategy/UnionPayStrategy.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/strategy/UnionPayStrategy.java deleted file mode 100644 index ca61c0f215d38aaf21b516720f02db11cf308311..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/strategy/UnionPayStrategy.java +++ /dev/null @@ -1,50 +0,0 @@ -package cn.bootx.payment.core.pay.strategy; - -import cn.bootx.payment.code.pay.PayChannelCode; -import cn.bootx.payment.core.pay.exception.ExceptionInfo; -import cn.bootx.payment.core.pay.func.AbsPayStrategy; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Service; - -import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROTOTYPE; - -/** - * 云闪付 - * - * @author xxm - * @date 2022/3/8 - */ -@Slf4j -@Scope(SCOPE_PROTOTYPE) -@Service -@RequiredArgsConstructor -public class UnionPayStrategy extends AbsPayStrategy { - - @Override - public int getType() { - return PayChannelCode.UNION_PAY; - } - - @Override - public void doPayHandler() { - - } - - @Override - public void doErrorHandler(ExceptionInfo exceptionInfo) { - - } - - @Override - public void doCloseHandler() { - - } - - @Override - public void doRefundHandler() { - - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/strategy/VoucherStrategy.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/strategy/VoucherStrategy.java deleted file mode 100644 index 965f3e3960ea3d9d8802938c14793ce355102856..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/strategy/VoucherStrategy.java +++ /dev/null @@ -1,89 +0,0 @@ -package cn.bootx.payment.core.pay.strategy; - -import cn.bootx.payment.code.pay.PayChannelCode; -import cn.bootx.payment.code.pay.PayChannelEnum; -import cn.bootx.payment.core.pay.func.AbsPayStrategy; -import cn.bootx.payment.core.payment.service.PaymentService; -import cn.bootx.payment.core.paymodel.voucher.entity.Voucher; -import cn.bootx.payment.core.paymodel.voucher.service.VoucherPayService; -import cn.bootx.payment.core.paymodel.voucher.service.VoucherPaymentService; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Service; - -import java.util.List; - -import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROTOTYPE; - -/** - * 储值卡支付 - * - * @author xxm - * @date 2022/3/13 - */ -@Slf4j -@Scope(SCOPE_PROTOTYPE) -@Service -@RequiredArgsConstructor -public class VoucherStrategy extends AbsPayStrategy { - - private final VoucherPayService voucherPayService; - - private final VoucherPaymentService voucherPaymentService; - - private final PaymentService paymentService; - - private List vouchers; - - @Override - public int getType() { - return PayChannelCode.VOUCHER; - } - - /** - * 支付前处理 - */ - @Override - public void doBeforePayHandler() { - // 获取并校验余额 - this.vouchers = voucherPayService.getAndCheckVoucher(this.getPayMode()); - } - - /** - * 支付操作 - */ - @Override - public void doPayHandler() { - voucherPayService.pay(getPayMode().getAmount(), this.getPayment(), this.vouchers); - voucherPaymentService.savePayment(getPayment(), getPayParam(), getPayMode(), vouchers); - } - - /** - * 成功 - */ - @Override - public void doSuccessHandler() { - voucherPaymentService.updateSuccess(this.getPayment().getId()); - } - - /** - * 关闭支付 - */ - @Override - public void doCloseHandler() { - voucherPayService.close(this.getPayment().getId()); - voucherPaymentService.updateClose(this.getPayment().getId()); - } - - /** - * 退款 - */ - @Override - public void doRefundHandler() { - voucherPayService.refund(this.getPayment().getId(), this.getPayMode().getAmount()); - voucherPaymentService.updateRefund(this.getPayment().getId(), this.getPayMode().getAmount()); - paymentService.updateRefundSuccess(this.getPayment(), this.getPayMode().getAmount(), PayChannelEnum.VOUCHER); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/strategy/WalletPayStrategy.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/strategy/WalletPayStrategy.java deleted file mode 100644 index 3adf8a5f6aa5ab593ec07d6bf8b8aa8b6895e784..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/strategy/WalletPayStrategy.java +++ /dev/null @@ -1,96 +0,0 @@ -package cn.bootx.payment.core.pay.strategy; - -import cn.bootx.common.core.util.BigDecimalUtil; -import cn.bootx.payment.code.pay.PayChannelCode; -import cn.bootx.payment.code.pay.PayChannelEnum; -import cn.bootx.payment.core.pay.func.AbsPayStrategy; -import cn.bootx.payment.core.payment.service.PaymentService; -import cn.bootx.payment.core.paymodel.wallet.entity.Wallet; -import cn.bootx.payment.core.paymodel.wallet.service.WalletPayService; -import cn.bootx.payment.core.paymodel.wallet.service.WalletPaymentService; -import cn.bootx.payment.core.paymodel.wallet.service.WalletService; -import cn.bootx.payment.exception.waller.WalletLackOfBalanceException; -import cn.bootx.payment.param.pay.PayParam; -import lombok.RequiredArgsConstructor; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Component; - -import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROTOTYPE; - -/** - * 钱包支付策略 - * - * @author xxm - * @date 2020/12/11 - */ -@Scope(SCOPE_PROTOTYPE) -@Component -@RequiredArgsConstructor -public class WalletPayStrategy extends AbsPayStrategy { - - private final WalletPaymentService walletPaymentService; - - private final WalletPayService walletPayService; - - private final WalletService walletService; - - private final PaymentService paymentService; - - private Wallet wallet; - - @Override - public int getType() { - return PayChannelCode.WALLET; - } - - /** - * 支付前处理 - */ - @Override - public void doBeforePayHandler() { - PayParam payParam = this.getPayParam(); - // 获取并校验钱包 - this.wallet = walletService.getNormalWalletByUserId(payParam.getUserId()); - // 判断余额 - if (BigDecimalUtil.compareTo(this.wallet.getBalance(), getPayMode().getAmount()) < 0) { - throw new WalletLackOfBalanceException(); - } - } - - /** - * 支付操作 - */ - @Override - public void doPayHandler() { - walletPayService.pay(getPayMode().getAmount(), this.getPayment(), this.wallet); - walletPaymentService.savePayment(this.getPayment(), this.getPayParam(), this.getPayMode(), this.wallet); - } - - /** - * 成功 - */ - @Override - public void doSuccessHandler() { - walletPaymentService.updateSuccess(this.getPayment().getId()); - } - - /** - * 取消支付并返还金额 - */ - @Override - public void doCloseHandler() { - walletPayService.close(this.getPayment().getId()); - walletPaymentService.updateClose(this.getPayment().getId()); - } - - /** - * 退款 - */ - @Override - public void doRefundHandler() { - walletPayService.refund(this.getPayment().getId(), this.getPayMode().getAmount()); - walletPaymentService.updateRefund(this.getPayment().getId(), this.getPayMode().getAmount()); - paymentService.updateRefundSuccess(this.getPayment(), this.getPayMode().getAmount(), PayChannelEnum.WALLET); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/strategy/WeChatPayStrategy.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/strategy/WeChatPayStrategy.java deleted file mode 100644 index c2a82f08d433b3429e95914537f4ab1434f84f8e..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/pay/strategy/WeChatPayStrategy.java +++ /dev/null @@ -1,196 +0,0 @@ -package cn.bootx.payment.core.pay.strategy; - -import cn.bootx.common.core.util.BigDecimalUtil; -import cn.bootx.payment.code.pay.PayChannelCode; -import cn.bootx.payment.code.pay.PayChannelEnum; -import cn.bootx.payment.code.paymodel.WeChatPayCode; -import cn.bootx.payment.core.pay.exception.ExceptionInfo; -import cn.bootx.payment.core.pay.func.AbsPayStrategy; -import cn.bootx.payment.core.pay.result.PaySyncResult; -import cn.bootx.payment.core.payment.service.PaymentService; -import cn.bootx.payment.core.paymodel.wechat.dao.WeChatPayConfigManager; -import cn.bootx.payment.core.paymodel.wechat.dao.WeChatPaymentManager; -import cn.bootx.payment.core.paymodel.wechat.entity.WeChatPayConfig; -import cn.bootx.payment.core.paymodel.wechat.entity.WeChatPayment; -import cn.bootx.payment.core.paymodel.wechat.service.*; -import cn.bootx.payment.exception.payment.PayAmountAbnormalException; -import cn.bootx.payment.exception.payment.PayFailureException; -import cn.bootx.payment.param.pay.PayModeParam; -import cn.bootx.payment.param.paymodel.wechat.WeChatPayParam; -import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONException; -import cn.hutool.json.JSONUtil; -import lombok.RequiredArgsConstructor; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Component; - -import java.math.BigDecimal; -import java.util.Map; -import java.util.Optional; - -import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROTOTYPE; - -/** - * 微信支付 - * - * @author xxm - * @date 2021/4/5 - */ -@Scope(SCOPE_PROTOTYPE) -@Component -@RequiredArgsConstructor -public class WeChatPayStrategy extends AbsPayStrategy { - - private final WeChatPayConfigManager weChatPayConfigManager; - - private final WeChatPayService weChatPayService; - - private final WeChatPaymentService weChatPaymentService; - - private final WeChatPaymentManager weChatPaymentManager; - - private final WeChatPayCancelService weChatPayCancelService; - - private final WeChatPaySyncService weChatPaySyncService; - - private final PaymentService paymentService; - - private WeChatPayConfig weChatPayConfig; - - private WeChatPayParam weChatPayParam; - - /** - * 类型 - */ - @Override - public int getType() { - return PayChannelCode.WECHAT; - } - - /** - * 支付前操作 - */ - @Override - public void doBeforePayHandler() { - try { - // 微信参数验证 - String extraParamsJson = this.getPayMode().getExtraParamsJson(); - if (StrUtil.isNotBlank(extraParamsJson)) { - this.weChatPayParam = JSONUtil.toBean(extraParamsJson, WeChatPayParam.class); - } - else { - this.weChatPayParam = new WeChatPayParam(); - } - } - catch (JSONException e) { - throw new PayFailureException("支付参数错误"); - } - - // 检查金额 - PayModeParam payMode = this.getPayMode(); - if (BigDecimalUtil.compareTo(payMode.getAmount(), BigDecimal.ZERO) < 1) { - throw new PayAmountAbnormalException(); - } - - // 检查并获取微信支付配置 - this.initWeChatPayConfig(); - weChatPayService.validation(this.getPayMode(), weChatPayConfig); - } - - /** - * 发起支付 - */ - @Override - public void doPayHandler() { - weChatPayService.pay(this.getPayMode().getAmount(), this.getPayment(), this.weChatPayParam, this.getPayMode(), - this.weChatPayConfig); - } - - /** - * 支付调起成功 - */ - @Override - public void doSuccessHandler() { - weChatPaymentService.updatePaySuccess(this.getPayment(), this.getPayMode()); - } - - /** - * 错误处理 - */ - @Override - public void doErrorHandler(ExceptionInfo exceptionInfo) { - this.doCloseHandler(); - } - - /** - * 异步支付成功 - */ - @Override - public void doAsyncSuccessHandler(Map map) { - String tradeNo = map.get(WeChatPayCode.TRANSACTION_ID); - weChatPaymentService.updateAsyncSuccess(this.getPayment().getId(), this.getPayMode(), tradeNo); - } - - /** - * 异步支付失败 - */ - @Override - public void doAsyncErrorHandler(ExceptionInfo exceptionInfo) { - // 调用撤销支付 - this.doCancelHandler(); - } - - /** - * 撤销支付 - */ - @Override - public void doCancelHandler() { - // 检查并获取微信支付配置 - this.initWeChatPayConfig(); - weChatPayCancelService.cancelRemote(this.getPayment(), weChatPayConfig); - // 调用关闭本地支付记录 - this.doCloseHandler(); - } - - /** - * 关闭本地支付记录 - */ - @Override - public void doCloseHandler() { - weChatPaymentService.updateClose(this.getPayment().getId()); - } - - /** - * 退款 - */ - @Override - public void doRefundHandler() { - this.initWeChatPayConfig(); - WeChatPayment weChatPayment = weChatPaymentManager.findByPaymentId(this.getPayment().getId()) - .orElseThrow(() -> new PayFailureException("微信支付记录不存在")); - weChatPayCancelService.refund(this.getPayment(), weChatPayment, this.getPayMode().getAmount(), - this.weChatPayConfig); - weChatPaymentService.updatePayRefund(weChatPayment, this.getPayMode().getAmount()); - paymentService.updateRefundSuccess(this.getPayment(), this.getPayMode().getAmount(), PayChannelEnum.WECHAT); - } - - /** - * 异步支付单与支付网关进行状态比对 - */ - @Override - public PaySyncResult doSyncPayStatusHandler() { - // 检查并获取微信支付配置 - this.initWeChatPayConfig(); - return weChatPaySyncService.syncPayStatus(this.getPayment().getId(), this.weChatPayConfig); - } - - /** - * 初始化微信支付 - */ - private void initWeChatPayConfig() { - // 检查并获取微信支付配置 - this.weChatPayConfig = Optional.ofNullable(this.weChatPayConfig) - .orElse(weChatPayConfigManager.findActivity().orElseThrow(() -> new PayFailureException("支付配置不存在"))); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/payment/convert/PaymentConvert.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/payment/convert/PaymentConvert.java deleted file mode 100644 index 0c1f22af7eb51f0874b262f0eb848ce23f0b4511..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/payment/convert/PaymentConvert.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.bootx.payment.core.payment.convert; - -import cn.bootx.payment.core.payment.entity.Payment; -import cn.bootx.payment.dto.payment.PaymentDto; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -/** - * 支付记录转换 - * - * @author xxm - * @date 2021/8/20 - */ -@Mapper -public interface PaymentConvert { - - PaymentConvert CONVERT = Mappers.getMapper(PaymentConvert.class); - - PaymentDto convert(Payment payment); - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/payment/dao/PaymentExpiredTimeRepository.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/payment/dao/PaymentExpiredTimeRepository.java deleted file mode 100644 index ddd96ad3f6dcfdd69e20052375330f4924546ec2..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/payment/dao/PaymentExpiredTimeRepository.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.bootx.payment.core.payment.dao; - -import cn.bootx.common.core.util.LocalDateTimeUtil; -import cn.bootx.common.redis.RedisClient; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Repository; - -import java.time.LocalDateTime; -import java.util.Set; - -/** - * 支付单过去处理 - * - * @author xxm - * @date 2022/7/12 - */ -@Slf4j -@Repository -@RequiredArgsConstructor -public class PaymentExpiredTimeRepository { - - private static final String KEY = "pay:payment:expiredtime"; - - private final RedisClient redisClient; - - /** - * 根据 token 存储对应的 ExpiredTokenKey - */ - public void store(Long paymentId, LocalDateTime expiredTime) { - long time = LocalDateTimeUtil.timestamp(expiredTime); - redisClient.zadd(KEY, String.valueOf(paymentId), time); - } - - /** - * 获取所有已过期的ExpiredTokenKey - */ - public Set retrieveExpiredKeys(LocalDateTime expiredTime) { - long time = LocalDateTimeUtil.timestamp(expiredTime); - return redisClient.zrangeByScore(KEY, 0L, time); - } - - /** - * 删除指定的ExpiredTokenKey - */ - public void removeKeys(String... keys) { - if (keys != null && keys.length > 0) { - redisClient.zremByMembers(KEY, keys); - } - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/payment/dao/PaymentManager.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/payment/dao/PaymentManager.java deleted file mode 100644 index 4abd55b4439ac19f6c8070492dcb01846edfde58..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/payment/dao/PaymentManager.java +++ /dev/null @@ -1,84 +0,0 @@ -package cn.bootx.payment.core.payment.dao; - -import cn.bootx.common.core.rest.param.OrderParam; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.common.query.entity.QueryParams; -import cn.bootx.common.query.generator.QueryGenerator; -import cn.bootx.payment.core.payment.entity.Payment; -import cn.bootx.payment.param.payment.PaymentQuery; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import org.springframework.cache.annotation.CacheEvict; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.cache.annotation.Caching; -import org.springframework.stereotype.Repository; - -import java.io.Serializable; -import java.util.List; -import java.util.Objects; -import java.util.Optional; - -import static cn.bootx.payment.code.CachingCode.PAYMENT_BUSINESS_ID; -import static cn.bootx.payment.code.CachingCode.PAYMENT_ID; - -@Repository -@RequiredArgsConstructor -public class PaymentManager extends BaseManager { - - @Override - @Caching(evict = { @CacheEvict(value = PAYMENT_ID, key = "#payment.id"), - @CacheEvict(value = PAYMENT_BUSINESS_ID, key = "#payment.businessId") }) - public Payment updateById(Payment payment) { - return super.updateById(payment); - } - - @Override - @Cacheable(value = { PAYMENT_ID }, key = "#id") - public Optional findById(Serializable id) { - return super.findById(id); - } - - /** - * 根据BusinessId查询 - */ - @Cacheable(value = { PAYMENT_BUSINESS_ID }, key = "#businessId") - public Optional findByBusinessId(String businessId) { - return findByField(Payment::getBusinessId, businessId); - } - - /** - * 根据用户查询 - */ - public List findByUserId(Long userId) { - return this.findAllByField(Payment::getUserId, userId); - } - - /** - * 分页查询 - */ - public Page page(PageParam pageParam, PaymentQuery param, OrderParam orderParam) { - Page mpPage = MpUtil.getMpPage(pageParam, Payment.class); - return query().select(Payment.class, MpUtil::excludeBigField) - .orderBy(Objects.nonNull(orderParam.getSortField()), orderParam.isAsc(), - StrUtil.toUnderlineCase(orderParam.getSortField())) - .like(Objects.nonNull(param.getPaymentId()), MpUtil.getColumnName(Payment::getId), param.getPaymentId()) - .like(Objects.nonNull(param.getBusinessId()), MpUtil.getColumnName(Payment::getBusinessId), - param.getBusinessId()) - .like(Objects.nonNull(param.getTitle()), MpUtil.getColumnName(Payment::getTitle), param.getTitle()) - .page(mpPage); - } - - /** - * 分页查询 - */ - public Page superPage(PageParam pageParam, QueryParams queryParams) { - QueryWrapper wrapper = QueryGenerator.generator(queryParams); - Page mpPage = MpUtil.getMpPage(pageParam, Payment.class); - return this.page(mpPage, wrapper); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/payment/dao/PaymentMapper.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/payment/dao/PaymentMapper.java deleted file mode 100644 index ed7e2800fcd12895978022ab0b75d7960a934498..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/payment/dao/PaymentMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.bootx.payment.core.payment.dao; - -import cn.bootx.payment.core.payment.entity.Payment; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * 支付记录 - * - * @author xxm - * @date 2021/7/27 - */ -@Mapper -public interface PaymentMapper extends BaseMapper { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/payment/entity/Payment.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/payment/entity/Payment.java deleted file mode 100644 index 9b227b5cdc0512260c4531470ef50d187f96e302..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/payment/entity/Payment.java +++ /dev/null @@ -1,102 +0,0 @@ -package cn.bootx.payment.core.payment.entity; - -import cn.bootx.common.core.annotation.BigField; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.common.mybatisplus.handler.JacksonRawTypeHandler; -import cn.bootx.payment.code.pay.PayStatusCode; -import cn.bootx.payment.core.payment.convert.PaymentConvert; -import cn.bootx.payment.dto.payment.PayChannelInfo; -import cn.bootx.payment.dto.payment.PaymentDto; -import cn.bootx.payment.dto.payment.RefundableInfo; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import lombok.experimental.FieldNameConstants; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.List; - -/** - * 支付记录 - * - * @author xxm - * @date 2020/12/8 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@FieldNameConstants -@Accessors(chain = true) -@TableName(value = "pay_payment", autoResultMap = true) -public class Payment extends MpBaseEntity implements EntityBaseFunction { - - /** 关联的业务id */ - private String businessId; - - /** 用户ID */ - private Long userId; - - /** 标题 */ - private String title; - - /** 描述 */ - private String description; - - /** 是否是异步支付 */ - private boolean asyncPayMode; - - /** 异步支付通道 */ - private Integer asyncPayChannel; - - /** 金额 */ - private BigDecimal amount; - - /** 可退款余额 */ - private BigDecimal refundableBalance; - - /** 错误码 */ - private String errorCode; - - /** 错误信息 */ - private String errorMsg; - - /** - * 支付通道信息列表 - * @see PayChannelInfo - */ - @TableField(typeHandler = JacksonRawTypeHandler.class) - @BigField - private List payChannelInfo; - - /** - * 退款信息列表 - * @see cn.bootx.payment.dto.payment.RefundableInfo - */ - @TableField(typeHandler = JacksonRawTypeHandler.class) - @BigField - private List refundableInfo; - - /** - * 支付状态 - * @see PayStatusCode#TRADE_PROGRESS - */ - private Integer payStatus; - - /** 支付时间 */ - private LocalDateTime payTime; - - /** 支付终端ip */ - private String clientIp; - - /** 过期时间 */ - private LocalDateTime expiredTime; - - @Override - public PaymentDto toDto() { - return PaymentConvert.CONVERT.convert(this); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/payment/service/PaymentQueryService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/payment/service/PaymentQueryService.java deleted file mode 100644 index 987d31f82b5fc294d418854837e0d47db8eb1c22..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/payment/service/PaymentQueryService.java +++ /dev/null @@ -1,84 +0,0 @@ -package cn.bootx.payment.core.payment.service; - -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.OrderParam; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.common.query.entity.QueryParams; -import cn.bootx.payment.core.payment.dao.PaymentManager; -import cn.bootx.payment.core.payment.entity.Payment; -import cn.bootx.payment.dto.payment.PayChannelInfo; -import cn.bootx.payment.dto.payment.PaymentDto; -import cn.bootx.payment.param.payment.PaymentQuery; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -/** - * 支付单查询 - * - * @author xxm - * @date 2021/6/28 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class PaymentQueryService { - - private final PaymentManager paymentManager; - - /** - * 根据支付Id查询支付单 - */ - public PaymentDto findById(Long id) { - return paymentManager.findById(id).map(Payment::toDto).orElseThrow(DataNotExistException::new); - } - - /** - * 根据业务ID获取支付状态 - */ - public Integer findStatusByBusinessId(String businessId) { - return paymentManager.findByBusinessId(businessId).map(Payment::getPayStatus).orElse(-1); - } - - /** - * 根据businessId获取订单支付方式 - */ - public List findPayTypeInfoByBusinessId(String businessId) { - return paymentManager.findByBusinessId(businessId).map(Payment::getPayChannelInfo).orElse(new ArrayList<>(1)); - } - - /** - * 根据id获取订单支付方式 - */ - public List findPayTypeInfoById(Long id) { - return paymentManager.findById(id).map(Payment::getPayChannelInfo).orElse(new ArrayList<>(1)); - } - - /** - * 根据用户id查询 - */ - public List findByUser(Long userId) { - return paymentManager.findByUserId(userId).stream().map(Payment::toDto).collect(Collectors.toList()); - } - - /** - * 分页 - */ - public PageResult page(PageParam pageParam, PaymentQuery param, OrderParam orderParam) { - return MpUtil.convert2DtoPageResult(paymentManager.page(pageParam, param, orderParam)); - } - - /** - * 超级查询 - */ - public PageResult superPage(PageParam pageParam, QueryParams queryParams) { - return MpUtil.convert2DtoPageResult(paymentManager.superPage(pageParam, queryParams)); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/payment/service/PaymentService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/payment/service/PaymentService.java deleted file mode 100644 index 7dd01860289c098f39cb15b0a2805122975e6b31..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/payment/service/PaymentService.java +++ /dev/null @@ -1,110 +0,0 @@ -package cn.bootx.payment.core.payment.service; - -import cn.bootx.common.core.util.LocalDateTimeUtil; -import cn.bootx.common.spring.exception.RetryableException; -import cn.bootx.payment.code.pay.PayChannelEnum; -import cn.bootx.payment.core.payment.dao.PaymentExpiredTimeRepository; -import cn.bootx.payment.core.payment.dao.PaymentManager; -import cn.bootx.payment.core.payment.entity.Payment; -import cn.bootx.payment.dto.payment.RefundableInfo; -import cn.bootx.payment.exception.payment.PayFailureException; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.retry.annotation.Retryable; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.time.temporal.ChronoUnit; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; -import java.util.Optional; - -import static cn.bootx.payment.code.pay.PayStatusCode.*; - -/** - * 支付记录 - * - * @author xxm - * @date 2021/3/8 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class PaymentService { - - private final PaymentManager paymentManager; - - private final PaymentExpiredTimeRepository expiredTimeRepository; - - /** - * 保存 - */ - public Payment save(Payment payment) { - return paymentManager.save(payment); - } - - /** - * 更新支付记录 - */ - public Payment updateById(Payment payment) { - // 超时注册 - this.registerExpiredTime(payment); - return paymentManager.updateById(payment); - } - - /** - * 根据id查询 - */ - public Optional findById(Serializable id) { - return paymentManager.findById(id); - } - - /** - * 根据BusinessId查询 - */ - public Optional findByBusinessId(String businessId) { - return paymentManager.findByBusinessId(businessId); - } - - /** - * 退款成功处理, 更新可退款信息 不进行持久化 - */ - public void updateRefundSuccess(Payment payment, BigDecimal amount, PayChannelEnum payChannelEnum) { - // 删除旧有的退款记录, 替换退款完的新的 - List refundableInfos = payment.getRefundableInfo(); - RefundableInfo refundableInfo = refundableInfos.stream() - .filter(o -> o.getPayChannel() == payChannelEnum.getNo()) - .findFirst() - .orElseThrow(() -> new PayFailureException("数据不存在")); - refundableInfos.remove(refundableInfo); - refundableInfo.setAmount(refundableInfo.getAmount().subtract(amount)); - refundableInfos.add(refundableInfo); - payment.setRefundableInfo(refundableInfos); - } - - /** - * 支付单超时关闭事件注册, 失败重试3次, 间隔一秒 - */ - @Async("bigExecutor") - @Retryable(value = RetryableException.class) - public void registerExpiredTime(Payment payment) { - LocalDateTime expiredTime = payment.getExpiredTime(); - // 支付中且有超时时间才会注册超时关闭时间 - if (Objects.equals(payment.getPayStatus(), TRADE_PROGRESS) && Objects.nonNull(expiredTime)) { - try { - // 将过期时间添加到redis中, 往后延时一分钟 - expiredTime = LocalDateTimeUtil.offset(expiredTime, 1, ChronoUnit.MINUTES); - expiredTimeRepository.store(payment.getId(), expiredTime); - } - catch (Exception e) { - log.error("注册支付单超时关闭失败"); - throw new RetryableException(); - } - } - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/convert/AlipayConvert.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/convert/AlipayConvert.java deleted file mode 100644 index 634cdbfe9d734d276f4fae0e06a31e69e83bb321..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/convert/AlipayConvert.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.bootx.payment.core.paymodel.alipay.convert; - -import cn.bootx.payment.core.paymodel.alipay.entity.AlipayConfig; -import cn.bootx.payment.dto.paymodel.alipay.AlipayConfigDto; -import cn.bootx.payment.param.paymodel.alipay.AlipayConfigParam; -import org.mapstruct.Mapper; -import org.mapstruct.Mappings; -import org.mapstruct.factory.Mappers; - -/** - * 支付宝转换 - * - * @author xxm - * @date 2021/7/5 - */ -@Mapper -public interface AlipayConvert { - - AlipayConvert CONVERT = Mappers.getMapper(AlipayConvert.class); - - AlipayConfig convert(AlipayConfigDto in); - - AlipayConfig convert(AlipayConfigParam in); - - AlipayConfigDto convert(AlipayConfig in); - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/dao/AliPaymentManager.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/dao/AliPaymentManager.java deleted file mode 100644 index b95f5def721f2029131235ca0c20bbb297a06aa3..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/dao/AliPaymentManager.java +++ /dev/null @@ -1,25 +0,0 @@ -package cn.bootx.payment.core.paymodel.alipay.dao; - -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.payment.core.paymodel.alipay.entity.AliPayment; -import cn.bootx.payment.core.paymodel.base.entity.BasePayment; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -/** - * 支付宝 - * - * @author xxm - * @date 2021/2/26 - */ -@Repository -@RequiredArgsConstructor -public class AliPaymentManager extends BaseManager { - - public Optional findByPaymentId(Long paymentId) { - return this.findByField(BasePayment::getPaymentId, paymentId); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/dao/AliPaymentMapper.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/dao/AliPaymentMapper.java deleted file mode 100644 index d2c22b3c49944c12642011b76e93250fa480efe0..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/dao/AliPaymentMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.bootx.payment.core.paymodel.alipay.dao; - -import cn.bootx.payment.core.paymodel.alipay.entity.AliPayment; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * 支付宝支付 - * - * @author xxm - * @date 2021/2/26 - */ -@Mapper -public interface AliPaymentMapper extends BaseMapper { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/dao/AlipayConfigManager.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/dao/AlipayConfigManager.java deleted file mode 100644 index 71d4b986c623cfc2534b680c9ad3af2cb467f028..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/dao/AlipayConfigManager.java +++ /dev/null @@ -1,78 +0,0 @@ -package cn.bootx.payment.core.paymodel.alipay.dao; - -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.payment.core.paymodel.alipay.entity.AlipayConfig; -import cn.bootx.payment.param.paymodel.alipay.AlipayConfigQuery; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; - -import java.util.Objects; -import java.util.Optional; - -/** - * 支付宝配置 - * - * @author xxm - * @date 2021/2/26 - */ -@Repository -@RequiredArgsConstructor -public class AlipayConfigManager extends BaseManager { - - private Optional alipayConfig; - - @Override - public AlipayConfig saveOrUpdate(AlipayConfig entity) { - this.clearCache(); - return super.saveOrUpdate(entity); - } - - @Override - public AlipayConfig updateById(AlipayConfig alipayConfig) { - this.clearCache(); - return super.updateById(alipayConfig); - } - - /** - * 获取启用的支付宝配置 - */ - public Optional findActivity() { - if (Objects.isNull(alipayConfig)) { - alipayConfig = findByField(AlipayConfig::getActivity, Boolean.TRUE); - } - return alipayConfig; - } - - /** - * 分页 - */ - public Page page(PageParam pageParam, AlipayConfigQuery param) { - Page mpPage = MpUtil.getMpPage(pageParam, AlipayConfig.class); - return lambdaQuery().select(AlipayConfig.class, MpUtil::excludeBigField) - .like(StrUtil.isNotBlank(param.getName()), AlipayConfig::getName, param.getName()) - .like(StrUtil.isNotBlank(param.getAppId()), AlipayConfig::getAppId, param.getAppId()) - .page(mpPage); - } - - /** - * 清除所有启用的支付配置 - */ - public void removeAllActivity() { - this.clearCache(); - lambdaUpdate().eq(AlipayConfig::getActivity, Boolean.TRUE) - .set(AlipayConfig::getActivity, Boolean.FALSE) - .update(); - } - - /** - * 清除缓存 - */ - public void clearCache() { - alipayConfig = null; - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/dao/AlipayConfigMapper.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/dao/AlipayConfigMapper.java deleted file mode 100644 index 46fe417c0074a8c5f36c405a3336d66aec98baac..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/dao/AlipayConfigMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package cn.bootx.payment.core.paymodel.alipay.dao; - -import cn.bootx.payment.core.paymodel.alipay.entity.AlipayConfig; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface AlipayConfigMapper extends BaseMapper { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/entity/AliPayment.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/entity/AliPayment.java deleted file mode 100644 index 097046bdf0618e50f33fbb5924236f394ea54606..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/entity/AliPayment.java +++ /dev/null @@ -1,34 +0,0 @@ -package cn.bootx.payment.core.paymodel.alipay.entity; - -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.payment.core.paymodel.base.entity.BasePayment; -import cn.bootx.payment.dto.paymodel.alipay.AliPaymentDto; -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 支付宝支付记录 - * - * @author xxm - * @date 2021/2/26 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@TableName("pay_ali_payment") -public class AliPayment extends BasePayment implements EntityBaseFunction { - - /** 支付宝交易号 */ - private String tradeNo; - - @Override - public AliPaymentDto toDto() { - AliPaymentDto dto = new AliPaymentDto(); - BeanUtil.copyProperties(this, dto); - return dto; - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/entity/AlipayConfig.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/entity/AlipayConfig.java deleted file mode 100644 index e37c593edbf189e1d9728003623377c02925cac8..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/entity/AlipayConfig.java +++ /dev/null @@ -1,114 +0,0 @@ -package cn.bootx.payment.core.paymodel.alipay.entity; - -import cn.bootx.common.core.annotation.BigField; -import cn.bootx.common.core.annotation.EncryptionField; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.payment.core.paymodel.alipay.convert.AlipayConvert; -import cn.bootx.payment.dto.paymodel.alipay.AlipayConfigDto; -import cn.bootx.payment.param.paymodel.alipay.AlipayConfigParam; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 支付宝支付配置 - * - * @author xxm - * @date 2020/12/15 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@TableName("pay_alipay_config") -public class AlipayConfig extends MpBaseEntity implements EntityBaseFunction { - - /** 名称 */ - private String name; - - /** 支付宝商户appId */ - private String appId; - - /** 服务器异步通知页面路径 需http://或者https://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问 */ - private String notifyUrl; - - /** - * 页面跳转同步通知页面路径 需http://或者https://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问 商户可以自定义同步跳转地址 - */ - private String returnUrl; - - /** 请求网关地址 */ - private String serverUrl; - - /** 认证类型 证书/公钥 */ - private Integer authType; - - /** 签名类型 */ - public String signType; - - /** 支付宝公钥 */ - @BigField - public String alipayPublicKey; - - /** 私钥 */ - @BigField - @EncryptionField - private String privateKey; - - /** 应用公钥证书 */ - @BigField - @EncryptionField - private String appCert; - - /** 支付宝公钥证书 */ - @BigField - @EncryptionField - private String alipayCert; - - /** 支付宝CA根证书 */ - @BigField - @EncryptionField - private String alipayRootCert; - - /** 是否沙箱环境 */ - private boolean sandbox; - - /** 超时配置 */ - private Integer expireTime; - - /** 可用支付方式 */ - @TableField(updateStrategy = FieldStrategy.IGNORED) - private String payWays; - - /** 是否启用 */ - private Boolean activity; - - /** 状态 暂时没什么用 */ - private Integer state; - - /** 备注 */ - private String remark; - - @Override - public AlipayConfigDto toDto() { - AlipayConfigDto convert = AlipayConvert.CONVERT.convert(this); - if (StrUtil.isNotBlank(this.getPayWays())) { - convert.setPayWayList(StrUtil.split(this.getPayWays(), ',')); - } - return convert; - } - - public static AlipayConfig init(AlipayConfigParam in) { - AlipayConfig convert = AlipayConvert.CONVERT.convert(in); - if (CollUtil.isNotEmpty(in.getPayWayList())) { - convert.setPayWays(String.join(",", in.getPayWayList())); - } - return convert; - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/service/AliPayCallbackService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/service/AliPayCallbackService.java deleted file mode 100644 index 7929c25f8e187d787e2ee82cffc27858e51ad95c..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/service/AliPayCallbackService.java +++ /dev/null @@ -1,103 +0,0 @@ -package cn.bootx.payment.core.paymodel.alipay.service; - -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.util.CertUtil; -import cn.bootx.common.redis.RedisClient; -import cn.bootx.payment.code.pay.PayChannelCode; -import cn.bootx.payment.code.pay.PayStatusCode; -import cn.bootx.payment.code.paymodel.AliPayCode; -import cn.bootx.payment.core.notify.dao.PayNotifyRecordManager; -import cn.bootx.payment.core.pay.func.AbsPayCallbackStrategy; -import cn.bootx.payment.core.pay.service.PayCallbackService; -import cn.bootx.payment.core.paymodel.alipay.dao.AlipayConfigManager; -import cn.bootx.payment.core.paymodel.alipay.entity.AlipayConfig; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; -import com.alipay.api.AlipayApiException; -import com.alipay.api.AlipayConstants; -import com.alipay.api.internal.util.AlipaySignature; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.Map; -import java.util.Objects; - -/** - * 支付宝回调处理 - * - * @author xxm - * @date 2021/2/28 - */ -@Slf4j -@Service -public class AliPayCallbackService extends AbsPayCallbackStrategy { - - private final AlipayConfigManager alipayConfigManager; - - public AliPayCallbackService(RedisClient redisClient, PayNotifyRecordManager payNotifyRecordManager, - PayCallbackService payCallbackService, AlipayConfigManager alipayConfigManager) { - super(redisClient, payNotifyRecordManager, payCallbackService); - this.alipayConfigManager = alipayConfigManager; - } - - @Override - public int getPayChannel() { - return PayChannelCode.ALI; - } - - @Override - public int getTradeStatus() { - Map params = PARAMS.get(); - String tradeStatus = params.get(AliPayCode.TRADE_STATUS); - if (Objects.equals(tradeStatus, AliPayCode.NOTIFY_TRADE_SUCCESS)) { - return PayStatusCode.NOTIFY_TRADE_SUCCESS; - } - return PayStatusCode.NOTIFY_TRADE_FAIL; - } - - @SneakyThrows - @Override - public boolean verifyNotify() { - Map params = PARAMS.get(); - String callReq = JSONUtil.toJsonStr(params); - String appId = params.get(AliPayCode.APP_ID); - if (StrUtil.isBlank(appId)) { - log.error("支付宝回调报文 appId 为空 {}", callReq); - return false; - } - AlipayConfig alipayConfig = alipayConfigManager.findActivity().orElseThrow(DataNotExistException::new); - if (alipayConfig == null) { - log.error("支付宝支付配置不存在: {}", callReq); - return false; - } - - try { - if (Objects.equals(alipayConfig.getAuthType(), AliPayCode.AUTH_TYPE_KEY)) { - return AlipaySignature.rsaCheckV1(params, alipayConfig.getAlipayPublicKey(), CharsetUtil.UTF_8, - AlipayConstants.SIGN_TYPE_RSA2); - } - else { - return AlipaySignature.verifyV1(params, CertUtil.getCertByContent(alipayConfig.getAlipayCert()), - CharsetUtil.UTF_8, AlipayConstants.SIGN_TYPE_RSA2); - } - } - catch (AlipayApiException e) { - log.error("支付宝验签失败", e); - return false; - } - } - - @Override - public Long getPaymentId() { - Map params = PARAMS.get(); - return Long.valueOf(params.get(AliPayCode.OUT_TRADE_NO)); - } - - @Override - public String getReturnMsg() { - return "success"; - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/service/AliPayCancelService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/service/AliPayCancelService.java deleted file mode 100644 index 06a4d813fb2399d11e8fb0ca39acb0c268d02a86..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/service/AliPayCancelService.java +++ /dev/null @@ -1,84 +0,0 @@ -package cn.bootx.payment.core.paymodel.alipay.service; - -import cn.bootx.common.spring.exception.RetryableException; -import cn.bootx.payment.code.paymodel.AliPayCode; -import cn.bootx.payment.core.pay.local.AsyncRefundLocal; -import cn.bootx.payment.core.payment.entity.Payment; -import cn.bootx.payment.exception.payment.PayFailureException; -import cn.hutool.core.util.IdUtil; -import com.alipay.api.AlipayApiException; -import com.alipay.api.domain.AlipayTradeCancelModel; -import com.alipay.api.domain.AlipayTradeRefundModel; -import com.alipay.api.response.AlipayTradeCancelResponse; -import com.alipay.api.response.AlipayTradeRefundResponse; -import com.ijpay.alipay.AliPayApi; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.retry.annotation.Retryable; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.util.Objects; - -/** - * 支付宝支付取消和退款 - * - * @author xxm - * @date 2021/4/20 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class AliPayCancelService { - - /** - * 关闭支付 - */ - @Retryable(value = RetryableException.class) - public void cancelRemote(Payment payment) { - // 只有部分需要调用支付宝网关进行关闭 - AlipayTradeCancelModel model = new AlipayTradeCancelModel(); - model.setOutTradeNo(String.valueOf(payment.getId())); - - try { - AlipayTradeCancelResponse response = AliPayApi.tradeCancelToResponse(model); - if (!Objects.equals(AliPayCode.SUCCESS, response.getCode())) { - log.error("网关返回撤销失败: {}", response.getSubMsg()); - throw new PayFailureException(response.getSubMsg()); - } - } - catch (AlipayApiException e) { - log.error("关闭订单失败:", e); - throw new PayFailureException("关闭订单失败"); - } - } - - /** - * 退款 - */ - public void refund(Payment payment, BigDecimal amount) { - AlipayTradeRefundModel refundModel = new AlipayTradeRefundModel(); - refundModel.setOutTradeNo(String.valueOf(payment.getId())); - refundModel.setRefundAmount(amount.toPlainString()); - - // 设置退款号 - AsyncRefundLocal.set(IdUtil.getSnowflakeNextIdStr()); - refundModel.setOutRequestNo(AsyncRefundLocal.get()); - try { - AlipayTradeRefundResponse response = AliPayApi.tradeRefundToResponse(refundModel); - if (!Objects.equals(AliPayCode.SUCCESS, response.getCode())) { - AsyncRefundLocal.setErrorMsg(response.getSubMsg()); - AsyncRefundLocal.setErrorCode(response.getCode()); - log.error("网关返回退款失败: {}", response.getSubMsg()); - throw new PayFailureException(response.getSubMsg()); - } - } - catch (AlipayApiException e) { - log.error("订单退款失败:", e); - AsyncRefundLocal.setErrorMsg(e.getErrMsg()); - AsyncRefundLocal.setErrorCode(e.getErrCode()); - throw new PayFailureException("订单退款失败"); - } - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/service/AliPayService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/service/AliPayService.java deleted file mode 100644 index e644e8c569b9b524b0ac22df6c8a1fc3a42bd4a3..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/service/AliPayService.java +++ /dev/null @@ -1,261 +0,0 @@ -package cn.bootx.payment.core.paymodel.alipay.service; - -import cn.bootx.payment.code.pay.PayStatusCode; -import cn.bootx.payment.code.pay.PayWayCode; -import cn.bootx.payment.code.pay.PayWayEnum; -import cn.bootx.payment.code.paymodel.AliPayCode; -import cn.bootx.payment.code.paymodel.AliPayWay; -import cn.bootx.payment.core.pay.local.AsyncPayInfoLocal; -import cn.bootx.payment.core.payment.entity.Payment; -import cn.bootx.payment.core.paymodel.alipay.entity.AlipayConfig; -import cn.bootx.payment.dto.pay.AsyncPayInfo; -import cn.bootx.payment.exception.payment.PayFailureException; -import cn.bootx.payment.param.pay.PayModeParam; -import cn.bootx.payment.param.paymodel.alipay.AliPayParam; -import cn.bootx.payment.util.PayModelUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.Method; -import com.alipay.api.AlipayApiException; -import com.alipay.api.AlipayResponse; -import com.alipay.api.domain.*; -import com.alipay.api.request.AlipayTradePagePayRequest; -import com.alipay.api.request.AlipayTradeWapPayRequest; -import com.alipay.api.response.*; -import com.ijpay.alipay.AliPayApi; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.Optional; - -import static cn.bootx.payment.code.paymodel.AliPayCode.BAR_CODE; -import static cn.bootx.payment.code.paymodel.AliPayCode.QUICK_MSECURITY_PAY; - -/** - * 支付宝支付service - * - * @author xxm - * @date 2021/2/26 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class AliPayService { - - /** - * 支付前检查支付方式是否可用 - */ - public void validation(PayModeParam payModeParam, AlipayConfig alipayConfig) { - List payWays = Optional.ofNullable(alipayConfig.getPayWays()) - .filter(StrUtil::isNotBlank) - .map(s -> StrUtil.split(s, ',')) - .orElse(new ArrayList<>(1)); - // 发起的支付类型是否在支持的范围内 - PayWayEnum payWayEnum = Optional.ofNullable(AliPayWay.findByNo(payModeParam.getPayWay())) - .orElseThrow(() -> new PayFailureException("非法的支付宝支付类型")); - if (!payWays.contains(payWayEnum.getCode())) { - throw new PayFailureException("该支付宝支付方式不可用"); - } - } - - /** - * 调起支付 - */ - public void pay(BigDecimal amount, Payment payment, AliPayParam aliPayParam, PayModeParam payModeParam, - AlipayConfig alipayConfig) { - String payBody = null; - // 线程存储 - AsyncPayInfo asyncPayInfo = Optional.ofNullable(AsyncPayInfoLocal.get()).orElse(new AsyncPayInfo()); - // wap支付 - if (payModeParam.getPayWay() == PayWayCode.WAP) { - payBody = this.wapPay(amount, payment, alipayConfig, aliPayParam); - } - // 程序支付 - else if (payModeParam.getPayWay() == PayWayCode.APP) { - payBody = this.appPay(amount, payment, alipayConfig); - } - // pc支付 - else if (payModeParam.getPayWay() == PayWayCode.WEB) { - payBody = this.webPay(amount, payment, alipayConfig, aliPayParam); - } - // 二维码支付 - else if (payModeParam.getPayWay() == PayWayCode.QRCODE) { - payBody = this.qrCodePay(amount, payment, alipayConfig); - } - // 付款码支付 - else if (payModeParam.getPayWay() == PayWayCode.BARCODE) { - String tradeNo = this.barCode(amount, payment, aliPayParam, alipayConfig); - asyncPayInfo.setExpiredTime(false).setTradeNo(tradeNo); - } - // 通常是发起支付的参数 - asyncPayInfo.setPayBody(payBody); - AsyncPayInfoLocal.set(asyncPayInfo); - } - - /** - * wap支付 - */ - public String wapPay(BigDecimal amount, Payment payment, AlipayConfig alipayConfig, AliPayParam aliPayParam) { - - AlipayTradeWapPayModel model = new AlipayTradeWapPayModel(); - model.setSubject(payment.getTitle()); - model.setOutTradeNo(String.valueOf(payment.getId())); - model.setTotalAmount(amount.toPlainString()); - // 过期时间 - model.setTimeoutExpress(PayModelUtil.getAliExpiredTime(alipayConfig.getExpireTime())); - payment.setExpiredTime(PayModelUtil.getPaymentExpiredTime(alipayConfig.getExpireTime())); - model.setProductCode(AliPayCode.QUICK_WAP_PAY); - model.setQuitUrl(aliPayParam.getReturnUrl()); - - AlipayTradeWapPayRequest request = new AlipayTradeWapPayRequest(); - request.setBizModel(model); - request.setNotifyUrl(alipayConfig.getNotifyUrl()); - request.setReturnUrl(aliPayParam.getReturnUrl()); - - try { - // 通过GET方式的请求, 返回URL的响应, 默认是POST方式的请求, 返回的是表单响应 - AlipayTradeWapPayResponse response = AliPayApi.pageExecute(request, Method.GET.name()); - return response.getBody(); - } - catch (AlipayApiException e) { - log.error("支付宝手机支付失败", e); - throw new PayFailureException("支付宝手机支付失败"); - } - } - - /** - * app支付 - */ - public String appPay(BigDecimal amount, Payment payment, AlipayConfig alipayConfig) { - AlipayTradeAppPayModel model = new AlipayTradeAppPayModel(); - - model.setSubject(payment.getTitle()); - model.setProductCode(QUICK_MSECURITY_PAY); - model.setOutTradeNo(String.valueOf(payment.getId())); - // 过期时间 - model.setTimeoutExpress(PayModelUtil.getAliExpiredTime(alipayConfig.getExpireTime())); - payment.setExpiredTime(PayModelUtil.getPaymentExpiredTime(alipayConfig.getExpireTime())); - model.setTotalAmount(amount.toPlainString()); - - try { - AlipayTradeAppPayResponse response = AliPayApi.appPayToResponse(model, alipayConfig.getNotifyUrl()); - return response.getBody(); - } - catch (AlipayApiException e) { - log.error("支付宝APP支付失败", e); - throw new PayFailureException("支付宝APP支付失败"); - } - } - - /** - * PC支付 - */ - public String webPay(BigDecimal amount, Payment payment, AlipayConfig alipayConfig, AliPayParam aliPayParam) { - - AlipayTradePagePayModel model = new AlipayTradePagePayModel(); - - model.setSubject(payment.getTitle()); - model.setOutTradeNo(String.valueOf(payment.getId())); - // 过期时间 - model.setTimeoutExpress(PayModelUtil.getAliExpiredTime(alipayConfig.getExpireTime())); - payment.setExpiredTime(PayModelUtil.getPaymentExpiredTime(alipayConfig.getExpireTime())); - model.setTotalAmount(amount.toPlainString()); - // 目前仅支持FAST_INSTANT_TRADE_PAY - model.setProductCode(AliPayCode.FAST_INSTANT_TRADE_PAY); - - AlipayTradePagePayRequest request = new AlipayTradePagePayRequest(); - request.setBizModel(model); - request.setNotifyUrl(alipayConfig.getNotifyUrl()); - request.setReturnUrl(aliPayParam.getReturnUrl()); - try { - // 通过GET方式的请求, 返回URL的响应, 默认是POST方式的请求, 返回的是表单响应 - AlipayTradePagePayResponse response = AliPayApi.pageExecute(request, Method.GET.name()); - return response.getBody(); - } - catch (AlipayApiException e) { - log.error("支付宝PC支付失败", e); - throw new PayFailureException("支付宝PC支付失败"); - } - } - - /** - * 二维码支付(扫码支付) - */ - public String qrCodePay(BigDecimal amount, Payment payment, AlipayConfig alipayConfig) { - AlipayTradePrecreateModel model = new AlipayTradePrecreateModel(); - model.setSubject(payment.getTitle()); - model.setOutTradeNo(String.valueOf(payment.getId())); - model.setTotalAmount(amount.toPlainString()); - - // 过期时间 - model.setTimeoutExpress(PayModelUtil.getAliExpiredTime(alipayConfig.getExpireTime())); - payment.setExpiredTime(PayModelUtil.getPaymentExpiredTime(alipayConfig.getExpireTime())); - - try { - AlipayTradePrecreateResponse response = AliPayApi.tradePrecreatePayToResponse(model, - alipayConfig.getNotifyUrl()); - this.verifyErrorMsg(response); - return response.getQrCode(); - } - catch (AlipayApiException e) { - log.error("支付宝手机支付失败", e); - throw new PayFailureException("支付宝手机支付失败"); - } - } - - /** - * 付款码支付 - */ - public String barCode(BigDecimal amount, Payment payment, AliPayParam aliPayParam, AlipayConfig alipayConfig) { - AlipayTradePayModel model = new AlipayTradePayModel(); - - model.setSubject(payment.getTitle()); - model.setOutTradeNo(String.valueOf(payment.getId())); - model.setScene(BAR_CODE); - model.setAuthCode(aliPayParam.getAuthCode()); - - // 过期时间 - model.setTimeoutExpress(PayModelUtil.getAliExpiredTime(alipayConfig.getExpireTime())); - payment.setExpiredTime(PayModelUtil.getPaymentExpiredTime(alipayConfig.getExpireTime())); - model.setTotalAmount(amount.toPlainString()); - - try { - AlipayTradePayResponse response = AliPayApi.tradePayToResponse(model, alipayConfig.getNotifyUrl()); - - // 支付成功处理 金额2000以下免密支付 - if (Objects.equals(response.getCode(), AliPayCode.SUCCESS)) { - payment.setPayStatus(PayStatusCode.TRADE_SUCCESS).setPayTime(LocalDateTime.now()); - return response.getTradeNo(); - } - // 非支付中响应码, 进行错误处理 - if (!Objects.equals(response.getCode(), AliPayCode.INPROCESS)) { - this.verifyErrorMsg(response); - } - } - catch (AlipayApiException e) { - log.error("主动扫码支付失败", e); - throw new PayFailureException("主动扫码支付失败"); - } - return null; - } - - /** - * 验证错误信息 - */ - private void verifyErrorMsg(AlipayResponse alipayResponse) { - if (!Objects.equals(alipayResponse.getCode(), AliPayCode.SUCCESS)) { - String errorMsg = alipayResponse.getSubMsg(); - if (StrUtil.isBlank(errorMsg)) { - errorMsg = alipayResponse.getMsg(); - } - log.error("支付失败 {}", errorMsg); - throw new PayFailureException(errorMsg); - } - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/service/AliPaymentService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/service/AliPaymentService.java deleted file mode 100644 index 4a7dd658975c18129496978a7ea5073e878c0ad1..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/service/AliPaymentService.java +++ /dev/null @@ -1,122 +0,0 @@ -package cn.bootx.payment.core.paymodel.alipay.service; - -import cn.bootx.common.core.util.BigDecimalUtil; -import cn.bootx.payment.code.pay.PayChannelCode; -import cn.bootx.payment.code.pay.PayStatusCode; -import cn.bootx.payment.core.pay.local.AsyncPayInfoLocal; -import cn.bootx.payment.core.payment.dao.PaymentManager; -import cn.bootx.payment.core.payment.entity.Payment; -import cn.bootx.payment.core.paymodel.alipay.dao.AliPaymentManager; -import cn.bootx.payment.core.paymodel.alipay.entity.AliPayment; -import cn.bootx.payment.dto.pay.AsyncPayInfo; -import cn.bootx.payment.dto.payment.PayChannelInfo; -import cn.bootx.payment.dto.payment.RefundableInfo; -import cn.bootx.payment.exception.payment.PayFailureException; -import cn.bootx.payment.param.pay.PayModeParam; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Objects; -import java.util.Optional; - -/** - * 支付宝支付记录 - * - * @author xxm - * @date 2021/2/26 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class AliPaymentService { - - private final AliPaymentManager aliPaymentManager; - - private final PaymentManager paymentManager; - - /** - * 支付调起成功 更新 payment 中 异步支付类型信息 - */ - public void updatePaySuccess(Payment payment, PayModeParam payModeParam) { - AsyncPayInfo asyncPayInfo = AsyncPayInfoLocal.get(); - payment.setAsyncPayMode(true).setAsyncPayChannel(PayChannelCode.ALI); - List payTypeInfos = payment.getPayChannelInfo(); - List refundableInfos = payment.getRefundableInfo(); - // 清除已有的异步支付类型信息 - payTypeInfos.removeIf(payTypeInfo -> PayChannelCode.ASYNC_TYPE.contains(payTypeInfo.getPayChannel())); - refundableInfos.removeIf(payTypeInfo -> PayChannelCode.ASYNC_TYPE.contains(payTypeInfo.getPayChannel())); - // 更新支付宝支付类型信息 - payTypeInfos.add(new PayChannelInfo().setPayChannel(PayChannelCode.ALI) - .setPayWay(payModeParam.getPayWay()) - .setAmount(payModeParam.getAmount()) - .setExtraParamsJson(payModeParam.getExtraParamsJson())); - payment.setPayChannelInfo(payTypeInfos); - // 更新支付宝可退款类型信息 - refundableInfos.add(new RefundableInfo().setPayChannel(PayChannelCode.ALI).setAmount(payModeParam.getAmount())); - payment.setRefundableInfo(refundableInfos); - // 如果支付完成(付款码情况) 调用 updateSyncSuccess 创建支付宝支付记录 - if (Objects.equals(payment.getPayStatus(), PayStatusCode.TRADE_SUCCESS)) { - this.createAliPayment(payment, payModeParam, asyncPayInfo.getTradeNo()); - } - } - - /** - * 更新异步支付记录成功状态, 并创建支付宝支付记录 - */ - public void updateAsyncSuccess(Long id, PayModeParam payModeParam, String tradeNo) { - // 更新支付记录 - Payment payment = paymentManager.findById(id).orElseThrow(() -> new PayFailureException("支付记录不存在")); - - } - - /** - * 创建支付宝支付记录 - */ - private void createAliPayment(Payment payment, PayModeParam payModeParam, String tradeNo) { - // 创建支付宝支付记录 - AliPayment aliPayment = new AliPayment(); - aliPayment.setTradeNo(tradeNo) - .setPaymentId(payment.getId()) - .setAmount(payModeParam.getAmount()) - .setRefundableBalance(payModeParam.getAmount()) - .setBusinessId(payment.getBusinessId()) - .setUserId(payment.getUserId()) - .setPayStatus(PayStatusCode.TRADE_SUCCESS) - .setPayTime(LocalDateTime.now()); - aliPaymentManager.save(aliPayment); - } - - /** - * 取消状态 - */ - public void updateClose(Long paymentId) { - Optional aliPaymentOptional = aliPaymentManager.findByPaymentId(paymentId); - aliPaymentOptional.ifPresent(aliPayment -> { - aliPayment.setPayStatus(PayStatusCode.TRADE_CANCEL); - aliPaymentManager.updateById(aliPayment); - }); - } - - /** - * 更新退款 - */ - public void updatePayRefund(Long paymentId, BigDecimal amount) { - Optional aliPaymentOptional = aliPaymentManager.findByPaymentId(paymentId); - aliPaymentOptional.ifPresent(payment -> { - BigDecimal refundableBalance = payment.getRefundableBalance().subtract(amount); - payment.setRefundableBalance(refundableBalance); - if (BigDecimalUtil.compareTo(refundableBalance, BigDecimal.ZERO) == 0) { - payment.setPayStatus(PayStatusCode.TRADE_REFUNDED); - } - else { - payment.setPayStatus(PayStatusCode.TRADE_REFUNDING); - } - aliPaymentManager.updateById(payment); - }); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/service/AlipayConfigService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/service/AlipayConfigService.java deleted file mode 100644 index 78c6d83409167b5e031c984b180c3c3f9e7897ee..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/service/AlipayConfigService.java +++ /dev/null @@ -1,119 +0,0 @@ -package cn.bootx.payment.core.paymodel.alipay.service; - -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.dto.KeyValue; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.payment.code.paymodel.AliPayWay; -import cn.bootx.payment.core.paymodel.alipay.dao.AlipayConfigManager; -import cn.bootx.payment.core.paymodel.alipay.entity.AlipayConfig; -import cn.bootx.payment.dto.paymodel.alipay.AlipayConfigDto; -import cn.bootx.payment.exception.payment.PayFailureException; -import cn.bootx.payment.param.paymodel.alipay.AlipayConfigParam; -import cn.bootx.payment.param.paymodel.alipay.AlipayConfigQuery; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import cn.hutool.core.collection.CollUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -/** - * 支付宝支付 - * - * @author xxm - * @date 2020/12/15 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class AlipayConfigService { - - private final AlipayConfigManager alipayConfigManager; - - /** - * 添加支付宝配置 - */ - @Transactional(rollbackFor = Exception.class) - public void add(AlipayConfigParam param) { - AlipayConfig alipayConfig = AlipayConfig.init(param); - alipayConfig.setActivity(false).setState(1); - alipayConfigManager.save(alipayConfig); - } - - /** - * 设置启用的支付宝配置 - */ - @Transactional(rollbackFor = Exception.class) - public void setUpActivity(Long id) { - AlipayConfig alipayConfig = alipayConfigManager.findById(id).orElseThrow(DataNotExistException::new); - if (Objects.equals(alipayConfig.getActivity(), Boolean.TRUE)) { - return; - } - alipayConfigManager.removeAllActivity(); - alipayConfig.setActivity(true); - alipayConfigManager.updateById(alipayConfig); - } - - /** - * 清除启用状态 - */ - @Transactional(rollbackFor = Exception.class) - public void clearActivity(Long id) { - AlipayConfig alipayConfig = alipayConfigManager.findById(id) - .orElseThrow(() -> new PayFailureException("支付宝配置不存在")); - if (Objects.equals(alipayConfig.getActivity(), Boolean.FALSE)) { - return; - } - alipayConfig.setActivity(false); - alipayConfigManager.updateById(alipayConfig); - } - - /** - * 修改 - */ - @Transactional(rollbackFor = Exception.class) - public void update(AlipayConfigParam param) { - AlipayConfig alipayConfig = alipayConfigManager.findById(param.getId()).orElseThrow(DataNotExistException::new); - BeanUtil.copyProperties(param, alipayConfig, CopyOptions.create().ignoreNullValue()); - // 支付方式 - if (CollUtil.isNotEmpty(param.getPayWayList())) { - alipayConfig.setPayWays(String.join(",", param.getPayWayList())); - } - else { - alipayConfig.setPayWays(null); - } - alipayConfigManager.updateById(alipayConfig); - } - - /** - * 获取 - */ - public AlipayConfigDto findById(Long id) { - return alipayConfigManager.findById(id).map(AlipayConfig::toDto).orElseThrow(DataNotExistException::new); - } - - /** - * 分页 - */ - public PageResult page(PageParam pageParam, AlipayConfigQuery param) { - return MpUtil.convert2DtoPageResult(alipayConfigManager.page(pageParam, param)); - } - - /** - * 支付宝支持支付方式 - */ - public List findPayWayList() { - return AliPayWay.getPayWays() - .stream() - .map(e -> new KeyValue(e.getCode(), e.getName())) - .collect(Collectors.toList()); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/service/AlipaySyncService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/service/AlipaySyncService.java deleted file mode 100644 index f4ccccfacf866b0e7e07481f7dd1780cdf07ee27..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/alipay/service/AlipaySyncService.java +++ /dev/null @@ -1,72 +0,0 @@ -package cn.bootx.payment.core.paymodel.alipay.service; - -import cn.bootx.payment.code.pay.PaySyncStatus; -import cn.bootx.payment.code.paymodel.AliPayCode; -import cn.bootx.payment.core.pay.result.PaySyncResult; -import cn.bootx.payment.core.payment.entity.Payment; -import com.alipay.api.AlipayApiException; -import com.alipay.api.domain.AlipayTradeQueryModel; -import com.alipay.api.response.AlipayTradeQueryResponse; -import com.ijpay.alipay.AliPayApi; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.Objects; - -/** - * 支付宝同步 - * - * @author xxm - * @date 2021/5/17 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class AlipaySyncService { - - /** - * 与支付宝网关同步状态 1 远程支付成功 2 交易创建，等待买家付款 3 超时关闭 4 查询不到 5 查询失败 - */ - public PaySyncResult syncPayStatus(Payment payment) { - PaySyncResult paySyncResult = new PaySyncResult().setPaySyncStatus(PaySyncStatus.FAIL); - - // 查询 - try { - AlipayTradeQueryModel queryModel = new AlipayTradeQueryModel(); - queryModel.setOutTradeNo(String.valueOf(payment.getId())); - // 查询退款参数 - AlipayTradeQueryResponse response = AliPayApi.tradeQueryToResponse(queryModel); - String tradeStatus = response.getTradeStatus(); - - // 支付完成 - if (Objects.equals(tradeStatus, AliPayCode.PAYMENT_TRADE_SUCCESS) - || Objects.equals(tradeStatus, AliPayCode.PAYMENT_TRADE_FINISHED)) { - - HashMap map = new HashMap<>(1); - map.put(AliPayCode.TRADE_NO, response.getTradeNo()); - return paySyncResult.setPaySyncStatus(PaySyncStatus.TRADE_SUCCESS).setMap(map); - } - // 待支付 - if (Objects.equals(tradeStatus, AliPayCode.PAYMENT_WAIT_BUYER_PAY)) { - return paySyncResult.setPaySyncStatus(PaySyncStatus.WAIT_BUYER_PAY); - } - // 已关闭 - if (Objects.equals(tradeStatus, AliPayCode.PAYMENT_TRADE_CLOSED)) { - return paySyncResult.setPaySyncStatus(PaySyncStatus.TRADE_CLOSED); - } - // 未找到 - if (Objects.equals(response.getSubCode(), AliPayCode.ACQ_TRADE_NOT_EXIST)) { - return paySyncResult.setPaySyncStatus(PaySyncStatus.NOT_FOUND); - } - // 退款 支付宝查不到 - - } - catch (AlipayApiException e) { - log.error("查询订单失败:", e); - } - return paySyncResult; - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/base/entity/BasePayment.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/base/entity/BasePayment.java deleted file mode 100644 index ccfb15eac636452f5ee023877652413aadb38876..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/base/entity/BasePayment.java +++ /dev/null @@ -1,47 +0,0 @@ -package cn.bootx.payment.core.paymodel.base.entity; - -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.payment.code.pay.PayStatusCode; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - * 基础支付记录类 - * - * @author xxm - * @date 2021/2/25 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -public class BasePayment extends MpBaseEntity { - - /** 交易记录ID */ - private Long paymentId; - - /** 用户ID */ - private Long userId; - - /** 交易金额 */ - private BigDecimal amount; - - /** 可退款金额 */ - private BigDecimal refundableBalance; - - /** 关联的业务id */ - private String businessId; - - /** - * 支付状态 - * @see PayStatusCode - */ - private Integer payStatus; - - /** 支付时间 */ - private LocalDateTime payTime; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/cash/dao/CashPaymentManager.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/cash/dao/CashPaymentManager.java deleted file mode 100644 index 59903005c927271fc2afaad98ab2304adf7331f5..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/cash/dao/CashPaymentManager.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.bootx.payment.core.paymodel.cash.dao; - -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.payment.core.paymodel.cash.entity.CashPayment; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -/** - * 现金支付 - * - * @author xxm - * @date 2021/6/23 - */ -@Slf4j -@Repository -@RequiredArgsConstructor -public class CashPaymentManager extends BaseManager { - - public Optional findByPaymentId(Long paymentId) { - return findByField(CashPayment::getPaymentId, paymentId); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/cash/dao/CashPaymentMapper.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/cash/dao/CashPaymentMapper.java deleted file mode 100644 index 2a56fece83e1418d9b5c8bf166f1f0ba22b96410..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/cash/dao/CashPaymentMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.bootx.payment.core.paymodel.cash.dao; - -import cn.bootx.payment.core.paymodel.cash.entity.CashPayment; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * 现金支付 - * - * @author xxm - * @date 2021/6/23 - */ -@Mapper -public interface CashPaymentMapper extends BaseMapper { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/cash/entity/CashPayment.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/cash/entity/CashPayment.java deleted file mode 100644 index c21542ec3433f1733d1ef595977a23e0ee63e811..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/cash/entity/CashPayment.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.bootx.payment.core.paymodel.cash.entity; - -import cn.bootx.payment.core.paymodel.base.entity.BasePayment; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 现金支付记录 - * - * @author xxm - * @date 2021/6/23 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("pay_cash_payment") -@Accessors(chain = true) -public class CashPayment extends BasePayment { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/cash/service/CashService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/cash/service/CashService.java deleted file mode 100644 index 95861b1b02ae0afaef1505618e06bedbb9f06559..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/cash/service/CashService.java +++ /dev/null @@ -1,72 +0,0 @@ -package cn.bootx.payment.core.paymodel.cash.service; - -import cn.bootx.common.core.util.BigDecimalUtil; -import cn.bootx.payment.code.pay.PayStatusCode; -import cn.bootx.payment.core.payment.entity.Payment; -import cn.bootx.payment.core.paymodel.cash.dao.CashPaymentManager; -import cn.bootx.payment.core.paymodel.cash.entity.CashPayment; -import cn.bootx.payment.param.pay.PayModeParam; -import cn.bootx.payment.param.pay.PayParam; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.util.Optional; - -/** - * 现金支付 - * - * @author xxm - * @date 2021/6/23 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class CashService { - - private final CashPaymentManager cashPaymentManager; - - /** - * 支付 - */ - public void pay(PayModeParam payMode, Payment payment, PayParam payParam) { - CashPayment walletPayment = new CashPayment(); - walletPayment.setPaymentId(payment.getId()) - .setUserId(payment.getUserId()) - .setBusinessId(payParam.getBusinessId()) - .setAmount(payMode.getAmount()) - .setRefundableBalance(payMode.getAmount()) - .setPayStatus(payment.getPayStatus()); - cashPaymentManager.save(walletPayment); - } - - /** - * 关闭 - */ - public void close(Long paymentId) { - Optional cashPaymentOpt = cashPaymentManager.findByPaymentId(paymentId); - cashPaymentOpt.ifPresent(cashPayment -> { - cashPayment.setPayStatus(PayStatusCode.TRADE_CANCEL); - cashPaymentManager.updateById(cashPayment); - }); - } - - /** - * 退款 - */ - public void refund(Long paymentId, BigDecimal amount) { - Optional cashPayment = cashPaymentManager.findByPaymentId(paymentId); - cashPayment.ifPresent(payment -> { - BigDecimal refundableBalance = payment.getRefundableBalance().subtract(amount); - if (BigDecimalUtil.compareTo(refundableBalance, BigDecimal.ZERO) == 0) { - payment.setPayStatus(PayStatusCode.TRADE_REFUNDED); - } - else { - payment.setPayStatus(PayStatusCode.TRADE_REFUNDING); - } - cashPaymentManager.updateById(payment); - }); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/convert/UnionPayConvert.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/convert/UnionPayConvert.java deleted file mode 100644 index 408bf3ee2d25c1971601e75734a9aab749da9515..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/convert/UnionPayConvert.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.bootx.payment.core.paymodel.union.convert; - -import cn.bootx.payment.core.paymodel.union.entity.UnionPayConfig; -import cn.bootx.payment.dto.paymodel.union.UnionPayConfigDto; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -/** - * @author xxm - * @date 2022/3/11 - */ -@Mapper -public interface UnionPayConvert { - - UnionPayConvert CONVERT = Mappers.getMapper(UnionPayConvert.class); - - UnionPayConfigDto convert(UnionPayConfig in); - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/dao/UnionPayConfigManager.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/dao/UnionPayConfigManager.java deleted file mode 100644 index 52111a0283c7303f537c5fae0d362eaf58daf6ce..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/dao/UnionPayConfigManager.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bootx.payment.core.paymodel.union.dao; - -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.payment.core.paymodel.union.entity.UnionPayConfig; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Repository; - -/** - * @author xxm - * @date 2022/3/11 - */ -@Slf4j -@Repository -@RequiredArgsConstructor -public class UnionPayConfigManager extends BaseManager { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/dao/UnionPayConfigMapper.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/dao/UnionPayConfigMapper.java deleted file mode 100644 index 62a2984372dc9910f58bbfb412b41633c983110b..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/dao/UnionPayConfigMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.bootx.payment.core.paymodel.union.dao; - -import cn.bootx.payment.core.paymodel.union.entity.UnionPayConfig; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author xxm - * @date 2022/3/11 - */ -@Mapper -public interface UnionPayConfigMapper extends BaseMapper { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/dao/UnionPaymentManager.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/dao/UnionPaymentManager.java deleted file mode 100644 index c7a908d17ed774e19e603104ebd1942a2004cdb5..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/dao/UnionPaymentManager.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bootx.payment.core.paymodel.union.dao; - -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.payment.core.paymodel.union.entity.UnionPayment; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Repository; - -/** - * @author xxm - * @date 2022/3/11 - */ -@Slf4j -@Repository -@RequiredArgsConstructor -public class UnionPaymentManager extends BaseManager { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/dao/UnionPaymentMapper.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/dao/UnionPaymentMapper.java deleted file mode 100644 index fe67698d315338453d79f8c349be32aeea4d163c..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/dao/UnionPaymentMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.bootx.payment.core.paymodel.union.dao; - -import cn.bootx.payment.core.paymodel.union.entity.UnionPayment; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author xxm - * @date 2022/3/11 - */ -@Mapper -public interface UnionPaymentMapper extends BaseMapper { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/entity/UnionPayConfig.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/entity/UnionPayConfig.java deleted file mode 100644 index cde9e44c847d506bb22a778784422d8b8bd66496..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/entity/UnionPayConfig.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.bootx.payment.core.paymodel.union.entity; - -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.payment.core.paymodel.union.convert.UnionPayConvert; -import cn.bootx.payment.dto.paymodel.union.UnionPayConfigDto; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 云闪付 - * - * @author xxm - * @date 2022/3/11 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@TableName("pay_union_pay_config") -public class UnionPayConfig extends MpBaseEntity implements EntityBaseFunction { - - @Override - public UnionPayConfigDto toDto() { - return UnionPayConvert.CONVERT.convert(this); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/entity/UnionPayment.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/entity/UnionPayment.java deleted file mode 100644 index f1cad89194ca7d1b279dcd311f66eb2f71fcb320..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/entity/UnionPayment.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.bootx.payment.core.paymodel.union.entity; - -import cn.bootx.payment.core.paymodel.base.entity.BasePayment; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @author xxm - * @date 2022/3/11 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@TableName("pay_union_payment") -public class UnionPayment extends BasePayment { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/service/UnionPayConfigService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/service/UnionPayConfigService.java deleted file mode 100644 index 8843cd6fb02c18aecb6430a0f28b107f46fb3120..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/service/UnionPayConfigService.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.bootx.payment.core.paymodel.union.service; - -import cn.bootx.payment.core.paymodel.union.dao.UnionPayConfigManager; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * @author xxm - * @date 2022/3/11 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class UnionPayConfigService { - - private final UnionPayConfigManager unionPayConfigManager; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/service/UnionPayService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/service/UnionPayService.java deleted file mode 100644 index 214f4a607681bd4d711e617665b41d46e351a0de..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/service/UnionPayService.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.bootx.payment.core.paymodel.union.service; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * @author xxm - * @date 2022/3/11 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class UnionPayService { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/service/UnionPaymentService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/service/UnionPaymentService.java deleted file mode 100644 index 45e6c03acad5ab23729d8c645afd7bc8a7fd6b9f..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/union/service/UnionPaymentService.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.bootx.payment.core.paymodel.union.service; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * @author xxm - * @date 2022/3/11 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class UnionPaymentService { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/convert/VoucherConvert.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/convert/VoucherConvert.java deleted file mode 100644 index b0bce32e78d088e51379c096686e7a40a895113b..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/convert/VoucherConvert.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.bootx.payment.core.paymodel.voucher.convert; - -import cn.bootx.payment.core.paymodel.voucher.entity.Voucher; -import cn.bootx.payment.core.paymodel.voucher.entity.VoucherPayment; -import cn.bootx.payment.dto.paymodel.voucher.VoucherDto; -import cn.bootx.payment.dto.paymodel.voucher.VoucherPaymentDto; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -/** - * @author xxm - * @date 2022/3/14 - */ -@Mapper -public interface VoucherConvert { - - VoucherConvert CONVERT = Mappers.getMapper(VoucherConvert.class); - - VoucherDto convert(Voucher in); - - VoucherPaymentDto convert(VoucherPayment in); - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/dao/VoucherLogManager.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/dao/VoucherLogManager.java deleted file mode 100644 index e3ac4a915f42bd226f2115d4b26762b80ec1d9e3..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/dao/VoucherLogManager.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.bootx.payment.core.paymodel.voucher.dao; - -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.payment.core.paymodel.voucher.entity.VoucherLog; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * @author xxm - * @date 2022/3/19 - */ -@Slf4j -@Repository -@RequiredArgsConstructor -public class VoucherLogManager extends BaseManager { - - /** - * 根据支付id和类型进行查询 - */ - public List findByPaymentIdAndType(Long paymentId, int type) { - return lambdaQuery().eq(VoucherLog::getPaymentId, paymentId).eq(VoucherLog::getType, type).list(); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/dao/VoucherLogMapper.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/dao/VoucherLogMapper.java deleted file mode 100644 index 6efebe1eb564ce2d633cba1e6e6760e13062ccc6..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/dao/VoucherLogMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.bootx.payment.core.paymodel.voucher.dao; - -import cn.bootx.payment.core.paymodel.voucher.entity.VoucherLog; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author xxm - * @date 2022/3/19 - */ -@Mapper -public interface VoucherLogMapper extends BaseMapper { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/dao/VoucherManager.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/dao/VoucherManager.java deleted file mode 100644 index 637749913f41cf91a72acdf885586d139ca47708..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/dao/VoucherManager.java +++ /dev/null @@ -1,72 +0,0 @@ -package cn.bootx.payment.core.paymodel.voucher.dao; - -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.payment.core.paymodel.voucher.entity.Voucher; -import cn.bootx.payment.param.paymodel.voucher.VoucherParam; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Objects; -import java.util.Optional; - -/** - * @author xxm - * @date 2022/3/14 - */ -@Slf4j -@Repository -@RequiredArgsConstructor -public class VoucherManager extends BaseManager { - - /** - * 分页 - */ - public Page page(PageParam pageParam, VoucherParam param) { - Page mpPage = MpUtil.getMpPage(pageParam, Voucher.class); - return this.lambdaQuery() - .ge(Objects.nonNull(param.getStartTime()), Voucher::getStartTime, param.getStartTime()) - .le(Objects.nonNull(param.getEndTime()), Voucher::getEndTime, param.getEndTime()) - .eq(Objects.nonNull(param.getEnduring()), Voucher::getEnduring, param.getEnduring()) - .like(StrUtil.isNotBlank(param.getCardNo()), Voucher::getCardNo, param.getCardNo()) - .like(Objects.nonNull(param.getBatchNo()), Voucher::getBatchNo, param.getBatchNo()) - .orderByDesc(MpIdEntity::getId) - .page(mpPage); - } - - /** - * 根据卡号查询 - */ - public Optional findByCardNo(String cardNo) { - return this.findByField(Voucher::getCardNo, cardNo); - } - - /** - * 根据卡号查询 - */ - public List findByCardNoList(List cardNos) { - return this.findAllByFields(Voucher::getCardNo, cardNos); - } - - /** - * 更改状态 - */ - public void changeStatus(Long id, int status) { - this.lambdaUpdate().eq(MpIdEntity::getId, id).set(Voucher::getStatus, status).update(); - - } - - /** - * 批量更改状态 - */ - public void changeStatusBatch(List ids, int status) { - this.lambdaUpdate().in(MpIdEntity::getId, ids).set(Voucher::getStatus, status).update(); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/dao/VoucherMapper.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/dao/VoucherMapper.java deleted file mode 100644 index b35c767fc007bcbea3a4d52f129c32dc5eb7225d..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/dao/VoucherMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.bootx.payment.core.paymodel.voucher.dao; - -import cn.bootx.payment.core.paymodel.voucher.entity.Voucher; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author xxm - * @date 2022/3/14 - */ -@Mapper -public interface VoucherMapper extends BaseMapper { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/dao/VoucherPaymentManager.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/dao/VoucherPaymentManager.java deleted file mode 100644 index a5d0060f817a1e3ecea33d2274ac73e566179637..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/dao/VoucherPaymentManager.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.bootx.payment.core.paymodel.voucher.dao; - -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.payment.core.paymodel.voucher.entity.VoucherPayment; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -/** - * @author xxm - * @date 2022/3/14 - */ -@Slf4j -@Repository -@RequiredArgsConstructor -public class VoucherPaymentManager extends BaseManager { - - /** - * 根据支付id - */ - public Optional findByPaymentId(Long paymentId) { - return this.findByField(VoucherPayment::getPaymentId, paymentId); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/dao/VoucherPaymentMapper.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/dao/VoucherPaymentMapper.java deleted file mode 100644 index 4d57f68908ccb948f02c240426ebb58e30478361..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/dao/VoucherPaymentMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.bootx.payment.core.paymodel.voucher.dao; - -import cn.bootx.payment.core.paymodel.voucher.entity.VoucherPayment; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author xxm - * @date 2022/3/14 - */ -@Mapper -public interface VoucherPaymentMapper extends BaseMapper { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/entity/Voucher.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/entity/Voucher.java deleted file mode 100644 index 2ba844e98fc5d05531a06850698cce96bbbe7858..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/entity/Voucher.java +++ /dev/null @@ -1,59 +0,0 @@ -package cn.bootx.payment.core.paymodel.voucher.entity; - -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.payment.core.paymodel.voucher.convert.VoucherConvert; -import cn.bootx.payment.dto.paymodel.voucher.VoucherDto; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - * 储值卡 - * - * @author xxm - * @date 2022/3/14 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@TableName("pay_voucher") -public class Voucher extends MpBaseEntity implements EntityBaseFunction { - - /** 卡号 */ - private String cardNo; - - /** 生成批次号 */ - private Long batchNo; - - /** 面值 */ - private BigDecimal faceValue; - - /** 余额 */ - private BigDecimal balance; - - /** 是否长期有效 */ - private Boolean enduring; - - /** 开始时间 */ - private LocalDateTime startTime; - - /** 结束时间 */ - private LocalDateTime endTime; - - /** - * 状态 - * @see cn.bootx.payment.code.paymodel.VoucherCode - */ - private Integer status; - - @Override - public VoucherDto toDto() { - return VoucherConvert.CONVERT.convert(this); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/entity/VoucherLog.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/entity/VoucherLog.java deleted file mode 100644 index 13d627d2f68e5f0570d5193072f8d869d2c82778..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/entity/VoucherLog.java +++ /dev/null @@ -1,47 +0,0 @@ -package cn.bootx.payment.core.paymodel.voucher.entity; - -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * 储值卡日志 - * - * @author xxm - * @date 2022/3/17 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@TableName("pay_voucher_log") -public class VoucherLog extends MpBaseEntity { - - /** 储值卡id */ - private Long voucherId; - - /** 储值卡号 */ - private String voucherNo; - - /** 金额 */ - private BigDecimal amount; - - /** - * 类型 - * @see cn.bootx.payment.code.paymodel.VoucherCode - */ - private Integer type; - - /** 交易记录ID */ - private Long paymentId; - - /** 业务ID */ - private String businessId; - - /** 备注 */ - private String remark; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/entity/VoucherPayment.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/entity/VoucherPayment.java deleted file mode 100644 index c68fa5051f69d0972f9863650e6309aeb317622f..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/entity/VoucherPayment.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.bootx.payment.core.paymodel.voucher.entity; - -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.payment.core.paymodel.base.entity.BasePayment; -import cn.bootx.payment.core.paymodel.voucher.convert.VoucherConvert; -import cn.bootx.payment.dto.paymodel.voucher.VoucherPaymentDto; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 储值卡支付记录 - * - * @author xxm - * @date 2022/3/14 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@TableName("pay_voucher_payment") -public class VoucherPayment extends BasePayment implements EntityBaseFunction { - - /** 储值卡id列表 */ - private String voucherIds; - - @Override - public VoucherPaymentDto toDto() { - return VoucherConvert.CONVERT.convert(this); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/service/VoucherLogService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/service/VoucherLogService.java deleted file mode 100644 index aac6d66bbed3bf02a9342819d4636c707273051b..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/service/VoucherLogService.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.bootx.payment.core.paymodel.voucher.service; - -import cn.bootx.payment.core.paymodel.voucher.dao.VoucherLogManager; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * 储值卡日志 - * - * @author xxm - * @date 2022/3/19 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class VoucherLogService { - - private final VoucherLogManager voucherLogManager; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/service/VoucherPayService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/service/VoucherPayService.java deleted file mode 100644 index 507bc9eac25ad36ab9283f840d7d9766cac58667..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/service/VoucherPayService.java +++ /dev/null @@ -1,185 +0,0 @@ -package cn.bootx.payment.core.paymodel.voucher.service; - -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.util.BigDecimalUtil; -import cn.bootx.common.core.util.LocalDateTimeUtil; -import cn.bootx.payment.code.paymodel.VoucherCode; -import cn.bootx.payment.core.payment.entity.Payment; -import cn.bootx.payment.core.paymodel.voucher.dao.VoucherLogManager; -import cn.bootx.payment.core.paymodel.voucher.dao.VoucherManager; -import cn.bootx.payment.core.paymodel.voucher.dao.VoucherPaymentManager; -import cn.bootx.payment.core.paymodel.voucher.entity.Voucher; -import cn.bootx.payment.core.paymodel.voucher.entity.VoucherLog; -import cn.bootx.payment.core.paymodel.voucher.entity.VoucherPayment; -import cn.bootx.payment.exception.payment.PayFailureException; -import cn.bootx.payment.param.pay.PayModeParam; -import cn.bootx.payment.param.paymodel.voucher.VoucherPayParam; -import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONException; -import cn.hutool.json.JSONUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * 储值卡支付 - * - * @author xxm - * @date 2022/3/14 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class VoucherPayService { - - private final VoucherManager voucherManager; - - private final VoucherPaymentManager voucherPaymentManager; - - private final VoucherLogManager voucherLogManager; - - /** - * 获取并检查储值卡 - */ - public List getAndCheckVoucher(PayModeParam payModeParam) { - VoucherPayParam voucherPayParam; - try { - // 储值卡参数验证 - String extraParamsJson = payModeParam.getExtraParamsJson(); - if (StrUtil.isNotBlank(extraParamsJson)) { - voucherPayParam = JSONUtil.toBean(extraParamsJson, VoucherPayParam.class); - } - else { - throw new PayFailureException("储值卡支付参数错误"); - } - } - catch (JSONException e) { - throw new PayFailureException("储值卡支付参数错误"); - } - - List cardNoList = voucherPayParam.getCardNoList(); - List vouchers = voucherManager.findByCardNoList(cardNoList); - // 判断是否有重复or无效的储值卡 - if (vouchers.size() != cardNoList.size()) { - throw new PayFailureException("储值卡支付参数错误"); - } - boolean timeCheck = this.check(vouchers); - if (!timeCheck) { - throw new PayFailureException("储值卡不再有效期内"); - } - // 金额是否满足 - BigDecimal amount = vouchers.stream().map(Voucher::getBalance).reduce(BigDecimal::add).orElse(BigDecimal.ZERO); - if (BigDecimalUtil.compareTo(amount, payModeParam.getAmount()) < 0) { - throw new PayFailureException("储值卡余额不足"); - } - - return vouchers; - } - - /** - * 支付 TODO 有期限的在前面, 同样有期限到期时间短的在前面, 同样到期日金额小的在前面 - */ - public void pay(BigDecimal amount, Payment payment, List vouchers) { - vouchers.sort((o1, o2) -> BigDecimalUtil.compareTo(o1.getBalance(), o2.getBalance())); - List voucherLogs = new ArrayList<>(); - - for (Voucher voucher : vouchers) { - // 待支付余额为零, 不在处理后面的储值卡 - if (BigDecimalUtil.compareTo(amount, BigDecimal.ZERO) < 1) { - break; - } - - BigDecimal balance = voucher.getBalance(); - // 日志 - VoucherLog voucherLog = new VoucherLog().setPaymentId(payment.getId()) - .setBusinessId(payment.getBusinessId()) - .setType(VoucherCode.LOG_PAY) - .setVoucherId(voucher.getId()) - .setVoucherNo(voucher.getCardNo()); - - // 待支付额大于储值卡余额. 全扣光 - if (BigDecimalUtil.compareTo(amount, balance) == 1) { - amount = amount.subtract(balance); - voucher.setBalance(BigDecimal.ZERO); - voucherLog.setAmount(balance); - } - else { - voucher.setBalance(balance.subtract(amount)); - voucherLog.setAmount(amount); - } - voucherLogs.add(voucherLog); - } - voucherManager.updateAllById(vouchers); - voucherLogManager.saveAll(voucherLogs); - } - - /** - * 取消支付 - */ - public void close(Long paymentId) { - // 查找支付记录日志 - List voucherLogs = voucherLogManager.findByPaymentIdAndType(paymentId, VoucherCode.LOG_PAY); - // 查出关联的储值卡 - Map voucherLogMap = voucherLogs.stream() - .collect(Collectors.toMap(VoucherLog::getVoucherId, Function.identity())); - List vouchers = voucherManager.findAllByIds(voucherLogMap.keySet()); - // 执行退款并记录日志 - List logs = new ArrayList<>(); - for (Voucher voucher : vouchers) { - VoucherLog voucherLog = voucherLogMap.get(voucher.getId()); - voucher.setBalance(voucher.getBalance().add(voucherLog.getAmount())); - VoucherLog log = new VoucherLog().setAmount(voucherLog.getAmount()) - .setPaymentId(paymentId) - .setBusinessId(voucherLog.getBusinessId()) - .setVoucherId(voucher.getId()) - .setVoucherNo(voucher.getCardNo()) - .setType(VoucherCode.LOG_CLOSE); - logs.add(log); - } - voucherManager.updateAllById(vouchers); - voucherLogManager.saveAll(logs); - } - - /** - * 退款 TODO 延长卡的有效期, - */ - public void refund(Long paymentId, BigDecimal amount) { - VoucherPayment voucherPayment = voucherPaymentManager.findByPaymentId(paymentId) - .orElseThrow(() -> new PayFailureException("储值卡支付记录不存在")); - - Long voucherId = Long.valueOf(voucherPayment.getVoucherIds().split(",")[0]); - Voucher voucher = voucherManager.findById(voucherId).orElseThrow(DataNotExistException::new); - - voucher.setBalance(voucher.getBalance().add(amount)); - - VoucherLog log = new VoucherLog().setAmount(amount) - .setPaymentId(paymentId) - .setBusinessId(voucherPayment.getBusinessId()) - .setVoucherId(voucher.getId()) - .setVoucherNo(voucher.getCardNo()) - .setType(VoucherCode.LOG_REFUND); - voucherManager.updateById(voucher); - voucherLogManager.save(log); - } - - /** - * 卡信息检查 - */ - private boolean check(List vouchers) { - // 判断有效期 - return vouchers.stream() - .filter(voucher -> !Objects.equals(voucher.getEnduring(), true)) - .allMatch(voucher -> LocalDateTimeUtil.between(LocalDateTime.now(), voucher.getStartTime(), - voucher.getEndTime())); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/service/VoucherPaymentService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/service/VoucherPaymentService.java deleted file mode 100644 index b12920c119101fa645a9a28a4ec5c1f67b4feef1..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/service/VoucherPaymentService.java +++ /dev/null @@ -1,95 +0,0 @@ -package cn.bootx.payment.core.paymodel.voucher.service; - -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.util.BigDecimalUtil; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.payment.code.pay.PayStatusCode; -import cn.bootx.payment.core.payment.entity.Payment; -import cn.bootx.payment.core.paymodel.voucher.dao.VoucherPaymentManager; -import cn.bootx.payment.core.paymodel.voucher.entity.Voucher; -import cn.bootx.payment.core.paymodel.voucher.entity.VoucherPayment; -import cn.bootx.payment.param.pay.PayModeParam; -import cn.bootx.payment.param.pay.PayParam; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; - -/** - * 储值卡支付记录 - * - * @author xxm - * @date 2022/3/14 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class VoucherPaymentService { - - private final VoucherPaymentManager voucherPaymentManager; - - /** - * 添加支付记录 - */ - public void savePayment(Payment payment, PayParam payParam, PayModeParam payMode, List vouchers) { - String voucherIds = vouchers.stream() - .map(MpIdEntity::getId) - .map(String::valueOf) - .collect(Collectors.joining(",")); - - VoucherPayment walletPayment = new VoucherPayment().setVoucherIds(voucherIds); - walletPayment.setPaymentId(payment.getId()) - .setUserId(payment.getUserId()) - .setBusinessId(payParam.getBusinessId()) - .setAmount(payMode.getAmount()) - .setRefundableBalance(payMode.getAmount()) - .setPayStatus(payment.getPayStatus()); - voucherPaymentManager.save(walletPayment); - } - - /** - * 更新成功状态 - */ - public void updateSuccess(Long paymentId) { - Optional payment = voucherPaymentManager.findByPaymentId(paymentId); - if (payment.isPresent()) { - VoucherPayment voucherPayment = payment.get(); - voucherPayment.setPayStatus(PayStatusCode.TRADE_SUCCESS).setPayTime(LocalDateTime.now()); - voucherPaymentManager.updateById(voucherPayment); - } - } - - /** - * 关闭操作 - */ - public void updateClose(Long paymentId) { - VoucherPayment payment = voucherPaymentManager.findByPaymentId(paymentId) - .orElseThrow(() -> new BizException("未查询到查询交易记录")); - payment.setPayStatus(PayStatusCode.TRADE_CANCEL); - voucherPaymentManager.updateById(payment); - } - - /** - * 更新退款 - */ - public void updateRefund(Long paymentId, BigDecimal amount) { - Optional voucherPayment = voucherPaymentManager.findByPaymentId(paymentId); - voucherPayment.ifPresent(payment -> { - BigDecimal refundableBalance = payment.getRefundableBalance().subtract(amount); - payment.setRefundableBalance(refundableBalance); - if (BigDecimalUtil.compareTo(refundableBalance, BigDecimal.ZERO) == 0) { - payment.setPayStatus(PayStatusCode.TRADE_REFUNDED); - } - else { - payment.setPayStatus(PayStatusCode.TRADE_REFUNDING); - } - voucherPaymentManager.updateById(payment); - }); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/service/VoucherQueryService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/service/VoucherQueryService.java deleted file mode 100644 index 173273c5a285a64a24fe39eb657d479e92a1c035..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/service/VoucherQueryService.java +++ /dev/null @@ -1,51 +0,0 @@ -package cn.bootx.payment.core.paymodel.voucher.service; - -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.payment.core.paymodel.voucher.dao.VoucherManager; -import cn.bootx.payment.core.paymodel.voucher.entity.Voucher; -import cn.bootx.payment.dto.paymodel.voucher.VoucherDto; -import cn.bootx.payment.param.paymodel.voucher.VoucherParam; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * 储值卡查询 - * - * @author xxm - * @date 2022/3/14 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class VoucherQueryService { - - private final VoucherManager voucherManager; - - /** - * 分页 - */ - public PageResult page(PageParam pageParam, VoucherParam param) { - return MpUtil.convert2DtoPageResult(voucherManager.page(pageParam, param)); - } - - /** - * 根据id查询 - */ - public VoucherDto findById(Long id) { - return voucherManager.findById(id).map(Voucher::toDto).orElseThrow(() -> new DataNotExistException("储值卡不存在")); - } - - /** - * 根据卡号查询 - */ - public VoucherDto findByCardNo(String cardNo) { - return voucherManager.findByCardNo(cardNo) - .map(Voucher::toDto) - .orElseThrow(() -> new DataNotExistException("储值卡不存在")); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/service/VoucherService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/service/VoucherService.java deleted file mode 100644 index 3b12ddb3f31553665b6ffe3003025d20acc8ab8b..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/voucher/service/VoucherService.java +++ /dev/null @@ -1,111 +0,0 @@ -package cn.bootx.payment.core.paymodel.voucher.service; - -import cn.bootx.payment.code.paymodel.VoucherCode; -import cn.bootx.payment.core.paymodel.voucher.dao.VoucherLogManager; -import cn.bootx.payment.core.paymodel.voucher.dao.VoucherManager; -import cn.bootx.payment.core.paymodel.voucher.entity.Voucher; -import cn.bootx.payment.core.paymodel.voucher.entity.VoucherLog; -import cn.bootx.payment.param.paymodel.voucher.VoucherGenerationParam; -import cn.bootx.payment.param.paymodel.voucher.VoucherImportParam; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.RandomUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -/** - * 储值卡 - * - * @author xxm - * @date 2022/3/14 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class VoucherService { - - private final VoucherManager voucherManager; - - private final VoucherLogManager voucherLogManager; - - /** - * 批量生成 - */ - @Transactional(rollbackFor = Exception.class) - public void generationBatch(VoucherGenerationParam param) { - Integer count = param.getCount(); - List vouchers = new ArrayList<>(count); - long batchNo = IdUtil.getSnowflakeNextId(); - for (int i = 0; i < count; i++) { - Voucher voucher = new Voucher() - .setCardNo('V' + IdUtil.getSnowflakeNextIdStr() + RandomUtil.randomNumbers(2)) - .setBatchNo(batchNo) - .setBalance(param.getFaceValue()) - .setFaceValue(param.getFaceValue()) - .setEnduring(param.getEnduring()) - .setStatus(param.getStatus()); - if (Objects.equals(param.getEnduring(), Boolean.FALSE)) { - voucher.setStartTime(param.getStartTime()).setEndTime(param.getEndTime()); - } - vouchers.add(voucher); - } - voucherManager.saveAll(vouchers); - // 日志 - List voucherLogs = vouchers.stream() - .map(voucher -> new VoucherLog().setType(VoucherCode.LOG_ACTIVE) - .setAmount(voucher.getBalance()) - .setVoucherId(voucher.getId()) - .setVoucherNo(voucher.getCardNo())) - .collect(Collectors.toList()); - voucherLogManager.saveAll(voucherLogs); - } - - /** - * 批量导入 - */ - public void importBatch(VoucherImportParam param) { - - } - - /** - * 启用 - */ - public void unlock(Long id) { - voucherManager.changeStatus(id, VoucherCode.STATUS_NORMAL); - } - - /** - * 冻结 - */ - public void lock(Long id) { - voucherManager.changeStatus(id, VoucherCode.STATUS_FORBIDDEN); - } - - /** - * 批量启用 - */ - public void unlockBatch(List ids) { - voucherManager.changeStatusBatch(ids, VoucherCode.STATUS_NORMAL); - } - - /** - * 批量冻结 - */ - public void lockBatch(List ids) { - voucherManager.changeStatusBatch(ids, VoucherCode.STATUS_FORBIDDEN); - } - - /** - * 更改有效期 - */ - public void changeEnduring() { - - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/convert/WalletConvert.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/convert/WalletConvert.java deleted file mode 100644 index cd3b31c154c4a0aef8ad49efb98ec6a102addc35..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/convert/WalletConvert.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.bootx.payment.core.paymodel.wallet.convert; - -import cn.bootx.payment.core.paymodel.wallet.entity.Wallet; -import cn.bootx.payment.core.paymodel.wallet.entity.WalletLog; -import cn.bootx.payment.core.paymodel.wallet.entity.WalletPayment; -import cn.bootx.payment.dto.paymodel.wallet.WalletDto; -import cn.bootx.payment.dto.paymodel.wallet.WalletLogDto; -import cn.bootx.payment.dto.paymodel.wallet.WalletPaymentDto; -import org.mapstruct.Mapper; -import org.mapstruct.Mappings; -import org.mapstruct.factory.Mappers; - -/** - * 转换 - * - * @author xxm - * @date 2021/8/20 - */ -@Mapper -public interface WalletConvert { - - WalletConvert CONVERT = Mappers.getMapper(WalletConvert.class); - - WalletDto convert(Wallet in); - - WalletPaymentDto convert(WalletPayment in); - - WalletLogDto convert(WalletLog walletLog); - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/dao/WalletLogManager.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/dao/WalletLogManager.java deleted file mode 100644 index 1d6bbce44e9d522120b2a33cdce4d8ac565b26ca..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/dao/WalletLogManager.java +++ /dev/null @@ -1,65 +0,0 @@ -package cn.bootx.payment.core.paymodel.wallet.dao; - -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.payment.core.paymodel.wallet.entity.WalletLog; -import cn.bootx.payment.param.paymodel.wallet.WalletLogQueryParam; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; - -import java.util.Objects; -import java.util.Optional; - -/** - * 钱包日志 - * - * @author xxm - * @date 2020/12/8 - */ -@Repository -@RequiredArgsConstructor -public class WalletLogManager extends BaseManager { - - /** - * 按付款查找优先 - */ - public Optional findFirstByPayment(Long paymentId) { - return MpUtil.findOne(lambdaQuery().eq(WalletLog::getPaymentId, paymentId).orderByDesc(MpIdEntity::getId)); - } - - /** - * 分页查询指定用户的钱包日志 - */ - public Page pageByUserId(PageParam pageParam, WalletLogQueryParam param, Long userId) { - Page mpPage = MpUtil.getMpPage(pageParam, WalletLog.class); - - return this.lambdaQuery().orderByDesc(MpIdEntity::getId).eq(WalletLog::getUserId, userId).page(mpPage); - } - - /** - * 分页查询 - */ - public Page page(PageParam pageParam, WalletLogQueryParam query) { - Page mpPage = MpUtil.getMpPage(pageParam, WalletLog.class); - return this.lambdaQuery() - .orderByDesc(MpIdEntity::getId) - .like(Objects.nonNull(query.getUserId()), WalletLog::getUserId, query.getUserId()) - .like(Objects.nonNull(query.getWalletId()), WalletLog::getWalletId, query.getWalletId()) - .page(mpPage); - } - - /** - * 分页查询 根据钱包id - */ - public Page pageByWalletId(PageParam pageParam, WalletLogQueryParam param) { - Page mpPage = MpUtil.getMpPage(pageParam, WalletLog.class); - return this.lambdaQuery() - .orderByDesc(MpIdEntity::getId) - .eq(WalletLog::getWalletId, param.getWalletId()) - .page(mpPage); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/dao/WalletLogMapper.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/dao/WalletLogMapper.java deleted file mode 100644 index d43e252c094e9fce5a1d0a02f61f3f5dac241d73..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/dao/WalletLogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.bootx.payment.core.paymodel.wallet.dao; - -import cn.bootx.payment.core.paymodel.wallet.entity.WalletLog; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * 钱包日志 - * - * @author xxm - * @date 2020/12/8 - */ -@Mapper -public interface WalletLogMapper extends BaseMapper { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/dao/WalletManager.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/dao/WalletManager.java deleted file mode 100644 index bd2920fe8d1c0a6eab1a8f1df667877da3d75add..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/dao/WalletManager.java +++ /dev/null @@ -1,126 +0,0 @@ -package cn.bootx.payment.core.paymodel.wallet.dao; - -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.iam.core.user.entity.UserInfo; -import cn.bootx.iam.param.user.UserInfoParam; -import cn.bootx.payment.core.paymodel.wallet.entity.Wallet; -import cn.bootx.payment.param.paymodel.wallet.WalletPayParam; -import cn.bootx.starter.auth.util.SecurityUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; - -/** - * 钱包管理 - * - * @author xxm - * @date 2020/12/8 - */ -@Repository -@RequiredArgsConstructor -public class WalletManager extends BaseManager { - - private final WalletMapper walletMapper; - - /** - * 增加余额 - * @param walletId 钱包 - * @param amount 金额 - * @return 更新数量 - */ - public int increaseBalance(Long walletId, BigDecimal amount) { - Long userId = SecurityUtil.getUserIdOrDefaultId(); - return walletMapper.increaseBalance(walletId, amount, userId, LocalDateTime.now()); - } - - /** - * 扣减余额 - * @param walletId 钱包ID - * @param amount 扣减金额 - * @return 操作条数 - */ - public int reduceBalance(Long walletId, BigDecimal amount) { - Long userId = SecurityUtil.getUserIdOrDefaultId(); - return walletMapper.reduceBalance(walletId, amount, userId, LocalDateTime.now()); - } - - /** - * 扣减余额-允许扣成负数 - * @param walletId 钱包ID - * @param amount 扣减金额 - * @return 剩余条数 - */ - public int reduceBalanceUnlimited(Long walletId, BigDecimal amount) { - Long userId = SecurityUtil.getUserIdOrDefaultId(); - return walletMapper.reduceBalanceUnlimited(walletId, amount, userId, LocalDateTime.now()); - } - - /** - * 更新钱包状态 - */ - public void setUpStatus(Long walletId, int status) { - lambdaUpdate().eq(Wallet::getId, walletId).set(Wallet::getStatus, status).update(); - } - - /** - * 用户钱包是否存在 - */ - public boolean existsByUser(Long userId) { - return existedByField(Wallet::getUserId, userId); - } - - /** - * 查询用户的钱包 - */ - public Optional findByUser(Long userId) { - return findByField(Wallet::getUserId, userId); - } - - /** - * 分页查询 - */ - public Page page(PageParam pageParam, WalletPayParam param) { - - Page mpPage = MpUtil.getMpPage(pageParam, Wallet.class); - return this.lambdaQuery().orderByDesc(MpIdEntity::getId).page(mpPage); - } - - /** - * 待开通钱包的用户列表 - */ - public Page pageByNotWallet(PageParam pageParam, UserInfoParam userInfoParam) { - Page mpPage = MpUtil.getMpPage(pageParam, UserInfo.class); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.isNull("w.id") - .orderByDesc("w.id") - .like(StrUtil.isNotBlank(userInfoParam.getUsername()), "w.username", userInfoParam.getUsername()) - .like(StrUtil.isNotBlank(userInfoParam.getName()), "w.name", userInfoParam.getName()); - return walletMapper.pageByNotWallet(mpPage, wrapper); - } - - /** - * 查询已经存在钱包的用户id - */ - public List findExistUserIds(List userIds) { - return this.lambdaQuery() - .select(Wallet::getUserId) - .in(Wallet::getUserId, userIds) - .list() - .stream() - .map(Wallet::getUserId) - .collect(Collectors.toList()); - - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/dao/WalletMapper.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/dao/WalletMapper.java deleted file mode 100644 index b6e09724373f22ff7f16df8fb2c6c60e275f4e00..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/dao/WalletMapper.java +++ /dev/null @@ -1,62 +0,0 @@ -package cn.bootx.payment.core.paymodel.wallet.dao; - -import cn.bootx.iam.core.user.entity.UserInfo; -import cn.bootx.payment.core.paymodel.wallet.entity.Wallet; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - * 钱包 - * - * @author xxm - * @date 2021/2/24 - */ -@Mapper -public interface WalletMapper extends BaseMapper { - - /** - * 增加余额 - * @param walletId 钱包ID - * @param amount 增加的额度 - * @param operator 操作人 - * @param date 时间 - * @return 更新数量 - */ - int increaseBalance(@Param("walletId") Long walletId, @Param("amount") BigDecimal amount, - @Param("operator") Long operator, @Param("date") LocalDateTime date); - - /** - * 减少余额 - * @param walletId 钱包ID - * @param amount 减少的额度 - * @param operator 操作人 - * @param date 操作时间 - * @return 操作条数 - */ - int reduceBalance(@Param("walletId") Long walletId, @Param("amount") BigDecimal amount, - @Param("operator") Long operator, @Param("date") LocalDateTime date); - - /** - * 减少余额,允许扣成负数 - * @param walletId 钱包ID - * @param amount 减少的额度 - * @param operator 操作人 - * @param date 操作时间 - * @return 操作条数 - */ - int reduceBalanceUnlimited(@Param("walletId") Long walletId, @Param("amount") BigDecimal amount, - @Param("operator") Long operator, @Param("date") LocalDateTime date); - - /** - * 待开通钱包的用户列表 - */ - Page pageByNotWallet(Page mpPage, @Param(Constants.WRAPPER) Wrapper wrapper); - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/dao/WalletPaymentManager.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/dao/WalletPaymentManager.java deleted file mode 100644 index 615f35b17af1807acfaf7e935962539d945dd0a4..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/dao/WalletPaymentManager.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.bootx.payment.core.paymodel.wallet.dao; - -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.payment.core.paymodel.base.entity.BasePayment; -import cn.bootx.payment.core.paymodel.wallet.entity.WalletPayment; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -@Repository -@RequiredArgsConstructor -public class WalletPaymentManager extends BaseManager { - - public Optional findByPaymentId(Long paymentId) { - return findByField(BasePayment::getPaymentId, paymentId); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/dao/WalletPaymentMapper.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/dao/WalletPaymentMapper.java deleted file mode 100644 index bda2a89a0ac9c317ff5bdb8571ba7bbabb9d9731..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/dao/WalletPaymentMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package cn.bootx.payment.core.paymodel.wallet.dao; - -import cn.bootx.payment.core.paymodel.wallet.entity.WalletPayment; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface WalletPaymentMapper extends BaseMapper { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/entity/Wallet.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/entity/Wallet.java deleted file mode 100644 index 06bf544fac9a35ef2894f108c1b51bf9977304b8..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/entity/Wallet.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.bootx.payment.core.paymodel.wallet.entity; - -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.payment.core.paymodel.wallet.convert.WalletConvert; -import cn.bootx.payment.dto.paymodel.wallet.WalletDto; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * 钱包 - * - * @author xxm - * @date 2020/12/8 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@TableName("pay_wallet") -public class Wallet extends MpBaseEntity implements EntityBaseFunction { - - /** 关联用户id */ - private Long userId; - - /** 余额 */ - private BigDecimal balance; - - /** 状态 */ - private Integer status; - - @Override - public WalletDto toDto() { - return WalletConvert.CONVERT.convert(this); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/entity/WalletLog.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/entity/WalletLog.java deleted file mode 100644 index ba7849ac19abedf1616724d01b43e377c011eac8..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/entity/WalletLog.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.bootx.payment.core.paymodel.wallet.entity; - -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.payment.core.paymodel.wallet.convert.WalletConvert; -import cn.bootx.payment.dto.paymodel.wallet.WalletLogDto; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * 钱包日志表 - * - * @author xxm - * @date 2020/12/8 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@TableName("pay_wallet_log") -public class WalletLog extends MpBaseEntity implements EntityBaseFunction { - - /** 钱包id */ - private Long walletId; - - /** 用户id */ - private Long userId; - - /** 类型 */ - private Integer type; - - /** 交易记录ID */ - private Long paymentId; - - /** 备注 */ - private String remark; - - /** 业务ID */ - private String businessId; - - /** 操作类型 */ - private int operationSource; - - /** 金额 */ - private BigDecimal amount; - - @Override - public WalletLogDto toDto() { - return WalletConvert.CONVERT.convert(this); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/entity/WalletPayment.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/entity/WalletPayment.java deleted file mode 100644 index fb16efe4948235a020b09315031f9c6f9af11412..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/entity/WalletPayment.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.bootx.payment.core.paymodel.wallet.entity; - -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.payment.core.paymodel.base.entity.BasePayment; -import cn.bootx.payment.core.paymodel.wallet.convert.WalletConvert; -import cn.bootx.payment.dto.paymodel.wallet.WalletPaymentDto; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 钱包交易记录表 - * - * @author xxm - * @date 2020/12/8 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@TableName("pay_wallet_payment") -public class WalletPayment extends BasePayment implements EntityBaseFunction { - - /** 钱包ID */ - private Long walletId; - - @Override - public WalletPaymentDto toDto() { - return WalletConvert.CONVERT.convert(this); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/service/WalletLogService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/service/WalletLogService.java deleted file mode 100644 index 9a7fe09051017c78cea10f47a3e240c1b42829e8..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/service/WalletLogService.java +++ /dev/null @@ -1,49 +0,0 @@ -package cn.bootx.payment.core.paymodel.wallet.service; - -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.payment.core.paymodel.wallet.dao.WalletLogManager; -import cn.bootx.payment.dto.paymodel.wallet.WalletLogDto; -import cn.bootx.payment.param.paymodel.wallet.WalletLogQueryParam; -import cn.bootx.starter.auth.util.SecurityUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * 钱包日志 - * - * @author xxm - * @date 2020/12/8 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class WalletLogService { - - private final WalletLogManager walletLogManager; - - /** - * 个人钱包日志分页 - */ - public PageResult pageByPersonal(PageParam pageParam, WalletLogQueryParam param) { - Long userId = SecurityUtil.getUserId(); - return MpUtil.convert2DtoPageResult(walletLogManager.pageByUserId(pageParam, param, userId)); - } - - /** - * 钱包日志分页 - */ - public PageResult page(PageParam pageParam, WalletLogQueryParam param) { - return MpUtil.convert2DtoPageResult(walletLogManager.page(pageParam, param)); - } - - /** - * 根据钱包id查询钱包日志(分页) - */ - public PageResult pageByWalletId(PageParam pageParam, WalletLogQueryParam param) { - return MpUtil.convert2DtoPageResult(walletLogManager.pageByWalletId(pageParam, param)); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/service/WalletPayService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/service/WalletPayService.java deleted file mode 100644 index ce8cf0876751f04626ffe796e03aacb369569050..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/service/WalletPayService.java +++ /dev/null @@ -1,122 +0,0 @@ -package cn.bootx.payment.core.paymodel.wallet.service; - -import cn.bootx.common.core.exception.BizException; -import cn.bootx.payment.code.pay.PayStatusCode; -import cn.bootx.payment.code.paymodel.WalletCode; -import cn.bootx.payment.core.payment.entity.Payment; -import cn.bootx.payment.core.paymodel.wallet.dao.WalletLogManager; -import cn.bootx.payment.core.paymodel.wallet.dao.WalletManager; -import cn.bootx.payment.core.paymodel.wallet.dao.WalletPaymentManager; -import cn.bootx.payment.core.paymodel.wallet.entity.Wallet; -import cn.bootx.payment.core.paymodel.wallet.entity.WalletLog; -import cn.bootx.payment.core.paymodel.wallet.entity.WalletPayment; -import cn.bootx.payment.exception.waller.WalletLackOfBalanceException; -import cn.bootx.payment.exception.waller.WalletNotExistsException; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.util.Optional; - -/** - * 钱包支付操作 - * - * @author xxm - * @date 2021/2/27 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class WalletPayService { - - private final WalletManager walletManager; - - private final WalletPaymentManager walletPaymentManager; - - private final WalletLogManager walletLogManager; - - /** - * 支付操作 - * @param amount 付款金额 - * @param payment 支付记录 - * @param wallet 钱包 - */ - public void pay(BigDecimal amount, Payment payment, Wallet wallet) { - // 扣减余额 - int i = walletManager.reduceBalance(wallet.getId(), amount); - - // 判断操作结果 - if (i < 1) { - throw new WalletLackOfBalanceException(); - } - // 日志 - WalletLog walletLog = new WalletLog().setWalletId(wallet.getId()) - .setUserId(wallet.getUserId()) - .setPaymentId(payment.getId()) - .setAmount(amount) - .setType(WalletCode.LOG_PAY) - .setRemark(String.format("钱包支付金额 %.2f ", amount)) - .setOperationSource(WalletCode.OPERATION_SOURCE_USER) - .setBusinessId(payment.getBusinessId()); - walletLogManager.save(walletLog); - } - - /** - * 取消支付并返还金额 - */ - public void close(Long paymentId) { - // 钱包支付记录 - walletPaymentManager.findByPaymentId(paymentId).ifPresent(walletPayment -> { - Optional walletOpt = walletManager.findById(walletPayment.getWalletId()); - if (!walletOpt.isPresent()) { - log.error("钱包出现恶性问题,需要人工排查"); - return; - } - Wallet wallet = walletOpt.get(); - walletPayment.setPayStatus(PayStatusCode.TRADE_CANCEL); - walletPaymentManager.save(walletPayment); - - // 金额返还 - walletManager.increaseBalance(wallet.getId(), walletPayment.getAmount()); - - // 记录日志 - WalletLog walletLog = new WalletLog().setAmount(walletPayment.getAmount()) - .setPaymentId(walletPayment.getPaymentId()) - .setWalletId(wallet.getId()) - .setUserId(wallet.getUserId()) - .setType(WalletCode.LOG_PAY_CLOSE) - .setRemark(String.format("取消支付返回金额 %.2f ", walletPayment.getAmount())) - .setOperationSource(WalletCode.OPERATION_SOURCE_SYSTEM) - .setBusinessId(walletPayment.getBusinessId()); - // save log - walletLogManager.save(walletLog); - }); - } - - /** - * 退款 - */ - @Transactional(rollbackFor = Exception.class) - public void refund(Long paymentId, BigDecimal amount) { - // 钱包支付记录 - WalletPayment walletPayment = walletPaymentManager.findByPaymentId(paymentId) - .orElseThrow(() -> new BizException("钱包支付记录不存在")); - // 获取钱包 - Wallet wallet = walletManager.findById(walletPayment.getWalletId()).orElseThrow(WalletNotExistsException::new); - walletManager.increaseBalance(wallet.getId(), amount); - - WalletLog walletLog = new WalletLog().setAmount(amount) - .setPaymentId(walletPayment.getPaymentId()) - .setWalletId(wallet.getId()) - .setUserId(wallet.getUserId()) - .setType(WalletCode.LOG_REFUND) - .setRemark(String.format("钱包退款金额 %.2f ", amount)) - .setOperationSource(WalletCode.OPERATION_SOURCE_ADMIN) - .setBusinessId(walletPayment.getBusinessId()); - // save log - walletLogManager.save(walletLog); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/service/WalletPaymentService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/service/WalletPaymentService.java deleted file mode 100644 index e04c23a0d0b4cf5e3d37da01d13d0aeaf053ae1c..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/service/WalletPaymentService.java +++ /dev/null @@ -1,87 +0,0 @@ -package cn.bootx.payment.core.paymodel.wallet.service; - -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.util.BigDecimalUtil; -import cn.bootx.payment.code.pay.PayStatusCode; -import cn.bootx.payment.core.payment.entity.Payment; -import cn.bootx.payment.core.paymodel.wallet.dao.WalletPaymentManager; -import cn.bootx.payment.core.paymodel.wallet.entity.Wallet; -import cn.bootx.payment.core.paymodel.wallet.entity.WalletPayment; -import cn.bootx.payment.param.pay.PayModeParam; -import cn.bootx.payment.param.pay.PayParam; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.Optional; - -/** - * 钱包交易记录的相关操作 - * - * @author xxm - * @date 2020/12/8 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class WalletPaymentService { - - private final WalletPaymentManager walletPaymentManager; - - /** - * 保存钱包支付记录 - */ - public void savePayment(Payment payment, PayParam payParam, PayModeParam payMode, Wallet wallet) { - WalletPayment walletPayment = new WalletPayment().setWalletId(wallet.getId()); - walletPayment.setPaymentId(payment.getId()) - .setUserId(payment.getUserId()) - .setBusinessId(payParam.getBusinessId()) - .setAmount(payMode.getAmount()) - .setRefundableBalance(payMode.getAmount()) - .setPayStatus(payment.getPayStatus()); - walletPaymentManager.save(walletPayment); - } - - /** - * 更新成功状态 - */ - public void updateSuccess(Long paymentId) { - Optional payment = walletPaymentManager.findByPaymentId(paymentId); - if (payment.isPresent()) { - WalletPayment walletPayment = payment.get(); - walletPayment.setPayStatus(PayStatusCode.TRADE_SUCCESS).setPayTime(LocalDateTime.now()); - walletPaymentManager.updateById(walletPayment); - } - } - - /** - * 关闭操作 - */ - public void updateClose(Long paymentId) { - WalletPayment walletPayment = walletPaymentManager.findByPaymentId(paymentId) - .orElseThrow(() -> new BizException("未查询到查询交易记录")); - walletPayment.setPayStatus(PayStatusCode.TRADE_CANCEL); - walletPaymentManager.updateById(walletPayment); - } - - /** - * 更新退款 - */ - public void updateRefund(Long paymentId, BigDecimal amount) { - Optional walletPayment = walletPaymentManager.findByPaymentId(paymentId); - walletPayment.ifPresent(payment -> { - BigDecimal refundableBalance = payment.getRefundableBalance().subtract(amount); - payment.setRefundableBalance(refundableBalance); - if (BigDecimalUtil.compareTo(refundableBalance, BigDecimal.ZERO) == 0) { - payment.setPayStatus(PayStatusCode.TRADE_REFUNDED); - } - else { - payment.setPayStatus(PayStatusCode.TRADE_REFUNDING); - } - walletPaymentManager.updateById(payment); - }); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/service/WalletQueryService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/service/WalletQueryService.java deleted file mode 100644 index f363adde59dccbbfbd5d52fe1af588ac18c0300a..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/service/WalletQueryService.java +++ /dev/null @@ -1,77 +0,0 @@ -package cn.bootx.payment.core.paymodel.wallet.service; - -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.iam.core.user.service.UserQueryService; -import cn.bootx.iam.dto.user.UserInfoDto; -import cn.bootx.iam.param.user.UserInfoParam; -import cn.bootx.payment.core.paymodel.wallet.dao.WalletManager; -import cn.bootx.payment.core.paymodel.wallet.entity.Wallet; -import cn.bootx.payment.dto.paymodel.wallet.WalletDto; -import cn.bootx.payment.dto.paymodel.wallet.WalletInfoDto; -import cn.bootx.payment.param.paymodel.wallet.WalletPayParam; -import cn.bootx.starter.auth.util.SecurityUtil; -import cn.hutool.core.bean.BeanUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * 钱包 - * - * @author xxm - * @date 2022/3/11 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class WalletQueryService { - - private final WalletManager walletManager; - - private final UserQueryService userQueryService; - - /** - * 根据ID查询Wallet - */ - public WalletDto findById(Long walletId) { - return walletManager.findById(walletId).map(Wallet::toDto).orElseThrow(DataNotExistException::new); - } - - /** - * 根据用户ID查询钱包 - */ - public WalletDto findByUser() { - Long userId = SecurityUtil.getUserId(); - return walletManager.findByUser(userId).map(Wallet::toDto).orElseThrow(DataNotExistException::new); - } - - /** - * 获取钱包综合信息 - */ - public WalletInfoDto getWalletInfo(Long walletId) { - Wallet wallet = walletManager.findById(walletId).orElseThrow(DataNotExistException::new); - UserInfoDto userInfoDto = userQueryService.findById(wallet.getUserId()); - WalletInfoDto walletInfoDto = new WalletInfoDto(); - BeanUtil.copyProperties(wallet, walletInfoDto); - walletInfoDto.setUserName(userInfoDto.getName()); - return walletInfoDto; - } - - /** - * 查询用户 分页 - */ - public PageResult page(PageParam pageParam, WalletPayParam param) { - return MpUtil.convert2DtoPageResult(walletManager.page(pageParam, param)); - } - - /** - * 待开通钱包的用户列表 - */ - public PageResult pageByNotWallet(PageParam pageParam, UserInfoParam userInfoParam) { - return MpUtil.convert2DtoPageResult(walletManager.pageByNotWallet(pageParam, userInfoParam)); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/service/WalletService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/service/WalletService.java deleted file mode 100644 index 5687c4773a3f155e9d0859ac5581a12120d41dd4..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wallet/service/WalletService.java +++ /dev/null @@ -1,192 +0,0 @@ -package cn.bootx.payment.core.paymodel.wallet.service; - -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.util.BigDecimalUtil; -import cn.bootx.payment.code.paymodel.WalletCode; -import cn.bootx.payment.core.paymodel.wallet.dao.WalletLogManager; -import cn.bootx.payment.core.paymodel.wallet.dao.WalletManager; -import cn.bootx.payment.core.paymodel.wallet.entity.Wallet; -import cn.bootx.payment.core.paymodel.wallet.entity.WalletLog; -import cn.bootx.payment.exception.waller.WalletBannedException; -import cn.bootx.payment.exception.waller.WalletLogError; -import cn.bootx.payment.exception.waller.WalletNotExistsException; -import cn.bootx.payment.param.paymodel.wallet.WalletRechargeParam; -import com.google.common.collect.Lists; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -/** - * 钱包的相关操作 - * - * @author xxm - * @date 2020/12/8 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class WalletService { - - private final WalletManager walletManager; - - private final WalletLogManager walletLogManager; - - /** - * 开通操作 创建 - */ - @Transactional(rollbackFor = Exception.class) - public void createWallet(Long userId) { - // 判断钱包是否已开通 - if (walletManager.existsByUser(userId)) { - throw new BizException("钱包已经开通"); - } - Wallet wallet = new Wallet().setUserId(userId).setBalance(BigDecimal.ZERO).setStatus(WalletCode.STATUS_NORMAL); - walletManager.save(wallet); - // 激活 log - WalletLog activeLog = new WalletLog().setWalletId(wallet.getId()) - .setUserId(wallet.getUserId()) - .setType(WalletCode.LOG_ACTIVE) - .setRemark("激活钱包") - .setOperationSource(WalletCode.OPERATION_SOURCE_USER); - walletLogManager.save(activeLog); - } - - /** - * 批量开通 - */ - public void createWalletBatch(List userIds) { - // 查询出 - List existUserIds = walletManager.findExistUserIds(userIds); - userIds.removeAll(existUserIds); - List wallets = userIds.stream() - .map(userId -> new Wallet().setUserId(userId) - .setStatus(WalletCode.STATUS_NORMAL) - .setBalance(BigDecimal.ZERO)) - .collect(Collectors.toList()); - walletManager.saveAll(wallets); - List walletLogs = wallets.stream() - .map(wallet -> new WalletLog().setWalletId(wallet.getId()) - .setUserId(wallet.getUserId()) - .setAmount(BigDecimal.ZERO) - .setType(WalletCode.LOG_ACTIVE) - .setRemark("激活钱包") - .setOperationSource(WalletCode.OPERATION_SOURCE_USER)) - .collect(Collectors.toList()); - walletLogManager.saveAll(walletLogs); - } - - /** - * 锁定钱包 - */ - public void lock(Long walletId) { - walletManager.setUpStatus(walletId, WalletCode.STATUS_FORBIDDEN); - } - - /** - * 解锁钱包 - */ - public void unlock(Long walletId) { - walletManager.setUpStatus(walletId, WalletCode.STATUS_NORMAL); - } - - /** - * 充值操作 也可以扣款 - */ - @Transactional(rollbackFor = Exception.class) - public void changerBalance(WalletRechargeParam param) { - if (BigDecimalUtil.compareTo(param.getAmount(), BigDecimal.ZERO) == 1) { - walletManager.increaseBalance(param.getWalletId(), param.getAmount()); - } - else if (BigDecimalUtil.compareTo(param.getAmount(), BigDecimal.ZERO) == -1) { - walletManager.reduceBalanceUnlimited(param.getWalletId(), param.getAmount()); - } - else { - return; - } - Wallet wallet = walletManager.findById(param.getWalletId()).orElseThrow(DataNotExistException::new); - WalletLog walletLog = new WalletLog().setAmount(param.getAmount()) - .setWalletId(wallet.getId()) - .setType(WalletCode.LOG_ADMIN_CHANGER) - .setUserId(wallet.getUserId()) - .setRemark(String.format("系统变动余额 %.2f ", param.getAmount())) - .setOperationSource(WalletCode.OPERATION_SOURCE_ADMIN); - walletLogManager.save(walletLog); - } - - /** - * 根据支付单对钱包充值的余额进行扣减 - */ - @Transactional(rollbackFor = Exception.class) - public void deductedBalanceByPaymentId(Long paymentId, Long orderId, String remark, Boolean isThrowError) { - - // 根据支付记录ID查询交易的金额和交易的钱包ID - WalletLog walletLog = walletLogManager.findFirstByPayment(paymentId).orElseThrow(DataNotExistException::new); - if (walletLog == null) { - return; - } - - // 充值类型 - List chargeLogType = Lists.newArrayList(WalletCode.LOG_RECHARGE, WalletCode.LOG_AUTO_RECHARGE, - WalletCode.LOG_ADMIN_CHANGER); - - // 保证是充值类型 且充值金额大于0 - if (!chargeLogType.contains(walletLog.getType()) - || BigDecimalUtil.compareTo(walletLog.getAmount(), BigDecimal.ZERO) < 0) { - log.warn("退款 发现非充值交易，日志ID:{},交易类型:{}", walletLog.getId(), walletLog.getType()); - if (isThrowError) { - throw new WalletLogError(); - } - return; - } - - // 获取钱包ID 并扣减对应金额(允许扣成负数) - walletManager.reduceBalanceUnlimited(walletLog.getWalletId(), walletLog.getAmount()); - - // 记录日志 - WalletLog log = new WalletLog().setWalletId(walletLog.getWalletId()) - .setUserId(walletLog.getUserId()) - .setPaymentId(paymentId) - .setAmount(walletLog.getAmount()) - .setType(WalletCode.LOG_SYSTEM_REDUCE_BALANCE) - .setRemark(String.format("系统减少余额 %.2f (" + remark + ")", walletLog.getAmount())) - .setOperationSource(WalletCode.OPERATION_SOURCE_SYSTEM) - .setPaymentId(paymentId) - .setBusinessId(String.valueOf(orderId)); - walletLogManager.save(log); - - } - - /** - * 查询钱包，如果钱包不存在或者钱包被禁用将抛出异常 - */ - public Wallet getNormalWalletById(Long walletId) { - // 查询Wallet - Wallet wallet = walletManager.findById(walletId).orElseThrow(WalletNotExistsException::new); - // 是否被禁用 - if (Objects.equals(WalletCode.STATUS_FORBIDDEN, wallet.getStatus())) { - throw new WalletBannedException(); - } - return wallet; - } - - /** - * 查询钱包，如果钱包不存在或者钱包被禁用将抛出异常 - */ - public Wallet getNormalWalletByUserId(Long userId) { - // 查询Wallet - Wallet wallet = walletManager.findByUser(userId).orElseThrow(WalletNotExistsException::new); - // 是否被禁用 - if (Objects.equals(WalletCode.STATUS_FORBIDDEN, wallet.getStatus())) { - throw new WalletBannedException(); - } - return wallet; - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/convert/WeChatConvert.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/convert/WeChatConvert.java deleted file mode 100644 index d60a3252354f4bc0d7b5973766d9b81a4ab28ed1..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/convert/WeChatConvert.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.bootx.payment.core.paymodel.wechat.convert; - -import cn.bootx.payment.core.paymodel.wechat.entity.WeChatPayConfig; -import cn.bootx.payment.core.paymodel.wechat.entity.WeChatPayment; -import cn.bootx.payment.dto.paymodel.wechat.WeChatPayConfigDto; -import cn.bootx.payment.dto.paymodel.wechat.WeChatPaymentDto; -import cn.bootx.payment.param.paymodel.wechat.WeChatPayConfigParam; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -/** - * 微信转换类 - * - * @author xxm - * @date 2021/6/21 - */ -@Mapper -public interface WeChatConvert { - - WeChatConvert CONVERT = Mappers.getMapper(WeChatConvert.class); - - WeChatPayConfig convert(WeChatPayConfigParam in); - - WeChatPayConfigDto convert(WeChatPayConfig in); - - WeChatPaymentDto convert(WeChatPayment in); - - WeChatPayment convert(WeChatPaymentDto in); - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/dao/WeChatPayConfigManager.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/dao/WeChatPayConfigManager.java deleted file mode 100644 index 0ff5117414017c41f16c2c05cd07ad6067a81472..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/dao/WeChatPayConfigManager.java +++ /dev/null @@ -1,79 +0,0 @@ -package cn.bootx.payment.core.paymodel.wechat.dao; - -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.payment.core.paymodel.wechat.entity.WeChatPayConfig; -import cn.bootx.payment.param.paymodel.wechat.WeChatPayConfigParam; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; - -import java.util.Objects; -import java.util.Optional; - -/** - * 微信支付配置 - * - * @author xxm - * @date 2021/3/19 - */ -@Repository -@RequiredArgsConstructor -public class WeChatPayConfigManager extends BaseManager { - - private Optional weChatPayConfig; - - @Override - public WeChatPayConfig saveOrUpdate(WeChatPayConfig entity) { - this.clearCache(); - return super.saveOrUpdate(entity); - } - - @Override - public WeChatPayConfig updateById(WeChatPayConfig weChatPayConfig) { - this.clearCache(); - return super.updateById(weChatPayConfig); - } - - /** - * 获取启用的微信配置 - */ - public Optional findActivity() { - if (Objects.isNull(weChatPayConfig)) { - weChatPayConfig = findByField(WeChatPayConfig::getActivity, Boolean.TRUE); - } - return weChatPayConfig; - } - - /** - * 分页 - */ - public Page page(PageParam pageParam, WeChatPayConfigParam param) { - Page mpPage = MpUtil.getMpPage(pageParam, WeChatPayConfig.class); - return lambdaQuery().select(WeChatPayConfig.class, MpUtil::excludeBigField) - .like(StrUtil.isNotBlank(param.getName()), WeChatPayConfig::getName, param.getName()) - .like(StrUtil.isNotBlank(param.getAppId()), WeChatPayConfig::getAppId, param.getAppId()) - .like(StrUtil.isNotBlank(param.getAppId()), WeChatPayConfig::getMchId, param.getMchId()) - .orderByDesc(MpIdEntity::getId) - .page(mpPage); - } - - /** - * 清除所有的被启用的 - */ - public void removeAllActivity() { - this.clearCache(); - lambdaUpdate().eq(WeChatPayConfig::getActivity, Boolean.TRUE).set(WeChatPayConfig::getActivity, Boolean.FALSE); - } - - /** - * 清除缓存 - */ - public void clearCache() { - weChatPayConfig = null; - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/dao/WeChatPayConfigMapper.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/dao/WeChatPayConfigMapper.java deleted file mode 100644 index e6ed35e0cd21baffee7e20addd4f66673ec98402..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/dao/WeChatPayConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.bootx.payment.core.paymodel.wechat.dao; - -import cn.bootx.payment.core.paymodel.wechat.entity.WeChatPayConfig; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * 微信支付配置 - * - * @author xxm - * @date 2021/3/19 - */ -@Mapper -public interface WeChatPayConfigMapper extends BaseMapper { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/dao/WeChatPaymentManager.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/dao/WeChatPaymentManager.java deleted file mode 100644 index cc90437b6c09a97a9af20e79ba16cd5f0a90d6c9..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/dao/WeChatPaymentManager.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.bootx.payment.core.paymodel.wechat.dao; - -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.payment.core.paymodel.wechat.entity.WeChatPayment; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -/** - * 微信支付记录 - * - * @author xxm - * @date 2021/6/21 - */ -@Slf4j -@Repository -@RequiredArgsConstructor -public class WeChatPaymentManager extends BaseManager { - - public Optional findByPaymentId(Long paymentId) { - return findByField(WeChatPayment::getPaymentId, paymentId); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/dao/WeChatPaymentMapper.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/dao/WeChatPaymentMapper.java deleted file mode 100644 index 1e329955ff4223484d9d982ba420b95587de530a..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/dao/WeChatPaymentMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package cn.bootx.payment.core.paymodel.wechat.dao; - -import cn.bootx.payment.core.paymodel.wechat.entity.WeChatPayment; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface WeChatPaymentMapper extends BaseMapper { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/entity/WeChatPayConfig.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/entity/WeChatPayConfig.java deleted file mode 100644 index 6c4aa5ebc19246d198f52582fdca41ba06820814..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/entity/WeChatPayConfig.java +++ /dev/null @@ -1,122 +0,0 @@ -package cn.bootx.payment.core.paymodel.wechat.entity; - -import cn.bootx.common.core.annotation.BigField; -import cn.bootx.common.core.annotation.EncryptionField; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.payment.core.paymodel.wechat.convert.WeChatConvert; -import cn.bootx.payment.dto.paymodel.wechat.WeChatPayConfigDto; -import cn.bootx.payment.param.paymodel.wechat.WeChatPayConfigParam; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 微信支付 - * - * @author xxm - * @date 2021/3/1 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@TableName("pay_wechat_pay_config") -public class WeChatPayConfig extends MpBaseEntity implements EntityBaseFunction { - - /** 名称 */ - private String name; - - /** 微信商户号 */ - private String mchId; - - /** 微信应用appId */ - private String appId; - - /** - * api版本 - * @see cn.bootx.payment.code.paymodel.WeChatPayCode#API_V2 - */ - private String apiVersion; - - /** 商户平台「API安全」中的 APIv2 密钥 */ - @TableField(updateStrategy = FieldStrategy.IGNORED) - @EncryptionField - private String apiKeyV2; - - /** 商户平台「API安全」中的 APIv3 密钥 */ - @TableField(updateStrategy = FieldStrategy.IGNORED) - @EncryptionField - private String apiKeyV3; - - /** APPID对应的接口密码，用于获取微信公众号jsapi支付时使用 */ - @EncryptionField - private String appSecret; - - /** API 证书中的 p12 文件存储的 id */ - @TableField(updateStrategy = FieldStrategy.IGNORED) - @EncryptionField - private Long p12; - - /** API 证书中的 cert.pem 证书 */ - @TableField(updateStrategy = FieldStrategy.IGNORED) - @BigField - @EncryptionField - private String certPem; - - /** API 证书中的 key.pem 私钥 */ - @TableField(updateStrategy = FieldStrategy.IGNORED) - @BigField - @EncryptionField - private String keyPem; - - /** 应用域名，回调中会使用此参数 */ - private String domain; - - /** 服务器异步通知页面路径 通知url必须为直接可访问的url，不能携带参数。公网域名必须为https */ - private String notifyUrl; - - /** 页面跳转同步通知页面路径 */ - private String returnUrl; - - /** 是否沙箱环境 */ - private boolean sandbox; - - /** 超时时间(分钟) */ - private Integer expireTime; - - /** 可用支付方式 */ - @TableField(updateStrategy = FieldStrategy.IGNORED) - private String payWays; - - /** 是否启用 */ - private Boolean activity; - - /** 状态 */ - private Integer state; - - /** 备注 */ - private String remark; - - @Override - public WeChatPayConfigDto toDto() { - WeChatPayConfigDto convert = WeChatConvert.CONVERT.convert(this); - if (StrUtil.isNotBlank(this.getPayWays())) { - convert.setPayWayList(StrUtil.split(this.getPayWays(), ',')); - } - return convert; - } - - public static WeChatPayConfig init(WeChatPayConfigParam in) { - WeChatPayConfig convert = WeChatConvert.CONVERT.convert(in); - if (CollUtil.isNotEmpty(in.getPayWayList())) { - convert.setPayWays(String.join(",", in.getPayWayList())); - } - return convert; - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/entity/WeChatPayment.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/entity/WeChatPayment.java deleted file mode 100644 index ef55b46634b22d71c77f83ca08b32bc63023ee86..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/entity/WeChatPayment.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.bootx.payment.core.paymodel.wechat.entity; - -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.payment.core.paymodel.base.entity.BasePayment; -import cn.bootx.payment.core.paymodel.wechat.convert.WeChatConvert; -import cn.bootx.payment.dto.paymodel.wechat.WeChatPaymentDto; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @author xxm - * @date 2021/6/21 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@TableName("pay_wechat_payment") -public class WeChatPayment extends BasePayment implements EntityBaseFunction { - - /** - * 微信交易号 - */ - private String tradeNo; - - @Override - public WeChatPaymentDto toDto() { - return WeChatConvert.CONVERT.convert(this); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/service/WeChatPayCallbackService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/service/WeChatPayCallbackService.java deleted file mode 100644 index 126224f08d08cb58f415b3cf3c9a6dcf82141c04..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/service/WeChatPayCallbackService.java +++ /dev/null @@ -1,103 +0,0 @@ -package cn.bootx.payment.core.paymodel.wechat.service; - -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.redis.RedisClient; -import cn.bootx.payment.code.pay.PayChannelCode; -import cn.bootx.payment.code.pay.PayStatusCode; -import cn.bootx.payment.code.paymodel.WeChatPayCode; -import cn.bootx.payment.core.notify.dao.PayNotifyRecordManager; -import cn.bootx.payment.core.pay.func.AbsPayCallbackStrategy; -import cn.bootx.payment.core.pay.service.PayCallbackService; -import cn.bootx.payment.core.paymodel.wechat.dao.WeChatPayConfigManager; -import cn.bootx.payment.core.paymodel.wechat.entity.WeChatPayConfig; -import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; -import com.ijpay.core.enums.SignType; -import com.ijpay.core.kit.WxPayKit; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.Map; - -import static cn.bootx.payment.code.paymodel.WeChatPayCode.APPID; - -/** - * 微信支付回调 - * - * @author xxm - * @date 2021/6/21 - */ -@Slf4j -@Service -public class WeChatPayCallbackService extends AbsPayCallbackStrategy { - - private final WeChatPayConfigManager weChatPayConfigManager; - - public WeChatPayCallbackService(RedisClient redisClient, PayNotifyRecordManager payNotifyRecordManager, - PayCallbackService payCallbackService, WeChatPayConfigManager weChatPayConfigManager) { - super(redisClient, payNotifyRecordManager, payCallbackService); - this.weChatPayConfigManager = weChatPayConfigManager; - } - - @Override - public int getPayChannel() { - return PayChannelCode.WECHAT; - } - - /** - * 获取支付单id - */ - @Override - public Long getPaymentId() { - Map params = PARAMS.get(); - String paymentId = params.get(WeChatPayCode.OUT_TRADE_NO); - return Long.valueOf(paymentId); - } - - /** - * 获取支付状态 - */ - @Override - public int getTradeStatus() { - Map params = PARAMS.get(); - if (WxPayKit.codeIsOk(params.get(WeChatPayCode.RESULT_CODE))) { - return PayStatusCode.NOTIFY_TRADE_SUCCESS; - } - else { - return PayStatusCode.NOTIFY_TRADE_FAIL; - } - } - - /** - * 验证回调消息 - */ - @Override - public boolean verifyNotify() { - Map params = PARAMS.get(); - String callReq = JSONUtil.toJsonStr(params); - log.info("微信发起回调 报文: {}", callReq); - String appId = params.get(APPID); - - if (StrUtil.isBlank(appId)) { - log.warn("微信回调报文 appId 为空 {}", callReq); - return false; - } - // - WeChatPayConfig weChatPayConfig = weChatPayConfigManager.findActivity().orElseThrow(DataNotExistException::new); - if (weChatPayConfig == null) { - log.warn("微信支付配置不存在: {}", callReq); - return false; - } - return WxPayKit.verifyNotify(params, weChatPayConfig.getApiKeyV2(), SignType.HMACSHA256, null); - } - - @Override - public String getReturnMsg() { - Map xml = new HashMap<>(4); - xml.put(WeChatPayCode.RETURN_CODE, "SUCCESS"); - xml.put(WeChatPayCode.RETURN_MSG, "OK"); - return WxPayKit.toXml(xml); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/service/WeChatPayCancelService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/service/WeChatPayCancelService.java deleted file mode 100644 index 39a343c57be12653629091dafa8e0af728c19a06..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/service/WeChatPayCancelService.java +++ /dev/null @@ -1,105 +0,0 @@ -package cn.bootx.payment.core.paymodel.wechat.service; - -import cn.bootx.common.spring.exception.RetryableException; -import cn.bootx.payment.code.paymodel.WeChatPayCode; -import cn.bootx.payment.core.pay.local.AsyncRefundLocal; -import cn.bootx.payment.core.payment.entity.Payment; -import cn.bootx.payment.core.paymodel.wechat.entity.WeChatPayConfig; -import cn.bootx.payment.core.paymodel.wechat.entity.WeChatPayment; -import cn.bootx.payment.exception.payment.PayFailureException; -import cn.bootx.starter.file.service.FileUploadService; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; -import com.ijpay.core.enums.SignType; -import com.ijpay.core.kit.WxPayKit; -import com.ijpay.wxpay.WxPayApi; -import com.ijpay.wxpay.model.CloseOrderModel; -import com.ijpay.wxpay.model.RefundModel; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.retry.annotation.Retryable; -import org.springframework.stereotype.Service; - -import java.io.ByteArrayInputStream; -import java.math.BigDecimal; -import java.util.Map; -import java.util.Optional; - -/** - * 微信支付关闭和退款 - * - * @author xxm - * @date 2021/6/21 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class WeChatPayCancelService { - - private final FileUploadService uploadService; - - /** - * 关闭支付 - */ - @Retryable(value = RetryableException.class) - public void cancelRemote(Payment payment, WeChatPayConfig weChatPayConfig) { - // 只有部分需要调用微信网关进行关闭 - Map params = CloseOrderModel.builder() - .appid(weChatPayConfig.getAppId()) - .mch_id(weChatPayConfig.getMchId()) - .out_trade_no(String.valueOf(payment.getId())) - .nonce_str(WxPayKit.generateStr()) - .build() - .createSign(weChatPayConfig.getApiKeyV2(), SignType.HMACSHA256); - String xmlResult = WxPayApi.closeOrder(params); - Map result = WxPayKit.xmlToMap(xmlResult); - this.verifyErrorMsg(result); - } - - /** - * 退款 - */ - public void refund(Payment payment, WeChatPayment weChatPayment, BigDecimal amount, - WeChatPayConfig weChatPayConfig) { - String totalFee = weChatPayment.getAmount().multiply(BigDecimal.valueOf(100)).toBigInteger().toString(); - String refundFee = amount.multiply(BigDecimal.valueOf(100)).toBigInteger().toString(); - // 设置退款号 - AsyncRefundLocal.set(IdUtil.getSnowflakeNextIdStr()); - Map params = RefundModel.builder() - .appid(weChatPayConfig.getAppId()) - .mch_id(weChatPayConfig.getMchId()) - .out_trade_no(String.valueOf(payment.getId())) - .out_refund_no(AsyncRefundLocal.get()) - .total_fee(totalFee) - .refund_fee(refundFee) - .nonce_str(WxPayKit.generateStr()) - .build() - .createSign(weChatPayConfig.getApiKeyV2(), SignType.HMACSHA256); - // 获取证书文件流 - byte[] fileBytes = uploadService.getFileBytes(weChatPayConfig.getP12()); - ByteArrayInputStream inputStream = new ByteArrayInputStream(fileBytes); - // 证书密码为 微信商户号 - String xmlResult = WxPayApi.orderRefund(false, params, inputStream, weChatPayConfig.getMchId()); - Map result = WxPayKit.xmlToMap(xmlResult); - this.verifyErrorMsg(result); - } - - /** - * 验证错误信息 - */ - private void verifyErrorMsg(Map result) { - String returnCode = result.get(WeChatPayCode.RETURN_CODE); - String resultCode = result.get(WeChatPayCode.RESULT_CODE); - if (!WxPayKit.codeIsOk(returnCode) || !WxPayKit.codeIsOk(resultCode)) { - String errorMsg = result.get(WeChatPayCode.ERR_CODE_DES); - if (StrUtil.isBlank(errorMsg)) { - errorMsg = result.get(WeChatPayCode.RETURN_MSG); - } - log.error("订单退款/关闭失败 {}", errorMsg); - AsyncRefundLocal.setErrorMsg(errorMsg); - AsyncRefundLocal.setErrorCode(Optional.ofNullable(resultCode).orElse(returnCode)); - throw new PayFailureException(errorMsg); - } - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/service/WeChatPayConfigService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/service/WeChatPayConfigService.java deleted file mode 100644 index 7342e4a13553860a69c1880ca2483f1369dc88c9..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/service/WeChatPayConfigService.java +++ /dev/null @@ -1,121 +0,0 @@ -package cn.bootx.payment.core.paymodel.wechat.service; - -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.dto.KeyValue; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.payment.code.paymodel.WeChatPayWay; -import cn.bootx.payment.core.paymodel.wechat.dao.WeChatPayConfigManager; -import cn.bootx.payment.core.paymodel.wechat.entity.WeChatPayConfig; -import cn.bootx.payment.dto.paymodel.wechat.WeChatPayConfigDto; -import cn.bootx.payment.exception.payment.PayFailureException; -import cn.bootx.payment.param.paymodel.wechat.WeChatPayConfigParam; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import cn.hutool.core.collection.CollUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -/** - * 微信支付配置 - * - * @author xxm - * @date 2021/3/5 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class WeChatPayConfigService { - - private final WeChatPayConfigManager weChatPayConfigManager; - - /** - * 添加微信支付配置 - */ - @Transactional(rollbackFor = Exception.class) - public void add(WeChatPayConfigParam param) { - WeChatPayConfig weChatPayConfig = WeChatPayConfig.init(param); - weChatPayConfig.setActivity(false); - weChatPayConfigManager.save(weChatPayConfig); - } - - /** - * 修改 - */ - @Transactional(rollbackFor = Exception.class) - public void update(WeChatPayConfigParam param) { - WeChatPayConfig weChatPayConfig = weChatPayConfigManager.findById(param.getId()) - .orElseThrow(() -> new PayFailureException("微信支付配置不存在")); - param.setActivity(null); - BeanUtil.copyProperties(param, weChatPayConfig, CopyOptions.create().ignoreNullValue()); - // 支付方式 - if (CollUtil.isNotEmpty(param.getPayWayList())) { - weChatPayConfig.setPayWays(String.join(",", param.getPayWayList())); - } - else { - weChatPayConfig.setPayWays(null); - } - weChatPayConfigManager.updateById(weChatPayConfig); - } - - /** - * 分页 - */ - public PageResult page(PageParam pageParam, WeChatPayConfigParam param) { - return MpUtil.convert2DtoPageResult(weChatPayConfigManager.page(pageParam, param)); - } - - /** - * 设置启用的支付宝配置 - */ - @Transactional(rollbackFor = Exception.class) - public void setUpActivity(Long id) { - WeChatPayConfig weChatPayConfig = weChatPayConfigManager.findById(id) - .orElseThrow(() -> new PayFailureException("微信支付配置不存在")); - if (Objects.equals(weChatPayConfig.getActivity(), Boolean.TRUE)) { - return; - } - weChatPayConfigManager.removeAllActivity(); - weChatPayConfig.setActivity(true); - weChatPayConfigManager.updateById(weChatPayConfig); - } - - /** - * 清除启用状态 - */ - @Transactional(rollbackFor = Exception.class) - public void clearActivity(Long id) { - WeChatPayConfig weChatPayConfig = weChatPayConfigManager.findById(id) - .orElseThrow(() -> new PayFailureException("微信支付配置不存在")); - if (Objects.equals(weChatPayConfig.getActivity(), Boolean.TRUE)) { - return; - } - weChatPayConfig.setActivity(false); - weChatPayConfigManager.updateById(weChatPayConfig); - } - - /** - * 获取 - */ - public WeChatPayConfigDto findById(Long id) { - return weChatPayConfigManager.findById(id).map(WeChatPayConfig::toDto).orElseThrow(DataNotExistException::new); - } - - /** - * 微信支持支付方式 - */ - public List findPayWayList() { - return WeChatPayWay.getPayWays() - .stream() - .map(e -> new KeyValue(e.getCode(), e.getName())) - .collect(Collectors.toList()); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/service/WeChatPayService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/service/WeChatPayService.java deleted file mode 100644 index 41d22f6e6de7255ba5703aba94599e1396d76cea..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/service/WeChatPayService.java +++ /dev/null @@ -1,275 +0,0 @@ -package cn.bootx.payment.core.paymodel.wechat.service; - -import cn.bootx.common.core.util.LocalDateTimeUtil; -import cn.bootx.common.spring.exception.RetryableException; -import cn.bootx.payment.code.pay.PayStatusCode; -import cn.bootx.payment.code.pay.PayWayCode; -import cn.bootx.payment.code.pay.PayWayEnum; -import cn.bootx.payment.code.paymodel.WeChatPayCode; -import cn.bootx.payment.code.paymodel.WeChatPayWay; -import cn.bootx.payment.core.pay.local.AsyncPayInfoLocal; -import cn.bootx.payment.core.pay.result.PaySyncResult; -import cn.bootx.payment.core.pay.service.PaySyncService; -import cn.bootx.payment.core.payment.entity.Payment; -import cn.bootx.payment.core.paymodel.wechat.entity.WeChatPayConfig; -import cn.bootx.payment.dto.pay.AsyncPayInfo; -import cn.bootx.payment.exception.payment.PayFailureException; -import cn.bootx.payment.param.pay.PayModeParam; -import cn.bootx.payment.param.paymodel.wechat.WeChatPayParam; -import cn.bootx.payment.util.PayModelUtil; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.net.NetUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.extra.spring.SpringUtil; -import com.ijpay.core.enums.SignType; -import com.ijpay.core.enums.TradeType; -import com.ijpay.core.kit.WxPayKit; -import com.ijpay.wxpay.WxPayApi; -import com.ijpay.wxpay.model.MicroPayModel; -import com.ijpay.wxpay.model.UnifiedOrderModel; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.retry.annotation.Backoff; -import org.springframework.retry.annotation.Retryable; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.*; - -import static cn.bootx.payment.code.pay.PaySyncStatus.WAIT_BUYER_PAY; - -/** - * 微信支付 - * - * @author xxm - * @date 2021/3/2 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class WeChatPayService { - - private final PaySyncService paySyncService; - - private final WeChatPaySyncService weChatPaySyncService; - - /** - * 校验 - */ - public void validation(PayModeParam payModeParam, WeChatPayConfig weChatPayConfig) { - List payWays = Optional.ofNullable(weChatPayConfig.getPayWays()) - .filter(StrUtil::isNotBlank) - .map(s -> StrUtil.split(s, ',')) - .orElse(new ArrayList<>(1)); - - PayWayEnum payWayEnum = Optional.ofNullable(WeChatPayWay.findByNo(payModeParam.getPayWay())) - .orElseThrow(() -> new PayFailureException("非法的微信支付类型")); - if (!payWays.contains(payWayEnum.getCode())) { - throw new PayFailureException("该微信支付方式不可用"); - } - } - - /** - * 支付 - */ - public void pay(BigDecimal amount, Payment payment, WeChatPayParam weChatPayParam, PayModeParam payModeParam, - WeChatPayConfig weChatPayConfig) { - // 微信传入的是分, 将元转换为分 - String totalFee = String.valueOf(amount.multiply(new BigDecimal(100)).longValue()); - AsyncPayInfo asyncPayInfo = Optional.ofNullable(AsyncPayInfoLocal.get()).orElse(new AsyncPayInfo()); - String payBody = null; - - // wap支付 - if (payModeParam.getPayWay() == PayWayCode.WAP) { - payBody = this.wapPay(totalFee, payment, weChatPayConfig); - } - // APP支付 - else if (payModeParam.getPayWay() == PayWayCode.APP) { - payBody = this.appPay(totalFee, payment, weChatPayConfig); - } - // 微信公众号支付或者小程序支付 - else if (payModeParam.getPayWay() == PayWayCode.JSAPI) { - payBody = this.jsPay(totalFee, payment, weChatPayParam.getOpenId(), weChatPayConfig); - } - // 二维码支付 - else if (payModeParam.getPayWay() == PayWayCode.QRCODE) { - payBody = this.qrCodePay(totalFee, payment, weChatPayConfig); - } - // 付款码支付 - else if (payModeParam.getPayWay() == PayWayCode.BARCODE) { - String tradeNo = this.barCode(totalFee, payment, weChatPayParam.getAuthCode(), weChatPayConfig); - asyncPayInfo.setTradeNo(tradeNo).setExpiredTime(false); - } - asyncPayInfo.setPayBody(payBody); - AsyncPayInfoLocal.set(asyncPayInfo); - } - - /** - * wap支付 - */ - private String wapPay(String amount, Payment payment, WeChatPayConfig weChatPayConfig) { - Map params = this.buildParams(amount, payment, weChatPayConfig, TradeType.MWEB.getTradeType()) - .build() - .createSign(weChatPayConfig.getApiKeyV2(), SignType.HMACSHA256); - - String xmlResult = WxPayApi.pushOrder(false, params); - Map result = WxPayKit.xmlToMap(xmlResult); - this.verifyErrorMsg(result); - return result.get(WeChatPayCode.MWEB_URL); - } - - /** - * 程序支付 - */ - private String appPay(String amount, Payment payment, WeChatPayConfig weChatPayConfig) { - Map params = this.buildParams(amount, payment, weChatPayConfig, TradeType.APP.getTradeType()) - .build() - .createSign(weChatPayConfig.getApiKeyV2(), SignType.HMACSHA256); - - String xmlResult = WxPayApi.pushOrder(false, params); - Map result = WxPayKit.xmlToMap(xmlResult); - this.verifyErrorMsg(result); - return result.get(WeChatPayCode.PREPAY_ID); - } - - /** - * 微信公众号支付或者小程序支付 - */ - private String jsPay(String amount, Payment payment, String openId, WeChatPayConfig weChatPayConfig) { - Map params = this.buildParams(amount, payment, weChatPayConfig, TradeType.JSAPI.getTradeType()) - .openid(openId) - .build() - .createSign(weChatPayConfig.getApiKeyV2(), SignType.HMACSHA256); - - String xmlResult = WxPayApi.pushOrder(false, params); - Map result = WxPayKit.xmlToMap(xmlResult); - this.verifyErrorMsg(result); - return result.get(WeChatPayCode.PREPAY_ID); - } - - /** - * 二维码支付 - */ - private String qrCodePay(String amount, Payment payment, WeChatPayConfig weChatPayConfig) { - - Map params = this.buildParams(amount, payment, weChatPayConfig, TradeType.NATIVE.getTradeType()) - .build() - .createSign(weChatPayConfig.getApiKeyV2(), SignType.HMACSHA256); - - String xmlResult = WxPayApi.pushOrder(false, params); - Map result = WxPayKit.xmlToMap(xmlResult); - this.verifyErrorMsg(result); - return result.get(WeChatPayCode.CODE_URL); - } - - /** - * 付款码支付 - */ - private String barCode(String amount, Payment payment, String authCode, WeChatPayConfig weChatPayConfig) { - Map params = MicroPayModel.builder() - .appid(weChatPayConfig.getAppId()) - .mch_id(weChatPayConfig.getMchId()) - .nonce_str(WxPayKit.generateStr()) - .body(payment.getTitle()) - .auth_code(authCode) - .out_trade_no(String.valueOf(payment.getId())) - .total_fee(amount) - .spbill_create_ip(NetUtil.getLocalhostStr()) - .build() - .createSign(weChatPayConfig.getApiKeyV2(), SignType.HMACSHA256); - - String xmlResult = WxPayApi.microPay(false, params); - Map result = WxPayKit.xmlToMap(xmlResult); - - String returnCode = result.get(WeChatPayCode.RETURN_CODE); - // 支付失败 - if (!WxPayKit.codeIsOk(returnCode)) { - String errorMsg = result.get(WeChatPayCode.ERR_CODE_DES); - throw new PayFailureException(errorMsg); - } - - String resultCode = result.get(WeChatPayCode.RESULT_CODE); - String errCode = result.get(WeChatPayCode.ERR_CODE); - // 支付成功处理 - if (Objects.equals(resultCode, WeChatPayCode.TRADE_SUCCESS)) { - payment.setPayStatus(PayStatusCode.TRADE_SUCCESS).setPayTime(LocalDateTime.now()); - return result.get(WeChatPayCode.TRANSACTION_ID); - } - // 支付中, 发起轮训同步 - if (Objects.equals(resultCode, WeChatPayCode.TRADE_FAIL) - && Objects.equals(errCode, WeChatPayCode.TRADE_USERPAYING)) { - SpringUtil.getBean(this.getClass()).rotationSync(payment, weChatPayConfig); - return result.get(WeChatPayCode.TRANSACTION_ID); - } - - // 支付撤销 - if (Objects.equals(resultCode, WeChatPayCode.TRADE_REVOKED)) { - throw new PayFailureException("用户已撤销支付"); - } - - // 支付失败 - if (Objects.equals(resultCode, WeChatPayCode.TRADE_PAYERROR) - || Objects.equals(resultCode, WeChatPayCode.TRADE_FAIL)) { - String errorMsg = result.get(WeChatPayCode.ERR_CODE_DES); - throw new PayFailureException(errorMsg); - } - return null; - } - - /** - * 构建参数 - */ - private UnifiedOrderModel.UnifiedOrderModelBuilder buildParams(String amount, Payment payment, - WeChatPayConfig weChatPayConfig, String tradeType) { - // 过期时间 - payment.setExpiredTime(PayModelUtil.getPaymentExpiredTime(weChatPayConfig.getExpireTime())); - return UnifiedOrderModel.builder() - .appid(weChatPayConfig.getAppId()) - .mch_id(weChatPayConfig.getMchId()) - .nonce_str(WxPayKit.generateStr()) - .time_start(LocalDateTimeUtil.format(LocalDateTime.now(), DatePattern.PURE_DATETIME_PATTERN)) - // 反正v2版本的超时时间无效 - .time_expire(PayModelUtil.getWxExpiredTime(weChatPayConfig.getExpireTime())) - .body(payment.getTitle()) - .out_trade_no(String.valueOf(payment.getId())) - .total_fee(amount) - .spbill_create_ip(NetUtil.getLocalhostStr()) - .notify_url(weChatPayConfig.getNotifyUrl()) - .trade_type(tradeType); - } - - /** - * 验证错误信息 - */ - private void verifyErrorMsg(Map result) { - String returnCode = result.get(WeChatPayCode.RETURN_CODE); - String resultCode = result.get(WeChatPayCode.RESULT_CODE); - if (!WxPayKit.codeIsOk(returnCode) || !WxPayKit.codeIsOk(resultCode)) { - String errorMsg = result.get(WeChatPayCode.ERR_CODE_DES); - if (StrUtil.isBlank(errorMsg)) { - errorMsg = result.get(WeChatPayCode.RETURN_MSG); - } - log.error("支付失败 {}", errorMsg); - throw new PayFailureException(errorMsg); - } - } - - /** - * 重试同步支付状态, 最多10次, 30秒不操作微信会自动关闭 - */ - @Async("bigExecutor") - @Retryable(value = RetryableException.class, maxAttempts = 10, backoff = @Backoff(value = 5000L)) - public void rotationSync(Payment payment, WeChatPayConfig weChatPayConfig) { - PaySyncResult paySyncResult = weChatPaySyncService.syncPayStatus(payment.getId(), weChatPayConfig); - // 不为支付中状态后, 调用系统同步更新状态, 支付状态则继续重试 - if (Objects.equals(WAIT_BUYER_PAY, paySyncResult.getPaySyncStatus())) { - throw new RetryableException(); - } - else { - paySyncService.syncPayment(payment); - } - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/service/WeChatPaySyncService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/service/WeChatPaySyncService.java deleted file mode 100644 index 6fec45fcfc5288bc5c7e4bba1cc2a36ed6ccdb91..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/service/WeChatPaySyncService.java +++ /dev/null @@ -1,85 +0,0 @@ -package cn.bootx.payment.core.paymodel.wechat.service; - -import cn.bootx.payment.code.pay.PaySyncStatus; -import cn.bootx.payment.code.paymodel.WeChatPayCode; -import cn.bootx.payment.core.pay.result.PaySyncResult; -import cn.bootx.payment.core.paymodel.wechat.entity.WeChatPayConfig; -import com.ijpay.core.enums.SignType; -import com.ijpay.core.kit.WxPayKit; -import com.ijpay.wxpay.WxPayApi; -import com.ijpay.wxpay.model.UnifiedOrderModel; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.Map; -import java.util.Objects; - -/** - * 微信支付同步服务 - * - * @author xxm - * @date 2021/6/21 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class WeChatPaySyncService { - - /** - * 同步查询 - */ - public PaySyncResult syncPayStatus(Long paymentId, WeChatPayConfig weChatPayConfig) { - PaySyncResult paySyncResult = new PaySyncResult().setPaySyncStatus(PaySyncStatus.FAIL); - Map params = UnifiedOrderModel.builder() - .appid(weChatPayConfig.getAppId()) - .mch_id(weChatPayConfig.getMchId()) - .nonce_str(WxPayKit.generateStr()) - .out_trade_no(String.valueOf(paymentId)) - .build() - .createSign(weChatPayConfig.getApiKeyV2(), SignType.HMACSHA256); - try { - String xmlResult = WxPayApi.orderQuery(params); - Map result = WxPayKit.xmlToMap(xmlResult); - // 查询失败 - if (!WxPayKit.codeIsOk(result.get(WeChatPayCode.RETURN_CODE))) { - log.warn("查询微信订单失败:{}", result); - return paySyncResult; - } - - // 未查到订单 - if (!WxPayKit.codeIsOk(result.get(WeChatPayCode.RESULT_CODE))) { - log.warn("疑似未查询到订单:{}", result); - return paySyncResult.setPaySyncStatus(PaySyncStatus.NOT_FOUND); - } - String tradeStatus = result.get(WeChatPayCode.TRADE_STATE); - // 支付完成 - if (Objects.equals(tradeStatus, WeChatPayCode.TRADE_SUCCESS) - || Objects.equals(tradeStatus, WeChatPayCode.TRADE_ACCEPT)) { - return paySyncResult.setPaySyncStatus(PaySyncStatus.TRADE_SUCCESS).setMap(result); - } - // 待支付 - if (Objects.equals(tradeStatus, WeChatPayCode.TRADE_NOTPAY) - || Objects.equals(tradeStatus, WeChatPayCode.TRADE_USERPAYING)) { - return paySyncResult.setPaySyncStatus(PaySyncStatus.WAIT_BUYER_PAY); - } - - // 已退款/退款中 - if (Objects.equals(tradeStatus, WeChatPayCode.TRADE_REFUND)) { - return paySyncResult.setPaySyncStatus(PaySyncStatus.TRADE_REFUND); - } - // 已关闭 - if (Objects.equals(tradeStatus, WeChatPayCode.TRADE_CLOSED) - || Objects.equals(tradeStatus, WeChatPayCode.TRADE_REVOKED) - || Objects.equals(tradeStatus, WeChatPayCode.TRADE_PAYERROR)) { - return paySyncResult.setPaySyncStatus(PaySyncStatus.TRADE_CLOSED); - } - - } - catch (RuntimeException e) { - log.error("查询订单失败:", e); - } - return paySyncResult; - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/service/WeChatPaymentService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/service/WeChatPaymentService.java deleted file mode 100644 index 38bceb90b6627cb39de15611dec2e4a2e55d219b..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/paymodel/wechat/service/WeChatPaymentService.java +++ /dev/null @@ -1,121 +0,0 @@ -package cn.bootx.payment.core.paymodel.wechat.service; - -import cn.bootx.common.core.exception.BizException; -import cn.bootx.common.core.util.BigDecimalUtil; -import cn.bootx.payment.code.pay.PayChannelCode; -import cn.bootx.payment.code.pay.PayStatusCode; -import cn.bootx.payment.core.pay.local.AsyncPayInfoLocal; -import cn.bootx.payment.core.payment.entity.Payment; -import cn.bootx.payment.core.payment.service.PaymentService; -import cn.bootx.payment.core.paymodel.wechat.dao.WeChatPaymentManager; -import cn.bootx.payment.core.paymodel.wechat.entity.WeChatPayment; -import cn.bootx.payment.dto.pay.AsyncPayInfo; -import cn.bootx.payment.dto.payment.PayChannelInfo; -import cn.bootx.payment.dto.payment.RefundableInfo; -import cn.bootx.payment.param.pay.PayModeParam; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Objects; -import java.util.Optional; - -/** - * 微信支付记录单 - * - * @author xxm - * @date 2021/6/21 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class WeChatPaymentService { - - private final PaymentService paymentService; - - private final WeChatPaymentManager weChatPaymentManager; - - /** - * 支付调起成功 更新 payment 中 异步支付类型信息 - */ - public void updatePaySuccess(Payment payment, PayModeParam payModeParam) { - AsyncPayInfo asyncPayInfo = AsyncPayInfoLocal.get(); - payment.setAsyncPayMode(true).setAsyncPayChannel(PayChannelCode.WECHAT); - - List payTypeInfos = payment.getPayChannelInfo(); - List refundableInfos = payment.getRefundableInfo(); - // 清除已有的异步支付类型信息 - payTypeInfos.removeIf(payTypeInfo -> PayChannelCode.ASYNC_TYPE.contains(payTypeInfo.getPayChannel())); - refundableInfos.removeIf(payTypeInfo -> PayChannelCode.ASYNC_TYPE.contains(payTypeInfo.getPayChannel())); - // 添加微信支付类型信息 - payTypeInfos.add(new PayChannelInfo().setPayChannel(PayChannelCode.WECHAT) - .setPayWay(payModeParam.getPayWay()) - .setAmount(payModeParam.getAmount()) - .setExtraParamsJson(payModeParam.getExtraParamsJson())); - payment.setPayChannelInfo(payTypeInfos); - // 更新微信可退款类型信息 - refundableInfos - .add(new RefundableInfo().setPayChannel(PayChannelCode.WECHAT).setAmount(payModeParam.getAmount())); - payment.setRefundableInfo(refundableInfos); - // 如果支付完成(付款码情况) 调用 updateSyncSuccess 创建微信支付记录 - if (Objects.equals(payment.getPayStatus(), PayStatusCode.TRADE_SUCCESS)) { - this.createWeChatPayment(payment, payModeParam, asyncPayInfo.getTradeNo()); - } - } - - /** - * 异步支付成功, 更新支付记录成功状态, 并创建微信支付记录 - */ - public void updateAsyncSuccess(Long id, PayModeParam payModeParam, String tradeNo) { - Payment payment = paymentService.findById(id).orElseThrow(() -> new BizException("支付记录不存在")); - this.createWeChatPayment(payment, payModeParam, tradeNo); - } - - /** - * 更新支付记录成功状态, 并创建微信支付记录 - */ - private void createWeChatPayment(Payment payment, PayModeParam payModeParam, String tradeNo) { - - // 创建微信支付记录 - WeChatPayment wechatPayment = new WeChatPayment(); - wechatPayment.setTradeNo(tradeNo) - .setPaymentId(payment.getId()) - .setAmount(payModeParam.getAmount()) - .setRefundableBalance(payModeParam.getAmount()) - .setBusinessId(payment.getBusinessId()) - .setUserId(payment.getUserId()) - .setPayStatus(PayStatusCode.TRADE_SUCCESS) - .setPayTime(LocalDateTime.now()); - weChatPaymentManager.save(wechatPayment); - } - - /** - * 取消状态 - */ - public void updateClose(Long paymentId) { - Optional weChatPaymentOptional = weChatPaymentManager.findByPaymentId(paymentId); - weChatPaymentOptional.ifPresent(weChatPayment -> { - weChatPayment.setPayStatus(PayStatusCode.TRADE_CANCEL); - weChatPaymentManager.updateById(weChatPayment); - }); - } - - /** - * 更新退款 - */ - public void updatePayRefund(WeChatPayment weChatPayment, BigDecimal amount) { - BigDecimal refundableBalance = weChatPayment.getRefundableBalance().subtract(amount); - weChatPayment.setRefundableBalance(refundableBalance); - if (BigDecimalUtil.compareTo(refundableBalance, BigDecimal.ZERO) == 0) { - weChatPayment.setPayStatus(PayStatusCode.TRADE_REFUNDED); - } - else { - weChatPayment.setPayStatus(PayStatusCode.TRADE_REFUNDING); - } - weChatPaymentManager.updateById(weChatPayment); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/refund/convert/RefundConvert.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/refund/convert/RefundConvert.java deleted file mode 100644 index bfba7702f019d440b5cabce9cc271ee7f974f568..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/refund/convert/RefundConvert.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.bootx.payment.core.refund.convert; - -import cn.bootx.payment.core.refund.entity.RefundRecord; -import cn.bootx.payment.dto.refund.RefundRecordDto; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -/** - * @author xxm - * @date 2022/3/2 - */ -@Mapper -public interface RefundConvert { - - RefundConvert CONVERT = Mappers.getMapper(RefundConvert.class); - - RefundRecordDto convert(RefundRecord in); - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/refund/dao/RefundRecordManager.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/refund/dao/RefundRecordManager.java deleted file mode 100644 index 7b6dbeac83c4a01f451aee17e5dc392ec6ddf0e7..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/refund/dao/RefundRecordManager.java +++ /dev/null @@ -1,34 +0,0 @@ -package cn.bootx.payment.core.refund.dao; - -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.payment.core.refund.entity.RefundRecord; -import cn.bootx.payment.dto.refund.RefundRecordDto; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Repository; - -import java.util.Objects; - -/** - * @author xxm - * @date 2022/3/2 - */ -@Slf4j -@Repository -@RequiredArgsConstructor -public class RefundRecordManager extends BaseManager { - - public Page page(PageParam pageParam, RefundRecordDto param) { - Page mpPage = MpUtil.getMpPage(pageParam, RefundRecord.class); - return lambdaQuery().orderByDesc(MpIdEntity::getId) - .like(Objects.nonNull(param.getPaymentId()), RefundRecord::getPaymentId, param.getPaymentId()) - .like(Objects.nonNull(param.getBusinessId()), RefundRecord::getBusinessId, param.getBusinessId()) - .like(Objects.nonNull(param.getTitle()), RefundRecord::getTitle, param.getTitle()) - .page(mpPage); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/refund/dao/RefundRecordMapper.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/refund/dao/RefundRecordMapper.java deleted file mode 100644 index 716b46724f02b3203685f278d960f6276d1f4560..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/refund/dao/RefundRecordMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.bootx.payment.core.refund.dao; - -import cn.bootx.payment.core.refund.entity.RefundRecord; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author xxm - * @date 2022/3/2 - */ -@Mapper -public interface RefundRecordMapper extends BaseMapper { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/refund/entity/RefundRecord.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/refund/entity/RefundRecord.java deleted file mode 100644 index ac37e19f643687b88ad376d76982d204fda60a98..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/refund/entity/RefundRecord.java +++ /dev/null @@ -1,81 +0,0 @@ -package cn.bootx.payment.core.refund.entity; - -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.common.mybatisplus.handler.JacksonRawTypeHandler; -import cn.bootx.payment.core.refund.convert.RefundConvert; -import cn.bootx.payment.dto.payment.RefundableInfo; -import cn.bootx.payment.dto.refund.RefundRecordDto; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.List; - -/** - * 退款记录 - * - * @author xxm - * @date 2022/3/2 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@TableName(value = "pay_refund_record", autoResultMap = true) -public class RefundRecord extends MpBaseEntity implements EntityBaseFunction { - - /** 支付单号 */ - private Long paymentId; - - /** 关联的业务id */ - private String businessId; - - /** 异步方式关联退款请求号(部分退款情况) */ - private String refundRequestNo; - - /** 用户ID */ - private Long userId; - - /** 标题 */ - private String title; - - /** 退款金额 */ - private BigDecimal amount; - - /** 剩余可退 */ - private BigDecimal refundableBalance; - - /** 退款终端ip */ - private String clientIp; - - /** 退款时间 */ - private LocalDateTime refundTime; - - /** - * 退款信息列表 - */ - @TableField(typeHandler = JacksonRawTypeHandler.class) - private List refundableInfo; - - /** - * 退款状态 - * @see cn.bootx.payment.code.pay.PayStatusCode#REFUND_PROCESS_FAIL - */ - private int refundStatus; - - /** 错误码 */ - private String errorCode; - - /** 错误信息 */ - private String errorMsg; - - @Override - public RefundRecordDto toDto() { - return RefundConvert.CONVERT.convert(this); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/refund/service/RefundRecordService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/refund/service/RefundRecordService.java deleted file mode 100644 index 5fc8d3980f38c6a5028fdfefdb3c51838a47e564..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/core/refund/service/RefundRecordService.java +++ /dev/null @@ -1,43 +0,0 @@ -package cn.bootx.payment.core.refund.service; - -import cn.bootx.common.core.exception.DataNotExistException; -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.payment.core.refund.dao.RefundRecordManager; -import cn.bootx.payment.core.refund.entity.RefundRecord; -import cn.bootx.payment.dto.refund.RefundRecordDto; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * 退款 - * - * @author xxm - * @date 2022/3/2 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class RefundRecordService { - - private final RefundRecordManager refundRecordManager; - - /** - * 分页查询 - */ - public PageResult page(PageParam pageParam, RefundRecordDto param) { - Page page = refundRecordManager.page(pageParam, param); - return MpUtil.convert2DtoPageResult(page); - } - - /** - * 根据id查询 - */ - public RefundRecordDto findById(Long id) { - return refundRecordManager.findById(id).map(RefundRecord::toDto).orElseThrow(DataNotExistException::new); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/notify/PayNotifyRecordDto.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/notify/PayNotifyRecordDto.java deleted file mode 100644 index e753c82fe14c412cb48657df79e2ac5394892dae..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/notify/PayNotifyRecordDto.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.bootx.payment.dto.notify; - -import cn.bootx.common.core.rest.dto.BaseDto; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - * @author xxm - * @date 2021/6/22 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@Schema(title = "支付回调记录") -public class PayNotifyRecordDto extends BaseDto implements Serializable { - - private static final long serialVersionUID = -1241346974397068912L; - - @Schema(description = "支付号") - private Long paymentId; - - @Schema(description = "通知消息") - private String notifyInfo; - - @Schema(description = "支付通道") - private Integer payChannel; - - @Schema(description = "处理状态") - private Integer status; - - @Schema(description = "提示信息") - private String msg; - - @Schema(description = "回调时间") - private LocalDateTime notifyTime; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/pay/AsyncPayInfo.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/pay/AsyncPayInfo.java deleted file mode 100644 index ea9de401af546fcb78f885b3c9cba40a8598193b..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/pay/AsyncPayInfo.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.bootx.payment.dto.pay; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * @author xxm - * @date 2021/2/28 - */ -@Data -@Accessors(chain = true) -@Schema(title = "异步支付线程信息") -public class AsyncPayInfo implements Serializable { - - private static final long serialVersionUID = 8239742916705144905L; - - /** 支付参数体(通常用于发起支付的参数) */ - private String payBody; - - /** 第三方支付平台订单号(付款码支付直接成功时会出现) */ - private String tradeNo; - - /** 是否记录超时时间,默认记录 */ - private boolean expiredTime = true; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/pay/PayResult.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/pay/PayResult.java deleted file mode 100644 index 1bb79a5dc2d7eacbd840789b8d72c8f5da6eb585..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/pay/PayResult.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.bootx.payment.dto.pay; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * @author xxm - * @date 2020/12/9 - */ -@Data -@Accessors(chain = true) -@Schema(title = "支付返回信息") -public class PayResult implements Serializable { - - private static final long serialVersionUID = 7729669194741851195L; - - @Schema(description = "是否是异步支付") - private boolean asyncPayMode; - - @Schema(description = "异步支付通道") - private Integer asyncPayChannel; - - /** - * @see cn.bootx.payment.code.pay.PayStatusCode#TRADE_PROGRESS - */ - @Schema(description = "支付状态") - private int payStatus; - - @Schema(description = "异步支付参数") - private AsyncPayInfo asyncPayInfo; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/payconfig/PayChannelDto.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/payconfig/PayChannelDto.java deleted file mode 100644 index e7d0e20b351948a960b09c9d9dc28723bc0a6e9b..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/payconfig/PayChannelDto.java +++ /dev/null @@ -1,43 +0,0 @@ -package cn.bootx.payment.dto.payconfig; - -import cn.bootx.common.core.rest.dto.BaseDto; -import cn.bootx.payment.code.pay.PayChannelEnum; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * 支付通道 - * - * @author xxm - * @date 2021/6/30 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -public class PayChannelDto extends BaseDto implements Serializable { - - /** - * 通道代码(唯一) - * @see PayChannelEnum - */ - private String code; - - /** 名称 */ - private String name; - - /** 页面展示：卡片-图标 */ - private String icon; - - /** 页面展示：卡片-背景色 */ - private String bgColor; - - /** 状态 */ - private Integer state; - - /** 备注 */ - private String remark; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/payconfig/PayChannelWayDto.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/payconfig/PayChannelWayDto.java deleted file mode 100644 index e7b98881b509126d58169b22ad1b22bc23553d04..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/payconfig/PayChannelWayDto.java +++ /dev/null @@ -1,38 +0,0 @@ -package cn.bootx.payment.dto.payconfig; - -import cn.bootx.common.core.rest.dto.BaseDto; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * 支付通道支持的支付方式 - * - * @author xxm - * @date 2021/6/30 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -public class PayChannelWayDto extends BaseDto implements Serializable { - - private static final long serialVersionUID = 4579797594767439540L; - - /** 支付方式代码 */ - private String code; - - /** 支付方式名称 */ - private String name; - - /** 通道id */ - private Long channelId; - - /** 通道code */ - private String channelCode; - - /** 备注 */ - private String remark; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/payment/BasePaymentDto.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/payment/BasePaymentDto.java deleted file mode 100644 index b9b269ff6ad1e945149c7f01932ecd12f68fd867..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/payment/BasePaymentDto.java +++ /dev/null @@ -1,47 +0,0 @@ -package cn.bootx.payment.dto.payment; - -import cn.bootx.common.core.rest.dto.BaseDto; -import cn.bootx.payment.code.pay.PayStatusCode; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - * @author xxm - * @date 2021/2/25 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@Schema(title = "具体支付日志基类") -public class BasePaymentDto extends BaseDto { - - @Schema(description = "支付id") - private Long paymentId; - - @Schema(description = "用户id") - private Long userId; - - @Schema(description = "关联的业务id") - private String businessId; - - @Schema(description = "金额") - private BigDecimal amount; - - @Schema(description = "可退款金额") - private BigDecimal refundableBalance; - - /** - * @see PayStatusCode - */ - @Schema(description = "支付状态") - private int payStatus; - - @Schema(description = "支付时间") - private LocalDateTime payTime; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/payment/PayChannelInfo.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/payment/PayChannelInfo.java deleted file mode 100644 index c751e41312a7c587dfbe013d351f7a1eb9af51a5..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/payment/PayChannelInfo.java +++ /dev/null @@ -1,33 +0,0 @@ -package cn.bootx.payment.dto.payment; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @author xxm - * @date 2020/12/8 - */ -@Data -@Accessors(chain = true) -@Schema(title = "支付通道信息") -public class PayChannelInfo implements Serializable { - - private static final long serialVersionUID = -7757908686367215682L; - - @Schema(description = "支付通道") - private int payChannel; - - @Schema(description = "支付方式") - private int payWay; - - @Schema(description = "金额") - private BigDecimal amount; - - @Schema(description = "扩展参数的json字符串", hidden = true) - private String extraParamsJson; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/payment/PaymentDto.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/payment/PaymentDto.java deleted file mode 100644 index ed21fad5de0b21d2f78821a08c856b5c2f215c1f..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/payment/PaymentDto.java +++ /dev/null @@ -1,86 +0,0 @@ -package cn.bootx.payment.dto.payment; - -import cn.bootx.common.core.rest.dto.BaseDto; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.List; - -/** - * @author xxm - * @date 2020/12/9 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@Schema(title = "支付记录") -public class PaymentDto extends BaseDto implements Serializable { - - private static final long serialVersionUID = 3269223993950227228L; - - @Schema(description = "用户ID") - private Long userId; - - @Schema(description = "关联的业务id") - private String businessId; - - @Schema(description = "标题") - private String title; - - @Schema(description = "描述") - private String description; - - @Schema(description = "是否是异步支付") - private boolean asyncPayMode; - - /** - * @see cn.bootx.payment.code.pay.PayChannelCode - */ - @Schema(description = "异步支付通道") - private Integer asyncPayChannel; - - /** - * @see cn.bootx.payment.code.pay.PayStatusCode - */ - @Schema(description = "支付状态") - private int payStatus; - - @Schema(description = "金额") - private BigDecimal amount; - - @Schema(description = "可退款余额") - private BigDecimal refundableBalance; - - @Schema(description = "错误码") - private String errorCode; - - @Schema(description = "错误信息") - private String errorMsg; - - /** - * @see PayChannelInfo - */ - @Schema(description = "支付通道信息") - private List payChannelInfo; - - /** - * @see RefundableInfo - */ - @Schema(description = "可退款信息列表") - private List refundableInfo; - - @Schema(description = "支付时间") - private LocalDateTime payTime; - - @Schema(description = "支付终端ip") - private String clientIp; - - @Schema(description = "过期时间") - private LocalDateTime expiredTime; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/payment/RefundableInfo.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/payment/RefundableInfo.java deleted file mode 100644 index c22bced7d6f0abd2219e022551ed822f9ee98be0..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/payment/RefundableInfo.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.bootx.payment.dto.payment; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * 可退款信息 - * - * @author xxm - * @date 2022/3/2 - */ -@Data -@Accessors(chain = true) -@Schema(title = "可退款信息") -public class RefundableInfo { - - @Schema(description = "支付通道") - private int payChannel; - - @Schema(description = "金额") - private BigDecimal amount; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/alipay/AliPaymentDto.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/alipay/AliPaymentDto.java deleted file mode 100644 index 9f38858e05456a4304ca3e618adf2d577801d4f6..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/alipay/AliPaymentDto.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.bootx.payment.dto.paymodel.alipay; - -import cn.bootx.payment.dto.payment.BasePaymentDto; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * @author xxm - * @date 2021/2/27 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@Schema(title = "支付宝支付记录") -public class AliPaymentDto extends BasePaymentDto implements Serializable { - - private static final long serialVersionUID = 6883103229754466130L; - - @Schema(description = "支付宝交易号") - private String tradeNo; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/alipay/AlipayConfigDto.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/alipay/AlipayConfigDto.java deleted file mode 100644 index f67e8b8bd8520fe0bd54a774ea65227f7d9e55bb..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/alipay/AlipayConfigDto.java +++ /dev/null @@ -1,85 +0,0 @@ -package cn.bootx.payment.dto.paymodel.alipay; - -import cn.bootx.common.core.rest.dto.BaseDto; -import cn.bootx.starter.data.perm.sensitive.SensitiveInfo; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.List; - -/** - * @author xxm - * @date 2021/2/26 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@Schema(title = "支付宝配置") -public class AlipayConfigDto extends BaseDto implements Serializable { - - private static final long serialVersionUID = 6641158663606363171L; - - @Schema(description = "名称") - private String name; - - @Schema(description = "支付宝商户appId") - @SensitiveInfo - private String appId; - - @Schema(description = "服务器异步通知页面路径 需http://或者https://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问") - private String notifyUrl; - - @Schema(description = "页面跳转同步通知页面路径 需http://或者https://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问 商户可以自定义同步跳转地址") - private String returnUrl; - - @Schema(description = "请求网关地址") - private String serverUrl; - - @Schema(description = "认证类型 证书/公钥") - private Integer authType; - - @Schema(description = "签名类型") - private String signType; - - @Schema(description = "支付宝公钥") - @SensitiveInfo(value = SensitiveInfo.SensitiveType.OTHER, front = 15) - private String alipayPublicKey; - - @Schema(description = "私钥") - @SensitiveInfo(value = SensitiveInfo.SensitiveType.OTHER, front = 15) - private String privateKey; - - @Schema(description = "应用公钥证书") - @SensitiveInfo(value = SensitiveInfo.SensitiveType.OTHER, front = 15) - private String appCert; - - @Schema(description = "支付宝公钥证书文件") - @SensitiveInfo(value = SensitiveInfo.SensitiveType.OTHER, front = 15) - private String alipayCert; - - @Schema(description = "支付宝CA根证书文件") - @SensitiveInfo(value = SensitiveInfo.SensitiveType.OTHER, front = 15) - private String alipayRootCert; - - @Schema(description = "超时配置") - private Integer expireTime; - - @Schema(description = "可用支付方式") - private List payWayList; - - @Schema(description = "是否沙箱环境") - private boolean sandbox; - - @Schema(description = "是否启用") - private Boolean activity; - - @Schema(description = "状态") - private Integer state; - - @Schema(description = "备注") - private String remark; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/union/UnionPayConfigDto.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/union/UnionPayConfigDto.java deleted file mode 100644 index bf4986178809010aa38e6be0f5a3b02a5757043d..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/union/UnionPayConfigDto.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.bootx.payment.dto.paymodel.union; - -import cn.bootx.common.core.rest.dto.BaseDto; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @author xxm - * @date 2022/3/11 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@Schema(title = "云闪付配置") -public class UnionPayConfigDto extends BaseDto { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/voucher/VoucherDto.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/voucher/VoucherDto.java deleted file mode 100644 index 6a85a1e34622c86a00461c9d7c8670d22a98cc5c..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/voucher/VoucherDto.java +++ /dev/null @@ -1,49 +0,0 @@ -package cn.bootx.payment.dto.paymodel.voucher; - -import cn.bootx.common.core.rest.dto.BaseDto; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - * @author xxm - * @date 2022/3/14 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@Schema(title = "储值卡") -public class VoucherDto extends BaseDto { - - @Schema(description = "卡号") - private String cardNo; - - @Schema(description = "生成批次号") - private Long batchNo; - - @Schema(description = "面值") - private BigDecimal faceValue; - - @Schema(description = "余额") - private BigDecimal balance; - - @Schema(description = "是否长期有效") - private Boolean enduring; - - @Schema(description = "开始时间") - private LocalDateTime startTime; - - @Schema(description = "结束时间") - private LocalDateTime endTime; - - /** - * @see cn.bootx.payment.code.paymodel.VoucherCode - */ - @Schema(description = "状态") - private Integer status; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/voucher/VoucherPaymentDto.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/voucher/VoucherPaymentDto.java deleted file mode 100644 index 615ff2d6f29ce4ed1017b634a0a061f5fdacf862..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/voucher/VoucherPaymentDto.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.bootx.payment.dto.paymodel.voucher; - -import cn.bootx.payment.dto.payment.BasePaymentDto; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @author xxm - * @date 2022/3/14 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@Schema(title = "储值卡支付记录") -public class VoucherPaymentDto extends BasePaymentDto { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/wallet/WalletDto.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/wallet/WalletDto.java deleted file mode 100644 index 799c9f584da4229592738bf130fe83cfcfb5fa43..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/wallet/WalletDto.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.bootx.payment.dto.paymodel.wallet; - -import cn.bootx.common.core.rest.dto.BaseDto; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @author xxm - * @date 2020/12/8 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@Schema(title = "钱包") -public class WalletDto extends BaseDto implements Serializable { - - private static final long serialVersionUID = -1563719305334334625L; - - @Schema(description = "ID,钱包的唯一标识") - private Long id; - - @Schema(description = "钱包关联的账号ID") - private Long userId; - - @Schema(description = "钱包余额") - private BigDecimal balance; - - @Schema(description = "状态 1启用 2禁用") - private Integer status; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/wallet/WalletInfoDto.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/wallet/WalletInfoDto.java deleted file mode 100644 index 0d9304b02bdac1171a35c6eaeac34968022db486..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/wallet/WalletInfoDto.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.bootx.payment.dto.paymodel.wallet; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 钱包综合信息 - * - * @author xxm - * @date 2022/3/13 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@Schema(title = "钱包综合信息") -public class WalletInfoDto extends WalletDto { - - @Schema(description = "钱包关联的账号名称") - private String userName; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/wallet/WalletLogDto.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/wallet/WalletLogDto.java deleted file mode 100644 index 29fd44a517a529823f67afa2e223789a7d3b2027..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/wallet/WalletLogDto.java +++ /dev/null @@ -1,59 +0,0 @@ -package cn.bootx.payment.dto.paymodel.wallet; - -import cn.bootx.common.core.rest.dto.BaseDto; -import cn.bootx.payment.code.paymodel.WalletCode; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - * @author xxm - * @date 2020/12/8 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@Schema(title = "钱包日志") -public class WalletLogDto extends BaseDto implements Serializable { - - private static final long serialVersionUID = -2553004953931903738L; - - @Schema(description = "钱包ID") - private Long walletId; - - @Schema(description = "用户ID") - private Long userId; - - /** - * @see WalletCode - */ - @Schema(description = "类型") - private Integer type; - - @Schema(description = "交易记录ID") - private Long paymentId; - - @Schema(description = "备注") - private String remark; - - @Schema(description = "业务ID") - private String businessId; - - /** - * @see WalletCode - */ - @Schema(description = " 1 系统操作 2管理员操作 3用户操作") - private Integer operationSource; - - @Schema(description = "金额") - private BigDecimal amount; - - @Schema(description = "创建时间") - private LocalDateTime createTime; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/wallet/WalletPaymentDto.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/wallet/WalletPaymentDto.java deleted file mode 100644 index d6ed735bc9f1546ed399323889da12ae407e34e6..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/wallet/WalletPaymentDto.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.bootx.payment.dto.paymodel.wallet; - -import cn.bootx.payment.dto.payment.BasePaymentDto; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * @author xxm - * @date 2020/12/8 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@Schema(title = "钱包支付记录") -public class WalletPaymentDto extends BasePaymentDto implements Serializable { - - private static final long serialVersionUID = 8238920331255597223L; - - @Schema(description = "钱包ID") - private Long walletId; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/wechat/WeChatPayConfigDto.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/wechat/WeChatPayConfigDto.java deleted file mode 100644 index 6d9e6d7f66bef4e2490b3fcbb57b24215f5dce49..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/wechat/WeChatPayConfigDto.java +++ /dev/null @@ -1,90 +0,0 @@ -package cn.bootx.payment.dto.paymodel.wechat; - -import cn.bootx.common.core.rest.dto.BaseDto; -import cn.bootx.starter.data.perm.sensitive.SensitiveInfo; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.List; - -/** - * @author xxm - * @date 2021/3/19 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@Schema(title = "微信支付配置") -public class WeChatPayConfigDto extends BaseDto implements Serializable { - - @Schema(description = "名称") - private String name; - - @Schema(description = "微信商户号") - @SensitiveInfo - private String mchId; - - @Schema(description = "微信应用appId") - @SensitiveInfo - private String appId; - - /** - * @see cn.bootx.payment.code.paymodel.WeChatPayCode#API_V2 - */ - @Schema(description = "api版本") - private String apiVersion; - - @Schema(description = "商户平台「API安全」中的 APIv2 密钥") - @SensitiveInfo - private String apiKeyV2; - - @Schema(description = "商户平台「API安全」中的 APIv3 密钥") - @SensitiveInfo - private String apiKeyV3; - - @Schema(description = "APPID对应的接口密码，用于获取接口调用凭证access_token时使用") - @SensitiveInfo - private String appSecret; - - @Schema(description = "API 证书中的 p12 文件id") - private Long p12; - - @Schema(description = "API 证书中的 cert.pem 证书") - @SensitiveInfo(value = SensitiveInfo.SensitiveType.OTHER, front = 15) - private String certPem; - - @Schema(description = "API 证书中的 key.pem 私钥") - @SensitiveInfo(value = SensitiveInfo.SensitiveType.OTHER, front = 15) - private String keyPem; - - @Schema(description = "应用域名，回调中会使用此参数") - private String domain; - - @Schema(description = "服务器异步通知页面路径 通知url必须为直接可访问的url，不能携带参数。公网域名必须为https ") - private String notifyUrl; - - @Schema(description = "页面跳转同步通知页面路径") - private String returnUrl; - - @Schema(description = "是否沙箱环境") - private boolean sandbox; - - @Schema(description = "超时时间(分钟)") - private Integer expireTime; - - @Schema(description = "可用支付方式") - private List payWayList; - - @Schema(description = "是否启用") - private Boolean activity; - - @Schema(description = "状态") - private Integer state; - - @Schema(description = "备注") - private String remark; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/wechat/WeChatPaymentDto.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/wechat/WeChatPaymentDto.java deleted file mode 100644 index 9a7733a17b8eaf9f678fbb80b21b96b8174fa8cf..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/paymodel/wechat/WeChatPaymentDto.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.bootx.payment.dto.paymodel.wechat; - -import cn.bootx.payment.dto.payment.BasePaymentDto; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * @author xxm - * @date 2021/6/21 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@Schema(title = "微信支付记录") -public class WeChatPaymentDto extends BasePaymentDto implements Serializable { - - private static final long serialVersionUID = -2400358210732595795L; - - @Schema(description = "微信交易号") - private String tradeNo; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/refund/RefundRecordDto.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/refund/RefundRecordDto.java deleted file mode 100644 index b8aca88e0127764132f9cfefcb730df0cee58a5e..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/dto/refund/RefundRecordDto.java +++ /dev/null @@ -1,68 +0,0 @@ -package cn.bootx.payment.dto.refund; - -import cn.bootx.common.core.rest.dto.BaseDto; -import cn.bootx.payment.dto.payment.RefundableInfo; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.List; - -/** - * 退款记录 - * - * @author xxm - * @date 2022/3/2 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@Schema(title = "退款记录") -public class RefundRecordDto extends BaseDto { - - @Schema(description = "关联的业务id") - private String businessId; - - @Schema(description = "付款付单号") - private Long paymentId; - - @Schema(description = "异步方式关联退款请求号(部分退款情况)") - private String refundRequestNo; - - @Schema(description = "用户ID") - private Long userId; - - @Schema(description = "标题") - private String title; - - @Schema(description = "退款金额") - private BigDecimal amount; - - @Schema(description = "剩余可退") - private BigDecimal refundableBalance; - - @Schema(description = "退款终端ip") - private String clientIp; - - @Schema(description = "退款时间") - private LocalDateTime refundTime; - - @Schema(description = "退款信息列表") - private List refundableInfo; - - /** - * @see cn.bootx.payment.code.pay.PayStatusCode#REFUND_PROCESS_FAIL - */ - @Schema(description = "退款状态") - private int refundStatus; - - @Schema(description = "错误码") - private String errorCode; - - @Schema(description = "错误信息") - private String errorMsg; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/event/PayCancelEvent.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/event/PayCancelEvent.java deleted file mode 100644 index cc5059092fc6c4c869fa2fd0f8d540d3ea71e436..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/event/PayCancelEvent.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.bootx.payment.event; - -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * 支付撤销事件 - * - * @author xxm - * @date 2022/7/11 - */ -@Data -@Accessors(chain = true) -public class PayCancelEvent { - - /** 支付单ID */ - private Long paymentId; - - /** 业务单号 */ - private String businessId; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/event/PayCompleteEvent.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/event/PayCompleteEvent.java deleted file mode 100644 index 825c104d6b1ee006c2acf8a9505e527702edadd1..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/event/PayCompleteEvent.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.bootx.payment.event; - -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * 支付完成事件 - * - * @author xxm - * @date 2022/7/11 - */ -@Data -@Accessors(chain = true) -public class PayCompleteEvent { - - /** 支付单ID */ - private Long paymentId; - - /** 业务单号 */ - private String businessId; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/event/PayRefundEvent.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/event/PayRefundEvent.java deleted file mode 100644 index 635f5a1eaf63077e0f7d82c34432393227a76c75..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/event/PayRefundEvent.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.bootx.payment.event; - -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * 支付退款事件 - * - * @author xxm - * @date 2022/7/11 - */ -@Data -@Accessors(chain = true) -public class PayRefundEvent { - - /** 支付单ID */ - private Long paymentId; - - /** 业务单号 */ - private String businessId; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/payment/PayAmountAbnormalException.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/payment/PayAmountAbnormalException.java deleted file mode 100644 index 1205d5e5c1463b51c0270858dbe79b75cc112a18..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/payment/PayAmountAbnormalException.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.bootx.payment.exception.payment; - -import cn.bootx.common.core.exception.FatalException; -import cn.bootx.payment.code.PaymentCenterErrorCode; - -/** - * 异常金额 - * - * @author xxm - * @date 2020/12/8 - */ -public class PayAmountAbnormalException extends FatalException { - - public PayAmountAbnormalException(String msg) { - super(PaymentCenterErrorCode.PAYMENT_AMOUNT_ABNORMAL, msg); - } - - public PayAmountAbnormalException() { - super(PaymentCenterErrorCode.PAYMENT_AMOUNT_ABNORMAL, "异常金额"); - } - -} \ No newline at end of file diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/payment/PayFailureException.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/payment/PayFailureException.java deleted file mode 100644 index 5b4548c90f69f6c01b3cf410558f4ef77e57d7b9..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/payment/PayFailureException.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.bootx.payment.exception.payment; - -import cn.bootx.common.core.exception.BizException; -import cn.bootx.payment.code.PaymentCenterErrorCode; - -/** - * 付款错误 - * - * @author xxm - * @date 2020/12/8 - */ -public class PayFailureException extends BizException { - - public PayFailureException(String message) { - super(PaymentCenterErrorCode.PAY_FAILURE, message); - } - - public PayFailureException() { - super(PaymentCenterErrorCode.PAY_FAILURE, "支付失败"); - } - -} \ No newline at end of file diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/payment/PayHasExistedException.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/payment/PayHasExistedException.java deleted file mode 100644 index a6bc461d6e0c232ccbdb02244edc32158a8425d2..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/payment/PayHasExistedException.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bootx.payment.exception.payment; - -import cn.bootx.common.core.exception.BizException; -import cn.bootx.payment.code.PaymentCenterErrorCode; - -/** - * 付款已存在 - * - * @author xxm - * @date 2020/12/8 - */ -public class PayHasExistedException extends BizException { - - public PayHasExistedException() { - super(PaymentCenterErrorCode.PAYMENT_HAS_EXISTED, "付款已存在"); - } - -} \ No newline at end of file diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/payment/PayIsProcessingException.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/payment/PayIsProcessingException.java deleted file mode 100644 index 3c95d1b12e51881687be60076e37f5a94740c99c..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/payment/PayIsProcessingException.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bootx.payment.exception.payment; - -import cn.bootx.common.core.exception.BizException; -import cn.bootx.payment.code.PaymentCenterErrorCode; - -/** - * 付款正在处理中 - * - * @author xxm - * @date 2020/12/8 - */ -public class PayIsProcessingException extends BizException { - - public PayIsProcessingException() { - super(PaymentCenterErrorCode.PAYMENT_IS_PROCESSING, "付款正在处理中"); - } - -} \ No newline at end of file diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/payment/PayNotExistedException.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/payment/PayNotExistedException.java deleted file mode 100644 index f3fc6f587526b5f434e6f529d4f49229201bbc9f..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/payment/PayNotExistedException.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bootx.payment.exception.payment; - -import cn.bootx.common.core.exception.BizException; -import cn.bootx.payment.code.PaymentCenterErrorCode; - -/** - * 付款记录不存在 - * - * @author xxm - * @date 2020/12/8 - */ -public class PayNotExistedException extends BizException { - - public PayNotExistedException() { - super(PaymentCenterErrorCode.PAYMENT_RECORD_NOT_EXISTED, "付款记录不存在"); - } - -} \ No newline at end of file diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/payment/PayUnsupportedMethodException.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/payment/PayUnsupportedMethodException.java deleted file mode 100644 index 0b2ed48177c47915c12ee2243c6e75b502a7257b..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/payment/PayUnsupportedMethodException.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bootx.payment.exception.payment; - -import cn.bootx.common.core.exception.FatalException; -import cn.bootx.payment.code.PaymentCenterErrorCode; - -/** - * 付款方式不支持异常 - * - * @author xxm - * @date 2020/12/9 - */ -public class PayUnsupportedMethodException extends FatalException { - - public PayUnsupportedMethodException() { - super(PaymentCenterErrorCode.PAYMENT_METHOD_UNSUPPORT, "不支持的支付方式"); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/waller/WalletBannedException.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/waller/WalletBannedException.java deleted file mode 100644 index 6a2cf7e1eeb75ee3e4c0cbdaeb82d9aebb93d370..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/waller/WalletBannedException.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bootx.payment.exception.waller; - -import cn.bootx.common.core.exception.BizException; -import cn.bootx.payment.code.PaymentCenterErrorCode; - -/** - * 钱包被禁用 - * - * @author xxm - * @date 2020/12/8 - */ -public class WalletBannedException extends BizException { - - public WalletBannedException() { - super(PaymentCenterErrorCode.WALLET_BANNED, "钱包被禁用"); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/waller/WalletInfoNotExistException.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/waller/WalletInfoNotExistException.java deleted file mode 100644 index 29d66d375a5c6d9a23d77a401e3735238852e737..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/waller/WalletInfoNotExistException.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bootx.payment.exception.waller; - -import cn.bootx.common.core.exception.FatalException; -import cn.bootx.payment.code.PaymentCenterErrorCode; - -/** - * 钱包信息不存在 - * - * @author xxm - * @date 2020/12/8 - */ -public class WalletInfoNotExistException extends FatalException { - - public WalletInfoNotExistException() { - super(PaymentCenterErrorCode.WALLET_INFO_NOT_EXISTS, "钱包信息不存在"); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/waller/WalletLackOfBalanceException.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/waller/WalletLackOfBalanceException.java deleted file mode 100644 index e3c5ae0fdbd1dc8056e935400a9d4078bd6b82d5..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/waller/WalletLackOfBalanceException.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bootx.payment.exception.waller; - -import cn.bootx.common.core.exception.BizException; -import cn.bootx.payment.code.PaymentCenterErrorCode; - -/** - * 余额不足异常 - * - * @author xxm - * @date 2020/12/8 - */ -public class WalletLackOfBalanceException extends BizException { - - public WalletLackOfBalanceException() { - super(PaymentCenterErrorCode.WALLET_BALANCE_NOT_ENOUGH, "余额不足异常"); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/waller/WalletLogError.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/waller/WalletLogError.java deleted file mode 100644 index b4b8d5f37a91f21678c15da409718070059d724a..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/waller/WalletLogError.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bootx.payment.exception.waller; - -import cn.bootx.common.core.exception.FatalException; -import cn.bootx.payment.code.PaymentCenterErrorCode; - -/** - * 钱包日志错误 - * - * @author xxm - * @date 2020/12/8 - */ -public class WalletLogError extends FatalException { - - public WalletLogError() { - super(PaymentCenterErrorCode.WALLET_LOG_ERROR, "钱包日志错误"); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/waller/WalletNotExistsException.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/waller/WalletNotExistsException.java deleted file mode 100644 index cd3b301e53a7eb3f44a87f84118bacd5fc9ecbce..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/exception/waller/WalletNotExistsException.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bootx.payment.exception.waller; - -import cn.bootx.common.core.exception.BizException; -import cn.bootx.payment.code.PaymentCenterErrorCode; - -/** - * 钱包不存在 - * - * @author xxm - * @date 2020/12/8 - */ -public class WalletNotExistsException extends BizException { - - public WalletNotExistsException() { - super(PaymentCenterErrorCode.WALLET_NOT_EXISTS, "钱包不存在"); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/mq/PaymentEventSender.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/mq/PaymentEventSender.java deleted file mode 100644 index 0223f7b760d0a843cb0b987e79644a3c83d120a1..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/mq/PaymentEventSender.java +++ /dev/null @@ -1,64 +0,0 @@ -package cn.bootx.payment.mq; - -import cn.bootx.payment.code.PaymentEventCode; -import cn.bootx.payment.event.PayCancelEvent; -import cn.bootx.payment.event.PayCompleteEvent; -import cn.bootx.payment.event.PayRefundEvent; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.retry.annotation.Retryable; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; - -/** - * 支付中心消息发送器 - * - * @author xxm - * @date 2021/4/22 - */ -@Slf4j -@Component -@RequiredArgsConstructor -public class PaymentEventSender { - - private final RabbitTemplate rabbitTemplate; - - /** - * 支付完成 事件发布 - */ - @Async("bigExecutor") - @Retryable(value = Exception.class) - public void sendPayComplete(PayCompleteEvent event) { - rabbitTemplate.convertAndSend(PaymentEventCode.EXCHANGE_PAYMENT, PaymentEventCode.PAY_COMPLETE, event); - } - - /** - * 支付撤销/关闭 事件发布 - */ - @Async("bigExecutor") - @Retryable(value = Exception.class) - public void sendPayCancel(PayCancelEvent event) { - rabbitTemplate.convertAndSend(PaymentEventCode.EXCHANGE_PAYMENT, PaymentEventCode.PAY_CANCEL, event); - } - - /** - * 支付退款 事件发布 - */ - @Async("bigExecutor") - @Retryable(value = Exception.class) - public void sendPayRefund(PayRefundEvent event) { - rabbitTemplate.convertAndSend(PaymentEventCode.EXCHANGE_PAYMENT, PaymentEventCode.PAY_REFUND, event); - } - - /** - * 支付单超时 事件发布 - */ - @Async("bigExecutor") - @Retryable(value = Exception.class) - public void sendPaymentExpiredTime(Long paymentId) { - rabbitTemplate.convertAndSend(PaymentEventCode.EXCHANGE_PAYMENT, PaymentEventCode.PAYMENT_EXPIRED_TIME, - paymentId); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/mq/PaymentMessageListener.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/mq/PaymentMessageListener.java deleted file mode 100644 index 650fdff72b99514d732243c17ee82cc34e11c113..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/mq/PaymentMessageListener.java +++ /dev/null @@ -1,60 +0,0 @@ -package cn.bootx.payment.mq; - -import cn.bootx.common.rabbit.conditional.ConditionalOnRabbit; -import cn.bootx.payment.code.PaymentEventCode; -import cn.bootx.payment.core.pay.service.PayExpiredTimeService; -import cn.bootx.payment.event.PayCancelEvent; -import cn.bootx.payment.event.PayCompleteEvent; -import cn.bootx.payment.event.PayRefundEvent; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.amqp.rabbit.annotation.RabbitListener; -import org.springframework.stereotype.Component; - -/** - * 消息接收 - * - * @author xxm - * @date 2021/4/22 - */ -@Slf4j -@Component -@ConditionalOnRabbit -@RequiredArgsConstructor -public class PaymentMessageListener { - - private final PayExpiredTimeService payExpiredTimeService; - - /** - * 支付超时事件处理 - */ - @RabbitListener(queues = PaymentEventCode.PAYMENT_EXPIRED_TIME) - public void PaymentExpiredTime(Long paymentId) { - payExpiredTimeService.expiredTime(paymentId); - } - - /** - * 支付成功 - */ - @RabbitListener(queues = PaymentEventCode.PAY_COMPLETE) - public void payCancel(PayCompleteEvent event) { - log.info("支付完成事件:{}", event); - } - - /** - * 支付撤销/关闭 - */ - @RabbitListener(queues = PaymentEventCode.PAY_CANCEL) - public void payCancel(PayCancelEvent event) { - log.info("支付撤销/关闭事件:{}", event); - } - - /** - * 支付退款 - */ - @RabbitListener(queues = PaymentEventCode.PAY_REFUND) - public void payCancel(PayRefundEvent event) { - log.info("支付退款事件:{}", event); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/cashier/CashierCombinationPayParam.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/cashier/CashierCombinationPayParam.java deleted file mode 100644 index ab52eb0994db3270ffda0fb902004dc3081aa0b3..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/cashier/CashierCombinationPayParam.java +++ /dev/null @@ -1,34 +0,0 @@ -package cn.bootx.payment.param.cashier; - -import cn.bootx.payment.param.pay.PayModeParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.List; - -/** - * 结算台发起支付参数 - * - * @author xxm - * @date 2022/2/23 - */ -@Data -@Accessors(chain = true) -@Schema(title = "结算台组合支付参数") -public class CashierCombinationPayParam { - - @Schema(description = "标题") - private String title; - - @Schema(description = "金额") - private BigDecimal amount; - - @Schema(description = "业务id") - private String businessId; - - @Schema(description = "支付信息", required = true) - private List payModeList; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/cashier/CashierSinglePayParam.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/cashier/CashierSinglePayParam.java deleted file mode 100644 index 5b5db8602be2171d4ad95dba5fef93b2afa67640..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/cashier/CashierSinglePayParam.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.bootx.payment.param.cashier; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * 结算台发起支付参数 - * - * @author xxm - * @date 2022/2/23 - */ -@Data -@Accessors(chain = true) -@Schema(title = "结算台单支付参数") -public class CashierSinglePayParam { - - @Schema(description = "标题") - private String title; - - @Schema(description = "金额") - private BigDecimal amount; - - @Schema(description = "openId") - private String openId; - - @Schema(description = "支付通道") - private Integer payChannel; - - @Schema(description = "支付方式") - private Integer payWay; - - @Schema(description = "业务id") - private String businessId; - - @Schema(description = "付款码") - private String authCode; - - @Schema(description = "储值卡") - private String voucherNo; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/pay/PayModeParam.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/pay/PayModeParam.java deleted file mode 100644 index 128e7f2ba3fa0feca6d12c8fce245987eccff4a9..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/pay/PayModeParam.java +++ /dev/null @@ -1,65 +0,0 @@ -package cn.bootx.payment.param.pay; - -import cn.bootx.payment.code.pay.PayChannelCode; -import cn.bootx.payment.code.pay.PayWayCode; -import cn.bootx.payment.core.pay.convert.PayConvert; -import cn.bootx.payment.dto.payment.PayChannelInfo; -import cn.bootx.payment.dto.payment.RefundableInfo; -import cn.bootx.payment.param.paymodel.alipay.AliPayParam; -import cn.bootx.payment.param.paymodel.voucher.VoucherPayParam; -import cn.bootx.payment.param.paymodel.wechat.WeChatPayParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * 不只是支付, 退款发起时也是用着参数 - * - * @author xxm - * @date 2020/12/8 - */ -@Data -@Accessors(chain = true) -@Schema(title = "支付方式参数") -public class PayModeParam implements Serializable { - - private static final long serialVersionUID = -46959864485463681L; - - /** - * @see PayChannelCode - */ - @Schema(description = "支付通道", required = true) - private int payChannel; - - /** - * @see PayWayCode - */ - @Schema(description = "支付通道下属支付方式", required = true) - private int payWay; - - @Schema(description = "支付金额", required = true) - private BigDecimal amount; - - /** - * @see AliPayParam - * @see WeChatPayParam - * @see VoucherPayParam - */ - @Schema(description = "扩展参数的json字符串") - private String extraParamsJson; - - public PayChannelInfo toPayTypeInfo() { - return PayConvert.CONVERT.convert(this); - } - - /** - * 转换为可退款信息 - */ - public RefundableInfo toRefundableInfo() { - return new RefundableInfo().setPayChannel(getPayChannel()).setAmount(getAmount()); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/pay/PayParam.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/pay/PayParam.java deleted file mode 100644 index 5fdc2c6defa6f560c4722ae79121ceeb082e68cc..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/pay/PayParam.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.bootx.payment.param.pay; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -/** - * @author xxm - * @date 2020/12/9 - */ -@Data -@Accessors(chain = true) -@Schema(title = "支付参数") -public class PayParam implements Serializable { - - private static final long serialVersionUID = 3895679513150533566L; - - @Schema(description = "用户ID") - private Long userId; - - @Schema(description = "业务ID") - @NotEmpty(message = "业务ID不可为空") - private String businessId; - - @Schema(description = "支付标题") - @NotEmpty(message = "支付标题不可为空") - private String title; - - @Schema(description = "支付描述") - private String description; - - @Schema(description = "支付信息参数", required = true) - @NotEmpty(message = "支付信息参数不可为空") - @Valid - private List payModeList; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/payconfig/PayChannelParam.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/payconfig/PayChannelParam.java deleted file mode 100644 index 69a05fd32947732547ddd7b4a28056f2d08051e0..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/payconfig/PayChannelParam.java +++ /dev/null @@ -1,41 +0,0 @@ -package cn.bootx.payment.param.payconfig; - -import cn.bootx.payment.code.pay.PayChannelEnum; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * 支付通道 - * - * @author xxm - * @date 2021/6/30 - */ -@Data -@Accessors(chain = true) -public class PayChannelParam { - - /** 主键 */ - private Long id; - - /** - * 通道代码(唯一) - * @see PayChannelEnum - */ - private String code; - - /** 名称 */ - private String name; - - /** 页面展示：卡片-图标 */ - private String icon; - - /** 页面展示：卡片-背景色 */ - private String bgColor; - - /** 状态 */ - private Integer state; - - /** 备注 */ - private String remark; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/payconfig/PayChannelWayParam.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/payconfig/PayChannelWayParam.java deleted file mode 100644 index b47f45695928fba75eb936d7ec943bf8c935dfc7..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/payconfig/PayChannelWayParam.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.bootx.payment.param.payconfig; - -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * 支付通道支持的支付方式 - * - * @author xxm - * @date 2021/6/30 - */ -@Data -@Accessors(chain = true) -public class PayChannelWayParam { - - /** 通道id */ - private Long channelId; - - /** 支付方式代码 */ - private String code; - - /** 支付方式名称 */ - private String name; - - /** 备注 */ - private String remark; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/payment/PaymentQuery.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/payment/PaymentQuery.java deleted file mode 100644 index 958212869ad9a07482f7a32a3ce719755c065c4b..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/payment/PaymentQuery.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.bootx.payment.param.payment; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * @author xxm - * @date 2021/7/21 - */ -@Data -@Accessors(chain = true) -@Schema(title = "支付记录查询参数") -public class PaymentQuery implements Serializable { - - private static final long serialVersionUID = 7071042101962400106L; - - @Schema(description = "支付单id") - private String paymentId; - - @Schema(description = "关联的业务id") - private String businessId; - - @Schema(description = "关联的业务id") - private String title; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/alipay/AliPayParam.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/alipay/AliPayParam.java deleted file mode 100644 index 0aa4afe9194e2054ce1b9fe9428c537be5bd9edb..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/alipay/AliPayParam.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.bootx.payment.param.paymodel.alipay; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * @author xxm - * @date 2021/2/27 - */ -@Data -@Accessors(chain = true) -@Schema(title = "支付宝支付参数") -public class AliPayParam implements Serializable { - - private static final long serialVersionUID = 7467373358780663978L; - - @Schema(description = "授权码(主动扫描用户的付款码)") - private String authCode; - - @Schema(description = "页面跳转同步通知页面路径") - private String returnUrl; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/alipay/AlipayConfigParam.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/alipay/AlipayConfigParam.java deleted file mode 100644 index cae8b515ca7c3856f576133ac83b2ec2d21a295c..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/alipay/AlipayConfigParam.java +++ /dev/null @@ -1,73 +0,0 @@ -package cn.bootx.payment.param.paymodel.alipay; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.List; - -/** - * @author xxm - * @date 2021/2/26 - */ -@Data -@Accessors(chain = true) -@Schema(title = "支付宝配置参数") -public class AlipayConfigParam implements Serializable { - - @Schema(description = "主键") - private Long id; - - @Schema(description = "名称") - private String name; - - @Schema(description = "支付宝商户appId") - private String appId; - - @Schema(description = "服务器异步通知页面路径 需http://或者https://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问") - private String notifyUrl; - - @Schema(description = "页面跳转同步通知页面路径 需http://或者https://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问 商户可以自定义同步跳转地址") - private String returnUrl; - - @Schema(description = "请求网关地址") - private String serverUrl; - - @Schema(description = "认证类型 证书/公钥") - private Integer authType; - - @Schema(description = "签名类型") - public String signType; - - @Schema(description = "支付宝公钥") - public String alipayPublicKey; - - @Schema(description = "私钥") - private String privateKey; - - @Schema(description = "应用公钥证书") - private String appCert; - - @Schema(description = "支付宝公钥证书文件") - private String alipayCert; - - @Schema(description = "支付宝CA根证书文件") - private String alipayRootCert; - - @Schema(description = "超时配置") - private Integer expireTime; - - @Schema(description = "可用支付方式") - private List payWayList; - - @Schema(description = "是否沙箱环境") - private boolean sandbox; - - @Schema(description = "状态") - private Integer state; - - @Schema(description = "备注") - private String remark; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/alipay/AlipayConfigQuery.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/alipay/AlipayConfigQuery.java deleted file mode 100644 index 40df48424ecf3f4aff816810648c0804ff97d4df..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/alipay/AlipayConfigQuery.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.bootx.payment.param.paymodel.alipay; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * @author xxm - * @date 2021/7/22 - */ -@Data -@Accessors(chain = true) -@Schema(title = "支付宝配置搜索参数") -public class AlipayConfigQuery implements Serializable { - - private static final long serialVersionUID = -173325268481050362L; - - /** 名称 */ - private String name; - - /** 状态 */ - private Integer state; - - /** 支付宝商户appId */ - private String appId; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/voucher/VoucherGenerationParam.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/voucher/VoucherGenerationParam.java deleted file mode 100644 index cb9451028c9ec59498b0eb2930cda1aab5d29d66..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/voucher/VoucherGenerationParam.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.bootx.payment.param.paymodel.voucher; - -import cn.hutool.core.date.DatePattern; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - * @author xxm - * @date 2022/3/14 - */ -@Data -@Accessors(chain = true) -@Schema(title = "储值卡生成参数") -public class VoucherGenerationParam { - - @Schema(description = "数量") - private Integer count; - - @Schema(description = "面值") - private BigDecimal faceValue; - - @Schema(description = "是否长期有效") - private Boolean enduring; - - @Schema(description = "开始时间") - @JsonFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) - private LocalDateTime startTime; - - @Schema(description = "结束时间") - @JsonFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) - private LocalDateTime endTime; - - /** - * @see cn.bootx.payment.code.paymodel.VoucherCode - */ - @Schema(description = "默认状态") - private Integer status; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/voucher/VoucherImportParam.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/voucher/VoucherImportParam.java deleted file mode 100644 index 0da86edf7f120f0bc83227379fde92c055e481db..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/voucher/VoucherImportParam.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.bootx.payment.param.paymodel.voucher; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * @author xxm - * @date 2022/3/14 - */ -@Data -@Accessors(chain = true) -@Schema(title = "储值卡导入参数") -public class VoucherImportParam { - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/voucher/VoucherParam.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/voucher/VoucherParam.java deleted file mode 100644 index 2c6b7b24c3046fb0e2a032178b1f1bfc727e0126..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/voucher/VoucherParam.java +++ /dev/null @@ -1,53 +0,0 @@ -package cn.bootx.payment.param.paymodel.voucher; - -import cn.hutool.core.date.DatePattern; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - * @author xxm - * @date 2022/3/14 - */ -@Data -@Accessors(chain = true) -@Schema(title = "储值卡查询参数") -public class VoucherParam { - - @Schema(description = "主键") - private Long id; - - @Schema(description = "卡号") - private String cardNo; - - @Schema(description = "生成批次号") - private Long batchNo; - - @Schema(description = "面值") - private BigDecimal faceValue; - - @Schema(description = "余额") - private BigDecimal balance; - - @Schema(description = "是否长期有效") - private Boolean enduring; - - @Schema(description = "开始时间") - @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) - private LocalDateTime startTime; - - @Schema(description = "结束时间") - @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) - private LocalDateTime endTime; - - /** - * @see cn.bootx.payment.code.paymodel.VoucherCode - */ - @Schema(description = "状态") - private Integer status; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/voucher/VoucherPayParam.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/voucher/VoucherPayParam.java deleted file mode 100644 index e13bc240bcbede14dc40594bc60d051c1fbf3213..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/voucher/VoucherPayParam.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.bootx.payment.param.paymodel.voucher; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.List; - -/** - * 储值卡支付参数 - * - * @author xxm - * @date 2022/3/14 - */ -@Data -@Accessors(chain = true) -@Schema(title = "储值卡支付参数") -public class VoucherPayParam { - - @Schema(description = "储值卡号") - private List cardNoList; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/wallet/WalletLogQueryParam.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/wallet/WalletLogQueryParam.java deleted file mode 100644 index 434d6625e811ca8cf615b979805f96ea749f4a80..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/wallet/WalletLogQueryParam.java +++ /dev/null @@ -1,38 +0,0 @@ -package cn.bootx.payment.param.paymodel.wallet; - -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.time.LocalDateTime; -import java.util.List; - -/** - * @author xxm - * @date 2020/12/8 - */ -@Data -@Accessors(chain = true) -@Schema(title = "钱包日志查询参数") -public class WalletLogQueryParam implements Serializable { - - private static final long serialVersionUID = -4046664021959786637L; - - @Schema(description = "钱包ID (与userId至少存在一个)") - private Long walletId; - - @Schema(description = "用户ID (钱包至少存在一个)") - private Long userId; - - @Schema(description = "开始日期") - private LocalDateTime startDate; - - @Schema(description = "结束日期") - private LocalDateTime endDate; - - @Schema(description = "日志类型，不传则查询全部") - private List type; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/wallet/WalletPayParam.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/wallet/WalletPayParam.java deleted file mode 100644 index dea696d79a7fe0c87379e6bf3a25a49b5cd10693..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/wallet/WalletPayParam.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.bootx.payment.param.paymodel.wallet; - -import cn.bootx.payment.code.paymodel.WalletCode; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * 钱包支付参数 - * - * @author xxm - * @date 2020/12/8 - */ -@Data -@Accessors(chain = true) -@Schema(title = "钱包支付参数") -public class WalletPayParam implements Serializable { - - private static final long serialVersionUID = 3255160458016870367L; - - @Schema(description = "用户ID") - private Long userId; - - @Schema(description = "操作人") - private Long operatorId; - - /** - * @see WalletCode - */ - @Schema(description = "操作源 1系统 2管理员 3用户") - private Integer operationSource; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/wallet/WalletRechargeParam.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/wallet/WalletRechargeParam.java deleted file mode 100644 index 827cd8f7e488efca8c1ce6e67d23540f5f6f99e8..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/wallet/WalletRechargeParam.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.bootx.payment.param.paymodel.wallet; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @author xxm - * @date 2020/12/8 - */ -@Data -@Accessors(chain = true) -@Schema(title = "钱包充值参数") -public class WalletRechargeParam implements Serializable { - - private static final long serialVersionUID = 73058709379178254L; - - @Schema(description = "钱包ID") - private Long walletId; - - @Schema(description = "支付记录ID") - private Long paymentId; - - @Schema(description = "充值金额") - private BigDecimal amount; - - @Schema(description = "类型 2 主动充值 3 自动充值 4 admin充值") - private Integer type; - - @Schema(description = "业务ID，对应的充值订单ID等") - private String businessId; - - @Schema(description = "操作源") - private Integer operationSource; - - @Schema(description = "订单id") - private Long orderId; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/wechat/WeChatPayConfigParam.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/wechat/WeChatPayConfigParam.java deleted file mode 100644 index ca5f4c083c267b5f492ee6fe7675c5cd28171210..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/wechat/WeChatPayConfigParam.java +++ /dev/null @@ -1,83 +0,0 @@ -package cn.bootx.payment.param.paymodel.wechat; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.List; - -/** - * 微信支付配置参数 - * - * @author xxm - * @date 2022/7/7 - */ -@Data -@Accessors(chain = true) -@Schema(title = "微信支付配置参数") -public class WeChatPayConfigParam { - - @Schema(description = "主键") - private Long id; - - @Schema(description = "名称") - private String name; - - @Schema(description = "微信商户号") - private String mchId; - - @Schema(description = "微信应用appId") - private String appId; - - /** - * @see cn.bootx.payment.code.paymodel.WeChatPayCode#API_V2 - */ - @Schema(description = "api版本") - private String apiVersion; - - @Schema(description = "商户平台「API安全」中的 APIv2 密钥") - private String apiKeyV2; - - @Schema(description = "商户平台「API安全」中的 APIv3 密钥") - private String apiKeyV3; - - @Schema(description = "APPID对应的接口密码，用于获取接口调用凭证access_token时使用") - private String appSecret; - - @Schema(description = "API 证书中的 p12 文件id") - private Long p12; - - @Schema(description = "API 证书中的 cert.pem 证书") - private String certPem; - - @Schema(description = "API 证书中的 key.pem 私钥") - private String keyPem; - - @Schema(description = "应用域名，回调中会使用此参数") - private String domain; - - @Schema(description = "服务器异步通知页面路径 通知url必须为直接可访问的url，不能携带参数。公网域名必须为https ") - private String notifyUrl; - - @Schema(description = "页面跳转同步通知页面路径") - private String returnUrl; - - @Schema(description = "是否沙箱环境") - private boolean sandbox; - - @Schema(description = "超时时间(分钟)") - private Integer expireTime; - - @Schema(description = "可用支付方式") - private List payWayList; - - @Schema(description = "是否启用") - private Boolean activity; - - @Schema(description = "状态") - private Integer state; - - @Schema(description = "备注") - private String remark; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/wechat/WeChatPayParam.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/wechat/WeChatPayParam.java deleted file mode 100644 index 1713ca5424a8fadaf05026c784da55ae6d49139e..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/paymodel/wechat/WeChatPayParam.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.bootx.payment.param.paymodel.wechat; - -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * @author xxm - * @date 2021/6/21 - */ -@Data -@Accessors(chain = true) -@Schema(title = "微信支付参数") -public class WeChatPayParam { - - @Schema(description = "微信openId") - private String openId; - - @Schema(description = "授权码(主动扫描用户的付款码)") - private String authCode; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/refund/RefundModeParam.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/refund/RefundModeParam.java deleted file mode 100644 index ee5265a8967df06c81ecf1586fffa7a2e70726ab..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/refund/RefundModeParam.java +++ /dev/null @@ -1,46 +0,0 @@ -package cn.bootx.payment.param.refund; - -import cn.bootx.payment.code.pay.PayChannelCode; -import cn.bootx.payment.dto.payment.RefundableInfo; -import cn.bootx.payment.param.pay.PayModeParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * 退款方式参数 - * - * @author xxm - * @date 2022/3/2 - */ -@Data -@Accessors(chain = true) -@Schema(title = "退款方式参数") -public class RefundModeParam { - - /** - * @see PayChannelCode - */ - @Schema(description = "支付通道", required = true) - private int payChannel; - - @Schema(description = "支付金额", required = true) - private BigDecimal amount; - - /** - * 转换成支付方式参数 - */ - public PayModeParam toPayModeParam() { - return new PayModeParam().setPayChannel(getPayChannel()).setAmount(getAmount()); - } - - /** - * 转换成退款方式记录对象 - */ - public RefundableInfo toRefundableInfo() { - return new RefundableInfo().setPayChannel(getPayChannel()).setAmount(getAmount()); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/refund/RefundParam.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/refund/RefundParam.java deleted file mode 100644 index 1f34c74385eb05d5ddf36f9eed11cb742dae7958..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/param/refund/RefundParam.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.bootx.payment.param.refund; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.List; - -/** - * 退款参数 - * - * @author xxm - * @date 2020/12/10 - */ -@Data -@Accessors(chain = true) -@Schema(title = "退款参数") -public class RefundParam { - - @Schema(description = "业务id") - private String businessId; - - @Schema(description = "各通道退款参数") - private List refundModeParams; - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/task/PayExpiredTimeTask.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/task/PayExpiredTimeTask.java deleted file mode 100644 index 32ced338babcf967fffccc65b28aaa9fe94500cc..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/task/PayExpiredTimeTask.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.bootx.payment.task; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.quartz.*; -import org.springframework.stereotype.Component; - -/** - * 超时支付单任务撤销(2-5秒轮训一次) - * - * @author xxm - * @date 2022/7/12 - */ -@Slf4j -@Component -@DisallowConcurrentExecution -@PersistJobDataAfterExecution -@RequiredArgsConstructor -public class PayExpiredTimeTask implements Job { - - private final PayExpiredTimeTaskService payExpiredTimeTaskService; - - @Override - public void execute(JobExecutionContext context) { - payExpiredTimeTaskService.sync(); - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/task/PayExpiredTimeTaskService.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/task/PayExpiredTimeTaskService.java deleted file mode 100644 index 59511a1474bfa1bca2957b36e920702b9257f9ac..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/task/PayExpiredTimeTaskService.java +++ /dev/null @@ -1,43 +0,0 @@ -package cn.bootx.payment.task; - -import cn.bootx.common.core.util.CollUtil; -import cn.bootx.payment.core.payment.dao.PaymentExpiredTimeRepository; -import cn.bootx.payment.mq.PaymentEventSender; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.time.LocalDateTime; -import java.util.List; -import java.util.stream.Collectors; - -/** - * 支付超时任务撤销消息注册 - * - * @author xxm - * @date 2022/7/12 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class PayExpiredTimeTaskService { - - private final PaymentExpiredTimeRepository expiredTimeRepository; - - private final PaymentEventSender paymentEventSender; - - /** - * 定时查询, 如果有过时的发送到消息队列 - */ - public void sync() { - List paymentIds = expiredTimeRepository.retrieveExpiredKeys(LocalDateTime.now()) - .stream() - .map(Long::valueOf) - .collect(Collectors.toList()); - if (CollUtil.isNotEmpty(paymentIds)) { - expiredTimeRepository.removeKeys(paymentIds.stream().map(String::valueOf).toArray(String[]::new)); - paymentIds.forEach(paymentEventSender::sendPaymentExpiredTime); - } - } - -} diff --git a/bootx-services/service-payment/src/main/java/cn/bootx/payment/util/PayModelUtil.java b/bootx-services/service-payment/src/main/java/cn/bootx/payment/util/PayModelUtil.java deleted file mode 100644 index 26564c5b1b9c5a1206fda7a3165572614db0b9ea..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/java/cn/bootx/payment/util/PayModelUtil.java +++ /dev/null @@ -1,134 +0,0 @@ -package cn.bootx.payment.util; - -import cn.bootx.common.core.util.BigDecimalUtil; -import cn.bootx.common.core.util.LocalDateTimeUtil; -import cn.bootx.payment.code.pay.PayChannelCode; -import cn.bootx.payment.code.pay.PayChannelEnum; -import cn.bootx.payment.code.pay.PayModelExtraCode; -import cn.bootx.payment.exception.payment.PayAmountAbnormalException; -import cn.bootx.payment.exception.payment.PayFailureException; -import cn.bootx.payment.param.pay.PayModeParam; -import cn.bootx.payment.param.pay.PayParam; -import cn.bootx.payment.param.paymodel.alipay.AliPayParam; -import cn.bootx.payment.param.paymodel.voucher.VoucherPayParam; -import cn.bootx.payment.param.paymodel.wechat.WeChatPayParam; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; -import lombok.experimental.UtilityClass; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * 支付方式工具类 - * - * @author xxm - * @date 2022/7/12 - */ -@UtilityClass -public class PayModelUtil { - - /** - * 获取支付宝的过期时间 - */ - public String getAliExpiredTime(Integer minute) { - return minute + "m"; - } - - /** - * 获取微信的过期时间 - */ - public String getWxExpiredTime(Integer minute) { - LocalDateTime time = LocalDateTimeUtil.offset(LocalDateTime.now(), minute, ChronoUnit.MINUTES); - return LocalDateTimeUtil.format(time, DatePattern.PURE_DATETIME_PATTERN); - } - - /** - * 获取支付单的超时时间 - */ - public LocalDateTime getPaymentExpiredTime(Integer minute) { - return LocalDateTimeUtil.offset(LocalDateTime.now(), minute, ChronoUnit.MINUTES); - } - - /** - * 判断是否有异步支付 - */ - public boolean isNotSync(List payModeParams) { - return payModeParams.stream().map(PayModeParam::getPayChannel).noneMatch(PayChannelCode.ASYNC_TYPE::contains); - } - - /** - * 获取异步支付参数 - */ - public PayModeParam getAsyncPayModeParam(PayParam payParam) { - return payParam.getPayModeList() - .stream() - .filter(payMode -> PayChannelCode.ASYNC_TYPE.contains(payMode.getPayChannel())) - .findFirst() - .orElseThrow(() -> new PayFailureException("支付方式数据异常")); - } - - /** - * 构建扩展参数构建 - * @param payChannel 支付通道 - * @param map 支付方式扩展字段信息 key 为 PayModelExtraCode中定义的 - */ - public String buildExtraParamsJson(Integer payChannel, Map map) { - PayChannelEnum payChannelEnum = PayChannelEnum.findByNo(payChannel); - switch (payChannelEnum) { - case ALI: { - return JSONUtil.toJsonStr(new AliPayParam().setAuthCode(map.get(PayModelExtraCode.AUTH_CODE)) - .setReturnUrl(map.get(PayModelExtraCode.RETURN_URL))); - } - case WECHAT: { - return JSONUtil.toJsonStr(new WeChatPayParam().setOpenId(map.get(PayModelExtraCode.OPEN_ID)) - .setAuthCode(map.get(PayModelExtraCode.AUTH_CODE))); - } - case VOUCHER: { - String voucherNo = map.get(PayModelExtraCode.VOUCHER_NO); - List list = new ArrayList<>(); - if (StrUtil.isNotBlank(voucherNo)) { - list.add(voucherNo); - } - return JSONUtil.toJsonStr(new VoucherPayParam().setCardNoList(list)); - } - default: { - return null; - } - } - } - - /** - * 检查支付金额 - */ - public void validationAmount(List payModeList) { - for (PayModeParam payModeParam : payModeList) { - // 同时满足支付金额小于等于零 - if (BigDecimalUtil.compareTo(payModeParam.getAmount(), BigDecimal.ZERO) < 1) { - throw new PayAmountAbnormalException(); - } - } - } - - /** - * 检查异步支付方式 - */ - public void validationAsyncPayMode(PayParam payParam) { - // 组合支付时只允许有一个异步支付方式 - List payModeList = payParam.getPayModeList(); - - long asyncPayModeCount = payModeList.stream() - .map(PayModeParam::getPayChannel) - .filter(PayChannelCode.ASYNC_TYPE::contains) - .count(); - if (asyncPayModeCount > 1) { - throw new PayFailureException("组合支付时只允许有一个异步支付方式"); - } - } - -} diff --git a/bootx-services/service-payment/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-services/service-payment/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index b5d709d4cb8843853efd48b81473ca865b74247e..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.bootx.payment.PaymentApplication \ No newline at end of file diff --git a/bootx-services/service-payment/src/main/resources/mapper/wallet/WalletMapper.xml b/bootx-services/service-payment/src/main/resources/mapper/wallet/WalletMapper.xml deleted file mode 100644 index efa1bada721ac1d190f21375c1588f5074f46cf2..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/resources/mapper/wallet/WalletMapper.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - update pay_wallet - set balance = (balance + #{amount}), - last_modifier = #{operator}, - last_modified_time = #{date}, - version = (version+1) - where id = #{walletId} - - - - update pay_wallet - set balance = (balance - #{amount}), - last_modifier = #{operator}, - last_modified_time = #{date}, - version = (version+1) - where id = #{walletId} and (balance- #{amount}) >= 0 - - - - update pay_wallet - set balance = (balance - #{amount}), - last_modifier = #{operator}, - last_modified_time = #{date}, - version = (version+1) - where id = #{walletId} - - - - - \ No newline at end of file diff --git a/bootx-services/service-payment/src/main/resources/templates/errorCashier.html b/bootx-services/service-payment/src/main/resources/templates/errorCashier.html deleted file mode 100644 index 3e4433e5ad7b37dc64d08bd1a86231cacef84b10..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/resources/templates/errorCashier.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - 请使用微信或支付宝扫码打开 - - -

请使用微信或支付宝扫码打开！

- - \ No newline at end of file diff --git a/bootx-services/service-payment/src/main/resources/templates/wechatJsapiPay.html b/bootx-services/service-payment/src/main/resources/templates/wechatJsapiPay.html deleted file mode 100644 index 6020e41450e6790316f4f13113376b2c7d2e987d..0000000000000000000000000000000000000000 --- a/bootx-services/service-payment/src/main/resources/templates/wechatJsapiPay.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - - 微信支付 - - -

-
-

- - - \ No newline at end of file diff --git a/bootx-services/service-visualization/pom.xml b/bootx-services/service-visualization/pom.xml index cc829a66248e14b5fef18a1a3bb864d9854ff108..a508caf495470a9109f2835c675ad9eb8ddc57d5 100644 --- a/bootx-services/service-visualization/pom.xml +++ b/bootx-services/service-visualization/pom.xml @@ -5,13 +5,18 @@ cn.bootx.platform bootx-services - 1.2.3 + 1.3.0 4.0.0 service-visualization jar + + + true + + diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/visualization/VisualizationApplication.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/VisualizationApplication.java similarity index 91% rename from bootx-services/service-visualization/src/main/java/cn/bootx/visualization/VisualizationApplication.java rename to bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/VisualizationApplication.java index 91b1cca0e093c1452b3f9bc458330fba2d835cf5..bc7269565eec02579bc235621a3dcbde64336d62 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/visualization/VisualizationApplication.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/VisualizationApplication.java @@ -1,4 +1,4 @@ -package cn.bootx.visualization; +package cn.bootx.platform.visualization; import org.apache.ibatis.annotations.Mapper; import org.mybatis.spring.annotation.MapperScan; diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/visualization/code/GoVIewCode.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/code/GoVIewCode.java similarity index 81% rename from bootx-services/service-visualization/src/main/java/cn/bootx/visualization/code/GoVIewCode.java rename to bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/code/GoVIewCode.java index 5da22b621f638280f7fbbffc6893939c0c70e9bf..88d1a6ded293f2cbacf91ca237020e40e534d982 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/visualization/code/GoVIewCode.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/code/GoVIewCode.java @@ -1,4 +1,4 @@ -package cn.bootx.visualization.code; +package cn.bootx.platform.visualization.code; /** * GoVIew大屏相关常量 diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/visualization/configuration/VisualizationProperties.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/configuration/VisualizationProperties.java similarity index 88% rename from bootx-services/service-visualization/src/main/java/cn/bootx/visualization/configuration/VisualizationProperties.java rename to bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/configuration/VisualizationProperties.java index c6d47c41db198e01ca4b85048dff4246b21238c0..b7d98cb685836e19c00e19709ea1844f4288bae5 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/visualization/configuration/VisualizationProperties.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/configuration/VisualizationProperties.java @@ -1,4 +1,4 @@ -package cn.bootx.visualization.configuration; +package cn.bootx.platform.visualization.configuration; import lombok.Data; import lombok.experimental.Accessors; diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/visualization/controller/GoViewAdminController.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/controller/GoViewAdminController.java similarity index 81% rename from bootx-services/service-visualization/src/main/java/cn/bootx/visualization/controller/GoViewAdminController.java rename to bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/controller/GoViewAdminController.java index d1c15e49376505aad9b796dba657a8e64c6e527a..7af40cdd4b8b3db05363dc2553da590a462289c9 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/visualization/controller/GoViewAdminController.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/controller/GoViewAdminController.java @@ -1,15 +1,15 @@ -package cn.bootx.visualization.controller; - -import cn.bootx.common.core.rest.PageResult; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.visualization.core.service.ProjectInfoService; -import cn.bootx.visualization.dto.ProjectInfoDto; -import cn.bootx.visualization.dto.ProjectInfoResult; -import cn.bootx.visualization.param.CreateParam; -import cn.bootx.visualization.param.ProjectInfoParam; -import cn.bootx.visualization.param.ProjectInfoSave; +package cn.bootx.platform.visualization.controller; + +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.visualization.core.service.ProjectInfoService; +import cn.bootx.platform.visualization.dto.ProjectInfoDto; +import cn.bootx.platform.visualization.dto.ProjectInfoResult; +import cn.bootx.platform.visualization.param.CreateParam; +import cn.bootx.platform.visualization.param.ProjectInfoParam; +import cn.bootx.platform.visualization.param.ProjectInfoSave; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/visualization/controller/GoViewController.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/controller/GoViewController.java similarity index 77% rename from bootx-services/service-visualization/src/main/java/cn/bootx/visualization/controller/GoViewController.java rename to bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/controller/GoViewController.java index d5960ef071c11db4880bb471598450488392e3ef..666ab8d1d79c3391ea4099cfa4143f0f3fbe9387 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/visualization/controller/GoViewController.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/controller/GoViewController.java @@ -1,13 +1,13 @@ -package cn.bootx.visualization.controller; +package cn.bootx.platform.visualization.controller; -import cn.bootx.common.core.annotation.IgnoreAuth; -import cn.bootx.common.core.rest.Res; -import cn.bootx.common.core.rest.ResResult; -import cn.bootx.visualization.core.service.ProjectInfoService; -import cn.bootx.visualization.dto.OssInfo; -import cn.bootx.visualization.dto.GoVIewPageResult; -import cn.bootx.visualization.dto.ProjectInfoResult; -import cn.bootx.visualization.param.ProjectInfoSave; +import cn.bootx.platform.common.core.annotation.IgnoreAuth; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.visualization.core.service.ProjectInfoService; +import cn.bootx.platform.visualization.dto.GoVIewPageResult; +import cn.bootx.platform.visualization.dto.OssInfo; +import cn.bootx.platform.visualization.dto.ProjectInfoResult; +import cn.bootx.platform.visualization.param.ProjectInfoSave; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/visualization/core/convert/GoViewConvert.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/convert/GoViewConvert.java similarity index 61% rename from bootx-services/service-visualization/src/main/java/cn/bootx/visualization/core/convert/GoViewConvert.java rename to bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/convert/GoViewConvert.java index fa9782faba3e58911c0afb9088a3130426df6db2..7e37f267f1707d80565b94995ae1f125d50bdb91 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/visualization/core/convert/GoViewConvert.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/convert/GoViewConvert.java @@ -1,7 +1,7 @@ -package cn.bootx.visualization.core.convert; +package cn.bootx.platform.visualization.core.convert; -import cn.bootx.visualization.core.entity.ProjectInfo; -import cn.bootx.visualization.dto.ProjectInfoDto; +import cn.bootx.platform.visualization.core.entity.ProjectInfo; +import cn.bootx.platform.visualization.dto.ProjectInfoDto; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/visualization/core/dao/ProjectInfoManager.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoManager.java similarity index 70% rename from bootx-services/service-visualization/src/main/java/cn/bootx/visualization/core/dao/ProjectInfoManager.java rename to bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoManager.java index 214bd68d3479da0e536930bd4430b1cde08019c9..b1da2a8bc491bb3d0e877d4758c056b36702cc37 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/visualization/core/dao/ProjectInfoManager.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoManager.java @@ -1,11 +1,11 @@ -package cn.bootx.visualization.core.dao; +package cn.bootx.platform.visualization.core.dao; -import cn.bootx.common.core.rest.param.PageParam; -import cn.bootx.common.mybatisplus.base.MpIdEntity; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.common.mybatisplus.util.MpUtil; -import cn.bootx.visualization.core.entity.ProjectInfo; -import cn.bootx.visualization.param.ProjectInfoSave; +import cn.bootx.platform.visualization.param.ProjectInfoSave; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.visualization.core.entity.ProjectInfo; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.stereotype.Repository; diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/visualization/core/dao/ProjectInfoMapper.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoMapper.java similarity index 66% rename from bootx-services/service-visualization/src/main/java/cn/bootx/visualization/core/dao/ProjectInfoMapper.java rename to bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoMapper.java index e2ad3da7d847eeb90c2d318c34246d476f0e56b6..2a7eab05063abd4f3a4587c9447f9f4bfaad06d2 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/visualization/core/dao/ProjectInfoMapper.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.visualization.core.dao; +package cn.bootx.platform.visualization.core.dao; -import cn.bootx.visualization.core.entity.ProjectInfo; +import cn.bootx.platform.visualization.core.entity.ProjectInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/visualization/core/dao/ProjectInfoPublishManager.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoPublishManager.java similarity index 54% rename from bootx-services/service-visualization/src/main/java/cn/bootx/visualization/core/dao/ProjectInfoPublishManager.java rename to bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoPublishManager.java index 3ebf56e9eb10daf0961aefbbae0b5270d9978bb8..bd83240f605dc3e502156d881d5f86c7e5e44dc8 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/visualization/core/dao/ProjectInfoPublishManager.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoPublishManager.java @@ -1,7 +1,7 @@ -package cn.bootx.visualization.core.dao; +package cn.bootx.platform.visualization.core.dao; -import cn.bootx.common.mybatisplus.impl.BaseManager; -import cn.bootx.visualization.core.entity.ProjectInfoPublish; +import cn.bootx.platform.visualization.core.entity.ProjectInfoPublish; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import org.springframework.stereotype.Repository; /** diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/visualization/core/dao/ProjectInfoPublishMapper.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoPublishMapper.java similarity index 66% rename from bootx-services/service-visualization/src/main/java/cn/bootx/visualization/core/dao/ProjectInfoPublishMapper.java rename to bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoPublishMapper.java index 5189968e23a1f83498dc46a747d64afd93ea2d93..81f0f371c110f85d88f9132e2f4c2149733eb4e2 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/visualization/core/dao/ProjectInfoPublishMapper.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoPublishMapper.java @@ -1,6 +1,6 @@ -package cn.bootx.visualization.core.dao; +package cn.bootx.platform.visualization.core.dao; -import cn.bootx.visualization.core.entity.ProjectInfoPublish; +import cn.bootx.platform.visualization.core.entity.ProjectInfoPublish; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/visualization/core/entity/ProjectInfo.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/entity/ProjectInfo.java similarity index 66% rename from bootx-services/service-visualization/src/main/java/cn/bootx/visualization/core/entity/ProjectInfo.java rename to bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/entity/ProjectInfo.java index 73079ee4d28b31dd30cfde76141d10048aac220f..862c4283aa1a511bd9a352f5b9b07bd0ae82c79e 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/visualization/core/entity/ProjectInfo.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/entity/ProjectInfo.java @@ -1,16 +1,14 @@ -package cn.bootx.visualization.core.entity; +package cn.bootx.platform.visualization.core.entity; -import cn.bootx.common.core.annotation.BigField; -import cn.bootx.common.core.annotation.actable.Column; -import cn.bootx.common.core.annotation.actable.Table; -import cn.bootx.common.core.code.actable.MySqlFieldType; -import cn.bootx.common.core.function.EntityBaseFunction; -import cn.bootx.common.core.util.CollUtil; -import cn.bootx.common.jackson.util.JacksonUtil; -import cn.bootx.common.mybatisplus.base.MpBaseEntity; -import cn.bootx.visualization.core.convert.GoViewConvert; -import cn.bootx.visualization.dto.ProjectInfoDto; -import cn.bootx.visualization.param.ProjectInfoSave; +import cn.bootx.platform.common.core.annotation.BigField; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.core.util.CollUtil; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.visualization.core.convert.GoViewConvert; +import cn.bootx.platform.visualization.dto.ProjectInfoDto; +import cn.bootx.platform.visualization.param.ProjectInfoSave; +import cn.bootx.platform.common.jackson.util.JacksonUtil; +import cn.bootx.platform.visualization.code.GoVIewCode; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -33,7 +31,7 @@ public class ProjectInfo extends MpBaseEntity implements EntityBaseFunction cn.bootx.platform - bootx-platform - 1.2.3 + bootx-platform-parent + 1.3.0 4.0.0 bootx-start jar + + + true + + + + + org.projectlombok + lombok + provided + org.springframework.boot @@ -68,7 +79,7 @@ com.plumelog plumelog-logback - 3.5.3 + ${plumelog.version} diff --git a/bootx-start/src/main/java/cn/bootx/start/BootxApplication.java b/bootx-start/src/main/java/cn/bootx/platform/start/BootxApplication.java similarity index 84% rename from bootx-start/src/main/java/cn/bootx/start/BootxApplication.java rename to bootx-start/src/main/java/cn/bootx/platform/start/BootxApplication.java index 53605bddfedbb02043675bbb4a65ccf71093cf2b..356ce117a52694f527a5a3d4d7d805b4baeb3ddf 100644 --- a/bootx-start/src/main/java/cn/bootx/start/BootxApplication.java +++ b/bootx-start/src/main/java/cn/bootx/platform/start/BootxApplication.java @@ -1,4 +1,4 @@ -package cn.bootx.start; +package cn.bootx.platform.start; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; @@ -34,12 +34,9 @@ public class BootxApplication { String appInfo = StrUtil.format("应用 '{}' 运行成功! \n\t", appName); // swagger栏 String swagger = StrUtil.format("Swagger文档: \t\thttp://{}:{}{}{}/doc.html\n\t", host, port, contextPath, path); - // plumelog栏 - String plumelog = StrUtil.format("PlumeLog日志管理: \t\thttp://{}:{}{}{}/plumelog/#/", host, port, contextPath, - path); - log.info("\n----------------------------------------------------------\n\t" + "{}{}{} \n" - + "----------------------------------------------------------", appInfo, swagger, plumelog); + log.info("\n----------------------------------------------------------\n\t" + "{}{} \n" + + "----------------------------------------------------------", appInfo, swagger); } } diff --git a/bootx-start/src/main/resources/application-dev.yml b/bootx-start/src/main/resources/application-dev.yml index 6b598fae369d73f379bef22b2cf2eee292932ce3..ae78010bc99f9054262a70db0e28146a24ad16f9 100644 --- a/bootx-start/src/main/resources/application-dev.yml +++ b/bootx-start/src/main/resources/application-dev.yml @@ -79,6 +79,11 @@ logging: level: cn.bootx.**: debug org.springframework.data.mongodb.core: debug +# 自动建表配置 +mybatis-table: + update-type: update + database-type: mysql + scan-package: cn.bootx # 项目配置 bootx: common: @@ -86,7 +91,7 @@ bootx: swagger: enabled: true author: bootx - version: 1.2.3 + version: 1.3.0 title: bootx开发平台单体版 description: bootx-platform开发平台单体版 # basic认证 @@ -94,27 +99,23 @@ bootx: enable: true # 多模块扫码 base-packages: - "[基础API]": cn.bootx.baseapi - "[身份识别和管理]": cn.bootx.iam - "[消息服务]": cn.bootx.notice - "[办公服务]": - - cn.bootx.office - - cn.bootx.starter.flowable - "[支付服务]": cn.bootx.payment + "[基础API]": cn.bootx.platform.baseapi + "[身份识别和管理]": cn.bootx.platform.iam + "[消息服务]": cn.bootx.platform.notice "[演示模块]": cn.bootx.demo "[可视化大屏]": cn.bootx.visualization "[第三方对接]": - - cn.bootx.starter.dingtalk - - cn.bootx.starter.wecom - - cn.bootx.starter.wechat + - cn.bootx.platform.starter.dingtalk + - cn.bootx.platform.starter.wecom + - cn.bootx.platform.starter.wechat "[认证与权限]": - - cn.bootx.starter.auth - - cn.bootx.starter.data.perm + - cn.bootx.platform.starter.auth + - cn.bootx.platform.starter.data.perm "[其他starter组件]": - - cn.bootx.starter.audit.log - - cn.bootx.starter.file - - cn.bootx.starter.quartz - - cn.bootx.starter.monitor + - cn.bootx.platform.starter.audit.log + - cn.bootx.platform.starter.file + - cn.bootx.platform.starter.quartz + - cn.bootx.platform.starter.monitor # 缓存 cache: # 默认超时时间 30分钟 @@ -134,18 +135,6 @@ bootx: # 是否启用Rabbit, 并不是停用了Rabbit, 需配合 ConditionalOnRabbit 注解使用 rabbit: enable: false - # 表结构自动维护 - actable: - # 数据库类型 - database-type: mysql - # 更新类型 none为不进行任何操作 - update-type: update - # 扫描包路径, 可以用 ,和 ; 分隔 - scan-package: cn.bootx.**.entity - # 指定生成索引前缀 - prefix-index: idx_ - # 指定生成唯一约束前缀 - prefix-unique: uni_ starter: # 三方平台 third: @@ -200,9 +189,16 @@ bootx: redirect-uri: http://127.0.0.1:9999/auth/third/callback/weChat client-id: ?? client-secret: ?? - # 审计日志存储 + # 审计日志 audit-log: + # 审计日志存储 store: jdbc + # ip归属地 + ip2region: + # 数据文件路径 + file-path: /data/ip2region/ip2region.xdb + # 查询方式 + search-type: cache # 文件上传 file-upload: upload-type: local @@ -210,6 +206,7 @@ bootx: local: local-path: /data/file mongo: + # 储存桶 bucket: fs minio: # 地址 diff --git a/bootx-start/src/main/resources/db/migration/V1.2.3_230411__release.sql b/bootx-start/src/main/resources/db/migration/V1.3.0_230510__release.sql similarity index 94% rename from bootx-start/src/main/resources/db/migration/V1.2.3_230411__release.sql rename to bootx-start/src/main/resources/db/migration/V1.3.0_230510__release.sql index cea8a0ddaa17de84286afe547219df751cc9521b..c94f59df593dc8b8d0c15eb7b0dbf2ced414852c 100644 --- a/bootx-start/src/main/resources/db/migration/V1.2.3_230411__release.sql +++ b/bootx-start/src/main/resources/db/migration/V1.3.0_230510__release.sql @@ -11,7 +11,7 @@ Target Server Version : 50735 File Encoding : 65001 - Date: 11/04/2023 09:16:10 + Date: 10/05/2023 09:31:59 */ SET NAMES utf8mb4; @@ -4277,18 +4277,6 @@ INSERT INTO `iam_perm_menu` VALUES (1450819607680991232, 'admin', NULL, '第三 INSERT INTO `iam_perm_menu` VALUES (1450821723027881984, 'admin', 1450819607680991232, '微信', 'WeChat', '', b'0', '', b'0', b'0', 'RouteView', NULL, '/third/wechat', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 21:50:28', 1399985191002447872, '2022-08-03 23:23:10', 3, 0); INSERT INTO `iam_perm_menu` VALUES (1450821877831254016, 'admin', 1450819607680991232, '企业微信', 'WeCom', '', b'0', '', b'0', b'0', 'RouteView', NULL, '/third/wecom', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 21:51:05', 1399985191002447872, '2022-08-03 23:22:58', 4, 0); INSERT INTO `iam_perm_menu` VALUES (1450822511087271936, 'admin', 1450819607680991232, '钉钉', 'DingTalk', '', b'0', '', b'0', b'0', 'RouteView', NULL, '/third/dingtalk', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 21:53:36', 1399985191002447872, '2022-08-03 23:23:29', 3, 0); -INSERT INTO `iam_perm_menu` VALUES (1450822842995130368, 'admin', NULL, '支付管理', 'PayManager', '', NULL, 'pay-circle', b'0', b'0', 'RouteView', NULL, '/payment', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 21:54:55', 1399985191002447872, '2021-10-20 21:54:55', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1450823960236081152, 'admin', 1450822842995130368, '支付通道', 'PayChannel', '', NULL, '', b'0', b'0', 'RouteView', NULL, '/payment/channel', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 21:59:22', 1399985191002447872, '2021-10-20 21:59:22', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1450824117849636864, 'admin', 1450823960236081152, '支付宝', 'AliPayConfig', '', NULL, '', b'0', b'0', 'payment/channel/alipay/AliPayConfigList', NULL, '/payment/channel/alipay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 21:59:59', 1399985191002447872, '2021-10-20 21:59:59', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1450824319868289024, 'admin', 1450823960236081152, '微信支付', 'WeChatPayConfig', '', NULL, '', b'0', b'0', 'payment/channel/wechat/WeChatConfigList', NULL, '/payment/channel/wechat', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:00:48', 1399985191002447872, '2021-10-20 22:00:48', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1450824637876224000, 'admin', 1450823960236081152, '云闪付', 'UnionPayConfig', '', b'0', '', b'0', b'0', 'payment/channel/unionpay/UnionPayConfigList', NULL, '/payment/channel/unionpay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:02:03', 1399985191002447872, '2022-03-04 16:12:13', 3, 0); -INSERT INTO `iam_perm_menu` VALUES (1450824875198332928, 'admin', 1450823960236081152, '现金支付', 'CashPayConfig', '', b'0', '', b'1', b'0', '', NULL, '/payment/channel/cash', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:03:00', 1399985191002447872, '2022-03-04 16:12:08', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1450825488577544192, 'admin', 1546850918849249280, '收银台', 'PayCashier', '', b'0', '', b'0', b'0', 'payment/cashier/Cashier', NULL, '/demo/pay/cashier', '', -1, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:05:26', 1399985191002447872, '2022-07-12 21:37:22', 3, 0); -INSERT INTO `iam_perm_menu` VALUES (1450825615857893376, 'admin', 1450822842995130368, '订单管理', 'PayOrder', '', NULL, '', b'0', b'0', 'RouteView', NULL, '/payment/order', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:05:57', 1399985191002447872, '2021-10-20 22:05:57', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1450825819436826624, 'admin', 1450822842995130368, '回调记录', 'PayNotify', '', NULL, '', b'0', b'0', 'payment/notify/PayNotifyRecordList', NULL, '/payment/notify', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:06:45', 1399985191002447872, '2021-10-20 22:06:45', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1450826890318135296, 'admin', 1450825615857893376, '支付订单', 'PaymentOrder', '', b'0', '', b'0', b'0', 'payment/order/payment/PaymentList', NULL, '/payment/order/payment', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:11:00', 1399985191002447872, '2022-02-25 15:17:07', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1450827159626006528, 'admin', 1450825615857893376, '退款订单', 'ReturnOrder', '', b'0', '', b'0', b'0', 'payment/order/refund/RefundRecordList', NULL, '/payment/order/return', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:12:05', 1399985191002447872, '2022-03-04 15:44:06', 4, 0); -INSERT INTO `iam_perm_menu` VALUES (1450827308515409920, 'admin', 1450825615857893376, '转账订单', 'TransferOrder', '', b'0', '', b'1', b'0', 'payment/order/transfer/TransferList', NULL, '/payment/order/transfer', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:12:40', 1399985191002447872, '2022-03-04 15:33:31', 3, 0); INSERT INTO `iam_perm_menu` VALUES (1450827660459458560, 'admin', 1438061887002759168, '微信', 'NoticeWeChat', '', b'0', '', b'0', b'0', 'Dev', NULL, '/notice/wechat', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-20 22:14:04', 1399985191002447872, '2022-06-21 20:53:04', 1, 1); INSERT INTO `iam_perm_menu` VALUES (1452567897717321728, 'admin', 1431152689832525824, '审计日志', 'auditLog', '', b'0', '', b'0', b'0', 'RouteView', NULL, '/monitor/log', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-25 17:29:09', 1399985191002447872, '2022-10-20 20:37:46', 2, 0); INSERT INTO `iam_perm_menu` VALUES (1452569339987472384, 'admin', 1414596052497092608, '权限管理', 'permission', '', NULL, '', b'0', b'0', 'RouteView', NULL, '/system/permission', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-10-25 17:34:53', 1399985191002447872, '2021-10-25 17:34:53', 2, 0); @@ -4302,24 +4290,12 @@ INSERT INTO `iam_perm_menu` VALUES (1495013564652429312, 'admin', 15522079825107 INSERT INTO `iam_perm_menu` VALUES (1495968302034210816, 'admin', NULL, '功能演示', 'Demo', NULL, b'0', 'block', b'0', b'0', 'RouteView', NULL, '/demo', '', 99, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-02-22 11:46:52', 1399985191002447872, '2022-05-10 11:02:05', 3, 0); INSERT INTO `iam_perm_menu` VALUES (1495969099987963904, 'admin', 1495968302034210816, '数据相关', 'DemoData', NULL, b'0', '', b'0', b'0', 'RouteView', NULL, '/demo/data', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-02-22 11:50:02', 1399985191002447872, '2022-03-24 16:27:46', 4, 0); INSERT INTO `iam_perm_menu` VALUES (1496020308992143360, 'admin', 1495968302034210816, '超级查询', 'SuperQueryDemo', NULL, b'0', '', b'0', b'0', 'demo/query/SuperQueryDemoList', NULL, '/demo/query/super', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-02-22 15:13:31', 1399985191002447872, '2022-05-27 17:34:41', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1501740492360962048, 'admin', 1450822842995130368, '钱包管理', 'Wallet', NULL, b'0', '', b'0', b'0', 'RouteView', NULL, '/payment/wallet', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-10 10:03:29', 1399985191002447872, '2022-03-10 10:04:53', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1501742229142556672, 'admin', 1501740492360962048, '钱包列表', 'WalletList', NULL, b'0', '', b'0', b'0', 'payment/wallet/list/WalletList', NULL, '/payment/wallet/list', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-10 10:10:23', 1399985191002447872, '2022-03-10 17:06:19', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1501742417378725888, 'admin', 1501740492360962048, '个人钱包', 'PersonalWallet', NULL, b'0', '', b'0', b'0', 'payment/wallet/list/WalletList', NULL, '/payment/wallet/personal', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-10 10:11:08', 1399985191002447872, '2022-03-10 17:06:10', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1501847310319972352, 'admin', 1546850918849249280, '组合支付', 'CombinationCashier', NULL, b'0', '', b'0', b'0', 'payment/combination/CombinationCashier', NULL, '/demo/pay/combination', '', -0.5, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-10 17:07:56', 1399985191002447872, '2022-07-12 21:37:59', 4, 0); -INSERT INTO `iam_perm_menu` VALUES (1502926397176242176, 'admin', 1450822842995130368, '储值卡', 'Voucher', NULL, b'0', '', b'0', b'0', 'payment/voucher/VoucherList', NULL, '/payment/voucher', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-13 16:35:51', 1399985191002447872, '2022-03-14 19:39:45', 2, 0); INSERT INTO `iam_perm_menu` VALUES (1506910599819165696, 'admin', 1495969099987963904, '数据权限', 'DataPermDemoList', NULL, b'0', '', b'0', b'0', 'demo/data/perm/DataPermDemoList', NULL, '/demo/data/perm', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-24 16:27:39', 1399985191002447872, '2022-03-24 16:28:56', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1506910885463851008, 'admin', 1495969099987963904, '加密解密', 'DataEncryptDemo', NULL, b'0', '', b'0', b'0', 'demo/data/encrypt/DataEncryptDemoList', NULL, '/demo/data/encrypt', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-24 16:28:47', 1399985191002447872, '2022-03-24 16:28:47', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1506911113394913280, 'admin', 1495969099987963904, '数据脱敏', 'DataSensitiveDemo', NULL, b'0', '', b'0', b'0', 'demo/data/sensitive/DataSensitiveDemoList', NULL, '/demo/data/sensitive', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-24 16:29:41', 1399985191002447872, '2022-03-24 17:16:03', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1507998458886197248, 'admin', 1495968302034210816, 'WS演示', 'WebsocketDemo', NULL, b'0', '', b'0', b'0', 'demo/ws/WebsocketDemo', NULL, '/demo/ws', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-27 16:30:25', 1399985191002447872, '2022-03-27 16:30:25', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1509488473583562752, 'admin', 1495968302034210816, '幂等请求演示', 'IdempotentDemo', NULL, b'0', '', b'0', b'0', 'demo/idempotent/Idempotent', NULL, '/demo/idempotent', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-03-31 19:11:12', 1399985191002447872, '2022-05-27 17:35:00', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1511266086400524288, 'admin', 1450822511087271936, '钉钉配置', 'DingTalkConfig', NULL, b'0', '', b'1', b'0', 'third/dingtalk/config/DingTalkConfigList', NULL, '/third/dingtalk/config', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-04-05 16:54:48', 1399985191002447872, '2022-07-26 13:34:44', 3, 0); -INSERT INTO `iam_perm_menu` VALUES (1523860792695283712, 'admin', NULL, '商品管理', 'GoodsManager', NULL, b'0', 'car', b'1', b'0', 'RouteView', NULL, '/goods', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-10 11:01:40', 1399985191002447872, '2022-10-07 12:38:50', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1523941932282114048, 'admin', 1523860792695283712, '类目管理', 'CategoryManager', NULL, b'0', '', b'0', b'0', 'RouteView', NULL, '/goods/category', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-10 16:24:05', 1399985191002447872, '2022-05-10 16:24:17', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1523942130555252736, 'admin', 1523941932282114048, '类目', 'Category', NULL, b'0', '', b'0', b'0', 'goods/category/CategoryList', NULL, '/goods/category/category', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-10 16:24:52', 1399985191002447872, '2022-05-10 16:25:23', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1524044195818278912, 'admin', 1523941932282114048, '品牌', 'Brand', NULL, b'0', '', b'0', b'0', 'goods/brand/BrandList', NULL, '/goods/category/brand', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-10 23:10:26', 1399985191002447872, '2022-05-10 23:14:20', 4, 0); -INSERT INTO `iam_perm_menu` VALUES (1524044395823665152, 'admin', 1523941932282114048, '规格', 'SpecificationList', NULL, b'0', '', b'0', b'0', 'goods/spec/SpecificationList', NULL, '/goods/category/spec', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-10 23:11:14', 1399985191002447872, '2022-05-10 23:13:51', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1524044678314233856, 'admin', 1523941932282114048, '参数组', 'ParameterGroup', NULL, b'0', '', b'1', b'0', 'goods/parameter/ParameterGroupList', NULL, '/goods/category/parameter', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-10 23:12:21', 1399985191002447872, '2022-05-12 20:30:23', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1525472571967860736, 'admin', 1523860792695283712, '商品', 'Goods', '', b'0', '', b'0', b'0', 'goods/goods/GoodsList', NULL, '/goods/goods', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-14 21:46:18', 1399985191002447872, '2022-05-14 21:46:18', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1530120084482084864, 'admin', 1495968302034210816, '消息中间件演示', 'MQDemo', NULL, b'0', '', b'0', b'0', 'demo/mq/MqDemo', NULL, '/demo/mq', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-27 17:33:51', 1399985191002447872, '2022-05-31 15:12:15', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1530120684645044224, 'admin', 1530120084482084864, 'MQTT消息', 'MqttDemo', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/mq/mqtt', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-27 17:36:14', 1399985191002447872, '2022-05-27 17:36:14', 0, 1); INSERT INTO `iam_perm_menu` VALUES (1530120821144473600, 'admin', 1530120084482084864, 'RabbitMQ', 'RabbitDemo', NULL, b'0', '', b'0', b'0', '', NULL, '/demo/mq/rabbit', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-05-27 17:36:47', 1399985191002447872, '2022-05-27 17:36:47', 0, 1); @@ -4328,14 +4304,9 @@ INSERT INTO `iam_perm_menu` VALUES (1534008203006652416, 'admin', 14311526898325 INSERT INTO `iam_perm_menu` VALUES (1535451167008436224, 'admin', 1431152689832525824, '系统信息', 'SysInfo', NULL, b'0', '', b'0', b'0', 'starter/monitor/SystemInfoMonitor', NULL, '/monitor/sysinfo', '', 0, 1, NULL, b'0', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-11 10:37:40', 1399985191002447872, '2022-06-13 13:07:46', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1535965936371085312, 'admin', 1431152689832525824, 'Redis监控', 'RedisInfoMonitor', NULL, b'0', '', b'0', b'0', 'starter/monitor/RedisInfoMonitor', NULL, '/monitor/redis', '', 0, 1, NULL, b'0', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-12 20:43:11', 1399985191002447872, '2022-06-13 13:07:38', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1537730140522348544, 'admin', 1438061887002759168, '站内信', 'SiteMessageSender', '', b'0', '', b'0', b'0', 'notice/site/sender/SiteMessageList', NULL, '/notice/siteMessage', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-17 17:33:30', 1399985191002447872, '2022-08-20 21:12:30', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1537732440632524800, 'admin', NULL, '个人办公', 'person', '', b'0', 'user', b'0', b'0', 'RouteView', NULL, '/person', '', -99, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-17 17:42:38', 1399985191002447872, '2022-08-20 22:15:21', 4, 0); -INSERT INTO `iam_perm_menu` VALUES (1537733801860333568, 'admin', 1537732440632524800, '我的消息', 'PersonSiteMessage', NULL, b'0', '', b'0', b'0', 'notice/site/receive/SiteMessageList', NULL, '/person/siteMessage', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-17 17:48:03', 1399985191002447872, '2022-10-24 11:10:35', 4, 0); -INSERT INTO `iam_perm_menu` VALUES (1537735851818024960, 'admin', 1537732440632524800, '待办任务', 'MyTodoTaskList', NULL, b'0', '', b'0', b'0', 'office/mytodo/MyTodoList', NULL, '/person/todo', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-17 17:56:11', 1399985191002447872, '2022-08-30 22:46:47', 6, 0); INSERT INTO `iam_perm_menu` VALUES (1538160478872625152, 'admin', 1495968302034210816, '富文本编辑', 'WangEditorDemo', NULL, b'0', '', b'0', b'0', 'demo/wangeditor/WangEditorDemo', NULL, '/demo/wangEditor', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-18 22:03:30', 1399985191002447872, '2022-06-18 22:03:31', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1541355214204030976, 'admin', 1541427353886859264, '认证终端', 'Client', '', b'0', '', b'0', b'0', 'system/client/ClientList', NULL, '/system/config/client', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2021-08-27 10:37:08', 1399985191002447872, '2022-07-05 21:17:45', 3, 0); INSERT INTO `iam_perm_menu` VALUES (1541427353886859264, 'admin', 1414596052497092608, '认证管理', 'Auth', '', b'0', '', b'0', b'0', 'RouteView', NULL, '/system/auth', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-06-27 22:24:54', 1399985191002447872, '2022-06-27 22:24:54', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1544952211901218816, 'admin', 1546850918849249280, '支付结算台演示', 'CashierDemo', NULL, b'0', '', b'0', b'0', '', NULL, '/cashier', '', 0, 1, NULL, b'0', b'1', b'0', b'0', NULL, 1399985191002447872, '2022-07-07 15:51:26', 1399985191002447872, '2022-11-23 15:31:08', 4, 0); -INSERT INTO `iam_perm_menu` VALUES (1546850918849249280, 'admin', 1495968302034210816, '支付演示', 'DemoPay', NULL, b'0', '', b'0', b'0', 'RouteView', NULL, '/demo/pay', '', 9, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-07-12 21:36:13', 1399985191002447872, '2022-08-03 14:49:16', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1551803592828932096, 'admin', 1450821877831254016, '企微机器人', 'WeComRobot', '', b'0', '', b'0', b'0', 'third/wecom/robot/WeComRobotConfigList', NULL, '/third/wecom/robot', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-07-26 13:36:22', 1399985191002447872, '2022-10-24 11:07:27', 3, 0); INSERT INTO `iam_perm_menu` VALUES (1552207982510706688, 'admin', NULL, '开发管理', 'develop', NULL, b'0', 'gold', b'0', b'0', 'RouteView', NULL, '/develop', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-07-27 16:23:16', 1399985191002447872, '2022-07-27 16:39:09', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1552208167664062464, 'admin', 1552207982510706688, '动态表单', 'DynamicForm', NULL, b'0', '', b'0', b'0', 'develop/dynamicform/DynamicFormList', NULL, '/develop/form', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-07-27 16:24:00', 1399985191002447872, '2022-07-27 16:38:05', 2, 0); @@ -4344,14 +4315,6 @@ INSERT INTO `iam_perm_menu` VALUES (1554721654336385024, 'admin', 15547209808653 INSERT INTO `iam_perm_menu` VALUES (1554850179754975232, 'admin', 1450821723027881984, '消息模板', 'WeChatTemplate', NULL, b'0', '', b'0', b'0', 'third/wechat/template/WeChatTemplateList', NULL, '/third/wechat/template', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-03 23:22:25', 1399985191002447872, '2022-08-03 23:23:18', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1555835229426368512, 'admin', 1450821723027881984, '自定义菜单', 'WeChatMenu', NULL, b'0', '', b'0', b'0', 'third/wechat/menu/WeChatMenuList', NULL, '/third/wechat/menu', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-06 16:36:39', 1399985191002447872, '2022-08-08 12:14:14', 2, 0); INSERT INTO `iam_perm_menu` VALUES (1556997405528805376, 'admin', 1450821723027881984, '素材管理', 'WeChatMedia', NULL, b'0', '', b'0', b'0', 'third/wechat/media/WeChatMediaList', NULL, '/third/wechat/media', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-09 21:34:44', 1399985191002447872, '2022-08-09 21:34:44', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1562460770753544192, 'admin', NULL, '流程管理', 'Bpm', NULL, b'0', 'audit', b'0', b'0', 'RouteView', NULL, '/bpm', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-24 23:24:12', 1399985191002447872, '2022-08-24 23:25:11', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1562461289450536960, 'admin', 1562460770753544192, '流程模型', 'BpmModel', NULL, b'0', '', b'0', b'0', 'bpm/model/BpmModelList', NULL, '/bpm/model', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-24 23:26:15', 1399985191002447872, '2022-08-24 23:26:15', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1562461620766998528, 'admin', 1562460770753544192, '流程表单', 'BpmFrom', NULL, b'0', '', b'0', b'0', 'Dev', NULL, '/bpm/form', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-24 23:27:34', 1399985191002447872, '2022-08-24 23:27:56', 1, 1); -INSERT INTO `iam_perm_menu` VALUES (1563092672406859776, 'admin', 1537732440632524800, '我的发起', 'MyApplyList', NULL, b'0', '', b'0', b'0', 'office/myapply/MyApplyList', NULL, '/person/myApply', '', 1, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-26 17:15:09', 1399985191002447872, '2022-08-30 22:46:25', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1564626025579462656, 'admin', 1537732440632524800, '已办任务', 'MyDoneTaskList', NULL, b'0', '', b'0', b'0', 'office/mydone/MyDoneList', NULL, '/person/done', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-08-30 22:48:09', 1399985191002447872, '2022-08-30 22:48:29', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1571023702122766336, 'admin', 1562460770753544192, '未处理任务', 'BpmTodoTask', NULL, b'0', '', b'0', b'0', 'bpm/task/TodoTaskList', NULL, '/bpm/todo', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-09-17 14:30:13', 1399985191002447872, '2022-09-17 14:31:23', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1571023925834358784, 'admin', 1562460770753544192, '已处理任务', 'BpmDoneTask', NULL, b'0', '', b'0', b'0', 'bpm/task/DoneTaskList', NULL, '/bpm/done', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-09-17 14:31:07', 1399985191002447872, '2022-09-17 14:31:07', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1571024250171498496, 'admin', 1562460770753544192, '流程实例', 'BpmInstance', NULL, b'0', '', b'0', b'0', 'bpm/instance/InstanceList', NULL, '/bpm/instance', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-09-17 14:32:24', 1399985191002447872, '2022-09-17 14:32:24', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1573669546890297344, 'admin', 1552207982510706688, '动态数据源', 'DynamicSource', NULL, b'0', '', b'0', b'0', 'develop/dynamicsource/DynamicDataSourceList', NULL, '/develop/source', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-09-24 21:43:52', 1399985191002447872, '2022-09-24 21:43:52', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1580740450633101312, 'adminv3', NULL, '系统管理', 'System', NULL, b'0', 'ant-design:setting-outlined', b'0', b'0', 'Layout', NULL, '/system', '/system1/client', -99999, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-10-14 10:01:07', 1414143554414059520, '2022-10-18 15:32:09', 4, 0); INSERT INTO `iam_perm_menu` VALUES (1580740637841666048, 'adminv3', 1582253306356649984, '终端管理', 'ClientList', NULL, b'0', '', b'0', b'0', '/modules/system/client/ClientList.vue', NULL, '/system/client', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2022-10-14 10:01:51', 1414143554414059520, '2022-10-18 14:13:27', 5, 0); @@ -4364,13 +4327,10 @@ INSERT INTO `iam_perm_menu` VALUES (1582249924602580992, 'adminv3', 158074045063 INSERT INTO `iam_perm_menu` VALUES (1582253011803262976, 'adminv3', 1580740450633101312, '用户信息', 'UserAuth', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/system/user', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 14:11:30', 1414143554414059520, '2022-10-18 14:11:30', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1582253152903843840, 'adminv3', 1580740450633101312, '系统配置', 'SystemConfig', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/system/config', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 14:12:03', 1414143554414059520, '2022-10-18 14:12:03', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1582253306356649984, 'adminv3', 1580740450633101312, '认证管理', 'Auth', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/system/auth', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 14:12:40', 1414143554414059520, '2022-10-18 14:13:13', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1582274981055909888, 'adminv3', NULL, '个人办公', 'Person', NULL, b'0', 'ant-design:align-right-outlined', b'0', b'0', 'Layout', NULL, '/person', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:38:47', 1414143554414059520, '2022-10-18 15:38:47', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1582275875424129024, 'adminv3', NULL, '系统监控', 'Monitor', NULL, b'0', 'ant-design:monitor-outlined', b'0', b'0', 'Layout', NULL, '/monitor', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:42:21', 1414143554414059520, '2022-10-19 17:29:29', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1582275984849326080, 'adminv3', NULL, '通知管理', 'Notice', NULL, b'0', 'ant-design:message-outlined', b'0', b'0', 'Layout', NULL, '/notice', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:42:47', 1414143554414059520, '2022-10-19 17:30:06', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1582276092038959104, 'adminv3', NULL, '第三方对接', 'Third', NULL, b'0', 'ant-design:api-twotone', b'0', b'0', 'Layout', NULL, '/third', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:43:12', 1414143554414059520, '2022-10-19 17:32:04', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1582276184120709120, 'adminv3', NULL, '支付管理', 'PayManager', NULL, b'0', 'ant-design:pay-circle-outlined', b'0', b'0', 'Layout', NULL, '/payment', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:43:34', 1414143554414059520, '2022-10-19 17:31:46', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1582276341792985088, 'adminv3', NULL, '开发管理', 'Develop', NULL, b'0', 'ant-design:apartment-outlined', b'0', b'0', 'Layout', NULL, '/develop', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:44:12', 1414143554414059520, '2022-10-19 15:24:22', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1582276447602692096, 'adminv3', NULL, '流程管理', 'Bpm', NULL, b'0', 'ant-design:file-protect-outlined', b'0', b'0', 'Layout', NULL, '/bpm', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:44:37', 1414143554414059520, '2022-10-19 17:34:11', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1582276516905177088, 'adminv3', NULL, '功能演示', 'Demo', NULL, b'0', 'ant-design:appstore-twotone', b'0', b'0', 'Layout', NULL, '/demo', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:44:54', 1414143554414059520, '2022-10-19 17:34:26', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1582277076421136384, 'adminv3', 1582249924602580992, '角色管理', 'RoleList', NULL, b'0', '', b'0', b'0', '/modules/system/role/RoleList.vue', NULL, '/system/permission/role', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 15:47:07', 1414143554414059520, '2022-10-18 15:59:37', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1582301940364308480, 'adminv3', 1582249924602580992, '请求权限管理', 'PermPathList', NULL, b'0', '', b'0', b'0', '/modules/system/path/PermPathList.vue', NULL, '/system/permission/path', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 17:25:55', 1414143554414059520, '2022-10-18 20:41:22', 1, 0); @@ -4405,43 +4365,14 @@ INSERT INTO `iam_perm_menu` VALUES (1584380824308097024, 'adminv3', 158437960218 INSERT INTO `iam_perm_menu` VALUES (1584381134950834176, 'adminv3', 1584379704122744832, '企微机器人', 'WeComRobotConfigList', NULL, b'0', '', b'0', b'0', '/modules/third/wecom/robot/WecomRobotConfigList.vue', NULL, '/third/wecom/robot', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:07:54', 1414143554414059520, '2022-11-12 20:58:25', 3, 0); INSERT INTO `iam_perm_menu` VALUES (1584381322184564736, 'adminv3', 1584380087805091840, '钉钉机器人', 'DingRobotConfigList', NULL, b'0', '', b'0', b'0', '/modules/third/dingtalk/robot/DingRobotConfigList.vue', NULL, '/third/dingTalk/robot', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:08:38', 1414143554414059520, '2022-11-12 20:58:37', 6, 0); INSERT INTO `iam_perm_menu` VALUES (1584381477986181120, 'adminv3', 1584380087805091840, '钉钉配置', 'DingRobotConfigList', NULL, b'0', '', b'1', b'0', '/modules/third/dingtalk/config/DingTalkConfigList.vue', NULL, '/third/dingtalk/config', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:09:15', 1414143554414059520, '2022-11-11 16:04:47', 1, 1); -INSERT INTO `iam_perm_menu` VALUES (1584381848238366720, 'adminv3', 1582274981055909888, '我的消息', 'SiteMessageListReceive', NULL, b'0', '', b'0', b'0', '/modules/notice/site/receive/SiteMessageList.vue', NULL, '/person/siteMessage', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:10:44', 1414143554414059520, '2022-11-17 09:08:02', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1584381976508571648, 'adminv3', 1582274981055909888, '待办任务', 'MyTodoList', NULL, b'0', '', b'0', b'0', '/modules/office/mytodo/MyTodoList.vue', NULL, '/person/todo', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:11:14', 1414143554414059520, '2022-10-24 11:11:14', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1584382091327643648, 'adminv3', 1582274981055909888, '已办任务', 'MyDoneList', NULL, b'0', '', b'0', b'0', '/modules/office/mydone/MyDoneList.vue', NULL, '/person/done', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:11:42', 1414143554414059520, '2022-10-24 11:12:29', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1584382258307080192, 'adminv3', 1582274981055909888, '我的发起', 'MyApplyList', NULL, b'0', '', b'0', b'0', '/modules/office/myapply/MyApplyList.vue', NULL, '/person/myApply', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:12:21', 1414143554414059520, '2022-10-24 11:12:21', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1584382569381830656, 'adminv3', 1582276184120709120, '支付通道', 'PayChannel', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/payment/channel', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:13:36', 1414143554414059520, '2022-10-24 11:13:36', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1584382723186958336, 'adminv3', 1582276184120709120, '支付订单', 'PayOrder', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/payment/order', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:14:12', 1414143554414059520, '2022-10-24 11:14:12', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1584382815407120384, 'adminv3', 1582276184120709120, '回调记录', 'PayNotify', NULL, b'0', '', b'0', b'0', '/modules/payment/notify/PayNotifyRecordList', NULL, '/payment/notify', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:14:34', 1414143554414059520, '2022-10-24 11:23:17', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1584383492338425856, 'adminv3', 1582276184120709120, '钱包管理', 'Wallet', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/payment/wallet', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:17:16', 1414143554414059520, '2022-10-24 11:17:16', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1584383640942616576, 'adminv3', 1582276184120709120, '储值卡', 'Voucher', NULL, b'0', '', b'0', b'0', '/modules/payment/voucher/VoucherList.vue', NULL, '/payment/voucher', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:17:51', 1414143554414059520, '2022-12-01 22:17:39', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1584383859121922048, 'adminv3', 1584382569381830656, '支付宝', 'AliPayConfigList', NULL, b'0', '', b'0', b'0', '/modules/payment/channel/alipay/AlipayConfigList.vue', NULL, '/payment/channel/alipay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:18:43', 1414143554414059520, '2022-11-22 15:20:37', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1584384015338774528, 'adminv3', 1584382569381830656, '微信支付', 'WeChatConfigList', NULL, b'0', '', b'0', b'0', '/modules/payment/channel/wechat/WechatPayConfigList.vue', NULL, '/payment/channel/wechat', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:19:20', 1414143554414059520, '2022-11-22 22:22:07', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1584384160574939136, 'adminv3', 1584382569381830656, '云闪付', 'UnionPayConfigList', NULL, b'0', '', b'0', b'0', '/modules/payment/channel/unionpay/UnionPayConfigList.vue', NULL, '/payment/channel/unionpay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:19:55', 1414143554414059520, '2022-11-22 22:27:32', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1584384526511185920, 'adminv3', 1584382723186958336, '支付订单', 'PaymentList', NULL, b'0', '', b'0', b'0', '/modules/payment/order/payment/PaymentList.vue', NULL, '/payment/order/payment', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:21:22', 1414143554414059520, '2022-10-24 11:21:22', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1584384752940687360, 'adminv3', 1584382723186958336, '退款订单', 'ReturnOrder', NULL, b'0', '', b'0', b'0', '/modules/payment/order/refund/RefundRecordList.vue', NULL, '/payment/order/return', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-24 11:22:16', 1414143554414059520, '2022-10-24 11:22:16', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1589495250199760896, 'adminv3', 1580740450633101312, '22', NULL, '11', b'1', NULL, b'0', b'0', NULL, NULL, NULL, NULL, 0, 2, NULL, b'0', b'0', b'0', b'0', '', 1414143554414059520, '2022-11-07 13:49:34', 1414143554414059520, '2022-11-07 13:49:34', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1591689087570378752, 'adminv3', 1582276447602692096, '流程模型', 'BpmModelList', NULL, b'0', '', b'0', b'0', '/modules/bpm/model/BpmModelList.vue', NULL, '/bpm/model', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-13 15:07:05', 1414143554414059520, '2022-11-13 15:07:05', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1591689307427405824, 'adminv3', 1582276447602692096, '未处理任务', 'TodoTaskList', NULL, b'0', '', b'0', b'0', '/modules/bpm/task/TodoTaskList.vue', NULL, '/bpm/todo', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-13 15:07:58', 1414143554414059520, '2022-11-14 22:45:57', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1591689479075102720, 'adminv3', 1582276447602692096, '已处理任务', 'BpmDoneTask', NULL, b'0', '', b'0', b'0', '/modules/bpm/task/DoneTaskList.vue', NULL, '/bpm/done', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-13 15:08:39', 1414143554414059520, '2022-11-13 15:14:17', 3, 0); -INSERT INTO `iam_perm_menu` VALUES (1591690820224778240, 'adminv3', 1582276447602692096, '流程实例', 'BpmInstance', NULL, b'0', '', b'0', b'0', '/modules/bpm/instance/InstanceList.vue', NULL, '/bpm/instance', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-13 15:13:58', 1414143554414059520, '2022-11-13 15:13:58', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1594586131247075328, 'adminv3', 1582275875424129024, 'ELK日志x', 'ELKx', NULL, b'0', '', b'0', b'0', 'Iframe', NULL, '/monitor/elk', 'https://www.antdv.com/components/overview-cn', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-21 14:58:54', 1414143554414059520, '2022-11-21 15:21:35', 6, 0); -INSERT INTO `iam_perm_menu` VALUES (1595255743081025536, 'adminv3', 1580740450633101312, '菜单管理1', '', NULL, b'0', '', b'0', b'0', '', NULL, 'outside:////system/menu?onlytab=1&__full__', '', -99, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-23 11:19:42', 1414143554414059520, '2022-11-23 21:02:52', 20, 1); INSERT INTO `iam_perm_menu` VALUES (1597044371008516096, 'adminv3', NULL, '功能演示', 'Demo', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/demo', '', 0, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-28 09:47:04', 1414143554414059520, '2022-11-28 09:47:04', 0, 1); INSERT INTO `iam_perm_menu` VALUES (1597102799370317824, 'adminv3', 1582276516905177088, '数据相关', 'DemoData', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/demo/data', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-28 13:39:15', 1414143554414059520, '2022-11-28 13:39:15', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1597210969883275264, 'adminv3', 1582276516905177088, '超级查询', 'SuperQueryDemoList', NULL, b'0', '', b'0', b'0', '/modules/demo/query/SuperQueryDemoList.vue', NULL, '/demo/query/super', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-11-28 20:49:05', 1414143554414059520, '2022-11-28 21:00:14', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1598306560788877312, 'adminv3', 1584383492338425856, '钱包列表', 'WalletList', NULL, b'0', '', b'0', b'0', '/modules/payment/wallet/list/WalletList.vue', NULL, '/payment/wallet/list', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-01 21:22:34', 1414143554414059520, '2022-12-01 21:22:34', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1598306760764903424, 'adminv3', 1584383492338425856, '个人钱包', 'MyWallet', NULL, b'0', '', b'0', b'0', '/modules/payment/wallet/personal/MyWallet.vue', NULL, '/payment/wallet/personal', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-01 21:23:22', 1414143554414059520, '2022-12-01 21:23:22', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1599337250200440832, 'adminv3', NULL, '关于', '', NULL, b'0', 'simple-icons:about-dot-me', b'0', b'0', '', NULL, '/about/index', '', 99, 0, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 17:38:09', 1414143554414059520, '2022-12-04 17:43:32', 3, 0); INSERT INTO `iam_perm_menu` VALUES (1599378494880436224, 'adminv3', 1582276516905177088, 'WS演示', 'WebsocketDemo', NULL, b'0', '', b'0', b'0', '/modules/demo/ws/WebsocketDemo', NULL, '/demo/ws', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:22:03', 1414143554414059520, '2023-02-08 12:17:58', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1599378579513102336, 'adminv3', 1582276516905177088, '幂等请求演示', 'IdempotentDemo', NULL, b'0', '', b'0', b'0', '/modules/demo/idempotent/IdempotentDemo', NULL, '/demo/idempotent', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:22:23', 1414143554414059520, '2023-02-08 11:46:00', 3, 0); INSERT INTO `iam_perm_menu` VALUES (1599378728490586112, 'adminv3', 1582276516905177088, '消息中间件演示', 'MqDemo', NULL, b'0', '', b'0', b'0', '/modules/demo/mq/MqDemo', NULL, '/demo/mq', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:22:59', 1414143554414059520, '2023-02-08 22:09:04', 2, 0); INSERT INTO `iam_perm_menu` VALUES (1599378838519762944, 'adminv3', 1582276516905177088, '富文本编辑', 'WangEditorDemo', NULL, b'0', '', b'0', b'0', '/modules/demo/wangeditor/WangEditorDemo.vue', NULL, '/demo/wangEditor', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:23:25', 1414143554414059520, '2023-02-10 09:05:16', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1599378992811429888, 'adminv3', 1582276516905177088, '消息通知', '', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/demo/notice', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:24:02', 1414143554414059520, '2022-12-04 20:24:37', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1599379197124366336, 'adminv3', 1582276516905177088, '支付演示', '', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/demo/pay', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:24:50', 1414143554414059520, '2022-12-04 20:24:50', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1599379348144476160, 'adminv3', 1599379197124366336, '收银台', 'SimpleCashier', NULL, b'0', '', b'0', b'0', '/demo/payment/cashier/SimpleCashier.vue', NULL, '/demo/pay/cashier', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:25:26', 1414143554414059520, '2022-12-05 21:28:10', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1599379428784164864, 'adminv3', 1599379197124366336, '组合支付', 'CombinationCashier', NULL, b'0', '', b'0', b'0', '/demo/payment/cashier/CombinationCashier.vue', NULL, '/demo/pay/combination', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:25:46', 1414143554414059520, '2022-12-08 22:32:55', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1599379539232772096, 'adminv3', 1599379197124366336, '支付结算台演示', '', NULL, b'0', '', b'0', b'0', '', NULL, 'outside:///cashier', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-12-04 20:26:12', 1414143554414059520, '2022-12-04 20:26:34', 1, 0); -INSERT INTO `iam_perm_menu` VALUES (1617513861605191680, 'admin', 1414596052497092608, '123', NULL, '123', b'0', NULL, b'0', b'0', NULL, NULL, NULL, NULL, 0, 2, NULL, b'0', b'0', b'0', b'0', '', 1399985191002447872, '2023-01-23 21:25:31', 1399985191002447872, '2023-01-23 21:56:34', 3, 0); INSERT INTO `iam_perm_menu` VALUES (1617847577158324224, 'adminv3', 1597102799370317824, '数据权限', 'DataPermDemoList', NULL, b'0', '', b'0', b'0', '/modules/demo/data/perm/DataPermDemoList.vue', NULL, '/demo/data/perm', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-01-24 19:31:35', 1414143554414059520, '2023-01-24 20:06:04', 2, 0); INSERT INTO `iam_perm_menu` VALUES (1617847653746315264, 'adminv3', 1597102799370317824, '加密解密', 'DataEncryptDemoList', NULL, b'0', '', b'0', b'0', '/modules/demo/data/encrypt/DataEncryptDemoList.vue', NULL, '/demo/data/encrypt', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-01-24 19:31:53', 1414143554414059520, '2023-01-24 20:05:45', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1617847747375763456, 'adminv3', 1597102799370317824, '数据脱敏', 'DataSensitiveDemoList', NULL, b'0', '', b'0', b'0', '/modules/demo/data/sensitive/DataSensitiveDemoList.vue', NULL, '/demo/data/sensitive', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-01-24 19:32:16', 1414143554414059520, '2023-01-24 20:06:58', 1, 0); @@ -4452,7 +4383,6 @@ INSERT INTO `iam_perm_menu` VALUES (1623494586215579648, 'admin', 15522079825107 INSERT INTO `iam_perm_menu` VALUES (1629039360928075776, 'adminv3', 1582276341792985088, '可视化大屏', 'ProjectInfoList', NULL, b'0', '', b'0', b'0', '/modules/develop/report/ProjectInfoList', NULL, '/develop/report', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-02-24 16:43:44', 1414143554414059520, '2023-02-24 16:44:17', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1631946120891707392, 'admin', 1552207982510706688, '可视化大屏', 'ProjectInfoList', NULL, b'0', '', b'0', b'0', 'develop/report/ProjectInfoList', NULL, '/develop/report', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2023-03-04 17:14:10', 1399985191002447872, '2023-03-04 17:14:10', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1635274568758435840, 'adminv3', 1582276341792985088, 'SQL查询语句', 'QuerySqlList', NULL, b'0', '', b'0', b'0', '/modules/develop/query/QuerySqlList', NULL, '/develop/querySql', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-03-13 21:40:14', 1414143554414059520, '2023-03-13 21:43:05', 2, 0); -INSERT INTO `iam_perm_menu` VALUES (1635895711235022848, 'adminv3', 1582276447602692096, '流程设计器', 'ProcessDesign', NULL, b'0', '', b'0', b'0', '/modules/bpm/design/ProcessDesign.vue', NULL, '/bpm/design', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-03-15 14:48:26', 1414143554414059520, '2023-03-15 14:48:26', 0, 0); -- ---------------------------- -- Table structure for iam_perm_path @@ -5405,7 +5335,6 @@ CREATE TABLE `qrtz_cron_triggers` ( -- ---------------------------- -- Records of qrtz_cron_triggers -- ---------------------------- -INSERT INTO `qrtz_cron_triggers` VALUES ('quartzScheduler', '1546857070483939328', 'DEFAULT', '0/5 * * * * ? *', 'Asia/Shanghai'); -- ---------------------------- -- Table structure for qrtz_fired_triggers @@ -5437,7 +5366,6 @@ CREATE TABLE `qrtz_fired_triggers` ( -- ---------------------------- -- Records of qrtz_fired_triggers -- ---------------------------- -INSERT INTO `qrtz_fired_triggers` VALUES ('quartzScheduler', 'NON_CLUSTERED1663741439856', '1546857070483939328', 'DEFAULT', 'NON_CLUSTERED', 1663741920988, 1663741925000, 5, 'ACQUIRED', NULL, NULL, '0', '0'); -- ---------------------------- -- Table structure for qrtz_job_details @@ -5462,7 +5390,6 @@ CREATE TABLE `qrtz_job_details` ( -- ---------------------------- -- Records of qrtz_job_details -- ---------------------------- -INSERT INTO `qrtz_job_details` VALUES ('quartzScheduler', '1546857070483939328', 'DEFAULT', NULL, 'cn.bootx.payment.task.PayExpiredTimeTask', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C77080000001000000001740009706172616D65746572707800); -- ---------------------------- -- Table structure for qrtz_locks @@ -5477,8 +5404,6 @@ CREATE TABLE `qrtz_locks` ( -- ---------------------------- -- Records of qrtz_locks -- ---------------------------- -INSERT INTO `qrtz_locks` VALUES ('quartzScheduler', 'STATE_ACCESS'); -INSERT INTO `qrtz_locks` VALUES ('quartzScheduler', 'TRIGGER_ACCESS'); -- ---------------------------- -- Table structure for qrtz_paused_trigger_grps @@ -5509,7 +5434,6 @@ CREATE TABLE `qrtz_scheduler_state` ( -- ---------------------------- -- Records of qrtz_scheduler_state -- ---------------------------- -INSERT INTO `qrtz_scheduler_state` VALUES ('quartzScheduler', 'xxm1638448483700', 1638451157328, 10000); -- ---------------------------- -- Table structure for qrtz_simple_triggers @@ -5597,7 +5521,6 @@ CREATE TABLE `qrtz_triggers` ( -- ---------------------------- -- Records of qrtz_triggers -- ---------------------------- -INSERT INTO `qrtz_triggers` VALUES ('quartzScheduler', '1546857070483939328', 'DEFAULT', '1546857070483939328', 'DEFAULT', NULL, 1663741925000, 1663741920000, 5, 'ACQUIRED', 'CRON', 1657634445000, 0, NULL, 0, ''); -- ---------------------------- -- Table structure for report_project_info @@ -5777,15 +5700,6 @@ CREATE TABLE `starter_file_upload_info` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '上传文件信息' ROW_FORMAT = DYNAMIC; --- ---------------------------- --- Records of starter_file_upload_info --- ---------------------------- -INSERT INTO `starter_file_upload_info` VALUES (1495330622946631680, NULL, 'blob', 'jpg', 'jpg', 68, '62120ac9efeec06e2275fc52', 1399985191002447872, '2022-02-20 17:32:57'); -INSERT INTO `starter_file_upload_info` VALUES (1495331213525606400, NULL, 'blob', 'jpg', 'jpg', 68, '62120b55efeec06e2275fc54', 1399985191002447872, '2022-02-20 17:35:28'); -INSERT INTO `starter_file_upload_info` VALUES (1495331812178616320, NULL, 'blob', 'jpg', 'jpg', 74, '62120be4efeec06e2275fc56', 1399985191002447872, '2022-02-20 17:37:43'); -INSERT INTO `starter_file_upload_info` VALUES (1495331905770315776, NULL, 'blob', 'jpg', 'jpg', 76, '62120bfaefeec06e2275fc58', 1399985191002447872, '2022-02-20 17:38:03'); -INSERT INTO `starter_file_upload_info` VALUES (1530065639127871488, NULL, 'blob', 'jpg', 'jpg', 83, '6290684abf0e90583f414dcf', 1414143554414059520, '2022-05-27 13:57:31'); - -- ---------------------------- -- Table structure for starter_quartz_job -- ---------------------------- diff --git a/bootx-start/src/main/resources/logback-spring.xml b/bootx-start/src/main/resources/logback-spring.xml index 5d81cbd34eae8a86d1611f0901d4c6d065ddae3a..c1a67868630ea7168e1d4a373a0bc1afadc62cef 100644 --- a/bootx-start/src/main/resources/logback-spring.xml +++ b/bootx-start/src/main/resources/logback-spring.xml @@ -7,17 +7,15 @@ - - - - - + + + + - diff --git a/docker-compose.yml b/docker-compose.yml index f6c09044cfe7d985b2f2c12bba4a1c45fc2e8317..917015df4132dcad5114208dcd12aa958a9849fd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,3 +10,4 @@ services: - /data/logs/bootx-platform:/logs # 外部化配置文件 - ./application.yml:/application.yml + - ./logback-spring.xml:/logback-spring.xml diff --git a/pom.xml b/pom.xml index ffc90fd9b1706ddbe7fb99433a53814bfcde096e..295ba505b8792598eb68496652966fe10bb8b723 100644 --- a/pom.xml +++ b/pom.xml @@ -6,25 +6,76 @@ org.springframework.boot spring-boot-starter-parent - 2.7.10 + 2.7.11 4.0.0 cn.bootx.platform - bootx-platform + bootx-platform-parent pom - 1.2.3 + 1.3.0 + + + bootx-platform + bootx-platform 基于Spring Boot框架打造，针对单体式应用进行专门设计，提供整套服务模块，努力为打造全方位企业级开发解决方案 + https://gitee.com/bootx/bootx-platform + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + bootx + xxm1995@outlook.com + bootx + https://gitee.com/bootx/bootx-platform + + + + + scm:git:git@gitee.com:bootx/bootx-platform.git + scm:git:git@gitee.com:bootx/bootx-platform.git + https://gitee.com/bootx/bootx-platform + + + + + + + noDeploy + + bootx-common-core + bootx-common-starters + bootx-commons + bootx-services + bootx-start + bootx-demo + + + true + + + + + deploy + + bootx-common-core + bootx-common-starters + bootx-commons + bootx-services + + + - - bootx-common-core - bootx-common-starters - bootx-commons - bootx-services - bootx-start - bootx-demo - UTF-8 @@ -32,9 +83,9 @@ 1.8 - 1.2.3 + 1.3.0 - 5.8.15 + 5.8.18 6.4.0 2.12.3 3.11 @@ -48,13 +99,12 @@ 2.14.2 7.15.0 1.4.01 - 6.8.0 - 1.2.4 - - 3.5.2 + 1.2.12 + + 3.5.3 3.2.1 - 2.3.1 + 2.4.0 2.9.7 1.34.0 1.16.5 @@ -75,6 +125,8 @@ 4.4.9.B 1.3.81 2.2.4 + 2.7.0 + 1.5.1.beta3 @@ -96,13 +148,6 @@ ${logback-classic.version} - - - com.plumelog - plumelog-lite-spring-boot-starter - ${plumelog.version} - - com.alibaba @@ -122,6 +167,7 @@ org.projectlombok lombok-mapstruct-binding ${lombok-mapstruct.version} + provided @@ -129,6 +175,7 @@ org.mapstruct mapstruct-processor ${mapstruct.version} + provided @@ -244,17 +291,11 @@ common-rabbitmq ${bootx-platform.version} - - - cn.bootx.platform - common-lock - ${bootx-platform.version} - - cn.bootx.platform - common-actable - ${bootx-platform.version} + cn.bootx + mybatis-table-modify + ${mybatis-table-modify.version} @@ -325,12 +366,6 @@ ${bootx-platform.version} - - - cn.bootx.platform - common-starter-flowable - ${bootx-platform.version} - @@ -356,19 +391,10 @@ true - - - - - + - - - org.codehaus.mojo - versions-maven-plugin - io.spring.javaformat @@ -389,6 +415,85 @@ + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + ${java.version} + ${java.version} + + + + + org.apache.maven.plugins + maven-source-plugin + 3.2.1 + + + attach-sources + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + -Xdoclint:none + true + + UTF-8 + + UTF-8 + + UTF-8 + + + + attach-javadocs + + jar + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + + sonatype + + https://s01.oss.sonatype.org/ + + false + + @@ -416,4 +521,17 @@ + + + sonatype + OSS Snapshots Repository + https://s01.oss.sonatype.org/content/repositories/snapshots/ + + + sonatype + OSS Staging Repository + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + +