From 4f7362ec2854732c2ff2454331ec815c4c3147f0 Mon Sep 17 00:00:00 2001 From: lixuliang <lixuliang_hd@126.com> Date: 星期五, 22 十一月 2024 11:08:59 +0800 Subject: [PATCH] Merge branch 'master' of http://103.135.160.14:9034/r/se-cloud --- se-modules/se-system/src/main/java/com/se/system/service/impl/FastDfsSysFileServiceImpl.java | 48 + se-modules/se-system/src/main/java/com/se/system/service/impl/SysPermissionServiceImpl.java | 8 se-common/se-common-redis/se-common-redis.iml | 12 se-modules/se-system/src/main/java/com/se/system/service/inte/ISysPostService.java | 2 se-modules/se-system/src/main/java/com/se/system/controller/SysUserOnlineController.java | 2 se-modules/se-system/src/main/java/com/se/system/service/inte/ISysDictDataService.java | 2 se-modules/se-system/src/main/java/com/se/system/controller/TokenController.java | 95 ++ se-modules/se-system/src/main/java/com/se/system/service/inte/ISysUserService.java | 2 se-common/se-common-security/se-common-security.iml | 12 se-modules/se-system/src/main/java/com/se/system/service/inte/ISysOperLogService.java | 2 se-common/se-common-datasource/se-common-datasource.iml | 10 se-common/se-common-seata/se-common-seata.iml | 8 se-modules/se-system/src/main/java/com/se/system/service/impl/SysUserOnlineServiceImpl.java | 2 se-common/se-common-datascope/se-common-datascope.iml | 12 se-modules/se-system/src/main/java/com/se/system/service/inte/ISysPermissionService.java | 2 docker-compose/mysql/initdb/se_cloud_20241119.sql | 219 ++++++ se-common/se-common-core/src/main/java/com/se/common/core/utils/AesUtils.java | 71 - se-modules/se-system/src/main/java/com/se/system/service/impl/MinioSysFileServiceImpl.java | 51 + se-modules/se-system/src/main/java/com/se/system/controller/SysUserController.java | 2 se-modules/se-system/src/main/java/com/se/system/controller/SysConfigController.java | 76 + se-modules/se-system/src/main/java/com/se/system/domain/LoginBody.java | 39 + se-modules/se-system/src/main/java/com/se/system/service/inte/ISysLogininforService.java | 2 se-modules/se-system/src/main/java/com/se/system/service/impl/LocalSysFileServiceImpl.java | 51 + se-auth/src/main/resources/bootstrap.yml | 2 se-modules/se-system/src/main/java/com/se/system/controller/SysMenuController.java | 2 说明.txt | 37 + se-common/se-common-core/src/main/java/com/se/common/core/utils/RsaUtils.java | 81 -- se-modules/se-system/src/main/java/com/se/system/service/inte/ISysDeptService.java | 2 docker-compose/docker-compose_241121.yml | 169 ++++ se-modules/se-system/src/main/java/com/se/system/service/impl/SysUserServiceImpl.java | 6 se-modules/se-system/src/main/java/com/se/system/service/inte/ISysFileService.java | 20 se-common/se-common-core/src/main/java/com/se/common/core/web/domain/BaseEntity.java | 2 se-modules/se-system/src/main/java/com/se/system/service/impl/SysDeptServiceImpl.java | 2 se-modules/se-system/src/main/java/com/se/system/service/inte/ISysMenuService.java | 6 se-api/se-api-system/se-api-system.iml | 12 se-modules/se-system/pom.xml | 20 se-modules/se-system/src/main/java/com/se/system/domain/RegisterBody.java | 11 se-modules/se-system/src/main/java/com/se/system/controller/SysDeptController.java | 2 se-modules/se-system/src/main/java/com/se/system/service/inte/ISysRoleService.java | 2 se-modules/se-system/src/main/java/com/se/system/controller/SysRoleController.java | 6 se-modules/se-system/src/main/resources/logback.xml | 2 se-modules/se-system/src/main/java/com/se/system/service/impl/SysDictTypeServiceImpl.java | 2 se-modules/se-system/src/main/java/com/se/system/service/SysLoginService.java | 163 ++++ se-modules/se-system/src/main/java/com/se/system/service/impl/SysDictDataServiceImpl.java | 2 504/放这里面.txt | 0 se-modules/se-system/src/main/java/com/se/system/service/inte/ISysUserOnlineService.java | 2 .gitignore | 2 se-modules/se-system/src/main/java/com/se/system/controller/SysPostController.java | 2 se-modules/se-system/src/main/java/com/se/system/service/impl/SysRoleServiceImpl.java | 2 se-modules/se-system/src/main/java/com/se/system/controller/SysOperlogController.java | 2 se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml | 35 se-common/se-common-log/se-common-log.iml | 12 se-modules/se-system/src/main/java/com/se/system/config/MinioConfig.java | 82 ++ docker-compose/mysql/initdb/se_cloud_20240629.sql | 2 se-modules/se-system/src/main/java/com/se/system/controller/SysProfileController.java | 10 se-auth/src/main/java/com/se/auth/controller/HealthController.java | 7 se-modules/se-system/src/main/java/com/se/system/controller/SysFileController.java | 49 + se-modules/se-system/src/main/java/com/se/system/controller/HealthController.java | 7 se-modules/se-system/src/main/java/com/se/system/mapper/SysMenuMapper.java | 6 se-modules/se-system/src/main/java/com/se/system/service/impl/SyncUserService.java | 7 se-modules/se-system/src/main/java/com/se/system/service/inte/ISysDictTypeService.java | 2 se-modules/se-system/src/main/java/com/se/system/service/SysPasswordService.java | 87 ++ se-modules/se-system/src/main/java/com/se/system/service/inte/ISysNoticeService.java | 2 se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java | 17 se-modules/se-system/src/main/java/com/se/system/service/impl/SysPostServiceImpl.java | 2 docker-compose/docker-compose.yml | 41 - se-gateway/se-gateway.iml | 12 se-modules/se-system/src/main/java/com/se/system/service/impl/SysNoticeServiceImpl.java | 2 se-modules/se-system/src/main/java/com/se/system/config/ResourcesConfig.java | 51 + se-common/se-common-core/se-common-core.iml | 12 se-modules/se-system/src/main/java/com/se/system/controller/SysDictTypeController.java | 2 se-modules/se-system/src/main/java/com/se/system/service/impl/SysConfigServiceImpl.java | 2 se-modules/se-system/src/main/java/com/se/system/service/impl/SysOperLogServiceImpl.java | 2 se-modules/se-system/src/main/java/com/se/system/controller/SysNoticeController.java | 2 se-modules/se-system/src/main/java/com/se/system/controller/SysLogininforController.java | 2 se-modules/se-system/src/main/java/com/se/system/service/impl/SysLogininforServiceImpl.java | 2 se-modules/se-system/src/main/java/com/se/system/utils/FileUploadUtils.java | 186 +++++ se-modules/se-system/src/main/java/com/se/system/controller/SysDictDataController.java | 4 se-common/se-common-swagger/se-common-swagger.iml | 12 /dev/null | 144 ---- docker-compose/nginx/conf/nginx.conf | 3 se-modules/se-system/src/main/java/com/se/system/service/impl/IsimUserService.java | 6 se-modules/se-system/src/main/java/com/se/system/service/inte/ISysConfigService.java | 2 se-modules/se-system/src/main/java/com/se/system/service/SysRecordLogService.java | 48 + se-gateway/src/main/java/com/se/gateway/handler/HealthController.java | 7 85 files changed, 1,634 insertions(+), 526 deletions(-) diff --git a/.gitignore b/.gitignore index 3aac515..08a2bba 100644 --- a/.gitignore +++ b/.gitignore @@ -22,7 +22,7 @@ ### IntelliJ IDEA ### .idea *.iws -#*.iml +*.iml *.ipr ### JRebel ### diff --git "a/504/\346\224\276\350\277\231\351\207\214\351\235\242.txt" "b/504/\346\224\276\350\277\231\351\207\214\351\235\242.txt" new file mode 100644 index 0000000..e69de29 --- /dev/null +++ "b/504/\346\224\276\350\277\231\351\207\214\351\235\242.txt" diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 041a6f9..50ea4ba 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -38,7 +38,7 @@ # - 7848:7848 - 8848:8848 - 9848:9848 -# - 9849:9849 +# - 9849:9849 depends_on: - se-mysql networks: @@ -67,31 +67,13 @@ - ./gateway:/data environment: TZ: Asia/Shanghai - entrypoint: java -jar /data/se-gateway.jar --spring.config.location=file:/data/ + entrypoint: /bin/sh -c "sleep 25 && java -jar /data/se-gateway.jar --spring.config.location=file:/data/" depends_on: - se-redis - se-mysql - se-nacos # links: # - se-redis - networks: - - network-se - restart: always - # auth - se-auth: - image: openjdk:8-jre -# ports: -# - 9200:9200 - volumes: - - ./auth/logs:/logs - - ./auth:/data - environment: - TZ: Asia/Shanghai - entrypoint: java -jar /data/se-auth.jar --spring.config.location=file:/data/ - depends_on: - - se-redis - - se-mysql - - se-nacos networks: - network-se restart: always @@ -105,26 +87,9 @@ - ./system:/data environment: TZ: Asia/Shanghai - entrypoint: java -jar /data/se-modules-system.jar --spring.config.location=file:/data/ + entrypoint: /bin/sh -c "sleep 30 && java -jar /data/se-modules-system.jar --spring.config.location=file:/data/" depends_on: - se-redis - - se-mysql - - se-nacos - networks: - - network-se - restart: always - # se-file - se-file: - image: openjdk:8-jre -# ports: -# - 9300:9300 - volumes: - - ./file/logs:/logs - - ./file:/data - environment: - TZ: Asia/Shanghai - entrypoint: java -jar /data/se-modules-file.jar --spring.config.location=file:/data/ - depends_on: - se-mysql - se-nacos networks: diff --git a/docker-compose/docker-compose_241121.yml b/docker-compose/docker-compose_241121.yml new file mode 100644 index 0000000..4eff45d --- /dev/null +++ b/docker-compose/docker-compose_241121.yml @@ -0,0 +1,169 @@ +version : '3.8' +services: + # mysql + se-mysql: + image: mysql:5.7 + ports: + - 3307:3306 + volumes: + - ./mysql/logs:/logs + - ./mysql/data:/var/lib/mysql + - ./mysql/conf:/etc/mysql/conf.d + - ./mysql/initdb:/docker-entrypoint-initdb.d + command: [ + 'mysqld', + '--innodb-buffer-pool-size=80M', + '--character-set-server=utf8mb4', + '--collation-server=utf8mb4_unicode_ci', + '--default-time-zone=+8:00', + '--lower-case-table-names=1' + ] + environment: + TZ: Asia/Shanghai + MYSQL_DATABASE: 'se-cloud' + MYSQL_ROOT_PASSWORD: My_Sql_s!E_v5.7 + networks: + - network-se + restart: always + # nacos + se-nacos: + image: nacos/nacos-server:v2.4.1 + environment: + MODE: standalone + TZ: Asia/Shanghai + volumes: + - ./nacos/logs/:/home/nacos/logs + - ./nacos/conf/application.properties:/home/nacos/conf/application.properties + ports: +# - 7848:7848 + - 8848:8848 + - 9848:9848 +# - 9849:9849 + depends_on: + - se-mysql + networks: + - network-se + restart: always + # redis + se-redis: + image: redis:latest + ports: + - 6379:6379 + volumes: + - ./redis/data/redis.conf:/data/redis.conf + - ./redis/data:/data + command: redis-server /data/redis.conf +# command: redis-server --requirepass Redis_s!E_6.2.6 + networks: + - network-se + restart: always + # gateway + se-gateway: + image: openjdk:8-jre +# ports: +# - 9204:8080 + volumes: + - ./gateway/logs:/logs + - ./gateway:/data + environment: + TZ: Asia/Shanghai + entrypoint: java -jar /data/se-gateway.jar --spring.config.location=file:/data/ + depends_on: + - se-redis + - se-mysql + - se-nacos +# links: +# - se-redis + networks: + - network-se + restart: always + # auth + se-auth: + image: openjdk:8-jre +# ports: +# - 9200:9200 + volumes: + - ./auth/logs:/logs + - ./auth:/data + environment: + TZ: Asia/Shanghai + entrypoint: java -jar /data/se-auth.jar --spring.config.location=file:/data/ + depends_on: + - se-redis + - se-mysql + - se-nacos + networks: + - network-se + restart: always + # system + se-system: + image: openjdk:8-jre +# ports: +# - 9201:9201 + volumes: + - ./system/logs:/logs + - ./system:/data + environment: + TZ: Asia/Shanghai + entrypoint: java -jar /data/se-modules-system.jar --spring.config.location=file:/data/ + depends_on: + - se-redis + - se-mysql + - se-nacos + networks: + - network-se + restart: always + # se-file + se-file: + image: openjdk:8-jre +# ports: +# - 9300:9300 + volumes: + - ./file/logs:/logs + - ./file:/data + environment: + TZ: Asia/Shanghai + entrypoint: java -jar /data/se-modules-file.jar --spring.config.location=file:/data/ + depends_on: + - se-mysql + - se-nacos + networks: + - network-se + restart: always + # se-wgcloud + se-wgcloud: + image: openjdk:8-jre + ports: + - 9999:9999 + volumes: + - ./wgcloud/logs:/log + - ./wgcloud:/data + environment: + TZ: Asia/Shanghai + entrypoint: java -jar /data/wgcloud-server-release.jar --spring.config.location=file:/data/ + depends_on: + - se-mysql + networks: + - network-se + restart: always + # nginx + se-nginx: + image: nginx:latest + ports: + - 8090:80 + environment: + TZ: Asia/Shanghai + volumes: + - ./nginx/logs:/var/log/nginx + - ./nginx/conf.d:/etc/nginx/conf.d + - ./nginx/html:/usr/share/nginx/html + - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf + depends_on: + - se-gateway + networks: + - network-se + restart: always +# networks +networks: + network-se: + driver: bridge diff --git a/docker-compose/mysql/initdb/se_cloud_20240629.sql b/docker-compose/mysql/initdb/se_cloud_20240629.sql index 6489582..19cf1fe 100644 --- a/docker-compose/mysql/initdb/se_cloud_20240629.sql +++ b/docker-compose/mysql/initdb/se_cloud_20240629.sql @@ -570,7 +570,7 @@ ) engine=innodb auto_increment=6 comment = '鍙傛暟閰嶇疆琛�'; insert into sys_config values(1, '涓绘鏋堕〉-榛樿鐨偆鏍峰紡鍚嶇О', 'sys.index.skinName', 'skin-blue', 'Y', 'admin', sysdate(), '', null, '钃濊壊 skin-blue銆佺豢鑹� skin-green銆佺传鑹� skin-purple銆佺孩鑹� skin-red銆侀粍鑹� skin-yellow' ); -insert into sys_config values(2, '鐢ㄦ埛绠$悊-璐﹀彿鍒濆瀵嗙爜', 'sys.user.initPassword', '123456', 'Y', 'admin', sysdate(), '', null, '鍒濆鍖栧瘑鐮� 123456' ); +insert into sys_config values(2, '鐢ㄦ埛绠$悊-璐﹀彿鍒濆瀵嗙爜', 'sys.user.initPassword', '123456', 'Y', 'admin', sysdate(), '', null, '鍒濆鍖栧瘑鐮�' ); insert into sys_config values(3, '涓绘鏋堕〉-渚ц竟鏍忎富棰�', 'sys.index.sideTheme', 'theme-dark', 'Y', 'admin', sysdate(), '', null, '娣辫壊涓婚theme-dark锛屾祬鑹蹭富棰榯heme-light' ); insert into sys_config values(4, '璐﹀彿鑷姪-鏄惁寮�鍚敤鎴锋敞鍐屽姛鑳�', 'sys.account.registerUser', 'false', 'Y', 'admin', sysdate(), '', null, '鏄惁寮�鍚敞鍐岀敤鎴峰姛鑳斤紙true寮�鍚紝false鍏抽棴锛�'); insert into sys_config values(5, '鐢ㄦ埛鐧诲綍-榛戝悕鍗曞垪琛�', 'sys.login.blackIPList', '', 'Y', 'admin', sysdate(), '', null, '璁剧疆鐧诲綍IP榛戝悕鍗曢檺鍒讹紝澶氫釜鍖归厤椤逛互;鍒嗛殧锛屾敮鎸佸尮閰嶏紙*閫氶厤銆佺綉娈碉級'); diff --git a/docker-compose/mysql/initdb/se_cloud_20241119.sql b/docker-compose/mysql/initdb/se_cloud_20241119.sql new file mode 100644 index 0000000..38dc72e --- /dev/null +++ b/docker-compose/mysql/initdb/se_cloud_20241119.sql @@ -0,0 +1,219 @@ +-- DROP DATABASE IF EXISTS `se-cloud`; + +CREATE DATABASE IF NOT EXISTS `se-cloud` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +USE `se-cloud`; + +-- ---------------------------- +-- 01銆佽蒋浠惰〃 +-- ---------------------------- +drop table if exists sys_soft; +create table sys_soft ( + soft_id bigint(20) not null auto_increment comment '杞欢ID', + name varchar(200) not null comment '鍚嶇О', + type char(1) default '0' comment '绫诲瀷锛�0-搴旂敤杞欢锛�1-鏁版嵁搴擄紝2-涓棿浠讹紝3-鎿嶄綔绯荤粺锛�', + lic varchar(500) comment '璁稿彲', + descr varchar(500) comment '鎻忚堪', + args varchar(8000) comment '鍙傛暟', + status char(1) default 0 comment '鐘舵�侊紙0姝e父 1鍋滅敤锛�', + create_by varchar(64) default '' comment '鍒涘缓鑰�', + create_time datetime comment '鍒涘缓鏃堕棿', + update_by varchar(64) default '' comment '鏇存柊鑰�', + update_time datetime comment '鏇存柊鏃堕棿', + remark varchar(500) default '' comment '澶囨敞', + primary key (soft_id) +) engine=innodb auto_increment=1 comment = '杞欢琛�'; +select * from sys_soft order by soft_id; + + +-- ---------------------------- +-- 02銆佺‖浠惰〃 +-- ---------------------------- +drop table if exists sys_hard; +create table sys_hard ( + hard_id bigint(20) not null auto_increment comment '纭欢ID', + name varchar(200) not null comment '鍚嶇О', + cpu varchar(20) comment 'CPU', + mem varchar(200) comment '鍐呭瓨', + disk varchar(200) comment '纭洏', + net varchar(200) comment '缃戠粶', + descr varchar(500) comment '鎻忚堪', + args varchar(8000) comment '鍙傛暟', + status char(1) default 0 comment '鐘舵�侊紙0姝e父 1鍋滅敤锛�', + create_by varchar(64) default '' comment '鍒涘缓鑰�', + create_time datetime comment '鍒涘缓鏃堕棿', + update_by varchar(64) default '' comment '鏇存柊鑰�', + update_time datetime comment '鏇存柊鏃堕棿', + remark varchar(500) default '' comment '澶囨敞', + primary key (hard_id) +) engine=innodb auto_increment=1 comment = '纭欢琛�'; +select * from sys_hard order by hard_id; + + +-- ---------------------------- +-- 03銆侀厤缃〃 +-- ---------------------------- +drop table if exists sys_cfg; +create table sys_cfg ( + cfg_id bigint(20) not null auto_increment comment '閰嶇疆ID', + name varchar(200) not null comment '鍚嶇О', + hard varchar(4000) comment '纭欢', + soft varchar(4000) comment '杞欢', + args varchar(4000) comment '鍙傛暟', + status char(1) default 0 comment '鐘舵�侊紙0姝e父 1鍋滅敤锛�', + create_by varchar(64) default '' comment '鍒涘缓鑰�', + create_time datetime comment '鍒涘缓鏃堕棿', + update_by varchar(64) default '' comment '鏇存柊鑰�', + update_time datetime comment '鏇存柊鏃堕棿', + remark varchar(500) default '' comment '澶囨敞', + primary key (cfg_id) +) engine=innodb auto_increment=1 comment = '閰嶇疆琛�'; +select * from sys_cfg order by cfg_id; + + +-- ---------------------------- +-- 04銆佽祫婧愯〃 +-- ---------------------------- +drop table if exists sys_res; +create table sys_res ( + res_id bigint(20) not null auto_increment comment '璧勬簮ID', + name varchar(200) not null comment '鍚嶇О', + type char(1) default '0' comment '绫诲瀷锛�0-鍏跺畠锛�1-IP锛�2-鏁版嵁搴擄紝3-娑堟伅涓棿浠讹紝4-鍏变韩鏂囦欢锛�5-鍒嗙郴缁熻蒋浠讹紝6-寮曟搸锛�', + descr varchar(500) comment '鎻忚堪', + args varchar(4000) comment '鍙傛暟', + status char(1) default 0 comment '鐘舵�侊紙0姝e父 1鍋滅敤锛�', + create_by varchar(64) default '' comment '鍒涘缓鑰�', + create_time datetime comment '鍒涘缓鏃堕棿', + update_by varchar(64) default '' comment '鏇存柊鑰�', + update_time datetime comment '鏇存柊鏃堕棿', + remark varchar(500) default '' comment '澶囨敞', + primary key (res_id) +) engine=innodb auto_increment=1 comment = '璧勬簮琛�'; +select * from sys_res order by res_id; + + +-- ---------------------------- +-- 05銆佹帴鍙h〃 +-- ---------------------------- +drop table if exists sys_inte; +create table sys_inte ( + inte_id bigint(20) not null auto_increment comment '鎺ュ彛ID', + name varchar(200) not null comment '鍚嶇О', + type char(1) default '0' comment '绫诲瀷', + descr varchar(500) comment '鎻忚堪', + url varchar(4000) comment 'URL', + data varchar(500) comment '鏁版嵁', + args varchar(4000) comment '鍙傛暟', + status char(1) default 0 comment '鐘舵�侊紙0姝e父 1鍋滅敤锛�', + create_by varchar(64) default '' comment '鍒涘缓鑰�', + create_time datetime comment '鍒涘缓鏃堕棿', + update_by varchar(64) default '' comment '鏇存柊鑰�', + update_time datetime comment '鏇存柊鏃堕棿', + remark varchar(500) default '' comment '澶囨敞', + primary key (inte_id) +) engine=innodb auto_increment=1 comment = '鎺ュ彛琛�'; +select * from sys_inte order by inte_id; + + +-- ---------------------------- +-- 06銆佸憡璀﹁〃 +-- ---------------------------- +drop table if exists sys_warn; +create table sys_warn ( + warn_id bigint(20) not null auto_increment comment '鍛婅ID', + name varchar(200) not null comment '鍚嶇О', + type char(1) default '0' comment '绫诲瀷', + descr varchar(500) comment '鎻忚堪', + data varchar(500) comment '鏁版嵁', + args varchar(4000) comment '鍙傛暟', + status char(1) default 0 comment '鐘舵�侊紙0姝e父 1鍋滅敤锛�', + create_by varchar(64) default '' comment '鍒涘缓鑰�', + create_time datetime comment '鍒涘缓鏃堕棿', + update_by varchar(64) default '' comment '鏇存柊鑰�', + update_time datetime comment '鏇存柊鏃堕棿', + remark varchar(500) default '' comment '澶囨敞', + primary key (warn_id) +) engine=innodb auto_increment=1 comment = '鍛婅琛�'; +select * from sys_warn order by warn_id; + + +-- ---------------------------- +-- 07銆佹帶鍒惰〃 +-- ---------------------------- +drop table if exists sys_ctrl; +create table sys_ctrl ( + ctrl_id bigint(20) not null auto_increment comment '鎺у埗ID', + name varchar(200) not null comment '鍚嶇О', + type char(1) default '0' comment '绫诲瀷', + descr varchar(500) comment '鎻忚堪', + data varchar(500) comment '鏁版嵁', + args varchar(4000) comment '鍙傛暟', + status char(1) default 0 comment '鐘舵�侊紙0姝e父 1鍋滅敤锛�', + create_by varchar(64) default '' comment '鍒涘缓鑰�', + create_time datetime comment '鍒涘缓鏃堕棿', + update_by varchar(64) default '' comment '鏇存柊鑰�', + update_time datetime comment '鏇存柊鏃堕棿', + remark varchar(500) default '' comment '澶囨敞', + primary key (ctrl_id) +) engine=innodb auto_increment=1 comment = '鎺у埗琛�'; +select * from sys_ctrl order by ctrl_id; + + +-- ---------------------------- +-- 08銆佹帶鍒舵棩蹇楄〃 +-- ---------------------------- +drop table if exists sys_ctrl_log; +create table sys_ctrl_log ( + log_id bigint(20) not null auto_increment comment '鏃ュ織ID', + title varchar(100) not null comment '鏍囬', + type char(1) default '0' comment '绫诲瀷', + ip varchar(50) comment 'IP', + url varchar(4000) comment 'URL', + method varchar(20) comment '鏂规硶', + args varchar(4000) comment '鍙傛暟', + msg varchar(2000) comment '娑堟伅', + oper varchar(50) comment '鎿嶄綔鍛�', + time datetime default now() comment '鎿嶄綔鏃堕棿', + remark varchar(500) default '' comment '澶囨敞', + primary key (log_id) +) engine=innodb auto_increment=1 comment = '鎺у埗鏃ュ織琛�'; +select * from sys_ctrl_log order by log_id; + + +-- ---------------------------- +-- 09銆佽鑹叉帶鍒惰〃 +-- ---------------------------- +drop table if exists sys_role_ctrl; +create table sys_role_ctrl ( + role_id bigint(20) not null comment '瑙掕壊ID', + ctrl_id bigint(20) not null comment '鎺у埗ID', + primary key(role_id, ctrl_id) +) engine=innodb comment = '瑙掕壊鎺у埗琛�'; +select * from sys_role_ctrl; + + +-- ---------------------------- +-- 10銆佽鑹叉帴鍙h〃 +-- ---------------------------- +drop table if exists sys_role_inte; +create table sys_role_inte ( + role_id bigint(20) not null comment '瑙掕壊ID', + inte_id bigint(20) not null comment '鎺ュ彛ID', + primary key(role_id, inte_id) +) engine=innodb comment = '瑙掕壊鎺ュ彛琛�'; +select * from sys_role_inte; + +-- ---------------------------- +-- 11銆佽鑹茶祫婧愯〃 +-- ---------------------------- +drop table if exists sys_role_res; +create table sys_role_res ( + role_id bigint(20) not null comment '瑙掕壊ID', + res_id bigint(20) not null comment '璧勬簮ID', + primary key(role_id, res_id) +) engine=innodb comment = '瑙掕壊璧勬簮琛�'; +select * from sys_role_res; + diff --git a/docker-compose/nginx/conf/nginx.conf b/docker-compose/nginx/conf/nginx.conf index 7582db2..883ed22 100644 --- a/docker-compose/nginx/conf/nginx.conf +++ b/docker-compose/nginx/conf/nginx.conf @@ -38,7 +38,8 @@ proxy_set_header REMOTE-HOST $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://se-file:9300/; + #proxy_pass http://se-file:9300/; + proxy_pass http://se-system:9201/; } location /prod-api/ { diff --git a/se-api/se-api-system/se-api-system.iml b/se-api/se-api-system/se-api-system.iml index 7b13ee7..f5e2e69 100644 --- a/se-api/se-api-system/se-api-system.iml +++ b/se-api/se-api-system/se-api-system.iml @@ -6,12 +6,12 @@ </facet> </component> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> - <output url="file://$MODULE_DIR$/../../se-api/se-api-system/target/classes" /> - <output-test url="file://$MODULE_DIR$/../../se-api/se-api-system/target/test-classes" /> - <content url="file://$MODULE_DIR$/../../se-api/se-api-system"> - <sourceFolder url="file://$MODULE_DIR$/../../se-api/se-api-system/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/../../se-api/se-api-system/src/main/resources" type="java-resource" /> - <excludeFolder url="file://$MODULE_DIR$/../../se-api/se-api-system/target" /> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> + <excludeFolder url="file://$MODULE_DIR$/target" /> </content> <orderEntry type="jdk" jdkName="jdk-1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> diff --git a/se-auth/src/main/java/com/se/auth/controller/HealthController.java b/se-auth/src/main/java/com/se/auth/controller/HealthController.java index dc39dc1..d032018 100644 --- a/se-auth/src/main/java/com/se/auth/controller/HealthController.java +++ b/se-auth/src/main/java/com/se/auth/controller/HealthController.java @@ -5,13 +5,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -/** - * 鍋ュ悍鎺у埗鍣� - * - * @author WWW - * @date 2024-08-24 - */ @RestController +@SuppressWarnings("ALL") public class HealthController extends BaseController { @GetMapping("/health") public long test() { diff --git a/se-auth/src/main/resources/bootstrap.yml b/se-auth/src/main/resources/bootstrap.yml index 5b028cd..71d5269 100644 --- a/se-auth/src/main/resources/bootstrap.yml +++ b/se-auth/src/main/resources/bootstrap.yml @@ -25,4 +25,4 @@ # 鍏变韩閰嶇疆 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} -enableEncrypt: false \ No newline at end of file +enableEncrypt: true \ No newline at end of file diff --git a/se-cloud.iml b/se-cloud.iml deleted file mode 100644 index 7cfda32..0000000 --- a/se-cloud.iml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> - <output url="file://$MODULE_DIR$/target/classes" /> - <output-test url="file://$MODULE_DIR$/target/test-classes" /> - <content url="file://$MODULE_DIR$"> - <excludeFolder url="file://$MODULE_DIR$/target" /> - </content> - <orderEntry type="jdk" jdkName="jdk-1.8" jdkType="JavaSDK" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-bootstrap:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.12" level="project" /> - <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.12" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" /> - <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" /> - <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.30" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.7.11" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.11.RELEASE" level="project" /> - <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.69" level="project" /> - <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.69" level="project" /> - <orderEntry type="library" name="Maven: org.bouncycastle:bcutil-jdk15on:1.69" level="project" /> - </component> -</module> \ No newline at end of file diff --git a/se-common/se-common-core/se-common-core.iml b/se-common/se-common-core/se-common-core.iml index 43d8066..6cb2b4a 100644 --- a/se-common/se-common-core/se-common-core.iml +++ b/se-common/se-common-core/se-common-core.iml @@ -6,12 +6,12 @@ </facet> </component> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> - <output url="file://$MODULE_DIR$/../../se-common/se-common-core/target/classes" /> - <output-test url="file://$MODULE_DIR$/../../se-common/se-common-core/target/test-classes" /> - <content url="file://$MODULE_DIR$/../../se-common/se-common-core"> - <sourceFolder url="file://$MODULE_DIR$/../../se-common/se-common-core/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/../../se-common/se-common-core/src/main/resources" type="java-resource" /> - <excludeFolder url="file://$MODULE_DIR$/../../se-common/se-common-core/target" /> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> + <excludeFolder url="file://$MODULE_DIR$/target" /> </content> <orderEntry type="jdk" jdkName="jdk-1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> diff --git a/se-common/se-common-core/src/main/java/com/se/common/core/utils/AesUtils.java b/se-common/se-common-core/src/main/java/com/se/common/core/utils/AesUtils.java index bf450f6..57a1291 100644 --- a/se-common/se-common-core/src/main/java/com/se/common/core/utils/AesUtils.java +++ b/se-common/se-common-core/src/main/java/com/se/common/core/utils/AesUtils.java @@ -4,77 +4,30 @@ import javax.crypto.spec.SecretKeySpec; import java.util.Base64; -/** - * AES鍔犲瘑宸ュ叿 - * - * @author WWW - * @date 2024-08-25 - */ @SuppressWarnings("ALL") public class AesUtils { - /** - * 瀵嗛挜闀垮害蹇呴』鏄�16 - */ private static final String DEFAULT_KEY = "A#s_zZ3seRve_k.y"; private static final String KEY_ALGORITHM = "AES"; - /** - * 绠楁硶 - */ private static final String ALGORITHMSTR = "AES/ECB/PKCS5Padding"; - /** - * aes瑙e瘑 - * - * @param encrypt 鍐呭 - * @return - * @throws Exception - */ public static String decrypt(String encrypt) throws Exception { return decrypt(encrypt, DEFAULT_KEY); } - /** - * aes鍔犲瘑 - * - * @param content 鍐呭 - * @return - * @throws Exception - */ public static String encrypt(String content) throws Exception { return encrypt(content, DEFAULT_KEY); } - /** - * base 64 encode - * - * @param bytes 寰呯紪鐮佺殑byte[] - * @return 缂栫爜鍚庣殑base64 code - */ private static String base64Encode(byte[] bytes) { return Base64.getEncoder().encodeToString(bytes); } - /** - * base 64 decode - * - * @param base64Code 寰呰В鐮佺殑base64 code - * @return 瑙g爜鍚庣殑byte[] - * @throws Exception - */ private static byte[] base64Decode(String base64Code) { return StringUtils.isEmpty(base64Code) ? null : Base64.getDecoder().decode(base64Code); } - /** - * AES鍔犲瘑 - * - * @param content 寰呭姞瀵嗙殑鍐呭 - * @param encryptKey 鍔犲瘑瀵嗛挜 - * @return 鍔犲瘑鍚庣殑byte[] - * @throws Exception - */ private static byte[] aesEncryptToBytes(String content, String encryptKey) throws Exception { // KeyGenerator kGen = KeyGenerator.getInstance(KEY_ALGORITHM) // kGen.init(128) @@ -85,38 +38,14 @@ return cipher.doFinal(content.getBytes("utf-8")); } - /** - * AES鍔犲瘑涓篵ase 64 code - * - * @param content 寰呭姞瀵嗙殑鍐呭 - * @param encryptKey 鍔犲瘑瀵嗛挜 - * @return 鍔犲瘑鍚庣殑base 64 code - * @throws Exception - */ public static String encrypt(String content, String encryptKey) throws Exception { return base64Encode(aesEncryptToBytes(content, encryptKey)); } - /** - * 灏哹ase 64 code AES瑙e瘑 - * - * @param encryptStr 寰呰В瀵嗙殑base 64 code - * @param decryptKey 瑙e瘑瀵嗛挜 - * @return 瑙e瘑鍚庣殑string - * @throws Exception - */ public static String decrypt(String encryptStr, String decryptKey) throws Exception { return StringUtils.isEmpty(encryptStr) ? null : aesDecryptByBytes(base64Decode(encryptStr), decryptKey); } - /** - * AES瑙e瘑 - * - * @param encryptBytes 寰呰В瀵嗙殑byte[] - * @param decryptKey 瑙e瘑瀵嗛挜 - * @return 瑙e瘑鍚庣殑String - * @throws Exception - */ private static String aesDecryptByBytes(byte[] encryptBytes, String decryptKey) throws Exception { // KeyGenerator kGen = KeyGenerator.getInstance(KEY_ALGORITHM) // kGen.init(128) diff --git a/se-common/se-common-core/src/main/java/com/se/common/core/utils/RsaUtils.java b/se-common/se-common-core/src/main/java/com/se/common/core/utils/RsaUtils.java index 27010cf..49ee43e 100644 --- a/se-common/se-common-core/src/main/java/com/se/common/core/utils/RsaUtils.java +++ b/se-common/se-common-core/src/main/java/com/se/common/core/utils/RsaUtils.java @@ -16,53 +16,24 @@ import java.util.HashMap; import java.util.Map; -/** - * RSA宸ュ叿绫� - * - * @author WWW - * @date 2024-08-25 - */ +@SuppressWarnings("ALL") public class RsaUtils { - /** - * 绉侀挜 - */ private static String privateKey; - /** - * 鍏挜 - */ private static String publicKey; - /** - * 瀵嗛挜绠楁硶 - */ private static final String KEY_ALGORITHM = "RSA"; - /** - * RSA瀵嗛挜闀垮害锛�1024 鎴� 2048 - */ private static final int DEFAULT_RSA_KEY_SIZE = 1024; - /** - * 鏃ュ織 - */ private static final Logger log = LoggerFactory.getLogger(RsaUtils.class); - /** - * 鐢熸垚鍏閽� - */ public static void generate() { Map<String, String> result = generateRsaKey(DEFAULT_RSA_KEY_SIZE); System.out.println("鍏挜涓猴細" + result.get("publicKey")); System.out.println("绉侀挜涓猴細" + result.get("privateKey")); } - /** - * 鑾峰彇RSA鍔犲瘑绉侀挜 - * - * @return - * @throws IOException - */ public static String getPrivateKey() throws IOException { if (privateKey == null) { InputStream inPrivate = new ClassPathResource("config" + File.separator + "rsa_private_key.txt").getInputStream(); @@ -73,12 +44,6 @@ return privateKey; } - /** - * 鑾峰彇RSA鍔犲瘑鍏挜 - * - * @return - * @throws IOException - */ public static String getPublicKey() throws IOException { if (publicKey == null) { InputStream inPrivate = new ClassPathResource("config" + File.separator + "rsa_public_key.txt").getInputStream(); @@ -89,13 +54,6 @@ return publicKey; } - /** - * 璇诲彇鏂囨湰鏂囦欢 - * - * @param fileName 鏂囦欢璺緞 - * @return - * @throws IOException - */ public static String readFile(String fileName) throws IOException { File file = new File(fileName); BufferedReader br = new BufferedReader(new FileReader(file)); @@ -111,13 +69,6 @@ return result.toString(); } - /** - * 鎶奿nputStream杞垚String - * - * @param is - * @return - * @throws IOException - */ private static String inputStream2String(InputStream is) throws IOException { ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -132,28 +83,18 @@ return str; } - /** - * 鐢熸垚RSA鐨勫叕绉侀挜 - * - * @param keySize 1025 鎴� 2048 - * @return - */ public static Map<String, String> generateRsaKey(int keySize) { Map<String, String> result = new HashMap<>(2); try { KeyPairGenerator keyPairGen = KeyPairGenerator.getInstance(KEY_ALGORITHM); - // 鍒濆鍖栧瘑閽ュ鐢熸垚鍣紝瀵嗛挜澶у皬涓�1024 2048浣� keyPairGen.initialize(keySize, new SecureRandom()); - // 鐢熸垚涓�涓瘑閽ュ锛屼繚瀛樺湪keyPair涓� KeyPair keyPair = keyPairGen.generateKeyPair(); - // 寰楀埌鍏挜瀛楃涓� String pub = new String(Base64.encodeBase64(keyPair.getPublic().getEncoded())); result.put("publicKey", pub); - // 寰楀埌绉侀挜瀛楃涓� String pri = new String(Base64.encodeBase64(keyPair.getPrivate().getEncoded())); result.put("privateKey", pri); } catch (Exception ex) { @@ -163,22 +104,13 @@ return result; } - /** - * RSA绉侀挜瑙e瘑 - * - * @param str 鍔犲瘑鐨勫瓧绗︿覆 - * @return 瑙e瘑瀛楃涓� - * @throws Exception 鍔犲瘑杩囩▼涓殑寮傚父淇℃伅 - */ public static String decrypt(String str) throws Exception { - // 64浣嶈В鐮佸姞瀵嗗悗鐨勫瓧绗︿覆 byte[] inputByte = Base64.decodeBase64(str.getBytes(StandardCharsets.UTF_8)); - // Base64缂栫爜鐨勭閽� byte[] decoded = Base64.decodeBase64(getPrivateKey()); RSAPrivateKey priKey = (RSAPrivateKey) KeyFactory.getInstance("RSA").generatePrivate(new PKCS8EncodedKeySpec(decoded)); - // RSA瑙e瘑锛歊SA/ECB/NoPadding + // RSA/ECB/NoPadding Cipher cipher = Cipher.getInstance("RSA"); cipher.init(Cipher.DECRYPT_MODE, priKey); @@ -187,20 +119,11 @@ return outStr; } - /** - * RSA鍏挜鍔犲瘑 - * - * @param str 闇�瑕佸姞瀵嗙殑瀛楃涓� - * @return 瀵嗘枃 - * @throws Exception 鍔犲瘑杩囩▼涓殑寮傚父淇℃伅 - */ public static String encrypt(String str) throws Exception { - // Base64缂栫爜鐨勫叕閽� byte[] decoded = Base64.decodeBase64(getPublicKey()); RSAPublicKey pubKey = (RSAPublicKey) KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(decoded)); - // RSA鍔犲瘑锛歊SA/ECB/NoPadding Cipher cipher = Cipher.getInstance("RSA"); cipher.init(Cipher.ENCRYPT_MODE, pubKey); diff --git a/se-common/se-common-core/src/main/java/com/se/common/core/web/domain/BaseEntity.java b/se-common/se-common-core/src/main/java/com/se/common/core/web/domain/BaseEntity.java index 4b7a1a9..4888147 100644 --- a/se-common/se-common-core/src/main/java/com/se/common/core/web/domain/BaseEntity.java +++ b/se-common/se-common-core/src/main/java/com/se/common/core/web/domain/BaseEntity.java @@ -13,6 +13,7 @@ * * @author admin */ +@SuppressWarnings("ALL") public class BaseEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -39,6 +40,7 @@ private String remark; /** 璇锋眰鍙傛暟 */ + //@TableField(exist = false) @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map<String, Object> params; diff --git a/se-common/se-common-datascope/se-common-datascope.iml b/se-common/se-common-datascope/se-common-datascope.iml index 2cbafb4..fe6f29f 100644 --- a/se-common/se-common-datascope/se-common-datascope.iml +++ b/se-common/se-common-datascope/se-common-datascope.iml @@ -6,12 +6,12 @@ </facet> </component> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> - <output url="file://$MODULE_DIR$/../../se-common/se-common-datascope/target/classes" /> - <output-test url="file://$MODULE_DIR$/../../se-common/se-common-datascope/target/test-classes" /> - <content url="file://$MODULE_DIR$/../../se-common/se-common-datascope"> - <sourceFolder url="file://$MODULE_DIR$/../../se-common/se-common-datascope/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/../../se-common/se-common-datascope/src/main/resources" type="java-resource" /> - <excludeFolder url="file://$MODULE_DIR$/../../se-common/se-common-datascope/target" /> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> + <excludeFolder url="file://$MODULE_DIR$/target" /> </content> <orderEntry type="jdk" jdkName="jdk-1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> diff --git a/se-common/se-common-datasource/se-common-datasource.iml b/se-common/se-common-datasource/se-common-datasource.iml index 1cfffb5..5bf78dd 100644 --- a/se-common/se-common-datasource/se-common-datasource.iml +++ b/se-common/se-common-datasource/se-common-datasource.iml @@ -6,11 +6,11 @@ </facet> </component> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> - <output url="file://$MODULE_DIR$/../../se-common/se-common-datasource/target/classes" /> - <output-test url="file://$MODULE_DIR$/../../se-common/se-common-datasource/target/test-classes" /> - <content url="file://$MODULE_DIR$/../../se-common/se-common-datasource"> - <sourceFolder url="file://$MODULE_DIR$/../../se-common/se-common-datasource/src/main/java" isTestSource="false" /> - <excludeFolder url="file://$MODULE_DIR$/../../se-common/se-common-datasource/target" /> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <excludeFolder url="file://$MODULE_DIR$/target" /> </content> <orderEntry type="jdk" jdkName="jdk-1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> diff --git a/se-common/se-common-log/se-common-log.iml b/se-common/se-common-log/se-common-log.iml index af1c381..fe6f29f 100644 --- a/se-common/se-common-log/se-common-log.iml +++ b/se-common/se-common-log/se-common-log.iml @@ -6,12 +6,12 @@ </facet> </component> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> - <output url="file://$MODULE_DIR$/../../se-common/se-common-log/target/classes" /> - <output-test url="file://$MODULE_DIR$/../../se-common/se-common-log/target/test-classes" /> - <content url="file://$MODULE_DIR$/../../se-common/se-common-log"> - <sourceFolder url="file://$MODULE_DIR$/../../se-common/se-common-log/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/../../se-common/se-common-log/src/main/resources" type="java-resource" /> - <excludeFolder url="file://$MODULE_DIR$/../../se-common/se-common-log/target" /> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> + <excludeFolder url="file://$MODULE_DIR$/target" /> </content> <orderEntry type="jdk" jdkName="jdk-1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> diff --git a/se-common/se-common-redis/se-common-redis.iml b/se-common/se-common-redis/se-common-redis.iml index c85896b..a8c3c88 100644 --- a/se-common/se-common-redis/se-common-redis.iml +++ b/se-common/se-common-redis/se-common-redis.iml @@ -6,12 +6,12 @@ </facet> </component> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> - <output url="file://$MODULE_DIR$/../../se-common/se-common-redis/target/classes" /> - <output-test url="file://$MODULE_DIR$/../../se-common/se-common-redis/target/test-classes" /> - <content url="file://$MODULE_DIR$/../../se-common/se-common-redis"> - <sourceFolder url="file://$MODULE_DIR$/../../se-common/se-common-redis/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/../../se-common/se-common-redis/src/main/resources" type="java-resource" /> - <excludeFolder url="file://$MODULE_DIR$/../../se-common/se-common-redis/target" /> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> + <excludeFolder url="file://$MODULE_DIR$/target" /> </content> <orderEntry type="jdk" jdkName="jdk-1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> diff --git a/se-common/se-common-seata/se-common-seata.iml b/se-common/se-common-seata/se-common-seata.iml index 5a35f22..4e63c78 100644 --- a/se-common/se-common-seata/se-common-seata.iml +++ b/se-common/se-common-seata/se-common-seata.iml @@ -6,10 +6,10 @@ </facet> </component> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> - <output url="file://$MODULE_DIR$/../../se-common/se-common-seata/target/classes" /> - <output-test url="file://$MODULE_DIR$/../../se-common/se-common-seata/target/test-classes" /> - <content url="file://$MODULE_DIR$/../../se-common/se-common-seata"> - <excludeFolder url="file://$MODULE_DIR$/../../se-common/se-common-seata/target" /> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <content url="file://$MODULE_DIR$"> + <excludeFolder url="file://$MODULE_DIR$/target" /> </content> <orderEntry type="jdk" jdkName="jdk-1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> diff --git a/se-common/se-common-security/se-common-security.iml b/se-common/se-common-security/se-common-security.iml index 197c189..daf2e70 100644 --- a/se-common/se-common-security/se-common-security.iml +++ b/se-common/se-common-security/se-common-security.iml @@ -6,12 +6,12 @@ </facet> </component> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> - <output url="file://$MODULE_DIR$/../../se-common/se-common-security/target/classes" /> - <output-test url="file://$MODULE_DIR$/../../se-common/se-common-security/target/test-classes" /> - <content url="file://$MODULE_DIR$/../../se-common/se-common-security"> - <sourceFolder url="file://$MODULE_DIR$/../../se-common/se-common-security/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/../../se-common/se-common-security/src/main/resources" type="java-resource" /> - <excludeFolder url="file://$MODULE_DIR$/../../se-common/se-common-security/target" /> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> + <excludeFolder url="file://$MODULE_DIR$/target" /> </content> <orderEntry type="jdk" jdkName="jdk-1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> diff --git a/se-common/se-common-swagger/se-common-swagger.iml b/se-common/se-common-swagger/se-common-swagger.iml index d2819c8..5b45195 100644 --- a/se-common/se-common-swagger/se-common-swagger.iml +++ b/se-common/se-common-swagger/se-common-swagger.iml @@ -11,12 +11,12 @@ </facet> </component> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> - <output url="file://$MODULE_DIR$/../../se-common/se-common-swagger/target/classes" /> - <output-test url="file://$MODULE_DIR$/../../se-common/se-common-swagger/target/test-classes" /> - <content url="file://$MODULE_DIR$/../../se-common/se-common-swagger"> - <sourceFolder url="file://$MODULE_DIR$/../../se-common/se-common-swagger/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/../../se-common/se-common-swagger/src/main/resources" type="java-resource" /> - <excludeFolder url="file://$MODULE_DIR$/../../se-common/se-common-swagger/target" /> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> + <excludeFolder url="file://$MODULE_DIR$/target" /> </content> <orderEntry type="jdk" jdkName="jdk-1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> diff --git a/se-gateway/se-gateway.iml b/se-gateway/se-gateway.iml index 90cc79c..44721bb 100644 --- a/se-gateway/se-gateway.iml +++ b/se-gateway/se-gateway.iml @@ -6,12 +6,12 @@ </facet> </component> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> - <output url="file://$MODULE_DIR$/../se-gateway/target/classes" /> - <output-test url="file://$MODULE_DIR$/../se-gateway/target/test-classes" /> - <content url="file://$MODULE_DIR$/../se-gateway"> - <sourceFolder url="file://$MODULE_DIR$/../se-gateway/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/../se-gateway/src/main/resources" type="java-resource" /> - <excludeFolder url="file://$MODULE_DIR$/../se-gateway/target" /> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> + <excludeFolder url="file://$MODULE_DIR$/target" /> </content> <orderEntry type="jdk" jdkName="jdk-1.8" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> diff --git a/se-gateway/src/main/java/com/se/gateway/handler/HealthController.java b/se-gateway/src/main/java/com/se/gateway/handler/HealthController.java index 74a663f..f29afb5 100644 --- a/se-gateway/src/main/java/com/se/gateway/handler/HealthController.java +++ b/se-gateway/src/main/java/com/se/gateway/handler/HealthController.java @@ -5,13 +5,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -/** - * 鍋ュ悍鎺у埗鍣� - * - * @author WWW - * @date 2024-08-24 - */ @RestController +@SuppressWarnings("ALL") @RequestMapping("/gateway") public class HealthController extends BaseController { @GetMapping("/health") diff --git a/se-modules/se-file/se-file.iml b/se-modules/se-file/se-file.iml deleted file mode 100644 index eedd944..0000000 --- a/se-modules/se-file/se-file.iml +++ /dev/null @@ -1,201 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> - <component name="FacetManager"> - <facet type="Spring" name="Spring"> - <configuration /> - </facet> - <facet type="web" name="Web"> - <configuration> - <webroots /> - </configuration> - </facet> - </component> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> - <output url="file://$MODULE_DIR$/target/classes" /> - <output-test url="file://$MODULE_DIR$/target/test-classes" /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> - <excludeFolder url="file://$MODULE_DIR$/target" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-commons:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:2.2.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-auth-plugin:2.2.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-encryption-plugin:2.2.0" level="project" /> - <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.5" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.16" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.16" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.14" level="project" /> - <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.15.0" level="project" /> - <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_otel:0.15.0" level="project" /> - <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_common:0.15.0" level="project" /> - <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_otel_agent:0.15.0" level="project" /> - <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.30" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.11" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.7.11" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-sentinel:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-transport-simple-http:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-transport-common:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-datasource-extension:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83_noneautotype" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-annotation-aspectj:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-core:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-circuitbreaker-sentinel:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-reactor-adapter:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-spring-webflux-adapter:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-spring-webmvc-adapter:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-parameter-flow-control:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-cluster-server-default:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-cluster-common-default:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-cluster-client-default:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-sentinel-datasource:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" /> - <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.9.17" level="project" /> - <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.12" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" /> - <orderEntry type="library" name="Maven: com.github.tobato:fastdfs-client:1.27.2" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.36" level="project" /> - <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.12" level="project" /> - <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.12" level="project" /> - <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" /> - <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" /> - <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" /> - <orderEntry type="library" name="Maven: commons-io:commons-io:2.13.0" level="project" /> - <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.11.1" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.5.Final" level="project" /> - <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" /> - <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.3.Final" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: net.coobird:thumbnailator:0.4.8" level="project" /> - <orderEntry type="library" name="Maven: io.minio:minio:8.2.2" level="project" /> - <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> - <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> - <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> - <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" /> - <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> - <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> - <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:4.9.3" level="project" /> - <orderEntry type="library" name="Maven: com.squareup.okio:okio:2.8.0" level="project" /> - <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21" level="project" /> - <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.6.21" level="project" /> - <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.5" level="project" /> - <orderEntry type="module" module-name="se-api-system" /> - <orderEntry type="module" module-name="se-common-core" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:3.1.8" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:3.1.8" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" /> - <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" /> - <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.5" level="project" /> - <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:11.10" level="project" /> - <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:11.10" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-loadbalancer:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-loadbalancer:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.34" level="project" /> - <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.4" level="project" /> - <orderEntry type="library" name="Maven: io.projectreactor.addons:reactor-extra:3.4.10" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: com.stoyanr:evictor:1.0.0" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.14.4" level="project" /> - <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:2.0.0" level="project" /> - <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.3.1" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.3.1" level="project" /> - <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.13" level="project" /> - <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.1.1" level="project" /> - <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:2.0.0" level="project" /> - <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:6.0.0" level="project" /> - <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.5" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.83" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.43" level="project" /> - <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" /> - <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" /> - <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" /> - <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" /> - <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" /> - <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" /> - <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" /> - <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" /> - <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" /> - <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.6.2" level="project" /> - <orderEntry type="module" module-name="se-common-swagger" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.83" level="project" /> - <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.83" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-spi:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-core:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.12.23" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-schema:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.1.2" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.8.83" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webflux:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" /> - <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.6.2" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-bootstrap:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.11.RELEASE" level="project" /> - <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.69" level="project" /> - <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.69" level="project" /> - <orderEntry type="library" name="Maven: org.bouncycastle:bcutil-jdk15on:1.69" level="project" /> - </component> -</module> \ No newline at end of file diff --git a/se-modules/se-gen/se-gen.iml b/se-modules/se-gen/se-gen.iml deleted file mode 100644 index b2d87ff..0000000 --- a/se-modules/se-gen/se-gen.iml +++ /dev/null @@ -1,193 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> - <component name="FacetManager"> - <facet type="Spring" name="Spring"> - <configuration /> - </facet> - <facet type="web" name="Web"> - <configuration> - <webroots /> - </configuration> - </facet> - </component> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> - <output url="file://$MODULE_DIR$/target/classes" /> - <output-test url="file://$MODULE_DIR$/target/test-classes" /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> - <excludeFolder url="file://$MODULE_DIR$/target" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-commons:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:2.2.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-auth-plugin:2.2.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-encryption-plugin:2.2.0" level="project" /> - <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.5" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.16" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.16" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.14" level="project" /> - <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.15.0" level="project" /> - <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_otel:0.15.0" level="project" /> - <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_common:0.15.0" level="project" /> - <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_otel_agent:0.15.0" level="project" /> - <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.30" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.11" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.7.11" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-sentinel:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-transport-simple-http:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-transport-common:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-datasource-extension:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83_noneautotype" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-annotation-aspectj:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-core:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-circuitbreaker-sentinel:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-reactor-adapter:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-spring-webflux-adapter:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-spring-webmvc-adapter:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-parameter-flow-control:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-cluster-server-default:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-cluster-common-default:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-cluster-client-default:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-sentinel-datasource:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.12" level="project" /> - <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.12" level="project" /> - <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" /> - <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.9.17" level="project" /> - <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.12" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-spi:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-schema:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-core:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.12.23" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.8.83" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" /> - <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" /> - <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" /> - <orderEntry type="library" name="Maven: com.mysql:mysql-connector-j:8.0.33" level="project" /> - <orderEntry type="module" module-name="se-common-log" /> - <orderEntry type="module" module-name="se-common-security" /> - <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.33" level="project" /> - <orderEntry type="module" module-name="se-api-system" /> - <orderEntry type="module" module-name="se-common-core" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:3.1.8" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:3.1.8" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" /> - <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" /> - <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.5" level="project" /> - <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:11.10" level="project" /> - <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:11.10" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-loadbalancer:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-loadbalancer:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: io.projectreactor.addons:reactor-extra:3.4.10" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: com.stoyanr:evictor:1.0.0" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.14.4" level="project" /> - <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:2.0.0" level="project" /> - <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.3.1" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.3.1" level="project" /> - <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.13" level="project" /> - <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.1.1" level="project" /> - <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:2.0.0" level="project" /> - <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:6.0.0" level="project" /> - <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.5" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.5.Final" level="project" /> - <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" /> - <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.3.Final" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.43" level="project" /> - <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" /> - <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" /> - <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" /> - <orderEntry type="library" name="Maven: commons-io:commons-io:2.13.0" level="project" /> - <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" /> - <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" /> - <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" /> - <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" /> - <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" /> - <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" /> - <orderEntry type="module" module-name="se-common-redis" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.10.RELEASE" level="project" /> - <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.34" level="project" /> - <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.4" level="project" /> - <orderEntry type="module" module-name="se-common-swagger" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.83" level="project" /> - <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.83" level="project" /> - <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.83" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.1.2" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webflux:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.6.2" level="project" /> - <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.6.2" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-bootstrap:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.11.RELEASE" level="project" /> - <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.69" level="project" /> - <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.69" level="project" /> - <orderEntry type="library" name="Maven: org.bouncycastle:bcutil-jdk15on:1.69" level="project" /> - </component> -</module> \ No newline at end of file diff --git a/se-modules/se-job/se-job.iml b/se-modules/se-job/se-job.iml deleted file mode 100644 index 75f4fcc..0000000 --- a/se-modules/se-job/se-job.iml +++ /dev/null @@ -1,194 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> - <component name="FacetManager"> - <facet type="Spring" name="Spring"> - <configuration /> - </facet> - <facet type="web" name="Web"> - <configuration> - <webroots /> - </configuration> - </facet> - </component> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> - <output url="file://$MODULE_DIR$/target/classes" /> - <output-test url="file://$MODULE_DIR$/target/test-classes" /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> - <excludeFolder url="file://$MODULE_DIR$/target" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-commons:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:2.2.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-auth-plugin:2.2.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-encryption-plugin:2.2.0" level="project" /> - <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.5" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.16" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.16" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.14" level="project" /> - <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.15.0" level="project" /> - <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_otel:0.15.0" level="project" /> - <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_common:0.15.0" level="project" /> - <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_otel_agent:0.15.0" level="project" /> - <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.30" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.11" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.7.11" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-sentinel:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-transport-simple-http:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-transport-common:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-datasource-extension:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83_noneautotype" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-annotation-aspectj:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-core:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-circuitbreaker-sentinel:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-reactor-adapter:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-spring-webflux-adapter:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-spring-webmvc-adapter:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-parameter-flow-control:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-cluster-server-default:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-cluster-common-default:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-cluster-client-default:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-sentinel-datasource:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.12" level="project" /> - <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.12" level="project" /> - <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" /> - <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.9.17" level="project" /> - <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.12" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-spi:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-schema:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-core:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.12.23" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.8.83" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" /> - <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" /> - <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.15" level="project" /> - <orderEntry type="library" name="Maven: com.mysql:mysql-connector-j:8.0.33" level="project" /> - <orderEntry type="module" module-name="se-common-log" /> - <orderEntry type="module" module-name="se-common-security" /> - <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.33" level="project" /> - <orderEntry type="module" module-name="se-api-system" /> - <orderEntry type="module" module-name="se-common-core" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:3.1.8" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:3.1.8" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" /> - <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" /> - <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.5" level="project" /> - <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:11.10" level="project" /> - <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:11.10" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-loadbalancer:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-loadbalancer:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: io.projectreactor.addons:reactor-extra:3.4.10" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: com.stoyanr:evictor:1.0.0" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.14.4" level="project" /> - <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:2.0.0" level="project" /> - <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.3.1" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.3.1" level="project" /> - <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.13" level="project" /> - <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.1.1" level="project" /> - <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:2.0.0" level="project" /> - <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:6.0.0" level="project" /> - <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.5" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.5.Final" level="project" /> - <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" /> - <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.3.Final" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.43" level="project" /> - <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" /> - <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" /> - <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" /> - <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" /> - <orderEntry type="library" name="Maven: commons-io:commons-io:2.13.0" level="project" /> - <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" /> - <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" /> - <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" /> - <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" /> - <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" /> - <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" /> - <orderEntry type="module" module-name="se-common-redis" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.10.RELEASE" level="project" /> - <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.34" level="project" /> - <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.4" level="project" /> - <orderEntry type="module" module-name="se-common-swagger" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.83" level="project" /> - <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.83" level="project" /> - <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.83" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.1.2" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webflux:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.6.2" level="project" /> - <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.6.2" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-bootstrap:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.11.RELEASE" level="project" /> - <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.69" level="project" /> - <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.69" level="project" /> - <orderEntry type="library" name="Maven: org.bouncycastle:bcutil-jdk15on:1.69" level="project" /> - </component> -</module> \ No newline at end of file diff --git a/se-modules/se-system/pom.xml b/se-modules/se-system/pom.xml index 10ee629..d80a606 100644 --- a/se-modules/se-system/pom.xml +++ b/se-modules/se-system/pom.xml @@ -85,6 +85,26 @@ <version>1.18.22</version> <optional>true</optional> </dependency> + + <!-- FastDFS --> + <dependency> + <groupId>com.github.tobato</groupId> + <artifactId>fastdfs-client</artifactId> + </dependency> + + <!-- Minio --> + <dependency> + <groupId>io.minio</groupId> + <artifactId>minio</artifactId> + <version>8.2.2</version> + <!-- <version>${minio.version}</version>--> + </dependency> + + <!-- SE Api System --> + <dependency> + <groupId>com.se</groupId> + <artifactId>se-api-system</artifactId> + </dependency> </dependencies> <build> diff --git a/se-modules/se-system/se-system.iml b/se-modules/se-system/se-system.iml deleted file mode 100644 index 6c1f70e..0000000 --- a/se-modules/se-system/se-system.iml +++ /dev/null @@ -1,205 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> - <component name="FacetManager"> - <facet type="Spring" name="Spring"> - <configuration /> - </facet> - <facet type="web" name="Web"> - <configuration> - <webroots /> - </configuration> - </facet> - </component> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> - <output url="file://$MODULE_DIR$/target/classes" /> - <output-test url="file://$MODULE_DIR$/target/test-classes" /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> - <excludeFolder url="file://$MODULE_DIR$/target" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-commons:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:2.2.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-auth-plugin:2.2.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-encryption-plugin:2.2.0" level="project" /> - <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.5" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.16" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.16" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.14" level="project" /> - <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.15.0" level="project" /> - <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_otel:0.15.0" level="project" /> - <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_common:0.15.0" level="project" /> - <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_otel_agent:0.15.0" level="project" /> - <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.30" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.11" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.7.11" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-sentinel:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-transport-simple-http:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-transport-common:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-datasource-extension:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83_noneautotype" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-annotation-aspectj:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-core:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-circuitbreaker-sentinel:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-reactor-adapter:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-spring-webflux-adapter:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-spring-webmvc-adapter:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-parameter-flow-control:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-cluster-server-default:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-cluster-common-default:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-cluster-client-default:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-sentinel-datasource:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.12" level="project" /> - <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.12" level="project" /> - <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" /> - <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.9.17" level="project" /> - <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.12" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-spi:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-schema:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-core:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.12.23" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.8.83" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" /> - <orderEntry type="library" name="Maven: com.mysql:mysql-connector-j:8.0.33" level="project" /> - <orderEntry type="module" module-name="se-common-datasource" /> - <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.23" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.23" level="project" /> - <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.9" level="project" /> - <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" /> - <orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.9" level="project" /> - <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.12" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" /> - <orderEntry type="library" name="Maven: com.baomidou:dynamic-datasource-spring-boot-starter:4.2.0" level="project" /> - <orderEntry type="library" name="Maven: com.baomidou:dynamic-datasource-spring-boot-common:4.2.0" level="project" /> - <orderEntry type="library" name="Maven: com.baomidou:dynamic-datasource-spring:4.2.0" level="project" /> - <orderEntry type="library" name="Maven: com.baomidou:dynamic-datasource-creator:4.2.0" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.7.18" level="project" /> - <orderEntry type="module" module-name="se-common-datascope" /> - <orderEntry type="module" module-name="se-common-security" /> - <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.33" level="project" /> - <orderEntry type="module" module-name="se-api-system" /> - <orderEntry type="module" module-name="se-common-core" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:3.1.8" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:3.1.8" level="project" /> - <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" /> - <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" /> - <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.5" level="project" /> - <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:11.10" level="project" /> - <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:11.10" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-loadbalancer:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-loadbalancer:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: io.projectreactor.addons:reactor-extra:3.4.10" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: com.stoyanr:evictor:1.0.0" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.14.4" level="project" /> - <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:2.0.0" level="project" /> - <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.3.1" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" /> - <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.3.1" level="project" /> - <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.13" level="project" /> - <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.1.1" level="project" /> - <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:2.0.0" level="project" /> - <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:6.0.0" level="project" /> - <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.5" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.5.Final" level="project" /> - <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" /> - <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.3.Final" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.43" level="project" /> - <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" /> - <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" /> - <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" /> - <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" /> - <orderEntry type="library" name="Maven: commons-io:commons-io:2.13.0" level="project" /> - <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" /> - <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" /> - <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" /> - <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" /> - <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" /> - <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" /> - <orderEntry type="module" module-name="se-common-redis" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.10.RELEASE" level="project" /> - <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.34" level="project" /> - <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.4" level="project" /> - <orderEntry type="module" module-name="se-common-log" /> - <orderEntry type="module" module-name="se-common-swagger" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.83" level="project" /> - <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.83" level="project" /> - <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.83" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.1.2" level="project" /> - <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webflux:3.0.0" level="project" /> - <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.6.2" level="project" /> - <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.6.2" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-bootstrap:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.11.RELEASE" level="project" /> - <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.69" level="project" /> - <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.69" level="project" /> - <orderEntry type="library" name="Maven: org.bouncycastle:bcutil-jdk15on:1.69" level="project" /> - </component> -</module> \ No newline at end of file diff --git a/se-modules/se-system/src/main/java/com/se/system/config/MinioConfig.java b/se-modules/se-system/src/main/java/com/se/system/config/MinioConfig.java new file mode 100644 index 0000000..f71e750 --- /dev/null +++ b/se-modules/se-system/src/main/java/com/se/system/config/MinioConfig.java @@ -0,0 +1,82 @@ +package com.se.system.config; + +import io.minio.MinioClient; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * Minio 閰嶇疆淇℃伅 + * + * @author admin + */ +@Configuration +@ConfigurationProperties(prefix = "minio") +public class MinioConfig +{ + /** + * 鏈嶅姟鍦板潃 + */ + private String url; + + /** + * 鐢ㄦ埛鍚� + */ + private String accessKey; + + /** + * 瀵嗙爜 + */ + private String secretKey; + + /** + * 瀛樺偍妗跺悕绉� + */ + private String bucketName; + + public String getUrl() + { + return url; + } + + public void setUrl(String url) + { + this.url = url; + } + + public String getAccessKey() + { + return accessKey; + } + + public void setAccessKey(String accessKey) + { + this.accessKey = accessKey; + } + + public String getSecretKey() + { + return secretKey; + } + + public void setSecretKey(String secretKey) + { + this.secretKey = secretKey; + } + + public String getBucketName() + { + return bucketName; + } + + public void setBucketName(String bucketName) + { + this.bucketName = bucketName; + } + + @Bean + public MinioClient getMinioClient() + { + return MinioClient.builder().endpoint(url).credentials(accessKey, secretKey).build(); + } +} diff --git a/se-modules/se-system/src/main/java/com/se/system/config/ResourcesConfig.java b/se-modules/se-system/src/main/java/com/se/system/config/ResourcesConfig.java new file mode 100644 index 0000000..1b1bded --- /dev/null +++ b/se-modules/se-system/src/main/java/com/se/system/config/ResourcesConfig.java @@ -0,0 +1,51 @@ +package com.se.system.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +import java.io.File; + +/** + * 閫氱敤鏄犲皠閰嶇疆 + * + * @author admin + */ +@Configuration +public class ResourcesConfig implements WebMvcConfigurer +{ + /** + * 涓婁紶鏂囦欢瀛樺偍鍦ㄦ湰鍦扮殑鏍硅矾寰� + */ + @Value("${file.path}") + private String localFilePath; + + /** + * 璧勬簮鏄犲皠璺緞 鍓嶇紑 + */ + @Value("${file.prefix}") + public String localFilePrefix; + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) + { + /** 鏈湴鏂囦欢涓婁紶璺緞 */ + registry.addResourceHandler(localFilePrefix + "/**") + .addResourceLocations("file:" + localFilePath + File.separator); + } + + /** + * 寮�鍚法鍩� + */ + @Override + public void addCorsMappings(CorsRegistry registry) { + // 璁剧疆鍏佽璺ㄥ煙鐨勮矾鐢� + registry.addMapping(localFilePrefix + "/**") + // 璁剧疆鍏佽璺ㄥ煙璇锋眰鐨勫煙鍚� + .allowedOrigins("*") + // 璁剧疆鍏佽鐨勬柟娉� + .allowedMethods("GET"); + } +} \ No newline at end of file diff --git a/se-modules/se-system/src/main/java/com/se/system/controller/HealthController.java b/se-modules/se-system/src/main/java/com/se/system/controller/HealthController.java index 2a2b41b..d22e460 100644 --- a/se-modules/se-system/src/main/java/com/se/system/controller/HealthController.java +++ b/se-modules/se-system/src/main/java/com/se/system/controller/HealthController.java @@ -4,13 +4,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -/** - * 鍋ュ悍鎺у埗鍣� - * - * @author WWW - * @date 2024-08-24 - */ @RestController +@SuppressWarnings("ALL") public class HealthController extends BaseController { @GetMapping("/health") public long test() { diff --git a/se-modules/se-system/src/main/java/com/se/system/controller/SysConfigController.java b/se-modules/se-system/src/main/java/com/se/system/controller/SysConfigController.java index 8f816b5..77886d7 100644 --- a/se-modules/se-system/src/main/java/com/se/system/controller/SysConfigController.java +++ b/se-modules/se-system/src/main/java/com/se/system/controller/SysConfigController.java @@ -5,6 +5,7 @@ import com.se.system.domain.SysConfig; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -22,7 +23,7 @@ import com.se.common.log.enums.BusinessType; import com.se.common.security.annotation.RequiresPermissions; import com.se.common.security.utils.SecurityUtils; -import com.se.system.service.ISysConfigService; +import com.se.system.service.inte.ISysConfigService; /** * 鍙傛暟閰嶇疆 淇℃伅鎿嶄綔澶勭悊 @@ -31,8 +32,13 @@ */ @RestController @RequestMapping("/config") -public class SysConfigController extends BaseController -{ +@SuppressWarnings("ALL") +public class SysConfigController extends BaseController { + @Value("${enableEncrypt}") + boolean enableEncrypt; + + private final static String PWD_KEY = "sys.user.initPassword"; + @Autowired private ISysConfigService configService; @@ -41,19 +47,33 @@ */ @RequiresPermissions("system:config:list") @GetMapping("/list") - public TableDataInfo list(SysConfig config) - { + public TableDataInfo list(SysConfig config) throws Exception { startPage(); List<SysConfig> list = configService.selectConfigList(config); + /*if (enableEncrypt && null != list) { + for (SysConfig cfg : list) { + if (null != cfg && PWD_KEY.equals(cfg.getConfigKey()) && !StringUtils.isEmpty(cfg.getConfigValue())) { + cfg.setConfigValue(AesUtils.encrypt(cfg.getConfigValue())); + } + } + }*/ + return getDataTable(list); } @Log(title = "鍙傛暟绠$悊", businessType = BusinessType.EXPORT) @RequiresPermissions("system:config:export") @PostMapping("/export") - public void export(HttpServletResponse response, SysConfig config) - { + public void export(HttpServletResponse response, SysConfig config) { List<SysConfig> list = configService.selectConfigList(config); + /*if (enableEncrypt && null != list) { + for (SysConfig cfg : list) { + if (null != cfg && PWD_KEY.equals(cfg.getConfigKey()) && !StringUtils.isEmpty(cfg.getConfigValue())) { + cfg.setConfigValue(AesUtils.encrypt(cfg.getConfigValue())); + } + } + }*/ + ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class); util.exportExcel(response, list, "鍙傛暟鏁版嵁"); } @@ -62,18 +82,26 @@ * 鏍规嵁鍙傛暟缂栧彿鑾峰彇璇︾粏淇℃伅 */ @GetMapping(value = "/{configId}") - public AjaxResult getInfo(@PathVariable Long configId) - { - return success(configService.selectConfigById(configId)); + public AjaxResult getInfo(@PathVariable Long configId) throws Exception { + SysConfig config = configService.selectConfigById(configId); + /*if ((enableEncrypt && null != config && PWD_KEY.equals(config.getConfigKey()) && !StringUtils.isEmpty(config.getConfigValue())) { + config.setConfigValue(AesUtils.encrypt(config.getConfigValue())); + }*/ + + return success(config); } /** * 鏍规嵁鍙傛暟閿悕鏌ヨ鍙傛暟鍊� */ @GetMapping(value = "/configKey/{configKey}") - public AjaxResult getConfigKey(@PathVariable String configKey) - { - return success(configService.selectConfigByKey(configKey)); + public AjaxResult getConfigKey(@PathVariable String configKey) throws Exception { + String val = configService.selectConfigByKey(configKey); + /*if (enableEncrypt && PWD_KEY.equals(configKey) && !StringUtils.isEmpty(val)) { + val = AesUtils.encrypt(val); + }*/ + + return success(val); } /** @@ -82,10 +110,8 @@ @RequiresPermissions("system:config:add") @Log(title = "鍙傛暟绠$悊", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysConfig config) - { - if (!configService.checkConfigKeyUnique(config)) - { + public AjaxResult add(@Validated @RequestBody SysConfig config) { + if (!configService.checkConfigKeyUnique(config)) { return error("鏂板鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪"); } config.setCreateBy(SecurityUtils.getUsername()); @@ -98,13 +124,15 @@ @RequiresPermissions("system:config:edit") @Log(title = "鍙傛暟绠$悊", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysConfig config) - { - if (!configService.checkConfigKeyUnique(config)) - { + public AjaxResult edit(@Validated @RequestBody SysConfig config) throws Exception { + if (!configService.checkConfigKeyUnique(config)) { return error("淇敼鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪"); } config.setUpdateBy(SecurityUtils.getUsername()); + /*if ((enableEncrypt && PWD_KEY.equals(config.getConfigKey()) && !StringUtils.isEmpty(config.getConfigValue())){ + config.setConfigValue(AesUtils.decrypt(config.getConfigValue())); + }*/ + return toAjax(configService.updateConfig(config)); } @@ -114,8 +142,7 @@ @RequiresPermissions("system:config:remove") @Log(title = "鍙傛暟绠$悊", businessType = BusinessType.DELETE) @DeleteMapping("/{configIds}") - public AjaxResult remove(@PathVariable Long[] configIds) - { + public AjaxResult remove(@PathVariable Long[] configIds) { configService.deleteConfigByIds(configIds); return success(); } @@ -126,8 +153,7 @@ @RequiresPermissions("system:config:remove") @Log(title = "鍙傛暟绠$悊", businessType = BusinessType.CLEAN) @DeleteMapping("/refreshCache") - public AjaxResult refreshCache() - { + public AjaxResult refreshCache() { configService.resetConfigCache(); return success(); } diff --git a/se-modules/se-system/src/main/java/com/se/system/controller/SysDeptController.java b/se-modules/se-system/src/main/java/com/se/system/controller/SysDeptController.java index c722d52..4a8db0f 100644 --- a/se-modules/se-system/src/main/java/com/se/system/controller/SysDeptController.java +++ b/se-modules/se-system/src/main/java/com/se/system/controller/SysDeptController.java @@ -21,7 +21,7 @@ import com.se.common.security.annotation.RequiresPermissions; import com.se.common.security.utils.SecurityUtils; import com.se.system.api.domain.SysDept; -import com.se.system.service.ISysDeptService; +import com.se.system.service.inte.ISysDeptService; /** * 閮ㄩ棬淇℃伅 diff --git a/se-modules/se-system/src/main/java/com/se/system/controller/SysDictDataController.java b/se-modules/se-system/src/main/java/com/se/system/controller/SysDictDataController.java index 51be763..73eb99d 100644 --- a/se-modules/se-system/src/main/java/com/se/system/controller/SysDictDataController.java +++ b/se-modules/se-system/src/main/java/com/se/system/controller/SysDictDataController.java @@ -23,8 +23,8 @@ import com.se.common.security.annotation.RequiresPermissions; import com.se.common.security.utils.SecurityUtils; import com.se.system.api.domain.SysDictData; -import com.se.system.service.ISysDictDataService; -import com.se.system.service.ISysDictTypeService; +import com.se.system.service.inte.ISysDictDataService; +import com.se.system.service.inte.ISysDictTypeService; /** * 鏁版嵁瀛楀吀淇℃伅 diff --git a/se-modules/se-system/src/main/java/com/se/system/controller/SysDictTypeController.java b/se-modules/se-system/src/main/java/com/se/system/controller/SysDictTypeController.java index 8762592..3e36b04 100644 --- a/se-modules/se-system/src/main/java/com/se/system/controller/SysDictTypeController.java +++ b/se-modules/se-system/src/main/java/com/se/system/controller/SysDictTypeController.java @@ -21,7 +21,7 @@ import com.se.common.security.annotation.RequiresPermissions; import com.se.common.security.utils.SecurityUtils; import com.se.system.api.domain.SysDictType; -import com.se.system.service.ISysDictTypeService; +import com.se.system.service.inte.ISysDictTypeService; /** * 鏁版嵁瀛楀吀淇℃伅 diff --git a/se-modules/se-system/src/main/java/com/se/system/controller/SysFileController.java b/se-modules/se-system/src/main/java/com/se/system/controller/SysFileController.java new file mode 100644 index 0000000..29f3e0b --- /dev/null +++ b/se-modules/se-system/src/main/java/com/se/system/controller/SysFileController.java @@ -0,0 +1,49 @@ +package com.se.system.controller; + +import com.se.common.core.domain.R; +import com.se.common.core.utils.file.FileUtils; +import com.se.system.api.domain.SysFile; +import com.se.system.service.inte.ISysFileService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; + +/** + * 鏂囦欢璇锋眰澶勭悊 + * + * @author admin + */ +@RestController +public class SysFileController +{ + private static final Logger log = LoggerFactory.getLogger(SysFileController.class); + + @Resource + private ISysFileService sysFileService; + + /** + * 鏂囦欢涓婁紶璇锋眰 + */ + @PostMapping("upload") + public R<SysFile> upload(MultipartFile file) + { + try + { + // 涓婁紶骞惰繑鍥炶闂湴鍧� + String url = sysFileService.uploadFile(file); + SysFile sysFile = new SysFile(); + sysFile.setName(FileUtils.getName(url)); + sysFile.setUrl(url); + return R.ok(sysFile); + } + catch (Exception e) + { + log.error("涓婁紶鏂囦欢澶辫触", e); + return R.fail(e.getMessage()); + } + } +} \ No newline at end of file diff --git a/se-modules/se-system/src/main/java/com/se/system/controller/SysLogininforController.java b/se-modules/se-system/src/main/java/com/se/system/controller/SysLogininforController.java index 4f5092b..3b01b7b 100644 --- a/se-modules/se-system/src/main/java/com/se/system/controller/SysLogininforController.java +++ b/se-modules/se-system/src/main/java/com/se/system/controller/SysLogininforController.java @@ -21,7 +21,7 @@ import com.se.common.security.annotation.InnerAuth; import com.se.common.security.annotation.RequiresPermissions; import com.se.system.api.domain.SysLogininfor; -import com.se.system.service.ISysLogininforService; +import com.se.system.service.inte.ISysLogininforService; /** * 绯荤粺璁块棶璁板綍 diff --git a/se-modules/se-system/src/main/java/com/se/system/controller/SysMenuController.java b/se-modules/se-system/src/main/java/com/se/system/controller/SysMenuController.java index 6dfeba5..054c837 100644 --- a/se-modules/se-system/src/main/java/com/se/system/controller/SysMenuController.java +++ b/se-modules/se-system/src/main/java/com/se/system/controller/SysMenuController.java @@ -21,7 +21,7 @@ import com.se.common.log.enums.BusinessType; import com.se.common.security.annotation.RequiresPermissions; import com.se.common.security.utils.SecurityUtils; -import com.se.system.service.ISysMenuService; +import com.se.system.service.inte.ISysMenuService; /** * 鑿滃崟淇℃伅 diff --git a/se-modules/se-system/src/main/java/com/se/system/controller/SysNoticeController.java b/se-modules/se-system/src/main/java/com/se/system/controller/SysNoticeController.java index 7b1f4a8..873fd4d 100644 --- a/se-modules/se-system/src/main/java/com/se/system/controller/SysNoticeController.java +++ b/se-modules/se-system/src/main/java/com/se/system/controller/SysNoticeController.java @@ -20,7 +20,7 @@ import com.se.common.log.enums.BusinessType; import com.se.common.security.annotation.RequiresPermissions; import com.se.common.security.utils.SecurityUtils; -import com.se.system.service.ISysNoticeService; +import com.se.system.service.inte.ISysNoticeService; /** * 鍏憡 淇℃伅鎿嶄綔澶勭悊 diff --git a/se-modules/se-system/src/main/java/com/se/system/controller/SysOperlogController.java b/se-modules/se-system/src/main/java/com/se/system/controller/SysOperlogController.java index e07f9be..fce4952 100644 --- a/se-modules/se-system/src/main/java/com/se/system/controller/SysOperlogController.java +++ b/se-modules/se-system/src/main/java/com/se/system/controller/SysOperlogController.java @@ -19,7 +19,7 @@ import com.se.common.security.annotation.InnerAuth; import com.se.common.security.annotation.RequiresPermissions; import com.se.system.api.domain.SysOperLog; -import com.se.system.service.ISysOperLogService; +import com.se.system.service.inte.ISysOperLogService; /** * 鎿嶄綔鏃ュ織璁板綍 diff --git a/se-modules/se-system/src/main/java/com/se/system/controller/SysPostController.java b/se-modules/se-system/src/main/java/com/se/system/controller/SysPostController.java index b45bb70..2a46cae 100644 --- a/se-modules/se-system/src/main/java/com/se/system/controller/SysPostController.java +++ b/se-modules/se-system/src/main/java/com/se/system/controller/SysPostController.java @@ -22,7 +22,7 @@ import com.se.common.log.enums.BusinessType; import com.se.common.security.annotation.RequiresPermissions; import com.se.common.security.utils.SecurityUtils; -import com.se.system.service.ISysPostService; +import com.se.system.service.inte.ISysPostService; /** * 宀椾綅淇℃伅鎿嶄綔澶勭悊 diff --git a/se-modules/se-system/src/main/java/com/se/system/controller/SysProfileController.java b/se-modules/se-system/src/main/java/com/se/system/controller/SysProfileController.java index 6201f36..8b07d1e 100644 --- a/se-modules/se-system/src/main/java/com/se/system/controller/SysProfileController.java +++ b/se-modules/se-system/src/main/java/com/se/system/controller/SysProfileController.java @@ -27,7 +27,7 @@ import com.se.system.api.domain.SysFile; import com.se.system.api.domain.SysUser; import com.se.system.api.model.LoginUser; -import com.se.system.service.ISysUserService; +import com.se.system.service.inte.ISysUserService; /** * 涓汉淇℃伅 涓氬姟澶勭悊 @@ -98,11 +98,13 @@ @Log(title = "涓汉淇℃伅", businessType = BusinessType.UPDATE) @PutMapping("/updatePwd") public AjaxResult updatePwd(String oldPassword, String newPassword) throws Exception { + if (enableEncrypt) { + oldPassword = AesUtils.decrypt(oldPassword); + newPassword = AesUtils.decrypt(newPassword); + } + String username = SecurityUtils.getUsername(); SysUser user = userService.selectUserByUserName(username); - if (enableEncrypt && !StringUtils.isEmpty(user.getPassword())) { - user.setPassword(AesUtils.decrypt(user.getPassword())); - } String password = user.getPassword(); if (!SecurityUtils.matchesPassword(oldPassword, password)) { return error("淇敼瀵嗙爜澶辫触锛屾棫瀵嗙爜閿欒"); diff --git a/se-modules/se-system/src/main/java/com/se/system/controller/SysRoleController.java b/se-modules/se-system/src/main/java/com/se/system/controller/SysRoleController.java index 5495969..fcc5bb5 100644 --- a/se-modules/se-system/src/main/java/com/se/system/controller/SysRoleController.java +++ b/se-modules/se-system/src/main/java/com/se/system/controller/SysRoleController.java @@ -25,9 +25,9 @@ import com.se.system.api.domain.SysDept; import com.se.system.api.domain.SysRole; import com.se.system.api.domain.SysUser; -import com.se.system.service.ISysDeptService; -import com.se.system.service.ISysRoleService; -import com.se.system.service.ISysUserService; +import com.se.system.service.inte.ISysDeptService; +import com.se.system.service.inte.ISysRoleService; +import com.se.system.service.inte.ISysUserService; /** * 瑙掕壊淇℃伅 diff --git a/se-modules/se-system/src/main/java/com/se/system/controller/SysUserController.java b/se-modules/se-system/src/main/java/com/se/system/controller/SysUserController.java index 34177f6..8073a79 100644 --- a/se-modules/se-system/src/main/java/com/se/system/controller/SysUserController.java +++ b/se-modules/se-system/src/main/java/com/se/system/controller/SysUserController.java @@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletResponse; import com.se.common.core.utils.AesUtils; +import com.se.system.service.inte.*; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -36,7 +37,6 @@ import com.se.system.api.domain.SysRole; import com.se.system.api.domain.SysUser; import com.se.system.api.model.LoginUser; -import com.se.system.service.*; /** * 鐢ㄦ埛淇℃伅 diff --git a/se-modules/se-system/src/main/java/com/se/system/controller/SysUserOnlineController.java b/se-modules/se-system/src/main/java/com/se/system/controller/SysUserOnlineController.java index f5804b5..5176b62 100644 --- a/se-modules/se-system/src/main/java/com/se/system/controller/SysUserOnlineController.java +++ b/se-modules/se-system/src/main/java/com/se/system/controller/SysUserOnlineController.java @@ -22,7 +22,7 @@ import com.se.common.redis.service.RedisService; import com.se.common.security.annotation.RequiresPermissions; import com.se.system.api.model.LoginUser; -import com.se.system.service.ISysUserOnlineService; +import com.se.system.service.inte.ISysUserOnlineService; /** * 鍦ㄧ嚎鐢ㄦ埛鐩戞帶 diff --git a/se-modules/se-system/src/main/java/com/se/system/controller/TokenController.java b/se-modules/se-system/src/main/java/com/se/system/controller/TokenController.java new file mode 100644 index 0000000..916ae1d --- /dev/null +++ b/se-modules/se-system/src/main/java/com/se/system/controller/TokenController.java @@ -0,0 +1,95 @@ +package com.se.system.controller; + +import com.se.common.core.domain.R; +import com.se.common.core.utils.AesUtils; +import com.se.common.core.utils.JwtUtils; +import com.se.common.core.utils.StringUtils; +import com.se.common.security.auth.AuthUtil; +import com.se.common.security.service.TokenService; +import com.se.common.security.utils.SecurityUtils; +import com.se.system.api.model.LoginUser; +import com.se.system.domain.LoginBody; +import com.se.system.service.SysLoginService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +/** + * token 鎺у埗 + * + * @author admin + */ +@RestController +public class TokenController { + @Resource + private TokenService tokenService; + + @Autowired + private SysLoginService sysLoginService; + + @Value("${enableEncrypt}") + boolean enableEncrypt; + + @PostMapping("login") + public R<?> login(@RequestBody LoginBody form) throws Exception { + if (enableEncrypt && !StringUtils.isEmpty(form.getPassword())) { + form.setPassword(AesUtils.decrypt(form.getPassword())); + } + // 鐢ㄦ埛鐧诲綍 + LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword()); + // 鑾峰彇鐧诲綍token + return R.ok(tokenService.createToken(userInfo)); + } + + @GetMapping("validate") + @PostMapping("validate") + public R<Object> validate(HttpServletRequest request) { + try { + boolean flag = false; + String token = SecurityUtils.getToken(request); + if (!StringUtils.isNotEmpty(token)) { + String userName = JwtUtils.getUserName(token); + flag = !StringUtils.isEmpty(userName); + } + + return R.ok(flag); + } catch (Exception ex) { + return R.fail(ex.getMessage()); + } + } + + @DeleteMapping("logout") + public R<?> logout(HttpServletRequest request) { + String token = SecurityUtils.getToken(request); + if (StringUtils.isNotEmpty(token)) { + String username = JwtUtils.getUserName(token); + // 鍒犻櫎鐢ㄦ埛缂撳瓨璁板綍 + AuthUtil.logoutByToken(token); + // 璁板綍鐢ㄦ埛閫�鍑烘棩蹇� + sysLoginService.logout(username); + } + return R.ok(); + } + + @PostMapping("refresh") + public R<?> refresh(HttpServletRequest request) { + LoginUser loginUser = tokenService.getLoginUser(request); + if (StringUtils.isNotNull(loginUser)) { + // 鍒锋柊浠ょ墝鏈夋晥鏈� + tokenService.refreshToken(loginUser); + return R.ok(); + } + return R.ok(); + } + + /*@PostMapping("register") + public R<?> register(@RequestBody RegisterBody registerBody) + { + // 鐢ㄦ埛娉ㄥ唽 + sysLoginService.register(registerBody.getUsername(), registerBody.getPassword()); + return R.ok(); + }*/ +} diff --git a/se-modules/se-system/src/main/java/com/se/system/domain/LoginBody.java b/se-modules/se-system/src/main/java/com/se/system/domain/LoginBody.java new file mode 100644 index 0000000..4f471e6 --- /dev/null +++ b/se-modules/se-system/src/main/java/com/se/system/domain/LoginBody.java @@ -0,0 +1,39 @@ +package com.se.system.domain; + +/** + * 鐢ㄦ埛鐧诲綍瀵硅薄 + * + * @author admin + */ +public class LoginBody +{ + /** + * 鐢ㄦ埛鍚� + */ + private String username; + + /** + * 鐢ㄦ埛瀵嗙爜 + */ + private String password; + + public String getUsername() + { + return username; + } + + public void setUsername(String username) + { + this.username = username; + } + + public String getPassword() + { + return password; + } + + public void setPassword(String password) + { + this.password = password; + } +} diff --git a/se-modules/se-system/src/main/java/com/se/system/domain/RegisterBody.java b/se-modules/se-system/src/main/java/com/se/system/domain/RegisterBody.java new file mode 100644 index 0000000..aca0d09 --- /dev/null +++ b/se-modules/se-system/src/main/java/com/se/system/domain/RegisterBody.java @@ -0,0 +1,11 @@ +package com.se.system.domain; + +/** + * 鐢ㄦ埛娉ㄥ唽瀵硅薄 + * + * @author admin + */ +public class RegisterBody extends LoginBody +{ + +} diff --git a/se-modules/se-system/src/main/java/com/se/system/mapper/SysMenuMapper.java b/se-modules/se-system/src/main/java/com/se/system/mapper/SysMenuMapper.java index b58335d..a489758 100644 --- a/se-modules/se-system/src/main/java/com/se/system/mapper/SysMenuMapper.java +++ b/se-modules/se-system/src/main/java/com/se/system/mapper/SysMenuMapper.java @@ -29,7 +29,7 @@ /** * 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃 * - * @param menu 鑿滃崟淇℃伅 + * @param menu 鑿滃崟淇℃伅 * @return 鑿滃崟鍒楄〃 */ public List<SysMenu> selectMenuListByUserId(SysMenu menu); @@ -61,7 +61,7 @@ * 鏍规嵁鐢ㄦ埛ID鏌ヨ鑿滃崟 * * @param userId 鐢ㄦ埛ID - * @param mark 鏍囪瘑 + * @param mark 鑿滃崟鏍囪瘑 * @return 鑿滃崟鍒楄〃 */ public List<SysMenu> selectMenuTreeByUserId(@Param("userId") Long userId, @Param("mark") String mark); @@ -128,7 +128,7 @@ * 鏍规嵁鐢ㄦ埛ID鍜屾爣璇嗘煡璇㈣彍鍗� * * @param userId 鐢ㄦ埛ID - * @param mark 鏍囪瘑 + * @param mark 鑿滃崟鏍囪瘑 * @return 鑿滃崟闆嗗悎 */ List<SysMenu> selectMenusByUserIdAndMark(@Param("userId") Long userId, @Param("mark") String mark); diff --git a/se-modules/se-system/src/main/java/com/se/system/service/SysLoginService.java b/se-modules/se-system/src/main/java/com/se/system/service/SysLoginService.java new file mode 100644 index 0000000..231122c --- /dev/null +++ b/se-modules/se-system/src/main/java/com/se/system/service/SysLoginService.java @@ -0,0 +1,163 @@ +package com.se.system.service; + +import com.se.common.core.constant.CacheConstants; +import com.se.common.core.constant.Constants; +import com.se.common.core.constant.SecurityConstants; +import com.se.common.core.constant.UserConstants; +import com.se.common.core.domain.R; +import com.se.common.core.enums.UserStatus; +import com.se.common.core.exception.ServiceException; +import com.se.common.core.text.Convert; +import com.se.common.core.utils.DateUtils; +import com.se.common.core.utils.StringUtils; +import com.se.common.core.utils.ip.IpUtils; +import com.se.common.redis.service.RedisService; +import com.se.common.security.utils.SecurityUtils; +import com.se.system.api.RemoteUserService; +import com.se.system.api.domain.SysUser; +import com.se.system.api.model.LoginUser; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * 鐧诲綍鏍¢獙鏂规硶 + * + * @author admin + */ +@Component +public class SysLoginService +{ + @Autowired + private RemoteUserService remoteUserService; + + @Autowired + private SysPasswordService passwordService; + + @Autowired + private SysRecordLogService recordLogService; + + @Resource + private RedisService redisService; + + /** + * 鐧诲綍 + */ + public LoginUser login(String username, String password) + { + // 鐢ㄦ埛鍚嶆垨瀵嗙爜涓虹┖ 閿欒 + if (StringUtils.isAnyBlank(username, password)) + { + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "鐢ㄦ埛/瀵嗙爜蹇呴』濉啓"); + throw new ServiceException("鐢ㄦ埛/瀵嗙爜蹇呴』濉啓"); + } + // 瀵嗙爜濡傛灉涓嶅湪鎸囧畾鑼冨洿鍐� 閿欒 + if (password.length() < UserConstants.PASSWORD_MIN_LENGTH + || password.length() > UserConstants.PASSWORD_MAX_LENGTH) + { + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "鐢ㄦ埛瀵嗙爜涓嶅湪鎸囧畾鑼冨洿"); + throw new ServiceException("鐢ㄦ埛瀵嗙爜涓嶅湪鎸囧畾鑼冨洿"); + } + // 鐢ㄦ埛鍚嶄笉鍦ㄦ寚瀹氳寖鍥村唴 閿欒 + if (username.length() < UserConstants.USERNAME_MIN_LENGTH + || username.length() > UserConstants.USERNAME_MAX_LENGTH) + { + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "鐢ㄦ埛鍚嶄笉鍦ㄦ寚瀹氳寖鍥�"); + throw new ServiceException("鐢ㄦ埛鍚嶄笉鍦ㄦ寚瀹氳寖鍥�"); + } + // IP榛戝悕鍗曟牎楠� + String blackStr = Convert.toStr(redisService.getCacheObject(CacheConstants.SYS_LOGIN_BLACKIPLIST)); + if (IpUtils.isMatchedIp(blackStr, IpUtils.getIpAddr())) + { + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "寰堥仐鎲撅紝璁块棶IP宸茶鍒楀叆绯荤粺榛戝悕鍗�"); + throw new ServiceException("寰堥仐鎲撅紝璁块棶IP宸茶鍒楀叆绯荤粺榛戝悕鍗�"); + } + // 鏌ヨ鐢ㄦ埛淇℃伅 + R<LoginUser> userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER); + + if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) + { + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "鐧诲綍鐢ㄦ埛涓嶅瓨鍦�"); + throw new ServiceException("鐧诲綍鐢ㄦ埛锛�" + username + " 涓嶅瓨鍦�"); + } + + if (R.FAIL == userResult.getCode()) + { + throw new ServiceException(userResult.getMsg()); + } + + LoginUser userInfo = userResult.getData(); + SysUser user = userResult.getData().getSysUser(); + if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) + { + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿宸茶鍒犻櫎"); + throw new ServiceException("瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿锛�" + username + " 宸茶鍒犻櫎"); + } + if (UserStatus.DISABLE.getCode().equals(user.getStatus())) + { + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "鐢ㄦ埛宸插仠鐢紝璇疯仈绯荤鐞嗗憳"); + throw new ServiceException("瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿锛�" + username + " 宸插仠鐢�"); + } + passwordService.validate(user, password); + recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "鐧诲綍鎴愬姛"); + recordLoginInfo(user.getUserId()); + return userInfo; + } + + /** + * 璁板綍鐧诲綍淇℃伅 + * + * @param userId 鐢ㄦ埛ID + */ + public void recordLoginInfo(Long userId) + { + SysUser sysUser = new SysUser(); + sysUser.setUserId(userId); + // 鏇存柊鐢ㄦ埛鐧诲綍IP + sysUser.setLoginIp(IpUtils.getIpAddr()); + // 鏇存柊鐢ㄦ埛鐧诲綍鏃堕棿 + sysUser.setLoginDate(DateUtils.getNowDate()); + remoteUserService.recordUserLogin(sysUser, SecurityConstants.INNER); + } + + public void logout(String loginName) + { + recordLogService.recordLogininfor(loginName, Constants.LOGOUT, "閫�鍑烘垚鍔�"); + } + + /** + * 娉ㄥ唽 + */ + public void register(String username, String password) + { + // 鐢ㄦ埛鍚嶆垨瀵嗙爜涓虹┖ 閿欒 + if (StringUtils.isAnyBlank(username, password)) + { + throw new ServiceException("鐢ㄦ埛/瀵嗙爜蹇呴』濉啓"); + } + if (username.length() < UserConstants.USERNAME_MIN_LENGTH + || username.length() > UserConstants.USERNAME_MAX_LENGTH) + { + throw new ServiceException("璐︽埛闀垮害蹇呴』鍦�2鍒�20涓瓧绗︿箣闂�"); + } + if (password.length() < UserConstants.PASSWORD_MIN_LENGTH + || password.length() > UserConstants.PASSWORD_MAX_LENGTH) + { + throw new ServiceException("瀵嗙爜闀垮害蹇呴』鍦�5鍒�20涓瓧绗︿箣闂�"); + } + + // 娉ㄥ唽鐢ㄦ埛淇℃伅 + SysUser sysUser = new SysUser(); + sysUser.setUserName(username); + sysUser.setNickName(username); + sysUser.setPassword(SecurityUtils.encryptPassword(password)); + R<?> registerResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER); + + if (R.FAIL == registerResult.getCode()) + { + throw new ServiceException(registerResult.getMsg()); + } + recordLogService.recordLogininfor(username, Constants.REGISTER, "娉ㄥ唽鎴愬姛"); + } +} diff --git a/se-modules/se-system/src/main/java/com/se/system/service/SysPasswordService.java b/se-modules/se-system/src/main/java/com/se/system/service/SysPasswordService.java new file mode 100644 index 0000000..a50f458 --- /dev/null +++ b/se-modules/se-system/src/main/java/com/se/system/service/SysPasswordService.java @@ -0,0 +1,87 @@ +package com.se.system.service; + +import com.se.common.core.constant.CacheConstants; +import com.se.common.core.constant.Constants; +import com.se.common.core.exception.ServiceException; +import com.se.common.redis.service.RedisService; +import com.se.common.security.utils.SecurityUtils; +import com.se.system.api.domain.SysUser; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.concurrent.TimeUnit; + +/** + * 鐧诲綍瀵嗙爜鏂规硶 + * + * @author admin + */ +@Component +@SuppressWarnings("ALL") +public class SysPasswordService +{ + @Autowired + private RedisService redisService; + + private int maxRetryCount = CacheConstants.PASSWORD_MAX_RETRY_COUNT; + + private Long lockTime = CacheConstants.PASSWORD_LOCK_TIME; + + @Autowired + private SysRecordLogService recordLogService; + + /** + * 鐧诲綍璐︽埛瀵嗙爜閿欒娆℃暟缂撳瓨閿悕 + * + * @param username 鐢ㄦ埛鍚� + * @return 缂撳瓨閿甼ey + */ + private String getCacheKey(String username) + { + return CacheConstants.PWD_ERR_CNT_KEY + username; + } + + public void validate(SysUser user, String password) + { + String username = user.getUserName(); + + Integer retryCount = redisService.getCacheObject(getCacheKey(username)); + + if (retryCount == null) + { + retryCount = 0; + } + + /*if (retryCount >= Integer.valueOf(maxRetryCount).intValue()) + { + String errMsg = String.format("瀵嗙爜杈撳叆閿欒%s娆★紝甯愭埛閿佸畾%s鍒嗛挓", maxRetryCount, lockTime); + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL,errMsg); + throw new ServiceException(errMsg); + }*/ + + if (!matches(user, password)) + { + retryCount = retryCount + 1; + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, String.format("瀵嗙爜杈撳叆閿欒%s娆�", retryCount)); + redisService.setCacheObject(getCacheKey(username), retryCount, lockTime, TimeUnit.MINUTES); + throw new ServiceException("鐢ㄦ埛涓嶅瓨鍦�/瀵嗙爜閿欒"); + } + else + { + clearLoginRecordCache(username); + } + } + + public boolean matches(SysUser user, String rawPassword) + { + return SecurityUtils.matchesPassword(rawPassword, user.getPassword()); + } + + public void clearLoginRecordCache(String loginName) + { + if (redisService.hasKey(getCacheKey(loginName))) + { + redisService.deleteObject(getCacheKey(loginName)); + } + } +} diff --git a/se-modules/se-system/src/main/java/com/se/system/service/SysRecordLogService.java b/se-modules/se-system/src/main/java/com/se/system/service/SysRecordLogService.java new file mode 100644 index 0000000..2913f2e --- /dev/null +++ b/se-modules/se-system/src/main/java/com/se/system/service/SysRecordLogService.java @@ -0,0 +1,48 @@ +package com.se.system.service; + +import com.se.common.core.constant.Constants; +import com.se.common.core.constant.SecurityConstants; +import com.se.common.core.utils.StringUtils; +import com.se.common.core.utils.ip.IpUtils; +import com.se.system.api.RemoteLogService; +import com.se.system.api.domain.SysLogininfor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 璁板綍鏃ュ織鏂规硶 + * + * @author admin + */ +@Component +public class SysRecordLogService +{ + @Autowired + private RemoteLogService remoteLogService; + + /** + * 璁板綍鐧诲綍淇℃伅 + * + * @param username 鐢ㄦ埛鍚� + * @param status 鐘舵�� + * @param message 娑堟伅鍐呭 + * @return + */ + public void recordLogininfor(String username, String status, String message) + { + SysLogininfor logininfor = new SysLogininfor(); + logininfor.setUserName(username); + logininfor.setIpaddr(IpUtils.getIpAddr()); + logininfor.setMsg(message); + // 鏃ュ織鐘舵�� + if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER)) + { + logininfor.setStatus(Constants.LOGIN_SUCCESS_STATUS); + } + else if (Constants.LOGIN_FAIL.equals(status)) + { + logininfor.setStatus(Constants.LOGIN_FAIL_STATUS); + } + remoteLogService.saveLogininfor(logininfor, SecurityConstants.INNER); + } +} diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/FastDfsSysFileServiceImpl.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/FastDfsSysFileServiceImpl.java new file mode 100644 index 0000000..3984b66 --- /dev/null +++ b/se-modules/se-system/src/main/java/com/se/system/service/impl/FastDfsSysFileServiceImpl.java @@ -0,0 +1,48 @@ +package com.se.system.service.impl; + +import com.alibaba.nacos.common.utils.IoUtils; +import com.github.tobato.fastdfs.domain.fdfs.StorePath; +import com.github.tobato.fastdfs.service.FastFileStorageClient; +import com.se.common.core.utils.file.FileTypeUtils; +import com.se.system.service.inte.ISysFileService; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import java.io.InputStream; + +/** + * FastDFS 鏂囦欢瀛樺偍 + * + * @author admin + */ +@Service +public class FastDfsSysFileServiceImpl implements ISysFileService +{ + /** + * 鍩熷悕鎴栨湰鏈鸿闂湴鍧� + */ + @Value("${fdfs.domain}") + public String domain; + + @Resource + private FastFileStorageClient storageClient; + + /** + * FastDfs鏂囦欢涓婁紶鎺ュ彛 + * + * @param file 涓婁紶鐨勬枃浠� + * @return 璁块棶鍦板潃 + * @throws Exception + */ + @Override + public String uploadFile(MultipartFile file) throws Exception + { + InputStream inputStream = file.getInputStream(); + StorePath storePath = storageClient.uploadFile(inputStream, file.getSize(), + FileTypeUtils.getExtension(file), null); + IoUtils.closeQuietly(inputStream); + return domain + "/" + storePath.getFullPath(); + } +} diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/IsimUserService.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/IsimUserService.java index b38cd56..d908f46 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/impl/IsimUserService.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/impl/IsimUserService.java @@ -6,12 +6,6 @@ import java.util.List; -/** - * ISIM鐢ㄦ埛鏈嶅姟 - * - * @author WWW - * @date 2024-08-30 - */ @Slf4j @Service @SuppressWarnings("ALL") diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/LocalSysFileServiceImpl.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/LocalSysFileServiceImpl.java new file mode 100644 index 0000000..fb72e1c --- /dev/null +++ b/se-modules/se-system/src/main/java/com/se/system/service/impl/LocalSysFileServiceImpl.java @@ -0,0 +1,51 @@ +package com.se.system.service.impl; + +import com.se.system.service.inte.ISysFileService; +import com.se.system.utils.FileUploadUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +/** + * 鏈湴鏂囦欢瀛樺偍 + * + * @author admin + */ +@Primary +@Service +public class LocalSysFileServiceImpl implements ISysFileService +{ + /** + * 璧勬簮鏄犲皠璺緞 鍓嶇紑 + */ + @Value("${file.prefix}") + public String localFilePrefix; + + /** + * 鍩熷悕鎴栨湰鏈鸿闂湴鍧� + */ + @Value("${file.domain}") + public String domain; + + /** + * 涓婁紶鏂囦欢瀛樺偍鍦ㄦ湰鍦扮殑鏍硅矾寰� + */ + @Value("${file.path}") + private String localFilePath; + + /** + * 鏈湴鏂囦欢涓婁紶鎺ュ彛 + * + * @param file 涓婁紶鐨勬枃浠� + * @return 璁块棶鍦板潃 + * @throws Exception + */ + @Override + public String uploadFile(MultipartFile file) throws Exception + { + String name = FileUploadUtils.upload(localFilePath, file); + String url = domain + localFilePrefix + name; + return url; + } +} diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/MinioSysFileServiceImpl.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/MinioSysFileServiceImpl.java new file mode 100644 index 0000000..337ffa1 --- /dev/null +++ b/se-modules/se-system/src/main/java/com/se/system/service/impl/MinioSysFileServiceImpl.java @@ -0,0 +1,51 @@ +package com.se.system.service.impl; + +import com.alibaba.nacos.common.utils.IoUtils; +import com.se.system.config.MinioConfig; +import com.se.system.service.inte.ISysFileService; +import com.se.system.utils.FileUploadUtils; +import io.minio.MinioClient; +import io.minio.PutObjectArgs; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import java.io.InputStream; + +/** + * Minio 鏂囦欢瀛樺偍 + * + * @author admin + */ +@Service +public class MinioSysFileServiceImpl implements ISysFileService +{ + @Resource + private MinioConfig minioConfig; + + @Resource + private MinioClient client; + + /** + * Minio鏂囦欢涓婁紶鎺ュ彛 + * + * @param file 涓婁紶鐨勬枃浠� + * @return 璁块棶鍦板潃 + * @throws Exception + */ + @Override + public String uploadFile(MultipartFile file) throws Exception + { + String fileName = FileUploadUtils.extractFilename(file); + InputStream inputStream = file.getInputStream(); + PutObjectArgs args = PutObjectArgs.builder() + .bucket(minioConfig.getBucketName()) + .object(fileName) + .stream(inputStream, file.getSize(), -1) + .contentType(file.getContentType()) + .build(); + client.putObject(args); + IoUtils.closeQuietly(inputStream); + return minioConfig.getUrl() + "/" + minioConfig.getBucketName() + "/" + fileName; + } +} diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/SyncUserService.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/SyncUserService.java index e76767c..7d88aba 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/impl/SyncUserService.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/impl/SyncUserService.java @@ -11,12 +11,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -/** - * 鐢ㄦ埛鍚屾鏈嶅姟 - * - * @author WWW - * @date 2024-08-30 - */ @Slf4j @Service @SuppressWarnings("ALL") @@ -25,7 +19,6 @@ IsimUserService isimUserService; public void insertUser(SysUser user) { - // supplyAsync-甯﹁繑鍥炲�硷紝runAsync-鏃犺繑鍥炲�� CompletableFuture.runAsync(() -> { isimUserService.insertUser(user); }); diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysConfigServiceImpl.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysConfigServiceImpl.java index a2d95e4..af74c96 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysConfigServiceImpl.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysConfigServiceImpl.java @@ -14,7 +14,7 @@ import com.se.common.core.utils.StringUtils; import com.se.common.redis.service.RedisService; import com.se.system.mapper.SysConfigMapper; -import com.se.system.service.ISysConfigService; +import com.se.system.service.inte.ISysConfigService; /** * 鍙傛暟閰嶇疆 鏈嶅姟灞傚疄鐜� diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysDeptServiceImpl.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysDeptServiceImpl.java index 03acb77..bdd4679 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysDeptServiceImpl.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysDeptServiceImpl.java @@ -19,7 +19,7 @@ import com.se.system.domain.vo.TreeSelect; import com.se.system.mapper.SysDeptMapper; import com.se.system.mapper.SysRoleMapper; -import com.se.system.service.ISysDeptService; +import com.se.system.service.inte.ISysDeptService; /** * 閮ㄩ棬绠$悊 鏈嶅姟瀹炵幇 diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysDictDataServiceImpl.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysDictDataServiceImpl.java index 68d61e5..1272a47 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysDictDataServiceImpl.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysDictDataServiceImpl.java @@ -6,7 +6,7 @@ import com.se.common.security.utils.DictUtils; import com.se.system.api.domain.SysDictData; import com.se.system.mapper.SysDictDataMapper; -import com.se.system.service.ISysDictDataService; +import com.se.system.service.inte.ISysDictDataService; /** * 瀛楀吀 涓氬姟灞傚鐞� diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysDictTypeServiceImpl.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysDictTypeServiceImpl.java index 127192d..a16d954 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysDictTypeServiceImpl.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysDictTypeServiceImpl.java @@ -16,7 +16,7 @@ import com.se.system.api.domain.SysDictType; import com.se.system.mapper.SysDictDataMapper; import com.se.system.mapper.SysDictTypeMapper; -import com.se.system.service.ISysDictTypeService; +import com.se.system.service.inte.ISysDictTypeService; /** * 瀛楀吀 涓氬姟灞傚鐞� diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysLogininforServiceImpl.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysLogininforServiceImpl.java index 19a6e57..e7ae241 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysLogininforServiceImpl.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysLogininforServiceImpl.java @@ -5,7 +5,7 @@ import org.springframework.stereotype.Service; import com.se.system.api.domain.SysLogininfor; import com.se.system.mapper.SysLogininforMapper; -import com.se.system.service.ISysLogininforService; +import com.se.system.service.inte.ISysLogininforService; /** * 绯荤粺璁块棶鏃ュ織鎯呭喌淇℃伅 鏈嶅姟灞傚鐞� diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java index 9a03e9f..25c4524 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java @@ -17,11 +17,10 @@ import com.se.common.core.utils.StringUtils; import com.se.common.security.utils.SecurityUtils; import com.se.system.api.domain.SysRole; -import com.se.system.api.domain.SysUser; import com.se.system.domain.vo.*; import com.se.system.mapper.SysMenuMapper; import com.se.system.mapper.*; -import com.se.system.service.ISysMenuService; +import com.se.system.service.inte.ISysMenuService; /** * 鑿滃崟 涓氬姟灞傚鐞� @@ -29,6 +28,7 @@ * @author admin */ @Service +@SuppressWarnings("ALL") public class SysMenuServiceImpl implements ISysMenuService { public static final String PREMISSION_STRING = "perms[\"{0}\"]"; @@ -60,15 +60,16 @@ */ @Override public List<SysMenu> selectMenuList(SysMenu menu, Long userId) { - List<SysMenu> menuList = null; + /*List<SysMenu> menuList = null; // 绠$悊鍛樻樉绀烘墍鏈夎彍鍗曚俊鎭� if (SysUser.isAdmin(userId)) { menuList = menuMapper.selectMenuList(menu); } else { menu.getParams().put("userId", userId); menuList = menuMapper.selectMenuListByUserId(menu); - } - return menuList; + }*/ + menu.setMenuId(SecurityUtils.isAdmin(userId) ? null : userId); + return menuMapper.selectMenuListByUserId(menu); } /** @@ -111,7 +112,7 @@ * 鏍规嵁鐢ㄦ埛ID鏌ヨ鑿滃崟 * * @param userId 鐢ㄦ埛鍚嶇О - * @param mark 鏍囪瘑 + * @param mark 鑿滃崟鏍囪瘑 * @return 鑿滃崟鍒楄〃 */ @Override @@ -337,8 +338,8 @@ /** * 鑾峰彇璺敱鍚嶇О锛屽娌℃湁閰嶇疆璺敱鍚嶇О鍒欏彇璺敱鍦板潃 * - * @param routerName 璺敱鍚嶇О - * @param path 璺敱鍦板潃 + * @param name 璺敱鍚嶇О + * @param path 璺敱鍦板潃 * @return 璺敱鍚嶇О锛堥┘宄版牸寮忥級 */ public String getRouteName(String name, String path) { diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysNoticeServiceImpl.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysNoticeServiceImpl.java index cd0d37b..885739e 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysNoticeServiceImpl.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysNoticeServiceImpl.java @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.se.system.mapper.SysNoticeMapper; -import com.se.system.service.ISysNoticeService; +import com.se.system.service.inte.ISysNoticeService; /** * 鍏憡 鏈嶅姟灞傚疄鐜� diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysOperLogServiceImpl.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysOperLogServiceImpl.java index cbc296f..d4d208c 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysOperLogServiceImpl.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysOperLogServiceImpl.java @@ -5,7 +5,7 @@ import org.springframework.stereotype.Service; import com.se.system.api.domain.SysOperLog; import com.se.system.mapper.SysOperLogMapper; -import com.se.system.service.ISysOperLogService; +import com.se.system.service.inte.ISysOperLogService; /** * 鎿嶄綔鏃ュ織 鏈嶅姟灞傚鐞� diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysPermissionServiceImpl.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysPermissionServiceImpl.java index 24387c8..142c08a 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysPermissionServiceImpl.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysPermissionServiceImpl.java @@ -1,12 +1,10 @@ package com.se.system.service.impl; -import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import com.se.common.core.utils.StringUtils; import com.se.system.domain.SysPost; import com.se.system.mapper.SysPostMapper; import org.springframework.beans.factory.annotation.Autowired; @@ -14,9 +12,9 @@ import org.springframework.util.CollectionUtils; import com.se.system.api.domain.SysRole; import com.se.system.api.domain.SysUser; -import com.se.system.service.ISysMenuService; -import com.se.system.service.ISysPermissionService; -import com.se.system.service.ISysRoleService; +import com.se.system.service.inte.ISysMenuService; +import com.se.system.service.inte.ISysPermissionService; +import com.se.system.service.inte.ISysRoleService; import javax.annotation.Resource; diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysPostServiceImpl.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysPostServiceImpl.java index 1a5d310..fbd7751 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysPostServiceImpl.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysPostServiceImpl.java @@ -10,7 +10,7 @@ import com.se.common.core.utils.StringUtils; import com.se.system.mapper.SysPostMapper; import com.se.system.mapper.SysUserPostMapper; -import com.se.system.service.ISysPostService; +import com.se.system.service.inte.ISysPostService; /** * 宀椾綅淇℃伅 鏈嶅姟灞傚鐞� diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysRoleServiceImpl.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysRoleServiceImpl.java index f27fb07..4692c2f 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysRoleServiceImpl.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysRoleServiceImpl.java @@ -24,7 +24,7 @@ import com.se.system.mapper.SysRoleMapper; import com.se.system.mapper.SysRoleMenuMapper; import com.se.system.mapper.SysUserRoleMapper; -import com.se.system.service.ISysRoleService; +import com.se.system.service.inte.ISysRoleService; /** * 瑙掕壊 涓氬姟灞傚鐞� diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysUserOnlineServiceImpl.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysUserOnlineServiceImpl.java index ad66af2..d662279 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysUserOnlineServiceImpl.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysUserOnlineServiceImpl.java @@ -4,7 +4,7 @@ import org.springframework.stereotype.Service; import com.se.common.core.utils.StringUtils; import com.se.system.api.model.LoginUser; -import com.se.system.service.ISysUserOnlineService; +import com.se.system.service.inte.ISysUserOnlineService; /** * 鍦ㄧ嚎鐢ㄦ埛 鏈嶅姟灞傚鐞� diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysUserServiceImpl.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysUserServiceImpl.java index 7244cf4..f804bdb 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysUserServiceImpl.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysUserServiceImpl.java @@ -29,9 +29,9 @@ import com.se.system.mapper.SysUserMapper; import com.se.system.mapper.SysUserPostMapper; import com.se.system.mapper.SysUserRoleMapper; -import com.se.system.service.ISysConfigService; -import com.se.system.service.ISysDeptService; -import com.se.system.service.ISysUserService; +import com.se.system.service.inte.ISysConfigService; +import com.se.system.service.inte.ISysDeptService; +import com.se.system.service.inte.ISysUserService; /** * 鐢ㄦ埛 涓氬姟灞傚鐞� diff --git a/se-modules/se-system/src/main/java/com/se/system/service/ISysConfigService.java b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysConfigService.java similarity index 97% rename from se-modules/se-system/src/main/java/com/se/system/service/ISysConfigService.java rename to se-modules/se-system/src/main/java/com/se/system/service/inte/ISysConfigService.java index f1b236a..4b9e224 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/ISysConfigService.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysConfigService.java @@ -1,4 +1,4 @@ -package com.se.system.service; +package com.se.system.service.inte; import java.util.List; import com.se.system.domain.*; diff --git a/se-modules/se-system/src/main/java/com/se/system/service/ISysDeptService.java b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysDeptService.java similarity index 98% rename from se-modules/se-system/src/main/java/com/se/system/service/ISysDeptService.java rename to se-modules/se-system/src/main/java/com/se/system/service/inte/ISysDeptService.java index 29190a8..1b9caf5 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/ISysDeptService.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysDeptService.java @@ -1,4 +1,4 @@ -package com.se.system.service; +package com.se.system.service.inte; import java.util.List; import com.se.system.api.domain.SysDept; diff --git a/se-modules/se-system/src/main/java/com/se/system/service/ISysDictDataService.java b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysDictDataService.java similarity index 97% rename from se-modules/se-system/src/main/java/com/se/system/service/ISysDictDataService.java rename to se-modules/se-system/src/main/java/com/se/system/service/inte/ISysDictDataService.java index 1d9b1e6..a2e820e 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/ISysDictDataService.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysDictDataService.java @@ -1,4 +1,4 @@ -package com.se.system.service; +package com.se.system.service.inte; import java.util.List; import com.se.system.api.domain.SysDictData; diff --git a/se-modules/se-system/src/main/java/com/se/system/service/ISysDictTypeService.java b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysDictTypeService.java similarity index 98% rename from se-modules/se-system/src/main/java/com/se/system/service/ISysDictTypeService.java rename to se-modules/se-system/src/main/java/com/se/system/service/inte/ISysDictTypeService.java index 2250161..ac9e0c5 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/ISysDictTypeService.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysDictTypeService.java @@ -1,4 +1,4 @@ -package com.se.system.service; +package com.se.system.service.inte; import java.util.List; import com.se.system.api.domain.SysDictData; diff --git a/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysFileService.java b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysFileService.java new file mode 100644 index 0000000..7077669 --- /dev/null +++ b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysFileService.java @@ -0,0 +1,20 @@ +package com.se.system.service.inte; + +import org.springframework.web.multipart.MultipartFile; + +/** + * 鏂囦欢涓婁紶鎺ュ彛 + * + * @author admin + */ +public interface ISysFileService +{ + /** + * 鏂囦欢涓婁紶鎺ュ彛 + * + * @param file 涓婁紶鐨勬枃浠� + * @return 璁块棶鍦板潃 + * @throws Exception + */ + public String uploadFile(MultipartFile file) throws Exception; +} diff --git a/se-modules/se-system/src/main/java/com/se/system/service/ISysLogininforService.java b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysLogininforService.java similarity index 95% rename from se-modules/se-system/src/main/java/com/se/system/service/ISysLogininforService.java rename to se-modules/se-system/src/main/java/com/se/system/service/inte/ISysLogininforService.java index 2692266..61c7cc2 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/ISysLogininforService.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysLogininforService.java @@ -1,4 +1,4 @@ -package com.se.system.service; +package com.se.system.service.inte; import java.util.List; import com.se.system.api.domain.SysLogininfor; diff --git a/se-modules/se-system/src/main/java/com/se/system/service/ISysMenuService.java b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysMenuService.java similarity index 96% rename from se-modules/se-system/src/main/java/com/se/system/service/ISysMenuService.java rename to se-modules/se-system/src/main/java/com/se/system/service/inte/ISysMenuService.java index e983f71..afdcc73 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/ISysMenuService.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysMenuService.java @@ -1,4 +1,4 @@ -package com.se.system.service; +package com.se.system.service.inte; import java.util.List; import java.util.Set; @@ -49,7 +49,7 @@ * 鏍规嵁鐢ㄦ埛ID鏌ヨ鑿滃崟鏍戜俊鎭� * * @param userId 鐢ㄦ埛ID - * @param mark 鏍囪瘑 + * @param mark 鑿滃崟鏍囪瘑 * @return 鑿滃崟鍒楄〃 */ public List<SysMenu> selectMenuTreeByUserId(Long userId, String mark); @@ -146,7 +146,7 @@ * 鏍规嵁鐢ㄦ埛ID鍜屾爣璇嗘煡璇㈣彍鍗� * * @param userId 鐢ㄦ埛ID - * @param mark 鏍囪瘑 + * @param mark 鑿滃崟鏍囪瘑 * @return 鑿滃崟闆嗗悎 */ List<SysMenu> selectMenusByUserIdAndMark(Long userId, String mark); diff --git a/se-modules/se-system/src/main/java/com/se/system/service/ISysNoticeService.java b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysNoticeService.java similarity index 96% rename from se-modules/se-system/src/main/java/com/se/system/service/ISysNoticeService.java rename to se-modules/se-system/src/main/java/com/se/system/service/inte/ISysNoticeService.java index 675ae95..506c0ed 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/ISysNoticeService.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysNoticeService.java @@ -1,4 +1,4 @@ -package com.se.system.service; +package com.se.system.service.inte; import java.util.List; import com.se.system.domain.SysNotice; diff --git a/se-modules/se-system/src/main/java/com/se/system/service/ISysOperLogService.java b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysOperLogService.java similarity index 96% rename from se-modules/se-system/src/main/java/com/se/system/service/ISysOperLogService.java rename to se-modules/se-system/src/main/java/com/se/system/service/inte/ISysOperLogService.java index 611f760..bb298e1 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/ISysOperLogService.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysOperLogService.java @@ -1,4 +1,4 @@ -package com.se.system.service; +package com.se.system.service.inte; import java.util.List; import com.se.system.api.domain.SysOperLog; diff --git a/se-modules/se-system/src/main/java/com/se/system/service/ISysPermissionService.java b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysPermissionService.java similarity index 94% rename from se-modules/se-system/src/main/java/com/se/system/service/ISysPermissionService.java rename to se-modules/se-system/src/main/java/com/se/system/service/inte/ISysPermissionService.java index 5a0ab43..df8295f 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/ISysPermissionService.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysPermissionService.java @@ -1,4 +1,4 @@ -package com.se.system.service; +package com.se.system.service.inte; import java.util.List; import java.util.Set; diff --git a/se-modules/se-system/src/main/java/com/se/system/service/ISysPostService.java b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysPostService.java similarity index 97% rename from se-modules/se-system/src/main/java/com/se/system/service/ISysPostService.java rename to se-modules/se-system/src/main/java/com/se/system/service/inte/ISysPostService.java index c513bf5..227abe9 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/ISysPostService.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysPostService.java @@ -1,4 +1,4 @@ -package com.se.system.service; +package com.se.system.service.inte; import java.util.List; import com.se.system.domain.SysPost; diff --git a/se-modules/se-system/src/main/java/com/se/system/service/ISysRoleService.java b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysRoleService.java similarity index 98% rename from se-modules/se-system/src/main/java/com/se/system/service/ISysRoleService.java rename to se-modules/se-system/src/main/java/com/se/system/service/inte/ISysRoleService.java index 659ba56..3dadd38 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/ISysRoleService.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysRoleService.java @@ -1,4 +1,4 @@ -package com.se.system.service; +package com.se.system.service.inte; import java.util.List; import java.util.Set; diff --git a/se-modules/se-system/src/main/java/com/se/system/service/ISysUserOnlineService.java b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysUserOnlineService.java similarity index 96% rename from se-modules/se-system/src/main/java/com/se/system/service/ISysUserOnlineService.java rename to se-modules/se-system/src/main/java/com/se/system/service/inte/ISysUserOnlineService.java index 6b0706a..9809a28 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/ISysUserOnlineService.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysUserOnlineService.java @@ -1,4 +1,4 @@ -package com.se.system.service; +package com.se.system.service.inte; import com.se.system.api.model.LoginUser; import com.se.system.domain.SysUserOnline; diff --git a/se-modules/se-system/src/main/java/com/se/system/service/ISysUserService.java b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysUserService.java similarity index 98% rename from se-modules/se-system/src/main/java/com/se/system/service/ISysUserService.java rename to se-modules/se-system/src/main/java/com/se/system/service/inte/ISysUserService.java index 1e54c8d..0263921 100644 --- a/se-modules/se-system/src/main/java/com/se/system/service/ISysUserService.java +++ b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysUserService.java @@ -1,4 +1,4 @@ -package com.se.system.service; +package com.se.system.service.inte; import java.util.List; import com.se.system.api.domain.SysUser; diff --git a/se-modules/se-system/src/main/java/com/se/system/utils/FileUploadUtils.java b/se-modules/se-system/src/main/java/com/se/system/utils/FileUploadUtils.java new file mode 100644 index 0000000..d453adc --- /dev/null +++ b/se-modules/se-system/src/main/java/com/se/system/utils/FileUploadUtils.java @@ -0,0 +1,186 @@ +package com.se.system.utils; + +import com.se.common.core.exception.file.FileException; +import com.se.common.core.exception.file.FileNameLengthLimitExceededException; +import com.se.common.core.exception.file.FileSizeLimitExceededException; +import com.se.common.core.exception.file.InvalidExtensionException; +import com.se.common.core.utils.DateUtils; +import com.se.common.core.utils.StringUtils; +import com.se.common.core.utils.file.FileTypeUtils; +import com.se.common.core.utils.file.MimeTypeUtils; +import com.se.common.core.utils.uuid.Seq; +import org.apache.commons.io.FilenameUtils; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Paths; +import java.util.Objects; + +/** + * 鏂囦欢涓婁紶宸ュ叿绫� + * + * @author admin + */ +public class FileUploadUtils +{ + /** + * 榛樿澶у皬 50M + */ + public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024L; + + /** + * 榛樿鐨勬枃浠跺悕鏈�澶ч暱搴� 100 + */ + public static final int DEFAULT_FILE_NAME_LENGTH = 100; + + /** + * 鏍规嵁鏂囦欢璺緞涓婁紶 + * + * @param baseDir 鐩稿搴旂敤鐨勫熀鐩綍 + * @param file 涓婁紶鐨勬枃浠� + * @return 鏂囦欢鍚嶇О + * @throws IOException + */ + public static final String upload(String baseDir, MultipartFile file) throws IOException + { + try + { + return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION); + } + catch (FileException fe) + { + throw new IOException(fe.getDefaultMessage(), fe); + } + catch (Exception e) + { + throw new IOException(e.getMessage(), e); + } + } + + /** + * 鏂囦欢涓婁紶 + * + * @param baseDir 鐩稿搴旂敤鐨勫熀鐩綍 + * @param file 涓婁紶鐨勬枃浠� + * @param allowedExtension 涓婁紶鏂囦欢绫诲瀷 + * @return 杩斿洖涓婁紶鎴愬姛鐨勬枃浠跺悕 + * @throws FileSizeLimitExceededException 濡傛灉瓒呭嚭鏈�澶уぇ灏� + * @throws FileNameLengthLimitExceededException 鏂囦欢鍚嶅お闀� + * @throws IOException 姣斿璇诲啓鏂囦欢鍑洪敊鏃� + * @throws InvalidExtensionException 鏂囦欢鏍¢獙寮傚父 + */ + public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension) + throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException, + InvalidExtensionException + { + int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length(); + if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH) + { + throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH); + } + + assertAllowed(file, allowedExtension); + + String fileName = extractFilename(file); + + String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath(); + file.transferTo(Paths.get(absPath)); + return getPathFileName(fileName); + } + + /** + * 缂栫爜鏂囦欢鍚� + */ + public static final String extractFilename(MultipartFile file) + { + return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(), + FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), FileTypeUtils.getExtension(file)); + } + + private static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException + { + File desc = new File(uploadDir + File.separator + fileName); + + if (!desc.exists()) + { + if (!desc.getParentFile().exists()) + { + desc.getParentFile().mkdirs(); + } + } + return desc.isAbsolute() ? desc : desc.getAbsoluteFile(); + } + + private static final String getPathFileName(String fileName) throws IOException + { + String pathFileName = "/" + fileName; + return pathFileName; + } + + /** + * 鏂囦欢澶у皬鏍¢獙 + * + * @param file 涓婁紶鐨勬枃浠� + * @throws FileSizeLimitExceededException 濡傛灉瓒呭嚭鏈�澶уぇ灏� + * @throws InvalidExtensionException 鏂囦欢鏍¢獙寮傚父 + */ + public static final void assertAllowed(MultipartFile file, String[] allowedExtension) + throws FileSizeLimitExceededException, InvalidExtensionException + { + long size = file.getSize(); + if (size > DEFAULT_MAX_SIZE) + { + throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024); + } + + String fileName = file.getOriginalFilename(); + String extension = FileTypeUtils.getExtension(file); + if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension)) + { + if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION) + { + throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension, + fileName); + } + else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION) + { + throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension, + fileName); + } + else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION) + { + throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension, + fileName); + } + else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION) + { + throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension, + fileName); + } + else + { + throw new InvalidExtensionException(allowedExtension, extension, fileName); + } + } + } + + /** + * 鍒ゆ柇MIME绫诲瀷鏄惁鏄厑璁哥殑MIME绫诲瀷 + * + * @param extension 涓婁紶鏂囦欢绫诲瀷 + * @param allowedExtension 鍏佽涓婁紶鏂囦欢绫诲瀷 + * @return true/false + */ + public static final boolean isAllowedExtension(String extension, String[] allowedExtension) + { + for (String str : allowedExtension) + { + if (str.equalsIgnoreCase(extension)) + { + return true; + } + } + return false; + } +} \ No newline at end of file diff --git a/se-modules/se-system/src/main/resources/logback.xml b/se-modules/se-system/src/main/resources/logback.xml index a60457c..5138555 100644 --- a/se-modules/se-system/src/main/resources/logback.xml +++ b/se-modules/se-system/src/main/resources/logback.xml @@ -58,7 +58,7 @@ </appender> <!-- 绯荤粺妯″潡鏃ュ織绾у埆鎺у埗:info,debug --> - <logger name="com.se" level="info" /> + <logger name="com.se" level="debug" /> <!-- Spring鏃ュ織绾у埆鎺у埗 --> <logger name="org.springframework" level="warn" /> diff --git a/se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml b/se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml index f5e0ae9..92904e2 100644 --- a/se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -59,19 +59,26 @@ <select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult"> select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time, m.mark from sys_menu m - left join sys_role_menu rm on m.menu_id = rm.menu_id - left join sys_user_role ur on rm.role_id = ur.role_id - left join sys_role ro on ur.role_id = ro.role_id - where ur.user_id = #{params.userId} - <if test="menuName != null and menuName != ''"> - AND m.menu_name like concat('%', #{menuName}, '%') - </if> - <if test="visible != null and visible != ''"> - AND m.visible = #{visible} - </if> - <if test="status != null and status != ''"> - AND m.status = #{status} - </if> + left join sys_role_menu rm on m.menu_id = rm.menu_id + left join sys_user_role ur on rm.role_id = ur.role_id + left join sys_role ro on ur.role_id = ro.role_id + <where> + <if test="menuId != null"> + ur.user_id = #{menuId} + </if> + <if test="menuName != null and menuName != ''"> + AND m.menu_name like concat('%', #{menuName}, '%') + </if> + <if test="visible != null and visible != ''"> + AND m.visible = #{visible} + </if> + <if test="status != null and status != ''"> + AND m.status = #{status} + </if> + <if test="mark != null and mark != ''"> + AND m.mark = #{mark} + </if> + </where> order by m.parent_id, m.order_num </select> @@ -83,7 +90,7 @@ left join sys_role ro on ur.role_id = ro.role_id left join sys_user u on ur.user_id = u.user_id where m.menu_type in ('M', 'C') and m.status = 0 and ro.status = 0 - <if test="userId != null and userId != ''"> + <if test="userId != null"> and u.user_id = #{userId} </if> <if test="mark != null and mark != ''"> diff --git a/se-visual/se-monitor/ruoyi-visual-monitor.iml b/se-visual/se-monitor/ruoyi-visual-monitor.iml deleted file mode 100644 index da30efa..0000000 --- a/se-visual/se-monitor/ruoyi-visual-monitor.iml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module version="4"> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> - <orderEntry type="jdk" jdkName="jdk-1.8" jdkType="JavaSDK" /> - <orderEntry type="sourceFolder" forTests="false" /> - </component> -</module> \ No newline at end of file diff --git a/se-visual/se-monitor/se-monitor.iml b/se-visual/se-monitor/se-monitor.iml deleted file mode 100644 index fcc1f4d..0000000 --- a/se-visual/se-monitor/se-monitor.iml +++ /dev/null @@ -1,144 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> - <component name="FacetManager"> - <facet type="Spring" name="Spring"> - <configuration /> - </facet> - <facet type="web" name="Web"> - <configuration> - <webroots /> - </configuration> - </facet> - </component> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> - <output url="file://$MODULE_DIR$/target/classes" /> - <output-test url="file://$MODULE_DIR$/target/test-classes" /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> - <excludeFolder url="file://$MODULE_DIR$/target" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="Maven: de.codecentric:spring-boot-admin-starter-server:2.7.15" level="project" /> - <orderEntry type="library" name="Maven: de.codecentric:spring-boot-admin-server:2.7.15" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-webflux:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-reactor-netty:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: io.projectreactor.netty:reactor-netty-http:1.0.39" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-codec-http2:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-resolver-dns:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-codec-dns:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-resolver-dns-native-macos:osx-x86_64:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-resolver-dns-classes-macos:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-transport-native-epoll:linux-x86_64:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-transport-classes-epoll:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.projectreactor.netty:reactor-netty-core:1.0.39" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-handler-proxy:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-codec-socks:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-webflux:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring5:3.0.15.RELEASE" level="project" /> - <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:3.0.15.RELEASE" level="project" /> - <orderEntry type="library" name="Maven: org.attoparser:attoparser:2.0.5.RELEASE" level="project" /> - <orderEntry type="library" name="Maven: org.unbescape:unbescape:1.1.6.RELEASE" level="project" /> - <orderEntry type="library" name="Maven: org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.4.RELEASE" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.9.17" level="project" /> - <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.12" level="project" /> - <orderEntry type="library" scope="RUNTIME" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.14" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.16" level="project" /> - <orderEntry type="library" name="Maven: io.projectreactor.addons:reactor-extra:3.4.10" level="project" /> - <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.34" level="project" /> - <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.4" level="project" /> - <orderEntry type="library" name="Maven: de.codecentric:spring-boot-admin-server-ui:2.7.15" level="project" /> - <orderEntry type="library" name="Maven: de.codecentric:spring-boot-admin-server-cloud:2.7.15" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-commons:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:2.2.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-auth-plugin:2.2.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-encryption-plugin:2.2.0" level="project" /> - <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.5" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.16" level="project" /> - <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.15.0" level="project" /> - <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_otel:0.15.0" level="project" /> - <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_common:0.15.0" level="project" /> - <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_otel_agent:0.15.0" level="project" /> - <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.30" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.11" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.7.11" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-sentinel:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-transport-simple-http:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-transport-common:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-datasource-extension:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83_noneautotype" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-annotation-aspectj:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-core:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-circuitbreaker-sentinel:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-reactor-adapter:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-spring-webflux-adapter:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-spring-webmvc-adapter:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-parameter-flow-control:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-cluster-server-default:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-cluster-common-default:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.101.Final" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-cluster-client-default:1.8.6" level="project" /> - <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-sentinel-datasource:2021.0.5.0" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.12" level="project" /> - <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.12" level="project" /> - <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" /> - <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.5" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.83" level="project" /> - <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.83" level="project" /> - <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.83" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.7.18" level="project" /> - <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.33" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.7.11" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.7.11" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.7.11" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-bootstrap:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:3.1.7" level="project" /> - <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.11.RELEASE" level="project" /> - <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.69" level="project" /> - <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.69" level="project" /> - <orderEntry type="library" name="Maven: org.bouncycastle:bcutil-jdk15on:1.69" level="project" /> - </component> -</module> \ No newline at end of file diff --git "a/\350\257\264\346\230\216.txt" "b/\350\257\264\346\230\216.txt" new file mode 100644 index 0000000..7d79468 --- /dev/null +++ "b/\350\257\264\346\230\216.txt" @@ -0,0 +1,37 @@ +http://192.168.11.203:8090/sso/login +http://192.168.11.203:8848/nacos锛宯Acos_!9#_admIn + + + +docker-compose logs -f -n 50 se-system + +se-gateway-dev.yml锛屼慨鏀� +-------------------------------------------------------- +uri: lb://se-auth 鈫� uri: lb://se-system + +uri: lb://se-file 鈫� uri: lb://se-system + +-------------------------------------------------------- + +se-system-dev.yml锛屾坊鍔� +-------------------------------------------------------- +# 鏈湴鏂囦欢涓婁紶 +file: + domain: http://127.0.0.1:9300 + path: D:/se/uploadPath + prefix: /statics + +# FastDFS閰嶇疆 +fdfs: + domain: http://8.129.231.12 + soTimeout: 3000 + connectTimeout: 2000 + trackerList: 8.129.231.12:22122 + +# Minio閰嶇疆 +minio: + url: http://8.129.231.12:9000 + accessKey: minioadmin + secretKey: minioadmin + bucketName: test +-------------------------------------------------------- -- Gitblit v1.9.3