mirror of
https://gitee.com/huangge1199_admin/vue-pro.git
synced 2024-11-24 08:11:55 +08:00
更新包名
This commit is contained in:
parent
9ad95223d1
commit
ae6a78bacf
4
pom.xml
4
pom.xml
@ -3,7 +3,7 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao</artifactId>
|
<artifactId>yudao</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
@ -50,7 +50,7 @@
|
|||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-dependencies</artifactId>
|
<artifactId>yudao-dependencies</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
<type>pom</type>
|
<type>pom</type>
|
||||||
|
@ -63,7 +63,7 @@ services:
|
|||||||
NODE_ENV:
|
NODE_ENV:
|
||||||
ENV=${NODE_ENV:-production}
|
ENV=${NODE_ENV:-production}
|
||||||
PUBLIC_PATH=${PUBLIC_PATH:-/}
|
PUBLIC_PATH=${PUBLIC_PATH:-/}
|
||||||
VUE_APP_TITLE=${VUE_APP_TITLE:-芋道管理系统}
|
VUE_APP_TITLE=${VUE_APP_TITLE:-龙儿管理系统}
|
||||||
VUE_APP_BASE_API=${VUE_APP_BASE_API:-/prod-api}
|
VUE_APP_BASE_API=${VUE_APP_BASE_API:-/prod-api}
|
||||||
VUE_APP_APP_NAME=${VUE_APP_APP_NAME:-/}
|
VUE_APP_APP_NAME=${VUE_APP_APP_NAME:-/}
|
||||||
VUE_APP_TENANT_ENABLE=${VUE_APP_TENANT_ENABLE:-true}
|
VUE_APP_TENANT_ENABLE=${VUE_APP_TENANT_ENABLE:-true}
|
||||||
|
@ -16,7 +16,7 @@ REDIS_HOST=yudao-redis
|
|||||||
## admin
|
## admin
|
||||||
NODE_ENV=production
|
NODE_ENV=production
|
||||||
PUBLIC_PATH=/
|
PUBLIC_PATH=/
|
||||||
VUE_APP_TITLE=芋道管理系统
|
VUE_APP_TITLE=龙儿管理系统
|
||||||
VUE_APP_BASE_API=/prod-api
|
VUE_APP_BASE_API=/prod-api
|
||||||
VUE_APP_APP_NAME=/
|
VUE_APP_APP_NAME=/
|
||||||
VUE_APP_TENANT_ENABLE=true
|
VUE_APP_TENANT_ENABLE=true
|
||||||
|
@ -388,8 +388,8 @@ COMMENT ON TABLE infra_file_config IS '文件配置表';
|
|||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- @formatter:off
|
-- @formatter:off
|
||||||
SET IDENTITY_INSERT infra_file_config ON;
|
SET IDENTITY_INSERT infra_file_config ON;
|
||||||
INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (4, '数据库', 1, '我是数据库', '0', '{"@class":"cn.iocoder.yudao.module.infra.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', '1', '2022-03-15 23:56:24', '1', '2024-02-28 22:54:07', '0');
|
INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (4, '数据库', 1, '我是数据库', '0', '{"@class":"cn.huangge.yudao.module.infra.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', '1', '2022-03-15 23:56:24', '1', '2024-02-28 22:54:07', '0');
|
||||||
INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (22, '七牛存储器', 20, '', '1', '{"@class":"cn.iocoder.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3.cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS","accessSecret":"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY"}', '1', '2024-01-13 22:11:12', '1', '2024-04-03 19:38:34', '0');
|
INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (22, '七牛存储器', 20, '', '1', '{"@class":"cn.huangge.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3.cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS","accessSecret":"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY"}', '1', '2024-01-13 22:11:12', '1', '2024-04-03 19:38:34', '0');
|
||||||
COMMIT;
|
COMMIT;
|
||||||
SET IDENTITY_INSERT infra_file_config OFF;
|
SET IDENTITY_INSERT infra_file_config OFF;
|
||||||
-- @formatter:on
|
-- @formatter:on
|
||||||
|
@ -493,8 +493,8 @@ COMMENT ON TABLE infra_file_config IS '文件配置表';
|
|||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- @formatter:off
|
-- @formatter:off
|
||||||
BEGIN;
|
BEGIN;
|
||||||
INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (4, '数据库', 1, '我是数据库', '0', '{"@class":"cn.iocoder.yudao.module.infra.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', '1', '2022-03-15 23:56:24', '1', '2024-02-28 22:54:07', '0');
|
INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (4, '数据库', 1, '我是数据库', '0', '{"@class":"cn.huangge.yudao.module.infra.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', '1', '2022-03-15 23:56:24', '1', '2024-02-28 22:54:07', '0');
|
||||||
INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (22, '七牛存储器', 20, '', '1', '{"@class":"cn.iocoder.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3.cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS","accessSecret":"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY"}', '1', '2024-01-13 22:11:12', '1', '2024-04-03 19:38:34', '0');
|
INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (22, '七牛存储器', 20, '', '1', '{"@class":"cn.huangge.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3.cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS","accessSecret":"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY"}', '1', '2024-01-13 22:11:12', '1', '2024-04-03 19:38:34', '0');
|
||||||
COMMIT;
|
COMMIT;
|
||||||
-- @formatter:on
|
-- @formatter:on
|
||||||
|
|
||||||
|
File diff suppressed because one or more lines are too long
@ -281,8 +281,8 @@ CREATE TABLE `infra_file_config` (
|
|||||||
-- Records of infra_file_config
|
-- Records of infra_file_config
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
BEGIN;
|
BEGIN;
|
||||||
INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (4, '数据库', 1, '我是数据库', b'0', '{\"@class\":\"cn.iocoder.yudao.module.infra.framework.file.core.client.db.DBFileClientConfig\",\"domain\":\"http://127.0.0.1:48080\"}', '1', '2022-03-15 23:56:24', '1', '2024-02-28 22:54:07', b'0');
|
INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (4, '数据库', 1, '我是数据库', b'0', '{\"@class\":\"cn.huangge.yudao.module.infra.framework.file.core.client.db.DBFileClientConfig\",\"domain\":\"http://127.0.0.1:48080\"}', '1', '2022-03-15 23:56:24', '1', '2024-02-28 22:54:07', b'0');
|
||||||
INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (22, '七牛存储器', 20, '', b'1', '{\"@class\":\"cn.iocoder.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig\",\"endpoint\":\"s3.cn-south-1.qiniucs.com\",\"domain\":\"http://test.yudao.iocoder.cn\",\"bucket\":\"ruoyi-vue-pro\",\"accessKey\":\"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS\",\"accessSecret\":\"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY\"}', '1', '2024-01-13 22:11:12', '1', '2024-04-03 19:38:34', b'0');
|
INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (22, '七牛存储器', 20, '', b'1', '{\"@class\":\"cn.huangge.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig\",\"endpoint\":\"s3.cn-south-1.qiniucs.com\",\"domain\":\"http://test.yudao.iocoder.cn\",\"bucket\":\"ruoyi-vue-pro\",\"accessKey\":\"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS\",\"accessSecret\":\"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY\"}', '1', '2024-01-13 22:11:12', '1', '2024-04-03 19:38:34', b'0');
|
||||||
COMMIT;
|
COMMIT;
|
||||||
|
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
|
@ -493,8 +493,8 @@ COMMENT ON TABLE infra_file_config IS '文件配置表';
|
|||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- @formatter:off
|
-- @formatter:off
|
||||||
BEGIN;
|
BEGIN;
|
||||||
INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (4, '数据库', 1, '我是数据库', '0', '{"@class":"cn.iocoder.yudao.module.infra.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', '1', '2022-03-15 23:56:24', '1', '2024-02-28 22:54:07', '0');
|
INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (4, '数据库', 1, '我是数据库', '0', '{"@class":"cn.huangge.yudao.module.infra.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', '1', '2022-03-15 23:56:24', '1', '2024-02-28 22:54:07', '0');
|
||||||
INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (22, '七牛存储器', 20, '', '1', '{"@class":"cn.iocoder.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3.cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS","accessSecret":"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY"}', '1', '2024-01-13 22:11:12', '1', '2024-04-03 19:38:34', '0');
|
INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (22, '七牛存储器', 20, '', '1', '{"@class":"cn.huangge.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3.cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS","accessSecret":"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY"}', '1', '2024-01-13 22:11:12', '1', '2024-04-03 19:38:34', '0');
|
||||||
COMMIT;
|
COMMIT;
|
||||||
-- @formatter:on
|
-- @formatter:on
|
||||||
|
|
||||||
|
@ -458,8 +458,8 @@ COMMENT ON TABLE infra_file_config IS '文件配置表';
|
|||||||
-- Records of infra_file_config
|
-- Records of infra_file_config
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- @formatter:off
|
-- @formatter:off
|
||||||
INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (4, '数据库', 1, '我是数据库', '0', '{"@class":"cn.iocoder.yudao.module.infra.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', '1', to_date('2022-03-15 23:56:24', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2024-02-28 22:54:07', 'SYYYY-MM-DD HH24:MI:SS'), '0');
|
INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (4, '数据库', 1, '我是数据库', '0', '{"@class":"cn.huangge.yudao.module.infra.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', '1', to_date('2022-03-15 23:56:24', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2024-02-28 22:54:07', 'SYYYY-MM-DD HH24:MI:SS'), '0');
|
||||||
INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (22, '七牛存储器', 20, '', '1', '{"@class":"cn.iocoder.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3.cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS","accessSecret":"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY"}', '1', to_date('2024-01-13 22:11:12', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2024-04-03 19:38:34', 'SYYYY-MM-DD HH24:MI:SS'), '0');
|
INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (22, '七牛存储器', 20, '', '1', '{"@class":"cn.huangge.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3.cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS","accessSecret":"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY"}', '1', to_date('2024-01-13 22:11:12', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2024-04-03 19:38:34', 'SYYYY-MM-DD HH24:MI:SS'), '0');
|
||||||
COMMIT;
|
COMMIT;
|
||||||
-- @formatter:on
|
-- @formatter:on
|
||||||
|
|
||||||
|
@ -493,8 +493,8 @@ COMMENT ON TABLE infra_file_config IS '文件配置表';
|
|||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- @formatter:off
|
-- @formatter:off
|
||||||
BEGIN;
|
BEGIN;
|
||||||
INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (4, '数据库', 1, '我是数据库', '0', '{"@class":"cn.iocoder.yudao.module.infra.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', '1', '2022-03-15 23:56:24', '1', '2024-02-28 22:54:07', '0');
|
INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (4, '数据库', 1, '我是数据库', '0', '{"@class":"cn.huangge.yudao.module.infra.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', '1', '2022-03-15 23:56:24', '1', '2024-02-28 22:54:07', '0');
|
||||||
INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (22, '七牛存储器', 20, '', '1', '{"@class":"cn.iocoder.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3.cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS","accessSecret":"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY"}', '1', '2024-01-13 22:11:12', '1', '2024-04-03 19:38:34', '0');
|
INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (22, '七牛存储器', 20, '', '1', '{"@class":"cn.huangge.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3.cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS","accessSecret":"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY"}', '1', '2024-01-13 22:11:12', '1', '2024-04-03 19:38:34', '0');
|
||||||
COMMIT;
|
COMMIT;
|
||||||
-- @formatter:on
|
-- @formatter:on
|
||||||
|
|
||||||
|
@ -1390,9 +1390,9 @@ BEGIN TRANSACTION
|
|||||||
GO
|
GO
|
||||||
SET IDENTITY_INSERT infra_file_config ON
|
SET IDENTITY_INSERT infra_file_config ON
|
||||||
GO
|
GO
|
||||||
INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (4, N'数据库', 1, N'我是数据库', N'0', N'{"@class":"cn.iocoder.yudao.module.infra.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', N'1', N'2022-03-15 23:56:24', N'1', N'2024-02-28 22:54:07', N'0')
|
INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (4, N'数据库', 1, N'我是数据库', N'0', N'{"@class":"cn.huangge.yudao.module.infra.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', N'1', N'2022-03-15 23:56:24', N'1', N'2024-02-28 22:54:07', N'0')
|
||||||
GO
|
GO
|
||||||
INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (22, N'七牛存储器', 20, N'', N'1', N'{"@class":"cn.iocoder.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3.cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS","accessSecret":"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY"}', N'1', N'2024-01-13 22:11:12', N'1', N'2024-04-03 19:38:34', N'0')
|
INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (22, N'七牛存储器', 20, N'', N'1', N'{"@class":"cn.huangge.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3.cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS","accessSecret":"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY"}', N'1', N'2024-01-13 22:11:12', N'1', N'2024-04-03 19:38:34', N'0')
|
||||||
GO
|
GO
|
||||||
SET IDENTITY_INSERT infra_file_config OFF
|
SET IDENTITY_INSERT infra_file_config OFF
|
||||||
GO
|
GO
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-dependencies</artifactId>
|
<artifactId>yudao-dependencies</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
@ -107,17 +107,17 @@
|
|||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
|
<artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-biz-data-permission</artifactId>
|
<artifactId>yudao-spring-boot-starter-biz-data-permission</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-biz-ip</artifactId>
|
<artifactId>yudao-spring-boot-starter-biz-ip</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
@ -132,19 +132,19 @@
|
|||||||
|
|
||||||
<!-- Web 相关 -->
|
<!-- Web 相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-web</artifactId>
|
<artifactId>yudao-spring-boot-starter-web</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-security</artifactId>
|
<artifactId>yudao-spring-boot-starter-security</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-websocket</artifactId>
|
<artifactId>yudao-spring-boot-starter-websocket</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
@ -162,7 +162,7 @@
|
|||||||
|
|
||||||
<!-- DB 相关 -->
|
<!-- DB 相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-mybatis</artifactId>
|
<artifactId>yudao-spring-boot-starter-mybatis</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
@ -225,7 +225,7 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-redis</artifactId>
|
<artifactId>yudao-spring-boot-starter-redis</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
@ -262,14 +262,14 @@
|
|||||||
|
|
||||||
<!-- Job 定时任务相关 -->
|
<!-- Job 定时任务相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-job</artifactId>
|
<artifactId>yudao-spring-boot-starter-job</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- 消息队列相关 -->
|
<!-- 消息队列相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-mq</artifactId>
|
<artifactId>yudao-spring-boot-starter-mq</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
@ -282,7 +282,7 @@
|
|||||||
|
|
||||||
<!-- 服务保障相关 -->
|
<!-- 服务保障相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-protection</artifactId>
|
<artifactId>yudao-spring-boot-starter-protection</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
@ -301,7 +301,7 @@
|
|||||||
|
|
||||||
<!-- 监控相关 -->
|
<!-- 监控相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-monitor</artifactId>
|
<artifactId>yudao-spring-boot-starter-monitor</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
@ -366,7 +366,7 @@
|
|||||||
|
|
||||||
<!-- Test 测试相关 -->
|
<!-- Test 测试相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-test</artifactId>
|
<artifactId>yudao-spring-boot-starter-test</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
@ -421,13 +421,13 @@
|
|||||||
|
|
||||||
<!-- 工具类相关 -->
|
<!-- 工具类相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-common</artifactId>
|
<artifactId>yudao-common</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-excel</artifactId>
|
<artifactId>yudao-spring-boot-starter-excel</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>yudao</artifactId>
|
<artifactId>yudao</artifactId>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-framework</artifactId>
|
<artifactId>yudao-framework</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>yudao-framework</artifactId>
|
<artifactId>yudao-framework</artifactId>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
@ -17,33 +17,33 @@
|
|||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-common</artifactId>
|
<artifactId>yudao-common</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Web 相关 -->
|
<!-- Web 相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-security</artifactId>
|
<artifactId>yudao-spring-boot-starter-security</artifactId>
|
||||||
<optional>true</optional> <!-- 可选,如果使用 DeptDataPermissionRule 必须提供 -->
|
<optional>true</optional> <!-- 可选,如果使用 DeptDataPermissionRule 必须提供 -->
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- DB 相关 -->
|
<!-- DB 相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-mybatis</artifactId>
|
<artifactId>yudao-spring-boot-starter-mybatis</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- 业务组件 -->
|
<!-- 业务组件 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-module-system-api</artifactId> <!-- 需要使用它,进行数据权限的获取 -->
|
<artifactId>yudao-module-system-api</artifactId> <!-- 需要使用它,进行数据权限的获取 -->
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Test 测试相关 -->
|
<!-- Test 测试相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-test</artifactId>
|
<artifactId>yudao-spring-boot-starter-test</artifactId>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
cn.iocoder.yudao.framework.datapermission.config.YudaoDataPermissionAutoConfiguration
|
cn.huangge.yudao.framework.datapermission.config.YudaoDataPermissionAutoConfiguration
|
||||||
cn.iocoder.yudao.framework.datapermission.config.YudaoDeptDataPermissionAutoConfiguration
|
cn.huangge.yudao.framework.datapermission.config.YudaoDeptDataPermissionAutoConfiguration
|
@ -4,7 +4,7 @@
|
|||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>yudao-framework</artifactId>
|
<artifactId>yudao-framework</artifactId>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
@ -22,7 +22,7 @@
|
|||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-common</artifactId>
|
<artifactId>yudao-common</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
@ -45,7 +45,7 @@
|
|||||||
|
|
||||||
<!-- Test 测试相关 -->
|
<!-- Test 测试相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-test</artifactId>
|
<artifactId>yudao-spring-boot-starter-test</artifactId>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>yudao-framework</artifactId>
|
<artifactId>yudao-framework</artifactId>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
@ -17,36 +17,36 @@
|
|||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-common</artifactId>
|
<artifactId>yudao-common</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Web 相关 -->
|
<!-- Web 相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-security</artifactId>
|
<artifactId>yudao-spring-boot-starter-security</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- DB 相关 -->
|
<!-- DB 相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-mybatis</artifactId>
|
<artifactId>yudao-spring-boot-starter-mybatis</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-redis</artifactId>
|
<artifactId>yudao-spring-boot-starter-redis</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Job 定时任务相关 -->
|
<!-- Job 定时任务相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-job</artifactId>
|
<artifactId>yudao-spring-boot-starter-job</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- 消息队列相关 -->
|
<!-- 消息队列相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-mq</artifactId>
|
<artifactId>yudao-spring-boot-starter-mq</artifactId>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
@ -68,7 +68,7 @@
|
|||||||
|
|
||||||
<!-- Test 测试相关 -->
|
<!-- Test 测试相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-test</artifactId>
|
<artifactId>yudao-spring-boot-starter-test</artifactId>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
@ -21,8 +21,8 @@ import java.lang.reflect.Method;
|
|||||||
import java.lang.reflect.Type;
|
import java.lang.reflect.Type;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
|
import cn.huangge.yudao.framework.tenant.core.context.TenantContextHolder;
|
||||||
import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils;
|
import cn.huangge.yudao.framework.tenant.core.util.TenantUtils;
|
||||||
import org.springframework.core.DefaultParameterNameDiscoverer;
|
import org.springframework.core.DefaultParameterNameDiscoverer;
|
||||||
import org.springframework.core.MethodParameter;
|
import org.springframework.core.MethodParameter;
|
||||||
import org.springframework.core.ParameterNameDiscoverer;
|
import org.springframework.core.ParameterNameDiscoverer;
|
||||||
@ -32,7 +32,7 @@ import org.springframework.messaging.Message;
|
|||||||
import org.springframework.messaging.handler.HandlerMethod;
|
import org.springframework.messaging.handler.HandlerMethod;
|
||||||
import org.springframework.util.ObjectUtils;
|
import org.springframework.util.ObjectUtils;
|
||||||
|
|
||||||
import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.HEADER_TENANT_ID;
|
import static cn.huangge.yudao.framework.web.core.util.WebFrameworkUtils.HEADER_TENANT_ID;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Extension of {@link HandlerMethod} that invokes the underlying method with
|
* Extension of {@link HandlerMethod} that invokes the underlying method with
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
org.springframework.boot.env.EnvironmentPostProcessor=\
|
org.springframework.boot.env.EnvironmentPostProcessor=\
|
||||||
cn.iocoder.yudao.framework.tenant.core.mq.kafka.TenantKafkaEnvironmentPostProcessor
|
cn.huangge.yudao.framework.tenant.core.mq.kafka.TenantKafkaEnvironmentPostProcessor
|
||||||
|
@ -1 +1 @@
|
|||||||
cn.iocoder.yudao.framework.tenant.config.YudaoTenantAutoConfiguration
|
cn.huangge.yudao.framework.tenant.config.YudaoTenantAutoConfiguration
|
@ -3,7 +3,7 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-framework</artifactId>
|
<artifactId>yudao-framework</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-common</artifactId>
|
<artifactId>yudao-common</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
<!-- 业务组件 -->
|
<!-- 业务组件 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-module-system-api</artifactId> <!-- 需要使用它,进行 Dict 的查询 -->
|
<artifactId>yudao-module-system-api</artifactId> <!-- 需要使用它,进行 Dict 的查询 -->
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
@ -64,14 +64,14 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-biz-ip</artifactId>
|
<artifactId>yudao-spring-boot-starter-biz-ip</artifactId>
|
||||||
<optional>true</optional> <!-- 设置为 optional,只有在 AreaConvert 的时候使用 -->
|
<optional>true</optional> <!-- 设置为 optional,只有在 AreaConvert 的时候使用 -->
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Test 测试相关 -->
|
<!-- Test 测试相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-test</artifactId>
|
<artifactId>yudao-spring-boot-starter-test</artifactId>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
@ -0,0 +1,6 @@
|
|||||||
|
/**
|
||||||
|
* 字典数据模块,提供 {@link cn.huangge.yudao.framework.dict.core.DictFrameworkUtils} 工具类
|
||||||
|
*
|
||||||
|
* 通过将字典缓存在内存中,保证性能
|
||||||
|
*/
|
||||||
|
package cn.huangge.yudao.framework.dict;
|
@ -1,6 +0,0 @@
|
|||||||
/**
|
|
||||||
* 字典数据模块,提供 {@link cn.iocoder.yudao.framework.dict.core.DictFrameworkUtils} 工具类
|
|
||||||
*
|
|
||||||
* 通过将字典缓存在内存中,保证性能
|
|
||||||
*/
|
|
||||||
package cn.iocoder.yudao.framework.dict;
|
|
@ -1 +1 @@
|
|||||||
cn.iocoder.yudao.framework.dict.config.YudaoDictAutoConfiguration
|
cn.huangge.yudao.framework.dict.config.YudaoDictAutoConfiguration
|
@ -3,7 +3,7 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-framework</artifactId>
|
<artifactId>yudao-framework</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-common</artifactId>
|
<artifactId>yudao-common</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
cn.iocoder.yudao.framework.quartz.config.YudaoQuartzAutoConfiguration
|
cn.huangge.yudao.framework.quartz.config.YudaoQuartzAutoConfiguration
|
||||||
cn.iocoder.yudao.framework.quartz.config.YudaoAsyncAutoConfiguration
|
cn.huangge.yudao.framework.quartz.config.YudaoAsyncAutoConfiguration
|
@ -3,7 +3,7 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-framework</artifactId>
|
<artifactId>yudao-framework</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-common</artifactId>
|
<artifactId>yudao-common</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
cn.iocoder.yudao.framework.tracer.config.YudaoTracerAutoConfiguration
|
cn.huangge.yudao.framework.tracer.config.YudaoTracerAutoConfiguration
|
||||||
cn.iocoder.yudao.framework.tracer.config.YudaoMetricsAutoConfiguration
|
cn.huangge.yudao.framework.tracer.config.YudaoMetricsAutoConfiguration
|
@ -3,7 +3,7 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-framework</artifactId>
|
<artifactId>yudao-framework</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
@ -18,7 +18,7 @@
|
|||||||
<dependencies>
|
<dependencies>
|
||||||
<!-- DB 相关 -->
|
<!-- DB 相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-redis</artifactId>
|
<artifactId>yudao-spring-boot-starter-redis</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
@ -0,0 +1,4 @@
|
|||||||
|
/**
|
||||||
|
* 占位符,无特殊逻辑
|
||||||
|
*/
|
||||||
|
package cn.huangge.yudao.framework.mq.rabbitmq.core;
|
@ -1,4 +0,0 @@
|
|||||||
/**
|
|
||||||
* 占位符,无特殊逻辑
|
|
||||||
*/
|
|
||||||
package cn.iocoder.yudao.framework.mq.rabbitmq.core;
|
|
@ -1,3 +1,3 @@
|
|||||||
cn.iocoder.yudao.framework.mq.redis.config.YudaoRedisMQProducerAutoConfiguration
|
cn.huangge.yudao.framework.mq.redis.config.YudaoRedisMQProducerAutoConfiguration
|
||||||
cn.iocoder.yudao.framework.mq.redis.config.YudaoRedisMQConsumerAutoConfiguration
|
cn.huangge.yudao.framework.mq.redis.config.YudaoRedisMQConsumerAutoConfiguration
|
||||||
cn.iocoder.yudao.framework.mq.rabbitmq.config.YudaoRabbitMQAutoConfiguration
|
cn.huangge.yudao.framework.mq.rabbitmq.config.YudaoRabbitMQAutoConfiguration
|
@ -3,7 +3,7 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-framework</artifactId>
|
<artifactId>yudao-framework</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
@ -17,13 +17,13 @@
|
|||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-common</artifactId>
|
<artifactId>yudao-common</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Web 相关 -->
|
<!-- Web 相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-web</artifactId>
|
<artifactId>yudao-spring-boot-starter-web</artifactId>
|
||||||
<scope>provided</scope> <!-- 设置为 provided,只有 OncePerRequestFilter 使用到 -->
|
<scope>provided</scope> <!-- 设置为 provided,只有 OncePerRequestFilter 使用到 -->
|
||||||
</dependency>
|
</dependency>
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
org.springframework.boot.env.EnvironmentPostProcessor=\
|
org.springframework.boot.env.EnvironmentPostProcessor=\
|
||||||
cn.iocoder.yudao.framework.mybatis.config.IdTypeEnvironmentPostProcessor
|
cn.huangge.yudao.framework.mybatis.config.IdTypeEnvironmentPostProcessor
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration
|
cn.huangge.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration
|
||||||
cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration
|
cn.huangge.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration
|
||||||
cn.iocoder.yudao.framework.translate.config.YudaoTranslateAutoConfiguration
|
cn.huangge.yudao.framework.translate.config.YudaoTranslateAutoConfiguration
|
@ -3,7 +3,7 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-framework</artifactId>
|
<artifactId>yudao-framework</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
@ -18,14 +18,14 @@
|
|||||||
<dependencies>
|
<dependencies>
|
||||||
<!-- Web 相关 -->
|
<!-- Web 相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-web</artifactId>
|
<artifactId>yudao-spring-boot-starter-web</artifactId>
|
||||||
<scope>provided</scope> <!-- 设置为 provided,只有限流、幂等使用到 -->
|
<scope>provided</scope> <!-- 设置为 provided,只有限流、幂等使用到 -->
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- DB 相关 -->
|
<!-- DB 相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-redis</artifactId>
|
<artifactId>yudao-spring-boot-starter-redis</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
@ -38,7 +38,7 @@
|
|||||||
|
|
||||||
<!-- Test 测试相关 -->
|
<!-- Test 测试相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-test</artifactId>
|
<artifactId>yudao-spring-boot-starter-test</artifactId>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
cn.iocoder.yudao.framework.idempotent.config.YudaoIdempotentConfiguration
|
cn.huangge.yudao.framework.idempotent.config.YudaoIdempotentConfiguration
|
||||||
cn.iocoder.yudao.framework.lock4j.config.YudaoLock4jConfiguration
|
cn.huangge.yudao.framework.lock4j.config.YudaoLock4jConfiguration
|
||||||
cn.iocoder.yudao.framework.ratelimiter.config.YudaoRateLimiterConfiguration
|
cn.huangge.yudao.framework.ratelimiter.config.YudaoRateLimiterConfiguration
|
||||||
cn.iocoder.yudao.framework.signature.config.YudaoApiSignatureAutoConfiguration
|
cn.huangge.yudao.framework.signature.config.YudaoApiSignatureAutoConfiguration
|
@ -3,7 +3,7 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-framework</artifactId>
|
<artifactId>yudao-framework</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-common</artifactId>
|
<artifactId>yudao-common</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration
|
cn.huangge.yudao.framework.redis.config.YudaoRedisAutoConfiguration
|
||||||
cn.iocoder.yudao.framework.redis.config.YudaoCacheAutoConfiguration
|
cn.huangge.yudao.framework.redis.config.YudaoCacheAutoConfiguration
|
@ -3,7 +3,7 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-framework</artifactId>
|
<artifactId>yudao-framework</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-common</artifactId>
|
<artifactId>yudao-common</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
@ -32,7 +32,7 @@
|
|||||||
|
|
||||||
<!-- Web 相关 -->
|
<!-- Web 相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-web</artifactId>
|
<artifactId>yudao-spring-boot-starter-web</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- spring boot 配置所需依赖 -->
|
<!-- spring boot 配置所需依赖 -->
|
||||||
@ -62,7 +62,7 @@
|
|||||||
|
|
||||||
<!-- 业务组件 -->
|
<!-- 业务组件 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-module-system-api</artifactId> <!-- 需要使用它,进行 Token 的校验 -->
|
<artifactId>yudao-module-system-api</artifactId> <!-- 需要使用它,进行 Token 的校验 -->
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
@ -0,0 +1,4 @@
|
|||||||
|
/**
|
||||||
|
* 占位,无特殊作用
|
||||||
|
*/
|
||||||
|
package cn.huangge.yudao.framework.operatelog.core;
|
@ -1,4 +0,0 @@
|
|||||||
/**
|
|
||||||
* 占位,无特殊作用
|
|
||||||
*/
|
|
||||||
package cn.iocoder.yudao.framework.operatelog.core;
|
|
@ -1,3 +1,3 @@
|
|||||||
cn.iocoder.yudao.framework.security.config.YudaoSecurityAutoConfiguration
|
cn.huangge.yudao.framework.security.config.YudaoSecurityAutoConfiguration
|
||||||
cn.iocoder.yudao.framework.security.config.YudaoWebSecurityConfigurerAdapter
|
cn.huangge.yudao.framework.security.config.YudaoWebSecurityConfigurerAdapter
|
||||||
cn.iocoder.yudao.framework.operatelog.config.YudaoOperateLogConfiguration
|
cn.huangge.yudao.framework.operatelog.config.YudaoOperateLogConfiguration
|
@ -3,7 +3,7 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-framework</artifactId>
|
<artifactId>yudao-framework</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
@ -17,18 +17,18 @@
|
|||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-common</artifactId>
|
<artifactId>yudao-common</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- DB 相关 -->
|
<!-- DB 相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-mybatis</artifactId>
|
<artifactId>yudao-spring-boot-starter-mybatis</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-redis</artifactId>
|
<artifactId>yudao-spring-boot-starter-redis</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-framework</artifactId>
|
<artifactId>yudao-framework</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-common</artifactId>
|
<artifactId>yudao-common</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
@ -55,12 +55,12 @@
|
|||||||
|
|
||||||
<!-- 业务组件 -->
|
<!-- 业务组件 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-module-infra-api</artifactId> <!-- 需要使用它,进行操作日志的记录 -->
|
<artifactId>yudao-module-infra-api</artifactId> <!-- 需要使用它,进行操作日志的记录 -->
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-module-system-api</artifactId> <!-- 需要使用它,进行错误码的记录 -->
|
<artifactId>yudao-module-system-api</artifactId> <!-- 需要使用它,进行错误码的记录 -->
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
@ -0,0 +1 @@
|
|||||||
|
package cn.huangge.yudao.framework.jackson.core;
|
@ -1 +0,0 @@
|
|||||||
package cn.iocoder.yudao.framework.jackson.core;
|
|
@ -1,6 +1,6 @@
|
|||||||
cn.iocoder.yudao.framework.apilog.config.YudaoApiLogAutoConfiguration
|
cn.huangge.yudao.framework.apilog.config.YudaoApiLogAutoConfiguration
|
||||||
cn.iocoder.yudao.framework.jackson.config.YudaoJacksonAutoConfiguration
|
cn.huangge.yudao.framework.jackson.config.YudaoJacksonAutoConfiguration
|
||||||
cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration
|
cn.huangge.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration
|
||||||
cn.iocoder.yudao.framework.web.config.YudaoWebAutoConfiguration
|
cn.huangge.yudao.framework.web.config.YudaoWebAutoConfiguration
|
||||||
cn.iocoder.yudao.framework.xss.config.YudaoXssAutoConfiguration
|
cn.huangge.yudao.framework.xss.config.YudaoXssAutoConfiguration
|
||||||
cn.iocoder.yudao.framework.banner.config.YudaoBannerAutoConfiguration
|
cn.huangge.yudao.framework.banner.config.YudaoBannerAutoConfiguration
|
@ -3,7 +3,7 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-framework</artifactId>
|
<artifactId>yudao-framework</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-common</artifactId>
|
<artifactId>yudao-common</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
@ -28,7 +28,7 @@
|
|||||||
因为 websocket 和 LoginUser 当前登录的用户有一定的相关性,具体可见 WebSocketSessionManagerImpl 逻辑。
|
因为 websocket 和 LoginUser 当前登录的用户有一定的相关性,具体可见 WebSocketSessionManagerImpl 逻辑。
|
||||||
如果让 security 拓展 websocket 的话,会导致 websocket 组件的封装很散,进而增大理解成本。
|
如果让 security 拓展 websocket 的话,会导致 websocket 组件的封装很散,进而增大理解成本。
|
||||||
-->
|
-->
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-security</artifactId>
|
<artifactId>yudao-spring-boot-starter-security</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
@ -40,7 +40,7 @@
|
|||||||
|
|
||||||
<!-- 消息队列相关 -->
|
<!-- 消息队列相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-mq</artifactId>
|
<artifactId>yudao-spring-boot-starter-mq</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -64,7 +64,7 @@
|
|||||||
<!-- 为什么要依赖 tenant 组件?
|
<!-- 为什么要依赖 tenant 组件?
|
||||||
因为广播某个类型的用户时候,需要根据租户过滤下,避免广播到别的租户!
|
因为广播某个类型的用户时候,需要根据租户过滤下,避免广播到别的租户!
|
||||||
-->
|
-->
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
|
<artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
@ -1 +1 @@
|
|||||||
cn.iocoder.yudao.framework.websocket.config.YudaoWebSocketAutoConfiguration
|
cn.huangge.yudao.framework.websocket.config.YudaoWebSocketAutoConfiguration
|
@ -3,7 +3,7 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao</artifactId>
|
<artifactId>yudao</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-module-ai</artifactId>
|
<artifactId>yudao-module-ai</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-common</artifactId>
|
<artifactId>yudao-common</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-module-ai</artifactId>
|
<artifactId>yudao-module-ai</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
@ -20,44 +20,44 @@
|
|||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-module-ai-api</artifactId>
|
<artifactId>yudao-module-ai-api</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- 业务组件 -->
|
<!-- 业务组件 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-ai</artifactId>
|
<artifactId>yudao-spring-boot-starter-ai</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
|
<artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Web 相关 -->
|
<!-- Web 相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-security</artifactId>
|
<artifactId>yudao-spring-boot-starter-security</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- DB 相关 -->
|
<!-- DB 相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-mybatis</artifactId>
|
<artifactId>yudao-spring-boot-starter-mybatis</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Job 相关 -->
|
<!-- Job 相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-job</artifactId>
|
<artifactId>yudao-spring-boot-starter-job</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Test 测试相关 -->
|
<!-- Test 测试相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-test</artifactId>
|
<artifactId>yudao-spring-boot-starter-test</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
@ -0,0 +1,4 @@
|
|||||||
|
/**
|
||||||
|
* crm 模块的 web 拓展封装
|
||||||
|
*/
|
||||||
|
package cn.huangge.yudao.module.crm.framework.web;
|
@ -1,4 +0,0 @@
|
|||||||
/**
|
|
||||||
* crm 模块的 web 拓展封装
|
|
||||||
*/
|
|
||||||
package cn.iocoder.yudao.module.crm.framework.web;
|
|
@ -3,7 +3,7 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-module-ai</artifactId>
|
<artifactId>yudao-module-ai</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
@ -65,12 +65,12 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-redis</artifactId>
|
<artifactId>yudao-spring-boot-starter-redis</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-common</artifactId>
|
<artifactId>yudao-common</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
cn.iocoder.yudao.framework.ai.config.YudaoAiAutoConfiguration
|
cn.huangge.yudao.framework.ai.config.YudaoAiAutoConfiguration
|
@ -4,7 +4,7 @@
|
|||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>yudao</artifactId>
|
<artifactId>yudao</artifactId>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-module-bpm</artifactId>
|
<artifactId>yudao-module-bpm</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-common</artifactId>
|
<artifactId>yudao-common</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-module-bpm</artifactId>
|
<artifactId>yudao-module-bpm</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
@ -17,52 +17,52 @@
|
|||||||
</description>
|
</description>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-module-bpm-api</artifactId>
|
<artifactId>yudao-module-bpm-api</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-module-system-api</artifactId>
|
<artifactId>yudao-module-system-api</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- 业务组件 -->
|
<!-- 业务组件 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-biz-data-permission</artifactId>
|
<artifactId>yudao-spring-boot-starter-biz-data-permission</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
|
<artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Web 相关 -->
|
<!-- Web 相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-web</artifactId>
|
<artifactId>yudao-spring-boot-starter-web</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-security</artifactId>
|
<artifactId>yudao-spring-boot-starter-security</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- DB 相关 -->
|
<!-- DB 相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-mybatis</artifactId>
|
<artifactId>yudao-spring-boot-starter-mybatis</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Test 测试相关 -->
|
<!-- Test 测试相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-test</artifactId>
|
<artifactId>yudao-spring-boot-starter-test</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- 工具类相关 -->
|
<!-- 工具类相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-excel</artifactId>
|
<artifactId>yudao-spring-boot-starter-excel</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
@ -0,0 +1,4 @@
|
|||||||
|
/**
|
||||||
|
* 基础包,放一些通用的 VO 类
|
||||||
|
*/
|
||||||
|
package cn.huangge.yudao.module.bpm.controller.admin.base;
|
@ -0,0 +1,4 @@
|
|||||||
|
/**
|
||||||
|
* 占位
|
||||||
|
*/
|
||||||
|
package cn.huangge.yudao.module.bpm.controller.app;
|
@ -0,0 +1,4 @@
|
|||||||
|
/**
|
||||||
|
* bpm 模块的 web 配置
|
||||||
|
*/
|
||||||
|
package cn.huangge.yudao.module.bpm.framework.web;
|
@ -1,4 +0,0 @@
|
|||||||
/**
|
|
||||||
* 基础包,放一些通用的 VO 类
|
|
||||||
*/
|
|
||||||
package cn.iocoder.yudao.module.bpm.controller.admin.base;
|
|
@ -1,4 +0,0 @@
|
|||||||
/**
|
|
||||||
* 占位
|
|
||||||
*/
|
|
||||||
package cn.iocoder.yudao.module.bpm.controller.app;
|
|
@ -1,4 +0,0 @@
|
|||||||
/**
|
|
||||||
* bpm 模块的 web 配置
|
|
||||||
*/
|
|
||||||
package cn.iocoder.yudao.module.bpm.framework.web;
|
|
@ -39,4 +39,4 @@ mybatis-plus:
|
|||||||
# 芋道配置项,设置当前项目所有自定义的配置
|
# 芋道配置项,设置当前项目所有自定义的配置
|
||||||
yudao:
|
yudao:
|
||||||
info:
|
info:
|
||||||
base-package: cn.iocoder.yudao.module
|
base-package: cn.huangge.yudao.module
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao</artifactId>
|
<artifactId>yudao</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-module-crm</artifactId>
|
<artifactId>yudao-module-crm</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-common</artifactId>
|
<artifactId>yudao-common</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-module-crm</artifactId>
|
<artifactId>yudao-module-crm</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</parent>
|
</parent>
|
||||||
@ -18,57 +18,57 @@
|
|||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-module-system-api</artifactId>
|
<artifactId>yudao-module-system-api</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-module-crm-api</artifactId>
|
<artifactId>yudao-module-crm-api</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-module-bpm-api</artifactId>
|
<artifactId>yudao-module-bpm-api</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- 业务组件 -->
|
<!-- 业务组件 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-biz-ip</artifactId>
|
<artifactId>yudao-spring-boot-starter-biz-ip</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
|
<artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Web 相关 -->
|
<!-- Web 相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-web</artifactId>
|
<artifactId>yudao-spring-boot-starter-web</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-security</artifactId>
|
<artifactId>yudao-spring-boot-starter-security</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- DB 相关 -->
|
<!-- DB 相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-mybatis</artifactId>
|
<artifactId>yudao-spring-boot-starter-mybatis</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- 工具类相关 -->
|
<!-- 工具类相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-excel</artifactId>
|
<artifactId>yudao-spring-boot-starter-excel</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Test 测试相关 -->
|
<!-- Test 测试相关 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.huangge.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-test</artifactId>
|
<artifactId>yudao-spring-boot-starter-test</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
@ -0,0 +1,4 @@
|
|||||||
|
/**
|
||||||
|
* 占位
|
||||||
|
*/
|
||||||
|
package cn.huangge.yudao.module.crm.controller.app;
|
@ -0,0 +1,4 @@
|
|||||||
|
/**
|
||||||
|
* 线索
|
||||||
|
*/
|
||||||
|
package cn.huangge.yudao.module.crm.dal.dataobject.clue;
|
@ -0,0 +1,4 @@
|
|||||||
|
/**
|
||||||
|
* 联系人
|
||||||
|
*/
|
||||||
|
package cn.huangge.yudao.module.crm.dal.dataobject.contact;
|
@ -0,0 +1,4 @@
|
|||||||
|
/**
|
||||||
|
* 产品表
|
||||||
|
*/
|
||||||
|
package cn.huangge.yudao.module.crm.dal.dataobject.product;
|
@ -0,0 +1,4 @@
|
|||||||
|
/**
|
||||||
|
* 线索
|
||||||
|
*/
|
||||||
|
package cn.huangge.yudao.module.crm.dal.mysql.clue;
|
@ -0,0 +1 @@
|
|||||||
|
package cn.huangge.yudao.module.crm.dal.mysql.permission;
|
@ -0,0 +1,4 @@
|
|||||||
|
/**
|
||||||
|
* crm 模块的 excel 拓展封装
|
||||||
|
*/
|
||||||
|
package cn.huangge.yudao.module.crm.framework.excel;
|
@ -0,0 +1,4 @@
|
|||||||
|
/**
|
||||||
|
* crm 模块的 operatelog 拓展封装
|
||||||
|
*/
|
||||||
|
package cn.huangge.yudao.module.crm.framework.operatelog;
|
@ -0,0 +1 @@
|
|||||||
|
package cn.huangge.yudao.module.crm.framework.permission.core;
|
@ -0,0 +1,4 @@
|
|||||||
|
/**
|
||||||
|
* crm 模块的 permission 拓展封装
|
||||||
|
*/
|
||||||
|
package cn.huangge.yudao.module.crm.framework.permission;
|
@ -0,0 +1,4 @@
|
|||||||
|
/**
|
||||||
|
* crm 模块的 web 拓展封装
|
||||||
|
*/
|
||||||
|
package cn.huangge.yudao.module.crm.framework.web;
|
@ -0,0 +1,4 @@
|
|||||||
|
/**
|
||||||
|
* 定时任务
|
||||||
|
*/
|
||||||
|
package cn.huangge.yudao.module.crm.job;
|
@ -1,4 +0,0 @@
|
|||||||
/**
|
|
||||||
* 占位
|
|
||||||
*/
|
|
||||||
package cn.iocoder.yudao.module.crm.controller.app;
|
|
@ -1,4 +0,0 @@
|
|||||||
/**
|
|
||||||
* 线索
|
|
||||||
*/
|
|
||||||
package cn.iocoder.yudao.module.crm.dal.dataobject.clue;
|
|
@ -1,4 +0,0 @@
|
|||||||
/**
|
|
||||||
* 联系人
|
|
||||||
*/
|
|
||||||
package cn.iocoder.yudao.module.crm.dal.dataobject.contact;
|
|
@ -1,4 +0,0 @@
|
|||||||
/**
|
|
||||||
* 产品表
|
|
||||||
*/
|
|
||||||
package cn.iocoder.yudao.module.crm.dal.dataobject.product;
|
|
@ -1,4 +0,0 @@
|
|||||||
/**
|
|
||||||
* 线索
|
|
||||||
*/
|
|
||||||
package cn.iocoder.yudao.module.crm.dal.mysql.clue;
|
|
@ -1 +0,0 @@
|
|||||||
package cn.iocoder.yudao.module.crm.dal.mysql.permission;
|
|
@ -1,4 +0,0 @@
|
|||||||
/**
|
|
||||||
* crm 模块的 excel 拓展封装
|
|
||||||
*/
|
|
||||||
package cn.iocoder.yudao.module.crm.framework.excel;
|
|
@ -1,4 +0,0 @@
|
|||||||
/**
|
|
||||||
* crm 模块的 operatelog 拓展封装
|
|
||||||
*/
|
|
||||||
package cn.iocoder.yudao.module.crm.framework.operatelog;
|
|
@ -1 +0,0 @@
|
|||||||
package cn.iocoder.yudao.module.crm.framework.permission.core;
|
|
@ -1,4 +0,0 @@
|
|||||||
/**
|
|
||||||
* crm 模块的 permission 拓展封装
|
|
||||||
*/
|
|
||||||
package cn.iocoder.yudao.module.crm.framework.permission;
|
|
@ -1,4 +0,0 @@
|
|||||||
/**
|
|
||||||
* crm 模块的 web 拓展封装
|
|
||||||
*/
|
|
||||||
package cn.iocoder.yudao.module.crm.framework.web;
|
|
@ -1,4 +0,0 @@
|
|||||||
/**
|
|
||||||
* 定时任务
|
|
||||||
*/
|
|
||||||
package cn.iocoder.yudao.module.crm.job;
|
|
@ -1,9 +1,9 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="cn.iocoder.yudao.module.crm.dal.mysql.statistics.CrmStatisticsCustomerMapper">
|
<mapper namespace="cn.huangge.yudao.module.crm.dal.mysql.statistics.CrmStatisticsCustomerMapper">
|
||||||
|
|
||||||
<select id="selectCustomerCreateCountGroupByDate"
|
<select id="selectCustomerCreateCountGroupByDate"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerSummaryByDateRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerSummaryByDateRespVO">
|
||||||
SELECT DATE_FORMAT(create_time, '%Y-%m-%d') AS time,
|
SELECT DATE_FORMAT(create_time, '%Y-%m-%d') AS time,
|
||||||
COUNT(*) AS customerCreateCount
|
COUNT(*) AS customerCreateCount
|
||||||
FROM crm_customer
|
FROM crm_customer
|
||||||
@ -17,14 +17,14 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectCustomerDealCountGroupByDate"
|
<select id="selectCustomerDealCountGroupByDate"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerSummaryByDateRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerSummaryByDateRespVO">
|
||||||
SELECT DATE_FORMAT(customer.create_time, '%Y-%m-%d') AS time,
|
SELECT DATE_FORMAT(customer.create_time, '%Y-%m-%d') AS time,
|
||||||
COUNT(DISTINCT customer.id) AS customer_deal_count
|
COUNT(DISTINCT customer.id) AS customer_deal_count
|
||||||
FROM crm_customer AS customer
|
FROM crm_customer AS customer
|
||||||
LEFT JOIN crm_contract AS contract ON contract.customer_id = customer.id
|
LEFT JOIN crm_contract AS contract ON contract.customer_id = customer.id
|
||||||
WHERE customer.deleted = 0
|
WHERE customer.deleted = 0
|
||||||
AND contract.deleted = 0
|
AND contract.deleted = 0
|
||||||
AND contract.audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
AND contract.audit_status = ${@cn.huangge.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
||||||
AND customer.owner_user_id IN
|
AND customer.owner_user_id IN
|
||||||
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
||||||
#{userId}
|
#{userId}
|
||||||
@ -34,7 +34,7 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectCustomerCreateCountGroupByUser"
|
<select id="selectCustomerCreateCountGroupByUser"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerSummaryByUserRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerSummaryByUserRespVO">
|
||||||
SELECT owner_user_id,
|
SELECT owner_user_id,
|
||||||
COUNT(*) AS customer_create_count
|
COUNT(*) AS customer_create_count
|
||||||
FROM crm_customer
|
FROM crm_customer
|
||||||
@ -48,14 +48,14 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectCustomerDealCountGroupByUser"
|
<select id="selectCustomerDealCountGroupByUser"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerSummaryByUserRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerSummaryByUserRespVO">
|
||||||
SELECT customer.owner_user_id,
|
SELECT customer.owner_user_id,
|
||||||
COUNT(DISTINCT customer.id) AS customer_deal_count
|
COUNT(DISTINCT customer.id) AS customer_deal_count
|
||||||
FROM crm_customer AS customer
|
FROM crm_customer AS customer
|
||||||
LEFT JOIN crm_contract AS contract ON contract.customer_id = customer.id
|
LEFT JOIN crm_contract AS contract ON contract.customer_id = customer.id
|
||||||
WHERE customer.deleted = 0
|
WHERE customer.deleted = 0
|
||||||
AND contract.deleted = 0
|
AND contract.deleted = 0
|
||||||
AND contract.audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
AND contract.audit_status = ${@cn.huangge.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
||||||
AND customer.owner_user_id IN
|
AND customer.owner_user_id IN
|
||||||
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
||||||
#{userId}
|
#{userId}
|
||||||
@ -65,12 +65,12 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectContractPriceGroupByUser"
|
<select id="selectContractPriceGroupByUser"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerSummaryByUserRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerSummaryByUserRespVO">
|
||||||
SELECT owner_user_id,
|
SELECT owner_user_id,
|
||||||
IFNULL(SUM(total_price), 0) AS contract_price
|
IFNULL(SUM(total_price), 0) AS contract_price
|
||||||
FROM crm_contract
|
FROM crm_contract
|
||||||
WHERE deleted = 0
|
WHERE deleted = 0
|
||||||
AND audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
AND audit_status = ${@cn.huangge.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
||||||
AND owner_user_id in
|
AND owner_user_id in
|
||||||
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
||||||
#{userId}
|
#{userId}
|
||||||
@ -80,12 +80,12 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectReceivablePriceGroupByUser"
|
<select id="selectReceivablePriceGroupByUser"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerSummaryByUserRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerSummaryByUserRespVO">
|
||||||
SELECT owner_user_id,
|
SELECT owner_user_id,
|
||||||
IFNULL(SUM(price), 0) AS receivable_price
|
IFNULL(SUM(price), 0) AS receivable_price
|
||||||
FROM crm_receivable
|
FROM crm_receivable
|
||||||
WHERE deleted = 0
|
WHERE deleted = 0
|
||||||
AND audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
AND audit_status = ${@cn.huangge.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
||||||
AND owner_user_id IN
|
AND owner_user_id IN
|
||||||
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
||||||
#{userId}
|
#{userId}
|
||||||
@ -95,7 +95,7 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectFollowUpRecordCountGroupByDate"
|
<select id="selectFollowUpRecordCountGroupByDate"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsFollowUpSummaryByDateRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsFollowUpSummaryByDateRespVO">
|
||||||
SELECT DATE_FORMAT(create_time, '%Y-%m-%d') AS time,
|
SELECT DATE_FORMAT(create_time, '%Y-%m-%d') AS time,
|
||||||
COUNT(*) AS follow_up_record_count
|
COUNT(*) AS follow_up_record_count
|
||||||
FROM crm_follow_up_record
|
FROM crm_follow_up_record
|
||||||
@ -104,12 +104,12 @@
|
|||||||
#{userId}
|
#{userId}
|
||||||
</foreach>
|
</foreach>
|
||||||
AND create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
|
AND create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
|
||||||
AND biz_type = ${@cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum@CRM_CUSTOMER.type}
|
AND biz_type = ${@cn.huangge.yudao.module.crm.enums.common.CrmBizTypeEnum@CRM_CUSTOMER.type}
|
||||||
GROUP BY time
|
GROUP BY time
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectFollowUpCustomerCountGroupByDate"
|
<select id="selectFollowUpCustomerCountGroupByDate"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsFollowUpSummaryByDateRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsFollowUpSummaryByDateRespVO">
|
||||||
SELECT DATE_FORMAT(create_time, '%Y-%m-%d') AS time,
|
SELECT DATE_FORMAT(create_time, '%Y-%m-%d') AS time,
|
||||||
COUNT(DISTINCT biz_id) AS follow_up_customer_count
|
COUNT(DISTINCT biz_id) AS follow_up_customer_count
|
||||||
FROM crm_follow_up_record
|
FROM crm_follow_up_record
|
||||||
@ -118,12 +118,12 @@
|
|||||||
#{userId}
|
#{userId}
|
||||||
</foreach>
|
</foreach>
|
||||||
AND create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
|
AND create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
|
||||||
AND biz_type = ${@cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum@CRM_CUSTOMER.type}
|
AND biz_type = ${@cn.huangge.yudao.module.crm.enums.common.CrmBizTypeEnum@CRM_CUSTOMER.type}
|
||||||
GROUP BY time
|
GROUP BY time
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectFollowUpRecordCountGroupByUser"
|
<select id="selectFollowUpRecordCountGroupByUser"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsFollowUpSummaryByUserRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsFollowUpSummaryByUserRespVO">
|
||||||
SELECT creator as owner_user_id,
|
SELECT creator as owner_user_id,
|
||||||
COUNT(*) AS follow_up_record_count
|
COUNT(*) AS follow_up_record_count
|
||||||
FROM crm_follow_up_record
|
FROM crm_follow_up_record
|
||||||
@ -132,12 +132,12 @@
|
|||||||
#{userId}
|
#{userId}
|
||||||
</foreach>
|
</foreach>
|
||||||
AND create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
|
AND create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
|
||||||
AND biz_type = ${@cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum@CRM_CUSTOMER.type}
|
AND biz_type = ${@cn.huangge.yudao.module.crm.enums.common.CrmBizTypeEnum@CRM_CUSTOMER.type}
|
||||||
GROUP BY creator
|
GROUP BY creator
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectFollowUpCustomerCountGroupByUser"
|
<select id="selectFollowUpCustomerCountGroupByUser"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsFollowUpSummaryByUserRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsFollowUpSummaryByUserRespVO">
|
||||||
SELECT
|
SELECT
|
||||||
creator as owner_user_id,
|
creator as owner_user_id,
|
||||||
COUNT(DISTINCT biz_id) AS follow_up_customer_count
|
COUNT(DISTINCT biz_id) AS follow_up_customer_count
|
||||||
@ -147,12 +147,12 @@
|
|||||||
#{userId}
|
#{userId}
|
||||||
</foreach>
|
</foreach>
|
||||||
AND create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
|
AND create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
|
||||||
AND biz_type = ${@cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum@CRM_CUSTOMER.type}
|
AND biz_type = ${@cn.huangge.yudao.module.crm.enums.common.CrmBizTypeEnum@CRM_CUSTOMER.type}
|
||||||
GROUP BY creator
|
GROUP BY creator
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectFollowUpRecordCountGroupByType"
|
<select id="selectFollowUpRecordCountGroupByType"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsFollowUpSummaryByTypeRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsFollowUpSummaryByTypeRespVO">
|
||||||
SELECT type AS follow_up_type,
|
SELECT type AS follow_up_type,
|
||||||
COUNT(*) AS follow_up_record_count
|
COUNT(*) AS follow_up_record_count
|
||||||
FROM crm_follow_up_record
|
FROM crm_follow_up_record
|
||||||
@ -161,12 +161,12 @@
|
|||||||
#{userId}
|
#{userId}
|
||||||
</foreach>
|
</foreach>
|
||||||
AND create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
|
AND create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
|
||||||
AND biz_type = ${@cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum@CRM_CUSTOMER.type}
|
AND biz_type = ${@cn.huangge.yudao.module.crm.enums.common.CrmBizTypeEnum@CRM_CUSTOMER.type}
|
||||||
GROUP BY follow_up_type
|
GROUP BY follow_up_type
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectContractSummary"
|
<select id="selectContractSummary"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerContractSummaryRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerContractSummaryRespVO">
|
||||||
SELECT customer.name AS customer_name,
|
SELECT customer.name AS customer_name,
|
||||||
customer.industry_id,
|
customer.industry_id,
|
||||||
customer.source,
|
customer.source,
|
||||||
@ -181,7 +181,7 @@
|
|||||||
INNER JOIN crm_contract AS contract ON customer.id = contract.customer_id
|
INNER JOIN crm_contract AS contract ON customer.id = contract.customer_id
|
||||||
LEFT JOIN crm_receivable AS receivable ON contract.id = receivable.contract_id
|
LEFT JOIN crm_receivable AS receivable ON contract.id = receivable.contract_id
|
||||||
WHERE customer.deleted = 0 AND contract.deleted = 0 AND receivable.deleted = 0
|
WHERE customer.deleted = 0 AND contract.deleted = 0 AND receivable.deleted = 0
|
||||||
AND contract.audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
AND contract.audit_status = ${@cn.huangge.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
||||||
AND customer.owner_user_id IN
|
AND customer.owner_user_id IN
|
||||||
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
||||||
#{userId}
|
#{userId}
|
||||||
@ -191,13 +191,13 @@
|
|||||||
|
|
||||||
<!-- TIMESTAMPDIFF 用于求差值;AVG 求平均;TRUNCATE 去掉小数点、只保留整数 -->
|
<!-- TIMESTAMPDIFF 用于求差值;AVG 求平均;TRUNCATE 去掉小数点、只保留整数 -->
|
||||||
<select id="selectCustomerDealCycleGroupByDate"
|
<select id="selectCustomerDealCycleGroupByDate"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerDealCycleByDateRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerDealCycleByDateRespVO">
|
||||||
SELECT DATE_FORMAT(contract.order_date, '%Y-%m-%d') AS time,
|
SELECT DATE_FORMAT(contract.order_date, '%Y-%m-%d') AS time,
|
||||||
IFNULL(TRUNCATE(AVG(TIMESTAMPDIFF(DAY, customer.create_time, contract.order_date)), 1), 0) AS customer_deal_cycle
|
IFNULL(TRUNCATE(AVG(TIMESTAMPDIFF(DAY, customer.create_time, contract.order_date)), 1), 0) AS customer_deal_cycle
|
||||||
FROM crm_customer AS customer
|
FROM crm_customer AS customer
|
||||||
LEFT JOIN crm_contract AS contract ON contract.customer_id = customer.id
|
LEFT JOIN crm_contract AS contract ON contract.customer_id = customer.id
|
||||||
WHERE customer.deleted = 0 AND contract.deleted = 0
|
WHERE customer.deleted = 0 AND contract.deleted = 0
|
||||||
AND contract.audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
AND contract.audit_status = ${@cn.huangge.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
||||||
AND customer.owner_user_id IN
|
AND customer.owner_user_id IN
|
||||||
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
||||||
#{userId}
|
#{userId}
|
||||||
@ -207,13 +207,13 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectCustomerDealCycleGroupByUser"
|
<select id="selectCustomerDealCycleGroupByUser"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerDealCycleByUserRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerDealCycleByUserRespVO">
|
||||||
SELECT customer.owner_user_id,
|
SELECT customer.owner_user_id,
|
||||||
IFNULL(TRUNCATE(AVG(TIMESTAMPDIFF(DAY, customer.create_time, contract.order_date)), 1), 0) AS customer_deal_cycle
|
IFNULL(TRUNCATE(AVG(TIMESTAMPDIFF(DAY, customer.create_time, contract.order_date)), 1), 0) AS customer_deal_cycle
|
||||||
FROM crm_customer AS customer
|
FROM crm_customer AS customer
|
||||||
LEFT JOIN crm_contract AS contract ON contract.customer_id = customer.id
|
LEFT JOIN crm_contract AS contract ON contract.customer_id = customer.id
|
||||||
WHERE customer.deleted = 0 AND contract.deleted = 0
|
WHERE customer.deleted = 0 AND contract.deleted = 0
|
||||||
AND contract.audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
AND contract.audit_status = ${@cn.huangge.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
||||||
AND customer.owner_user_id IN
|
AND customer.owner_user_id IN
|
||||||
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
||||||
#{userId}
|
#{userId}
|
||||||
@ -223,7 +223,7 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectCustomerDealCycleGroupByAreaId"
|
<select id="selectCustomerDealCycleGroupByAreaId"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerDealCycleByAreaRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerDealCycleByAreaRespVO">
|
||||||
SELECT customer.area_id AS area_id,
|
SELECT customer.area_id AS area_id,
|
||||||
IFNULL(TRUNCATE(AVG(TIMESTAMPDIFF(DAY, customer.create_time, contract.order_date)), 1), 0) AS customer_deal_cycle,
|
IFNULL(TRUNCATE(AVG(TIMESTAMPDIFF(DAY, customer.create_time, contract.order_date)), 1), 0) AS customer_deal_cycle,
|
||||||
COUNT(DISTINCT customer.id) AS customer_deal_count
|
COUNT(DISTINCT customer.id) AS customer_deal_count
|
||||||
@ -231,7 +231,7 @@
|
|||||||
LEFT JOIN crm_contract AS contract ON customer.id = contract.customer_id
|
LEFT JOIN crm_contract AS contract ON customer.id = contract.customer_id
|
||||||
WHERE customer.deleted = 0
|
WHERE customer.deleted = 0
|
||||||
AND contract.deleted = 0
|
AND contract.deleted = 0
|
||||||
AND contract.audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
AND contract.audit_status = ${@cn.huangge.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
||||||
AND customer.owner_user_id IN
|
AND customer.owner_user_id IN
|
||||||
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
||||||
#{userId}
|
#{userId}
|
||||||
@ -242,7 +242,7 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectCustomerDealCycleGroupByProductId"
|
<select id="selectCustomerDealCycleGroupByProductId"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerDealCycleByProductRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerDealCycleByProductRespVO">
|
||||||
SELECT product.name AS product_name,
|
SELECT product.name AS product_name,
|
||||||
IFNULL(TRUNCATE(AVG(TIMESTAMPDIFF(DAY, customer.create_time, contract.order_date)), 1), 0) AS customer_deal_cycle,
|
IFNULL(TRUNCATE(AVG(TIMESTAMPDIFF(DAY, customer.create_time, contract.order_date)), 1), 0) AS customer_deal_cycle,
|
||||||
COUNT(DISTINCT customer.id) AS customer_deal_count
|
COUNT(DISTINCT customer.id) AS customer_deal_count
|
||||||
@ -254,7 +254,7 @@
|
|||||||
AND contract.deleted = 0
|
AND contract.deleted = 0
|
||||||
AND contract_product.deleted = 0
|
AND contract_product.deleted = 0
|
||||||
AND product.deleted = 0
|
AND product.deleted = 0
|
||||||
AND contract.audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
AND contract.audit_status = ${@cn.huangge.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
||||||
AND customer.owner_user_id IN
|
AND customer.owner_user_id IN
|
||||||
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
||||||
#{userId}
|
#{userId}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="cn.iocoder.yudao.module.crm.dal.mysql.statistics.CrmStatisticsFunnelMapper">
|
<mapper namespace="cn.huangge.yudao.module.crm.dal.mysql.statistics.CrmStatisticsFunnelMapper">
|
||||||
|
|
||||||
<select id="selectCustomerCountByDate" resultType="java.lang.Long">
|
<select id="selectCustomerCountByDate" resultType="java.lang.Long">
|
||||||
SELECT
|
SELECT
|
||||||
@ -34,7 +34,7 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectBusinessSummaryListGroupByEndStatus"
|
<select id="selectBusinessSummaryListGroupByEndStatus"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.funnel.CrmStatisticsBusinessSummaryByEndStatusRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.funnel.CrmStatisticsBusinessSummaryByEndStatusRespVO">
|
||||||
SELECT
|
SELECT
|
||||||
end_status AS endStatus,
|
end_status AS endStatus,
|
||||||
COUNT(*) AS businessCount,
|
COUNT(*) AS businessCount,
|
||||||
@ -51,7 +51,7 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectBusinessSummaryGroupByDate"
|
<select id="selectBusinessSummaryGroupByDate"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.funnel.CrmStatisticsBusinessSummaryByDateRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.funnel.CrmStatisticsBusinessSummaryByDateRespVO">
|
||||||
SELECT
|
SELECT
|
||||||
DATE_FORMAT(create_time, '%Y-%m-%d') AS time,
|
DATE_FORMAT(create_time, '%Y-%m-%d') AS time,
|
||||||
COUNT(*) AS businessCreateCount,
|
COUNT(*) AS businessCreateCount,
|
||||||
@ -68,7 +68,7 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectBusinessInversionRateSummaryByDate"
|
<select id="selectBusinessInversionRateSummaryByDate"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.funnel.CrmStatisticsBusinessInversionRateSummaryByDateRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.funnel.CrmStatisticsBusinessInversionRateSummaryByDateRespVO">
|
||||||
SELECT
|
SELECT
|
||||||
DATE_FORMAT(create_time, '%Y-%m-%d') AS time,
|
DATE_FORMAT(create_time, '%Y-%m-%d') AS time,
|
||||||
COUNT(*) AS businessCount,
|
COUNT(*) AS businessCount,
|
||||||
|
@ -1,15 +1,15 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="cn.iocoder.yudao.module.crm.dal.mysql.statistics.CrmStatisticsPerformanceMapper">
|
<mapper namespace="cn.huangge.yudao.module.crm.dal.mysql.statistics.CrmStatisticsPerformanceMapper">
|
||||||
|
|
||||||
<select id="selectContractCountPerformance"
|
<select id="selectContractCountPerformance"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.performance.CrmStatisticsPerformanceRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.performance.CrmStatisticsPerformanceRespVO">
|
||||||
SELECT
|
SELECT
|
||||||
DATE_FORMAT(order_date, '%Y%m') AS time,
|
DATE_FORMAT(order_date, '%Y%m') AS time,
|
||||||
COUNT(1) AS currentMonthCount
|
COUNT(1) AS currentMonthCount
|
||||||
FROM crm_contract
|
FROM crm_contract
|
||||||
WHERE deleted = 0
|
WHERE deleted = 0
|
||||||
AND audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
AND audit_status = ${@cn.huangge.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
||||||
AND owner_user_id in
|
AND owner_user_id in
|
||||||
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
||||||
#{userId}
|
#{userId}
|
||||||
@ -20,13 +20,13 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectContractPricePerformance"
|
<select id="selectContractPricePerformance"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.performance.CrmStatisticsPerformanceRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.performance.CrmStatisticsPerformanceRespVO">
|
||||||
SELECT
|
SELECT
|
||||||
DATE_FORMAT(order_date, '%Y%m') AS time,
|
DATE_FORMAT(order_date, '%Y%m') AS time,
|
||||||
IFNULL(SUM(total_price), 0) AS currentMonthCount
|
IFNULL(SUM(total_price), 0) AS currentMonthCount
|
||||||
FROM crm_contract
|
FROM crm_contract
|
||||||
WHERE deleted = 0
|
WHERE deleted = 0
|
||||||
AND audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
AND audit_status = ${@cn.huangge.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
||||||
AND owner_user_id in
|
AND owner_user_id in
|
||||||
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
||||||
#{userId}
|
#{userId}
|
||||||
@ -37,13 +37,13 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectReceivablePricePerformance"
|
<select id="selectReceivablePricePerformance"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.performance.CrmStatisticsPerformanceRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.performance.CrmStatisticsPerformanceRespVO">
|
||||||
SELECT
|
SELECT
|
||||||
DATE_FORMAT(return_time, '%Y%m') AS time,
|
DATE_FORMAT(return_time, '%Y%m') AS time,
|
||||||
IFNULL(SUM(price), 0) AS currentMonthCount
|
IFNULL(SUM(price), 0) AS currentMonthCount
|
||||||
FROM crm_receivable
|
FROM crm_receivable
|
||||||
WHERE deleted = 0
|
WHERE deleted = 0
|
||||||
AND audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
AND audit_status = ${@cn.huangge.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
||||||
AND owner_user_id in
|
AND owner_user_id in
|
||||||
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
||||||
#{userId}
|
#{userId}
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="cn.iocoder.yudao.module.crm.dal.mysql.statistics.CrmStatisticsPortraitMapper">
|
<mapper namespace="cn.huangge.yudao.module.crm.dal.mysql.statistics.CrmStatisticsPortraitMapper">
|
||||||
|
|
||||||
<select id="selectSummaryListGroupByAreaId"
|
<select id="selectSummaryListGroupByAreaId"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.portrait.CrmStatisticCustomerAreaRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.portrait.CrmStatisticCustomerAreaRespVO">
|
||||||
SELECT area_id, COUNT(*) AS customerCount, SUM(deal_status) AS dealCount
|
SELECT area_id, COUNT(*) AS customerCount, SUM(deal_status) AS dealCount
|
||||||
FROM crm_customer
|
FROM crm_customer
|
||||||
WHERE deleted = 0 AND area_id IS NOT NULL
|
WHERE deleted = 0 AND area_id IS NOT NULL
|
||||||
@ -17,7 +17,7 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectCustomerIndustryListGroupByIndustryId"
|
<select id="selectCustomerIndustryListGroupByIndustryId"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.portrait.CrmStatisticCustomerIndustryRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.portrait.CrmStatisticCustomerIndustryRespVO">
|
||||||
SELECT industry_id, COUNT(*) AS customerCount, SUM(deal_status) AS dealCount
|
SELECT industry_id, COUNT(*) AS customerCount, SUM(deal_status) AS dealCount
|
||||||
FROM crm_customer
|
FROM crm_customer
|
||||||
WHERE deleted = 0 AND industry_id IS NOT NULL
|
WHERE deleted = 0 AND industry_id IS NOT NULL
|
||||||
@ -31,7 +31,7 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectCustomerSourceListGroupBySource"
|
<select id="selectCustomerSourceListGroupBySource"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.portrait.CrmStatisticCustomerSourceRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.portrait.CrmStatisticCustomerSourceRespVO">
|
||||||
SELECT source, COUNT(*) AS customerCount, SUM(deal_status) AS dealCount
|
SELECT source, COUNT(*) AS customerCount, SUM(deal_status) AS dealCount
|
||||||
FROM crm_customer
|
FROM crm_customer
|
||||||
WHERE deleted = 0 AND source IS NOT NULL
|
WHERE deleted = 0 AND source IS NOT NULL
|
||||||
@ -45,7 +45,7 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectCustomerLevelListGroupByLevel"
|
<select id="selectCustomerLevelListGroupByLevel"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.portrait.CrmStatisticCustomerLevelRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.portrait.CrmStatisticCustomerLevelRespVO">
|
||||||
SELECT level, COUNT(*) AS customerCount, SUM(deal_status) AS dealCount
|
SELECT level, COUNT(*) AS customerCount, SUM(deal_status) AS dealCount
|
||||||
FROM crm_customer
|
FROM crm_customer
|
||||||
WHERE deleted = 0 AND level IS NOT NULL
|
WHERE deleted = 0 AND level IS NOT NULL
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="cn.iocoder.yudao.module.crm.dal.mysql.statistics.CrmStatisticsRankMapper">
|
<mapper namespace="cn.huangge.yudao.module.crm.dal.mysql.statistics.CrmStatisticsRankMapper">
|
||||||
|
|
||||||
<select id="selectContractPriceRank"
|
<select id="selectContractPriceRank"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
|
||||||
SELECT IFNULL(SUM(total_price), 0) AS count, owner_user_id
|
SELECT IFNULL(SUM(total_price), 0) AS count, owner_user_id
|
||||||
FROM crm_contract
|
FROM crm_contract
|
||||||
WHERE deleted = 0
|
WHERE deleted = 0
|
||||||
AND audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
AND audit_status = ${@cn.huangge.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
||||||
and owner_user_id in
|
and owner_user_id in
|
||||||
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
||||||
#{userId}
|
#{userId}
|
||||||
@ -17,11 +17,11 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectReceivablePriceRank"
|
<select id="selectReceivablePriceRank"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
|
||||||
SELECT IFNULL(SUM(price), 0) AS count, owner_user_id
|
SELECT IFNULL(SUM(price), 0) AS count, owner_user_id
|
||||||
FROM crm_receivable
|
FROM crm_receivable
|
||||||
WHERE deleted = 0
|
WHERE deleted = 0
|
||||||
AND audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
AND audit_status = ${@cn.huangge.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
||||||
AND owner_user_id in
|
AND owner_user_id in
|
||||||
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
||||||
#{userId}
|
#{userId}
|
||||||
@ -31,11 +31,11 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectContractCountRank"
|
<select id="selectContractCountRank"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
|
||||||
SELECT COUNT(1) AS count, owner_user_id
|
SELECT COUNT(1) AS count, owner_user_id
|
||||||
FROM crm_contract
|
FROM crm_contract
|
||||||
WHERE deleted = 0
|
WHERE deleted = 0
|
||||||
AND audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
AND audit_status = ${@cn.huangge.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
||||||
AND owner_user_id in
|
AND owner_user_id in
|
||||||
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
||||||
#{userId}
|
#{userId}
|
||||||
@ -45,12 +45,12 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectProductSalesRank"
|
<select id="selectProductSalesRank"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
|
||||||
SELECT COUNT(product.count) AS count, contract.owner_user_id
|
SELECT COUNT(product.count) AS count, contract.owner_user_id
|
||||||
FROM crm_contract_product product
|
FROM crm_contract_product product
|
||||||
INNER JOIN crm_contract contract ON product.contract_id = contract.id
|
INNER JOIN crm_contract contract ON product.contract_id = contract.id
|
||||||
WHERE contract.deleted = 0 AND contract.deleted = 0
|
WHERE contract.deleted = 0 AND contract.deleted = 0
|
||||||
AND contract.audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
AND contract.audit_status = ${@cn.huangge.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
|
||||||
AND contract.owner_user_id in
|
AND contract.owner_user_id in
|
||||||
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
||||||
#{userId}
|
#{userId}
|
||||||
@ -60,7 +60,7 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectCustomerCountRank"
|
<select id="selectCustomerCountRank"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
|
||||||
SELECT COUNT(1) AS count, owner_user_id
|
SELECT COUNT(1) AS count, owner_user_id
|
||||||
FROM crm_customer
|
FROM crm_customer
|
||||||
WHERE deleted = 0
|
WHERE deleted = 0
|
||||||
@ -73,7 +73,7 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectContactsCountRank"
|
<select id="selectContactsCountRank"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
|
||||||
SELECT COUNT(1) AS count, owner_user_id
|
SELECT COUNT(1) AS count, owner_user_id
|
||||||
FROM crm_contact
|
FROM crm_contact
|
||||||
WHERE deleted = 0
|
WHERE deleted = 0
|
||||||
@ -86,7 +86,7 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectFollowCountRank"
|
<select id="selectFollowCountRank"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
|
||||||
SELECT COUNT(1) AS count, cc.owner_user_id
|
SELECT COUNT(1) AS count, cc.owner_user_id
|
||||||
FROM crm_follow_up_record AS cfur
|
FROM crm_follow_up_record AS cfur
|
||||||
LEFT JOIN crm_contact AS cc ON FIND_IN_SET(cc.id, cfur.contact_ids)
|
LEFT JOIN crm_contact AS cc ON FIND_IN_SET(cc.id, cfur.contact_ids)
|
||||||
@ -101,7 +101,7 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectFollowCustomerCountRank"
|
<select id="selectFollowCustomerCountRank"
|
||||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
|
resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
|
||||||
SELECT COUNT(DISTINCT cc.id) AS count, cc.owner_user_id
|
SELECT COUNT(DISTINCT cc.id) AS count, cc.owner_user_id
|
||||||
FROM crm_follow_up_record AS cfur
|
FROM crm_follow_up_record AS cfur
|
||||||
LEFT JOIN crm_contact AS cc ON FIND_IN_SET(cc.id, cfur.contact_ids)
|
LEFT JOIN crm_contact AS cc ON FIND_IN_SET(cc.id, cfur.contact_ids)
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user