From 9b6ce0074fbe254b4c5935376d647f558d1d6f06 Mon Sep 17 00:00:00 2001 From: 1332987 <13329870472@163.com> Date: Tue, 19 Apr 2022 13:15:04 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=20=E8=A7=A3=E5=86=B3=E4=BE=9D=E8=B5=96=E5=86=B2?= =?UTF-8?q?=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/FUNDING.yml | 1 - bin/clean.bat | 12 - bin/package.bat | 12 - bin/run-auth.bat | 14 - bin/run-gateway.bat | 14 - bin/run-modules-file.bat | 14 - bin/run-modules-gen.bat | 14 - bin/run-modules-job.bat | 14 - bin/run-modules-system.bat | 14 - bin/run-monitor.bat | 14 - pom.xml | 5 +- ruoyi-auth/pom.xml | 1 + ruoyi-common/ruoyi-common-datasource/pom.xml | 25 +- ruoyi-gateway/pom.xml | 1 + ruoyi-modules/ruoyi-file/pom.xml | 29 + ruoyi-modules/ruoyi-gen/pom.xml | 1 + ruoyi-modules/ruoyi-job/pom.xml | 1 + ruoyi-modules/ruoyi-system/pom.xml | 7 + ruoyi-visual/ruoyi-monitor/pom.xml | 1 + sql/quartz.sql | 174 ----- sql/ry_20210908.sql | 685 ------------------- sql/ry_config_20220114.sql | 216 ------ sql/ry_seata_20210128.sql | 80 --- 23 files changed, 68 insertions(+), 1281 deletions(-) delete mode 100644 .github/FUNDING.yml delete mode 100644 bin/clean.bat delete mode 100644 bin/package.bat delete mode 100644 bin/run-auth.bat delete mode 100644 bin/run-gateway.bat delete mode 100644 bin/run-modules-file.bat delete mode 100644 bin/run-modules-gen.bat delete mode 100644 bin/run-modules-job.bat delete mode 100644 bin/run-modules-system.bat delete mode 100644 bin/run-monitor.bat delete mode 100644 sql/quartz.sql delete mode 100644 sql/ry_20210908.sql delete mode 100644 sql/ry_config_20220114.sql delete mode 100644 sql/ry_seata_20210128.sql diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 06edc15f..00000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1 +0,0 @@ -custom: http://doc.ruoyi.vip/ruoyi-cloud/other/donate.html diff --git a/bin/clean.bat b/bin/clean.bat deleted file mode 100644 index af841d8e..00000000 --- a/bin/clean.bat +++ /dev/null @@ -1,12 +0,0 @@ -@echo off -echo. -echo [信息] 清理工程target生成路径。 -echo. - -%~d0 -cd %~dp0 - -cd .. -call mvn clean - -pause \ No newline at end of file diff --git a/bin/package.bat b/bin/package.bat deleted file mode 100644 index af8af8ec..00000000 --- a/bin/package.bat +++ /dev/null @@ -1,12 +0,0 @@ -@echo off -echo. -echo [信息] 打包Web工程，生成war/jar包文件。 -echo. - -%~d0 -cd %~dp0 - -cd .. -call mvn clean package -Dmaven.test.skip=true - -pause \ No newline at end of file diff --git a/bin/run-auth.bat b/bin/run-auth.bat deleted file mode 100644 index 4c09a743..00000000 --- a/bin/run-auth.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [信息] 使用Jar命令运行Auth工程。 -echo. - -cd %~dp0 -cd ../ruoyi-auth/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-auth.jar - -cd bin -pause \ No newline at end of file diff --git a/bin/run-gateway.bat b/bin/run-gateway.bat deleted file mode 100644 index d0d78af5..00000000 --- a/bin/run-gateway.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [信息] 使用Jar命令运行Gateway工程。 -echo. - -cd %~dp0 -cd ../ruoyi-gateway/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-gateway.jar - -cd bin -pause \ No newline at end of file diff --git a/bin/run-modules-file.bat b/bin/run-modules-file.bat deleted file mode 100644 index 61f89068..00000000 --- a/bin/run-modules-file.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [信息] 使用Jar命令运行Modules-File工程。 -echo. - -cd %~dp0 -cd ../ruoyi-modules/ruoyi-file/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-file.jar - -cd bin -pause \ No newline at end of file diff --git a/bin/run-modules-gen.bat b/bin/run-modules-gen.bat deleted file mode 100644 index cbb7e7b2..00000000 --- a/bin/run-modules-gen.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [信息] 使用Jar命令运行Modules-Gen工程。 -echo. - -cd %~dp0 -cd ../ruoyi-modules/ruoyi-gen/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-gen.jar - -cd bin -pause \ No newline at end of file diff --git a/bin/run-modules-job.bat b/bin/run-modules-job.bat deleted file mode 100644 index b419237a..00000000 --- a/bin/run-modules-job.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [信息] 使用Jar命令运行Modules-Job工程。 -echo. - -cd %~dp0 -cd ../ruoyi-modules/ruoyi-job/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-job.jar - -cd bin -pause \ No newline at end of file diff --git a/bin/run-modules-system.bat b/bin/run-modules-system.bat deleted file mode 100644 index 0d232fef..00000000 --- a/bin/run-modules-system.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [信息] 使用Jar命令运行Modules-System工程。 -echo. - -cd %~dp0 -cd ../ruoyi-modules/ruoyi-system/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-system.jar - -cd bin -pause \ No newline at end of file diff --git a/bin/run-monitor.bat b/bin/run-monitor.bat deleted file mode 100644 index 6149abd1..00000000 --- a/bin/run-monitor.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [信息] 使用Jar命令运行Monitor工程。 -echo. - -cd %~dp0 -cd ../ruoyi-visual/ruoyi-monitor/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-visual-monitor.jar - -cd bin -pause \ No newline at end of file diff --git a/pom.xml b/pom.xml index 83ea1903..f1ead2b9 100644 --- a/pom.xml +++ b/pom.xml @@ -29,13 +29,13 @@ 2.3.2 1.4.1 1.2.8 - 3.5.0 + 3.5.1 2.11.0 1.4 2.3 1.2.80 0.9.1 - 8.2.2 + 8.3.7 4.1.2 3.2.2 2.12.2 @@ -264,6 +264,7 @@ org.apache.maven.plugins maven-compiler-plugin + 3.10.1 ${java.version} ${java.version} diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index ee36ebc8..e2727b6e 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -60,6 +60,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.6 diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml index 178c5a62..21444bd9 100644 --- a/ruoyi-common/ruoyi-common-datasource/pom.xml +++ b/ruoyi-common/ruoyi-common-datasource/pom.xml @@ -35,7 +35,30 @@ com.alibaba.cloud spring-cloud-starter-alibaba-seata + + + checker-qual + org.checkerframework + + + druid + com.alibaba + + + error_prone_annotations + com.google.errorprone + + + + + org.checkerframework + checker-qual + 3.19.0 + + + com.google.errorprone + error_prone_annotations + 2.10.0 - \ No newline at end of file diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index c2a308ad..fd9fb43a 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -96,6 +96,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.6 diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index 1250262c..c67b98bf 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/ruoyi-modules/ruoyi-file/pom.xml @@ -21,6 +21,12 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery + + + guava + com.google.guava + + @@ -52,12 +58,34 @@ io.minio minio ${minio.version} + + + bcprov-jdk15on + org.bouncycastle + + + okhttp + com.squareup.okhttp3 + + + + + + com.squareup.okhttp3 + okhttp + 4.8.1 com.ruoyi ruoyi-api-system + + + commons-compress + org.apache.commons + + @@ -74,6 +102,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.6 diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index 4a9bd404..83465c64 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -86,6 +86,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.6 diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index dfefc570..4accc768 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -86,6 +86,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.6 diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index c3199bbc..3e676152 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -21,6 +21,12 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery + + + guava + com.google.guava + + @@ -86,6 +92,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.6 diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index 1fee5ace..cb567625 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/ruoyi-visual/ruoyi-monitor/pom.xml @@ -61,6 +61,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.6 diff --git a/sql/quartz.sql b/sql/quartz.sql deleted file mode 100644 index 5f99bfb5..00000000 --- a/sql/quartz.sql +++ /dev/null @@ -1,174 +0,0 @@ -DROP TABLE IF EXISTS QRTZ_FIRED_TRIGGERS; -DROP TABLE IF EXISTS QRTZ_PAUSED_TRIGGER_GRPS; -DROP TABLE IF EXISTS QRTZ_SCHEDULER_STATE; -DROP TABLE IF EXISTS QRTZ_LOCKS; -DROP TABLE IF EXISTS QRTZ_SIMPLE_TRIGGERS; -DROP TABLE IF EXISTS QRTZ_SIMPROP_TRIGGERS; -DROP TABLE IF EXISTS QRTZ_CRON_TRIGGERS; -DROP TABLE IF EXISTS QRTZ_BLOB_TRIGGERS; -DROP TABLE IF EXISTS QRTZ_TRIGGERS; -DROP TABLE IF EXISTS QRTZ_JOB_DETAILS; -DROP TABLE IF EXISTS QRTZ_CALENDARS; - --- ---------------------------- --- 1銆佸瓨鍌ㄦ瘡涓涓凡閰嶇疆鐨 jobDetail 鐨勮缁嗕俊鎭 --- ---------------------------- -create table QRTZ_JOB_DETAILS ( - sched_name varchar(120) not null comment '璋冨害鍚嶇О', - job_name varchar(200) not null comment '浠诲姟鍚嶇О', - job_group varchar(200) not null comment '浠诲姟缁勫悕', - description varchar(250) null comment '鐩稿叧浠嬬粛', - job_class_name varchar(250) not null comment '鎵ц浠诲姟绫诲悕绉', - is_durable varchar(1) not null comment '鏄惁鎸佷箙鍖', - is_nonconcurrent varchar(1) not null comment '鏄惁骞跺彂', - is_update_data varchar(1) not null comment '鏄惁鏇存柊鏁版嵁', - requests_recovery varchar(1) not null comment '鏄惁鎺ュ彈鎭㈠鎵ц', - job_data blob null comment '瀛樻斁鎸佷箙鍖杍ob瀵硅薄', - primary key (sched_name, job_name, job_group) -) engine=innodb comment = '浠诲姟璇︾粏淇℃伅琛'; - --- ---------------------------- --- 2銆 瀛樺偍宸查厤缃殑 Trigger 鐨勪俊鎭 --- ---------------------------- -create table QRTZ_TRIGGERS ( - sched_name varchar(120) not null comment '璋冨害鍚嶇О', - trigger_name varchar(200) not null comment '瑙﹀彂鍣ㄧ殑鍚嶅瓧', - trigger_group varchar(200) not null comment '瑙﹀彂鍣ㄦ墍灞炵粍鐨勫悕瀛', - job_name varchar(200) not null comment 'qrtz_job_details琛╦ob_name鐨勫閿', - job_group varchar(200) not null comment 'qrtz_job_details琛╦ob_group鐨勫閿', - description varchar(250) null comment '鐩稿叧浠嬬粛', - next_fire_time bigint(13) null comment '涓婁竴娆¤Е鍙戞椂闂达紙姣锛', - prev_fire_time bigint(13) null comment '涓嬩竴娆¤Е鍙戞椂闂达紙榛樿涓-1琛ㄧず涓嶈Е鍙戯級', - priority integer null comment '浼樺厛绾', - trigger_state varchar(16) not null comment '瑙﹀彂鍣ㄧ姸鎬', - trigger_type varchar(8) not null comment '瑙﹀彂鍣ㄧ殑绫诲瀷', - start_time bigint(13) not null comment '寮濮嬫椂闂', - end_time bigint(13) null comment '缁撴潫鏃堕棿', - calendar_name varchar(200) null comment '鏃ョ▼琛ㄥ悕绉', - misfire_instr smallint(2) null comment '琛ュ伩鎵ц鐨勭瓥鐣', - job_data blob null comment '瀛樻斁鎸佷箙鍖杍ob瀵硅薄', - primary key (sched_name, trigger_name, trigger_group), - foreign key (sched_name, job_name, job_group) references QRTZ_JOB_DETAILS(sched_name, job_name, job_group) -) engine=innodb comment = '瑙﹀彂鍣ㄨ缁嗕俊鎭〃'; - --- ---------------------------- --- 3銆 瀛樺偍绠鍗曠殑 Trigger锛屽寘鎷噸澶嶆鏁帮紝闂撮殧锛屼互鍙婂凡瑙﹀彂鐨勬鏁 --- ---------------------------- -create table QRTZ_SIMPLE_TRIGGERS ( - sched_name varchar(120) not null comment '璋冨害鍚嶇О', - trigger_name varchar(200) not null comment 'qrtz_triggers琛╰rigger_name鐨勫閿', - trigger_group varchar(200) not null comment 'qrtz_triggers琛╰rigger_group鐨勫閿', - repeat_count bigint(7) not null comment '閲嶅鐨勬鏁扮粺璁', - repeat_interval bigint(12) not null comment '閲嶅鐨勯棿闅旀椂闂', - times_triggered bigint(10) not null comment '宸茬粡瑙﹀彂鐨勬鏁', - primary key (sched_name, trigger_name, trigger_group), - foreign key (sched_name, trigger_name, trigger_group) references QRTZ_TRIGGERS(sched_name, trigger_name, trigger_group) -) engine=innodb comment = '绠鍗曡Е鍙戝櫒鐨勪俊鎭〃'; - --- ---------------------------- --- 4銆 瀛樺偍 Cron Trigger锛屽寘鎷 Cron 琛ㄨ揪寮忓拰鏃跺尯淇℃伅 --- ---------------------------- -create table QRTZ_CRON_TRIGGERS ( - sched_name varchar(120) not null comment '璋冨害鍚嶇О', - trigger_name varchar(200) not null comment 'qrtz_triggers琛╰rigger_name鐨勫閿', - trigger_group varchar(200) not null comment 'qrtz_triggers琛╰rigger_group鐨勫閿', - cron_expression varchar(200) not null comment 'cron琛ㄨ揪寮', - time_zone_id varchar(80) comment '鏃跺尯', - primary key (sched_name, trigger_name, trigger_group), - foreign key (sched_name, trigger_name, trigger_group) references QRTZ_TRIGGERS(sched_name, trigger_name, trigger_group) -) engine=innodb comment = 'Cron绫诲瀷鐨勮Е鍙戝櫒琛'; - --- ---------------------------- --- 5銆 Trigger 浣滀负 Blob 绫诲瀷瀛樺偍(鐢ㄤ簬 Quartz 鐢ㄦ埛鐢 JDBC 鍒涘缓浠栦滑鑷繁瀹氬埗鐨 Trigger 绫诲瀷锛孞obStore 骞朵笉鐭ラ亾濡備綍瀛樺偍瀹炰緥鐨勬椂鍊) --- ---------------------------- -create table QRTZ_BLOB_TRIGGERS ( - sched_name varchar(120) not null comment '璋冨害鍚嶇О', - trigger_name varchar(200) not null comment 'qrtz_triggers琛╰rigger_name鐨勫閿', - trigger_group varchar(200) not null comment 'qrtz_triggers琛╰rigger_group鐨勫閿', - blob_data blob null comment '瀛樻斁鎸佷箙鍖朤rigger瀵硅薄', - primary key (sched_name, trigger_name, trigger_group), - foreign key (sched_name, trigger_name, trigger_group) references QRTZ_TRIGGERS(sched_name, trigger_name, trigger_group) -) engine=innodb comment = 'Blob绫诲瀷鐨勮Е鍙戝櫒琛'; - --- ---------------------------- --- 6銆 浠 Blob 绫诲瀷瀛樺偍瀛樻斁鏃ュ巻淇℃伅锛 quartz鍙厤缃竴涓棩鍘嗘潵鎸囧畾涓涓椂闂磋寖鍥 --- ---------------------------- -create table QRTZ_CALENDARS ( - sched_name varchar(120) not null comment '璋冨害鍚嶇О', - calendar_name varchar(200) not null comment '鏃ュ巻鍚嶇О', - calendar blob not null comment '瀛樻斁鎸佷箙鍖朿alendar瀵硅薄', - primary key (sched_name, calendar_name) -) engine=innodb comment = '鏃ュ巻淇℃伅琛'; - --- ---------------------------- --- 7銆 瀛樺偍宸叉殏鍋滅殑 Trigger 缁勭殑淇℃伅 --- ---------------------------- -create table QRTZ_PAUSED_TRIGGER_GRPS ( - sched_name varchar(120) not null comment '璋冨害鍚嶇О', - trigger_group varchar(200) not null comment 'qrtz_triggers琛╰rigger_group鐨勫閿', - primary key (sched_name, trigger_group) -) engine=innodb comment = '鏆傚仠鐨勮Е鍙戝櫒琛'; - --- ---------------------------- --- 8銆 瀛樺偍涓庡凡瑙﹀彂鐨 Trigger 鐩稿叧鐨勭姸鎬佷俊鎭紝浠ュ強鐩歌仈 Job 鐨勬墽琛屼俊鎭 --- ---------------------------- -create table QRTZ_FIRED_TRIGGERS ( - sched_name varchar(120) not null comment '璋冨害鍚嶇О', - entry_id varchar(95) not null comment '璋冨害鍣ㄥ疄渚媔d', - trigger_name varchar(200) not null comment 'qrtz_triggers琛╰rigger_name鐨勫閿', - trigger_group varchar(200) not null comment 'qrtz_triggers琛╰rigger_group鐨勫閿', - instance_name varchar(200) not null comment '璋冨害鍣ㄥ疄渚嬪悕', - fired_time bigint(13) not null comment '瑙﹀彂鐨勬椂闂', - sched_time bigint(13) not null comment '瀹氭椂鍣ㄥ埗瀹氱殑鏃堕棿', - priority integer not null comment '浼樺厛绾', - state varchar(16) not null comment '鐘舵', - job_name varchar(200) null comment '浠诲姟鍚嶇О', - job_group varchar(200) null comment '浠诲姟缁勫悕', - is_nonconcurrent varchar(1) null comment '鏄惁骞跺彂', - requests_recovery varchar(1) null comment '鏄惁鎺ュ彈鎭㈠鎵ц', - primary key (sched_name, entry_id) -) engine=innodb comment = '宸茶Е鍙戠殑瑙﹀彂鍣ㄨ〃'; - --- ---------------------------- --- 9銆 瀛樺偍灏戦噺鐨勬湁鍏 Scheduler 鐨勭姸鎬佷俊鎭紝鍋囧鏄敤浜庨泦缇や腑锛屽彲浠ョ湅鍒板叾浠栫殑 Scheduler 瀹炰緥 --- ---------------------------- -create table QRTZ_SCHEDULER_STATE ( - sched_name varchar(120) not null comment '璋冨害鍚嶇О', - instance_name varchar(200) not null comment '瀹炰緥鍚嶇О', - last_checkin_time bigint(13) not null comment '涓婃妫鏌ユ椂闂', - checkin_interval bigint(13) not null comment '妫鏌ラ棿闅旀椂闂', - primary key (sched_name, instance_name) -) engine=innodb comment = '璋冨害鍣ㄧ姸鎬佽〃'; - --- ---------------------------- --- 10銆 瀛樺偍绋嬪簭鐨勬偛瑙傞攣鐨勪俊鎭(鍋囧浣跨敤浜嗘偛瑙傞攣) --- ---------------------------- -create table QRTZ_LOCKS ( - sched_name varchar(120) not null comment '璋冨害鍚嶇О', - lock_name varchar(40) not null comment '鎮茶閿佸悕绉', - primary key (sched_name, lock_name) -) engine=innodb comment = '瀛樺偍鐨勬偛瑙傞攣淇℃伅琛'; - --- ---------------------------- --- 11銆 Quartz闆嗙兢瀹炵幇鍚屾鏈哄埗鐨勮閿佽〃 --- ---------------------------- -create table QRTZ_SIMPROP_TRIGGERS ( - sched_name varchar(120) not null comment '璋冨害鍚嶇О', - trigger_name varchar(200) not null comment 'qrtz_triggers琛╰rigger_name鐨勫閿', - trigger_group varchar(200) not null comment 'qrtz_triggers琛╰rigger_group鐨勫閿', - str_prop_1 varchar(512) null comment 'String绫诲瀷鐨則rigger鐨勭涓涓弬鏁', - str_prop_2 varchar(512) null comment 'String绫诲瀷鐨則rigger鐨勭浜屼釜鍙傛暟', - str_prop_3 varchar(512) null comment 'String绫诲瀷鐨則rigger鐨勭涓変釜鍙傛暟', - int_prop_1 int null comment 'int绫诲瀷鐨則rigger鐨勭涓涓弬鏁', - int_prop_2 int null comment 'int绫诲瀷鐨則rigger鐨勭浜屼釜鍙傛暟', - long_prop_1 bigint null comment 'long绫诲瀷鐨則rigger鐨勭涓涓弬鏁', - long_prop_2 bigint null comment 'long绫诲瀷鐨則rigger鐨勭浜屼釜鍙傛暟', - dec_prop_1 numeric(13,4) null comment 'decimal绫诲瀷鐨則rigger鐨勭涓涓弬鏁', - dec_prop_2 numeric(13,4) null comment 'decimal绫诲瀷鐨則rigger鐨勭浜屼釜鍙傛暟', - bool_prop_1 varchar(1) null comment 'Boolean绫诲瀷鐨則rigger鐨勭涓涓弬鏁', - bool_prop_2 varchar(1) null comment 'Boolean绫诲瀷鐨則rigger鐨勭浜屼釜鍙傛暟', - primary key (sched_name, trigger_name, trigger_group), - foreign key (sched_name, trigger_name, trigger_group) references QRTZ_TRIGGERS(sched_name, trigger_name, trigger_group) -) engine=innodb comment = '鍚屾鏈哄埗鐨勮閿佽〃'; - -commit; \ No newline at end of file diff --git a/sql/ry_20210908.sql b/sql/ry_20210908.sql deleted file mode 100644 index d01ecea5..00000000 --- a/sql/ry_20210908.sql +++ /dev/null @@ -1,685 +0,0 @@ -SET NAMES utf8mb4; - --- ---------------------------- --- 1銆侀儴闂ㄨ〃 --- ---------------------------- -drop table if exists sys_dept; -create table sys_dept ( - dept_id bigint(20) not null auto_increment comment '閮ㄩ棬id', - parent_id bigint(20) default 0 comment '鐖堕儴闂╥d', - ancestors varchar(50) default '' comment '绁栫骇鍒楄〃', - dept_name varchar(30) default '' comment '閮ㄩ棬鍚嶇О', - order_num int(4) default 0 comment '鏄剧ず椤哄簭', - leader varchar(20) default null comment '璐熻矗浜', - phone varchar(11) default null comment '鑱旂郴鐢佃瘽', - email varchar(50) default null comment '閭', - status char(1) default '0' comment '閮ㄩ棬鐘舵侊紙0姝ｅ父 1鍋滅敤锛', - del_flag char(1) default '0' comment '鍒犻櫎鏍囧織锛0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛', - create_by varchar(64) default '' comment '鍒涘缓鑰', - create_time datetime comment '鍒涘缓鏃堕棿', - update_by varchar(64) default '' comment '鏇存柊鑰', - update_time datetime comment '鏇存柊鏃堕棿', - primary key (dept_id) -) engine=innodb auto_increment=200 comment = '閮ㄩ棬琛'; - --- ---------------------------- --- 鍒濆鍖-閮ㄩ棬琛ㄦ暟鎹 --- ---------------------------- -insert into sys_dept values(100, 0, '0', '鑻ヤ緷绉戞妧', 0, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(101, 100, '0,100', '娣卞湷鎬诲叕鍙', 1, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(102, 100, '0,100', '闀挎矙鍒嗗叕鍙', 2, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(103, 101, '0,100,101', '鐮斿彂閮ㄩ棬', 1, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(104, 101, '0,100,101', '甯傚満閮ㄩ棬', 2, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(105, 101, '0,100,101', '娴嬭瘯閮ㄩ棬', 3, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(106, 101, '0,100,101', '璐㈠姟閮ㄩ棬', 4, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(107, 101, '0,100,101', '杩愮淮閮ㄩ棬', 5, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(108, 102, '0,100,102', '甯傚満閮ㄩ棬', 1, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(109, 102, '0,100,102', '璐㈠姟閮ㄩ棬', 2, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); - - --- ---------------------------- --- 2銆佺敤鎴蜂俊鎭〃 --- ---------------------------- -drop table if exists sys_user; -create table sys_user ( - user_id bigint(20) not null auto_increment comment '鐢ㄦ埛ID', - dept_id bigint(20) default null comment '閮ㄩ棬ID', - user_name varchar(30) not null comment '鐢ㄦ埛璐﹀彿', - nick_name varchar(30) not null comment '鐢ㄦ埛鏄电О', - user_type varchar(2) default '00' comment '鐢ㄦ埛绫诲瀷锛00绯荤粺鐢ㄦ埛锛', - email varchar(50) default '' comment '鐢ㄦ埛閭', - phonenumber varchar(11) default '' comment '鎵嬫満鍙风爜', - sex char(1) default '0' comment '鐢ㄦ埛鎬у埆锛0鐢 1濂 2鏈煡锛', - avatar varchar(100) default '' comment '澶村儚鍦板潃', - password varchar(100) default '' comment '瀵嗙爜', - status char(1) default '0' comment '甯愬彿鐘舵侊紙0姝ｅ父 1鍋滅敤锛', - del_flag char(1) default '0' comment '鍒犻櫎鏍囧織锛0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛', - login_ip varchar(128) default '' comment '鏈鍚庣櫥褰旾P', - login_date datetime comment '鏈鍚庣櫥褰曟椂闂', - create_by varchar(64) default '' comment '鍒涘缓鑰', - create_time datetime comment '鍒涘缓鏃堕棿', - update_by varchar(64) default '' comment '鏇存柊鑰', - update_time datetime comment '鏇存柊鏃堕棿', - remark varchar(500) default null comment '澶囨敞', - primary key (user_id) -) engine=innodb auto_increment=100 comment = '鐢ㄦ埛淇℃伅琛'; - --- ---------------------------- --- 鍒濆鍖-鐢ㄦ埛淇℃伅琛ㄦ暟鎹 --- ---------------------------- -insert into sys_user values(1, 103, 'admin', '鑻ヤ緷', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '绠＄悊鍛'); -insert into sys_user values(2, 105, 'ry', '鑻ヤ緷', '00', 'ry@qq.com', '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '娴嬭瘯鍛'); - - --- ---------------------------- --- 3銆佸矖浣嶄俊鎭〃 --- ---------------------------- -drop table if exists sys_post; -create table sys_post -( - post_id bigint(20) not null auto_increment comment '宀椾綅ID', - post_code varchar(64) not null comment '宀椾綅缂栫爜', - post_name varchar(50) not null comment '宀椾綅鍚嶇О', - post_sort int(4) not null comment '鏄剧ず椤哄簭', - status char(1) not null comment '鐘舵侊紙0姝ｅ父 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 null comment '澶囨敞', - primary key (post_id) -) engine=innodb comment = '宀椾綅淇℃伅琛'; - --- ---------------------------- --- 鍒濆鍖-宀椾綅淇℃伅琛ㄦ暟鎹 --- ---------------------------- -insert into sys_post values(1, 'ceo', '钁ｄ簨闀', 1, '0', 'admin', sysdate(), '', null, ''); -insert into sys_post values(2, 'se', '椤圭洰缁忕悊', 2, '0', 'admin', sysdate(), '', null, ''); -insert into sys_post values(3, 'hr', '浜哄姏璧勬簮', 3, '0', 'admin', sysdate(), '', null, ''); -insert into sys_post values(4, 'user', '鏅氬憳宸', 4, '0', 'admin', sysdate(), '', null, ''); - - --- ---------------------------- --- 4銆佽鑹蹭俊鎭〃 --- ---------------------------- -drop table if exists sys_role; -create table sys_role ( - role_id bigint(20) not null auto_increment comment '瑙掕壊ID', - role_name varchar(30) not null comment '瑙掕壊鍚嶇О', - role_key varchar(100) not null comment '瑙掕壊鏉冮檺瀛楃涓', - role_sort int(4) not null comment '鏄剧ず椤哄簭', - data_scope char(1) default '1' comment '鏁版嵁鑼冨洿锛1锛氬叏閮ㄦ暟鎹潈闄 2锛氳嚜瀹氭暟鎹潈闄 3锛氭湰閮ㄩ棬鏁版嵁鏉冮檺 4锛氭湰閮ㄩ棬鍙婁互涓嬫暟鎹潈闄愶級', - menu_check_strictly tinyint(1) default 1 comment '鑿滃崟鏍戦夋嫨椤规槸鍚﹀叧鑱旀樉绀', - dept_check_strictly tinyint(1) default 1 comment '閮ㄩ棬鏍戦夋嫨椤规槸鍚﹀叧鑱旀樉绀', - status char(1) not null comment '瑙掕壊鐘舵侊紙0姝ｅ父 1鍋滅敤锛', - del_flag char(1) default '0' comment '鍒犻櫎鏍囧織锛0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛', - create_by varchar(64) default '' comment '鍒涘缓鑰', - create_time datetime comment '鍒涘缓鏃堕棿', - update_by varchar(64) default '' comment '鏇存柊鑰', - update_time datetime comment '鏇存柊鏃堕棿', - remark varchar(500) default null comment '澶囨敞', - primary key (role_id) -) engine=innodb auto_increment=100 comment = '瑙掕壊淇℃伅琛'; - --- ---------------------------- --- 鍒濆鍖-瑙掕壊淇℃伅琛ㄦ暟鎹 --- ---------------------------- -insert into sys_role values('1', '瓒呯骇绠＄悊鍛', 'admin', 1, 1, 1, 1, '0', '0', 'admin', sysdate(), '', null, '瓒呯骇绠＄悊鍛'); -insert into sys_role values('2', '鏅氳鑹', 'common', 2, 2, 1, 1, '0', '0', 'admin', sysdate(), '', null, '鏅氳鑹'); - - --- ---------------------------- --- 5銆佽彍鍗曟潈闄愯〃 --- ---------------------------- -drop table if exists sys_menu; -create table sys_menu ( - menu_id bigint(20) not null auto_increment comment '鑿滃崟ID', - menu_name varchar(50) not null comment '鑿滃崟鍚嶇О', - parent_id bigint(20) default 0 comment '鐖惰彍鍗旾D', - order_num int(4) default 0 comment '鏄剧ず椤哄簭', - path varchar(200) default '' comment '璺敱鍦板潃', - component varchar(255) default null comment '缁勪欢璺緞', - query varchar(255) default null comment '璺敱鍙傛暟', - is_frame int(1) default 1 comment '鏄惁涓哄閾撅紙0鏄 1鍚︼級', - is_cache int(1) default 0 comment '鏄惁缂撳瓨锛0缂撳瓨 1涓嶇紦瀛橈級', - menu_type char(1) default '' comment '鑿滃崟绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛', - visible char(1) default 0 comment '鑿滃崟鐘舵侊紙0鏄剧ず 1闅愯棌锛', - status char(1) default 0 comment '鑿滃崟鐘舵侊紙0姝ｅ父 1鍋滅敤锛', - perms varchar(100) default null comment '鏉冮檺鏍囪瘑', - icon varchar(100) default '#' comment '鑿滃崟鍥炬爣', - 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 (menu_id) -) engine=innodb auto_increment=2000 comment = '鑿滃崟鏉冮檺琛'; - --- ---------------------------- --- 鍒濆鍖-鑿滃崟淇℃伅琛ㄦ暟鎹 --- ---------------------------- --- 涓绾ц彍鍗 -insert into sys_menu values('1', '绯荤粺绠＄悊', '0', '1', 'system', null, '', 1, 0, 'M', '0', '0', '', 'system', 'admin', sysdate(), '', null, '绯荤粺绠＄悊鐩綍'); -insert into sys_menu values('2', '绯荤粺鐩戞帶', '0', '2', 'monitor', null, '', 1, 0, 'M', '0', '0', '', 'monitor', 'admin', sysdate(), '', null, '绯荤粺鐩戞帶鐩綍'); -insert into sys_menu values('3', '绯荤粺宸ュ叿', '0', '3', 'tool', null, '', 1, 0, 'M', '0', '0', '', 'tool', 'admin', sysdate(), '', null, '绯荤粺宸ュ叿鐩綍'); -insert into sys_menu values('4', '鑻ヤ緷瀹樼綉', '0', '4', 'http://ruoyi.vip', null, '', 0, 0, 'M', '0', '0', '', 'guide', 'admin', sysdate(), '', null, '鑻ヤ緷瀹樼綉鍦板潃'); --- 浜岀骇鑿滃崟 -insert into sys_menu values('100', '鐢ㄦ埛绠＄悊', '1', '1', 'user', 'system/user/index', '', 1, 0, 'C', '0', '0', 'system:user:list', 'user', 'admin', sysdate(), '', null, '鐢ㄦ埛绠＄悊鑿滃崟'); -insert into sys_menu values('101', '瑙掕壊绠＄悊', '1', '2', 'role', 'system/role/index', '', 1, 0, 'C', '0', '0', 'system:role:list', 'peoples', 'admin', sysdate(), '', null, '瑙掕壊绠＄悊鑿滃崟'); -insert into sys_menu values('102', '鑿滃崟绠＄悊', '1', '3', 'menu', 'system/menu/index', '', 1, 0, 'C', '0', '0', 'system:menu:list', 'tree-table', 'admin', sysdate(), '', null, '鑿滃崟绠＄悊鑿滃崟'); -insert into sys_menu values('103', '閮ㄩ棬绠＄悊', '1', '4', 'dept', 'system/dept/index', '', 1, 0, 'C', '0', '0', 'system:dept:list', 'tree', 'admin', sysdate(), '', null, '閮ㄩ棬绠＄悊鑿滃崟'); -insert into sys_menu values('104', '宀椾綅绠＄悊', '1', '5', 'post', 'system/post/index', '', 1, 0, 'C', '0', '0', 'system:post:list', 'post', 'admin', sysdate(), '', null, '宀椾綅绠＄悊鑿滃崟'); -insert into sys_menu values('105', '瀛楀吀绠＄悊', '1', '6', 'dict', 'system/dict/index', '', 1, 0, 'C', '0', '0', 'system:dict:list', 'dict', 'admin', sysdate(), '', null, '瀛楀吀绠＄悊鑿滃崟'); -insert into sys_menu values('106', '鍙傛暟璁剧疆', '1', '7', 'config', 'system/config/index', '', 1, 0, 'C', '0', '0', 'system:config:list', 'edit', 'admin', sysdate(), '', null, '鍙傛暟璁剧疆鑿滃崟'); -insert into sys_menu values('107', '閫氱煡鍏憡', '1', '8', 'notice', 'system/notice/index', '', 1, 0, 'C', '0', '0', 'system:notice:list', 'message', 'admin', sysdate(), '', null, '閫氱煡鍏憡鑿滃崟'); -insert into sys_menu values('108', '鏃ュ織绠＄悊', '1', '9', 'log', '', '', 1, 0, 'M', '0', '0', '', 'log', 'admin', sysdate(), '', null, '鏃ュ織绠＄悊鑿滃崟'); -insert into sys_menu values('109', '鍦ㄧ嚎鐢ㄦ埛', '2', '1', 'online', 'monitor/online/index', '', 1, 0, 'C', '0', '0', 'monitor:online:list', 'online', 'admin', sysdate(), '', null, '鍦ㄧ嚎鐢ㄦ埛鑿滃崟'); -insert into sys_menu values('110', '瀹氭椂浠诲姟', '2', '2', 'job', 'monitor/job/index', '', 1, 0, 'C', '0', '0', 'monitor:job:list', 'job', 'admin', sysdate(), '', null, '瀹氭椂浠诲姟鑿滃崟'); -insert into sys_menu values('111', 'Sentinel鎺у埗鍙', '2', '3', 'http://localhost:8718', '', '', 0, 0, 'C', '0', '0', 'monitor:sentinel:list', 'sentinel', 'admin', sysdate(), '', null, '娴侀噺鎺у埗鑿滃崟'); -insert into sys_menu values('112', 'Nacos鎺у埗鍙', '2', '4', 'http://localhost:8848/nacos', '', '', 0, 0, 'C', '0', '0', 'monitor:nacos:list', 'nacos', 'admin', sysdate(), '', null, '鏈嶅姟娌荤悊鑿滃崟'); -insert into sys_menu values('113', 'Admin鎺у埗鍙', '2', '5', 'http://localhost:9100/login', '', '', 0, 0, 'C', '0', '0', 'monitor:server:list', 'server', 'admin', sysdate(), '', null, '鏈嶅姟鐩戞帶鑿滃崟'); -insert into sys_menu values('114', '琛ㄥ崟鏋勫缓', '3', '1', 'build', 'tool/build/index', '', 1, 0, 'C', '0', '0', 'tool:build:list', 'build', 'admin', sysdate(), '', null, '琛ㄥ崟鏋勫缓鑿滃崟'); -insert into sys_menu values('115', '浠ｇ爜鐢熸垚', '3', '2', 'gen', 'tool/gen/index', '', 1, 0, 'C', '0', '0', 'tool:gen:list', 'code', 'admin', sysdate(), '', null, '浠ｇ爜鐢熸垚鑿滃崟'); -insert into sys_menu values('116', '绯荤粺鎺ュ彛', '3', '3', 'http://localhost:8080/swagger-ui/index.html', '', '', 0, 0, 'C', '0', '0', 'tool:swagger:list', 'swagger', 'admin', sysdate(), '', null, '绯荤粺鎺ュ彛鑿滃崟'); --- 涓夌骇鑿滃崟 -insert into sys_menu values('500', '鎿嶄綔鏃ュ織', '108', '1', 'operlog', 'system/operlog/index', '', 1, 0, 'C', '0', '0', 'system:operlog:list', 'form', 'admin', sysdate(), '', null, '鎿嶄綔鏃ュ織鑿滃崟'); -insert into sys_menu values('501', '鐧诲綍鏃ュ織', '108', '2', 'logininfor', 'system/logininfor/index', '', 1, 0, 'C', '0', '0', 'system:logininfor:list', 'logininfor', 'admin', sysdate(), '', null, '鐧诲綍鏃ュ織鑿滃崟'); --- 鐢ㄦ埛绠＄悊鎸夐挳 -insert into sys_menu values('1001', '鐢ㄦ埛鏌ヨ', '100', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:user:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1002', '鐢ㄦ埛鏂板', '100', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:user:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1003', '鐢ㄦ埛淇敼', '100', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:user:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1004', '鐢ㄦ埛鍒犻櫎', '100', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:user:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1005', '鐢ㄦ埛瀵煎嚭', '100', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:user:export', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1006', '鐢ㄦ埛瀵煎叆', '100', '6', '', '', '', 1, 0, 'F', '0', '0', 'system:user:import', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1007', '閲嶇疆瀵嗙爜', '100', '7', '', '', '', 1, 0, 'F', '0', '0', 'system:user:resetPwd', '#', 'admin', sysdate(), '', null, ''); --- 瑙掕壊绠＄悊鎸夐挳 -insert into sys_menu values('1008', '瑙掕壊鏌ヨ', '101', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:role:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1009', '瑙掕壊鏂板', '101', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:role:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1010', '瑙掕壊淇敼', '101', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:role:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1011', '瑙掕壊鍒犻櫎', '101', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:role:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1012', '瑙掕壊瀵煎嚭', '101', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:role:export', '#', 'admin', sysdate(), '', null, ''); --- 鑿滃崟绠＄悊鎸夐挳 -insert into sys_menu values('1013', '鑿滃崟鏌ヨ', '102', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1014', '鑿滃崟鏂板', '102', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1015', '鑿滃崟淇敼', '102', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1016', '鑿滃崟鍒犻櫎', '102', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:remove', '#', 'admin', sysdate(), '', null, ''); --- 閮ㄩ棬绠＄悊鎸夐挳 -insert into sys_menu values('1017', '閮ㄩ棬鏌ヨ', '103', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1018', '閮ㄩ棬鏂板', '103', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1019', '閮ㄩ棬淇敼', '103', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1020', '閮ㄩ棬鍒犻櫎', '103', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:remove', '#', 'admin', sysdate(), '', null, ''); --- 宀椾綅绠＄悊鎸夐挳 -insert into sys_menu values('1021', '宀椾綅鏌ヨ', '104', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:post:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1022', '宀椾綅鏂板', '104', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:post:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1023', '宀椾綅淇敼', '104', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:post:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1024', '宀椾綅鍒犻櫎', '104', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:post:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1025', '宀椾綅瀵煎嚭', '104', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:post:export', '#', 'admin', sysdate(), '', null, ''); --- 瀛楀吀绠＄悊鎸夐挳 -insert into sys_menu values('1026', '瀛楀吀鏌ヨ', '105', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1027', '瀛楀吀鏂板', '105', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1028', '瀛楀吀淇敼', '105', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1029', '瀛楀吀鍒犻櫎', '105', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1030', '瀛楀吀瀵煎嚭', '105', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:export', '#', 'admin', sysdate(), '', null, ''); --- 鍙傛暟璁剧疆鎸夐挳 -insert into sys_menu values('1031', '鍙傛暟鏌ヨ', '106', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1032', '鍙傛暟鏂板', '106', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1033', '鍙傛暟淇敼', '106', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1034', '鍙傛暟鍒犻櫎', '106', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1035', '鍙傛暟瀵煎嚭', '106', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:export', '#', 'admin', sysdate(), '', null, ''); --- 閫氱煡鍏憡鎸夐挳 -insert into sys_menu values('1036', '鍏憡鏌ヨ', '107', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1037', '鍏憡鏂板', '107', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1038', '鍏憡淇敼', '107', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1039', '鍏憡鍒犻櫎', '107', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:remove', '#', 'admin', sysdate(), '', null, ''); --- 鎿嶄綔鏃ュ織鎸夐挳 -insert into sys_menu values('1040', '鎿嶄綔鏌ヨ', '500', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:operlog:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1041', '鎿嶄綔鍒犻櫎', '500', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:operlog:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1042', '鏃ュ織瀵煎嚭', '500', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:operlog:export', '#', 'admin', sysdate(), '', null, ''); --- 鐧诲綍鏃ュ織鎸夐挳 -insert into sys_menu values('1043', '鐧诲綍鏌ヨ', '501', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1044', '鐧诲綍鍒犻櫎', '501', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1045', '鏃ュ織瀵煎嚭', '501', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:export', '#', 'admin', sysdate(), '', null, ''); --- 鍦ㄧ嚎鐢ㄦ埛鎸夐挳 -insert into sys_menu values('1046', '鍦ㄧ嚎鏌ヨ', '109', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1047', '鎵归噺寮洪', '109', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:batchLogout', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1048', '鍗曟潯寮洪', '109', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:forceLogout', '#', 'admin', sysdate(), '', null, ''); --- 瀹氭椂浠诲姟鎸夐挳 -insert into sys_menu values('1049', '浠诲姟鏌ヨ', '110', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1050', '浠诲姟鏂板', '110', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1051', '浠诲姟淇敼', '110', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1052', '浠诲姟鍒犻櫎', '110', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1053', '鐘舵佷慨鏀', '110', '5', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:changeStatus', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1054', '浠诲姟瀵煎嚭', '110', '7', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:export', '#', 'admin', sysdate(), '', null, ''); --- 浠ｇ爜鐢熸垚鎸夐挳 -insert into sys_menu values('1055', '鐢熸垚鏌ヨ', '115', '1', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1056', '鐢熸垚淇敼', '115', '2', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1057', '鐢熸垚鍒犻櫎', '115', '3', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1058', '瀵煎叆浠ｇ爜', '115', '2', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:import', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1059', '棰勮浠ｇ爜', '115', '4', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:preview', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1060', '鐢熸垚浠ｇ爜', '115', '5', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:code', '#', 'admin', sysdate(), '', null, ''); - - --- ---------------------------- --- 6銆佺敤鎴峰拰瑙掕壊鍏宠仈琛 鐢ㄦ埛N-1瑙掕壊 --- ---------------------------- -drop table if exists sys_user_role; -create table sys_user_role ( - user_id bigint(20) not null comment '鐢ㄦ埛ID', - role_id bigint(20) not null comment '瑙掕壊ID', - primary key(user_id, role_id) -) engine=innodb comment = '鐢ㄦ埛鍜岃鑹插叧鑱旇〃'; - --- ---------------------------- --- 鍒濆鍖-鐢ㄦ埛鍜岃鑹插叧鑱旇〃鏁版嵁 --- ---------------------------- -insert into sys_user_role values ('1', '1'); -insert into sys_user_role values ('2', '2'); - - --- ---------------------------- --- 7銆佽鑹插拰鑿滃崟鍏宠仈琛 瑙掕壊1-N鑿滃崟 --- ---------------------------- -drop table if exists sys_role_menu; -create table sys_role_menu ( - role_id bigint(20) not null comment '瑙掕壊ID', - menu_id bigint(20) not null comment '鑿滃崟ID', - primary key(role_id, menu_id) -) engine=innodb comment = '瑙掕壊鍜岃彍鍗曞叧鑱旇〃'; - --- ---------------------------- --- 鍒濆鍖-瑙掕壊鍜岃彍鍗曞叧鑱旇〃鏁版嵁 --- ---------------------------- -insert into sys_role_menu values ('2', '1'); -insert into sys_role_menu values ('2', '2'); -insert into sys_role_menu values ('2', '3'); -insert into sys_role_menu values ('2', '4'); -insert into sys_role_menu values ('2', '100'); -insert into sys_role_menu values ('2', '101'); -insert into sys_role_menu values ('2', '102'); -insert into sys_role_menu values ('2', '103'); -insert into sys_role_menu values ('2', '104'); -insert into sys_role_menu values ('2', '105'); -insert into sys_role_menu values ('2', '106'); -insert into sys_role_menu values ('2', '107'); -insert into sys_role_menu values ('2', '108'); -insert into sys_role_menu values ('2', '109'); -insert into sys_role_menu values ('2', '110'); -insert into sys_role_menu values ('2', '111'); -insert into sys_role_menu values ('2', '112'); -insert into sys_role_menu values ('2', '113'); -insert into sys_role_menu values ('2', '114'); -insert into sys_role_menu values ('2', '115'); -insert into sys_role_menu values ('2', '116'); -insert into sys_role_menu values ('2', '500'); -insert into sys_role_menu values ('2', '501'); -insert into sys_role_menu values ('2', '1000'); -insert into sys_role_menu values ('2', '1001'); -insert into sys_role_menu values ('2', '1002'); -insert into sys_role_menu values ('2', '1003'); -insert into sys_role_menu values ('2', '1004'); -insert into sys_role_menu values ('2', '1005'); -insert into sys_role_menu values ('2', '1006'); -insert into sys_role_menu values ('2', '1007'); -insert into sys_role_menu values ('2', '1008'); -insert into sys_role_menu values ('2', '1009'); -insert into sys_role_menu values ('2', '1010'); -insert into sys_role_menu values ('2', '1011'); -insert into sys_role_menu values ('2', '1012'); -insert into sys_role_menu values ('2', '1013'); -insert into sys_role_menu values ('2', '1014'); -insert into sys_role_menu values ('2', '1015'); -insert into sys_role_menu values ('2', '1016'); -insert into sys_role_menu values ('2', '1017'); -insert into sys_role_menu values ('2', '1018'); -insert into sys_role_menu values ('2', '1019'); -insert into sys_role_menu values ('2', '1020'); -insert into sys_role_menu values ('2', '1021'); -insert into sys_role_menu values ('2', '1022'); -insert into sys_role_menu values ('2', '1023'); -insert into sys_role_menu values ('2', '1024'); -insert into sys_role_menu values ('2', '1025'); -insert into sys_role_menu values ('2', '1026'); -insert into sys_role_menu values ('2', '1027'); -insert into sys_role_menu values ('2', '1028'); -insert into sys_role_menu values ('2', '1029'); -insert into sys_role_menu values ('2', '1030'); -insert into sys_role_menu values ('2', '1031'); -insert into sys_role_menu values ('2', '1032'); -insert into sys_role_menu values ('2', '1033'); -insert into sys_role_menu values ('2', '1034'); -insert into sys_role_menu values ('2', '1035'); -insert into sys_role_menu values ('2', '1036'); -insert into sys_role_menu values ('2', '1037'); -insert into sys_role_menu values ('2', '1038'); -insert into sys_role_menu values ('2', '1039'); -insert into sys_role_menu values ('2', '1040'); -insert into sys_role_menu values ('2', '1041'); -insert into sys_role_menu values ('2', '1042'); -insert into sys_role_menu values ('2', '1043'); -insert into sys_role_menu values ('2', '1044'); -insert into sys_role_menu values ('2', '1045'); -insert into sys_role_menu values ('2', '1046'); -insert into sys_role_menu values ('2', '1047'); -insert into sys_role_menu values ('2', '1048'); -insert into sys_role_menu values ('2', '1049'); -insert into sys_role_menu values ('2', '1050'); -insert into sys_role_menu values ('2', '1051'); -insert into sys_role_menu values ('2', '1052'); -insert into sys_role_menu values ('2', '1053'); -insert into sys_role_menu values ('2', '1054'); -insert into sys_role_menu values ('2', '1055'); -insert into sys_role_menu values ('2', '1056'); -insert into sys_role_menu values ('2', '1057'); -insert into sys_role_menu values ('2', '1058'); -insert into sys_role_menu values ('2', '1059'); -insert into sys_role_menu values ('2', '1060'); - --- ---------------------------- --- 8銆佽鑹插拰閮ㄩ棬鍏宠仈琛 瑙掕壊1-N閮ㄩ棬 --- ---------------------------- -drop table if exists sys_role_dept; -create table sys_role_dept ( - role_id bigint(20) not null comment '瑙掕壊ID', - dept_id bigint(20) not null comment '閮ㄩ棬ID', - primary key(role_id, dept_id) -) engine=innodb comment = '瑙掕壊鍜岄儴闂ㄥ叧鑱旇〃'; - --- ---------------------------- --- 鍒濆鍖-瑙掕壊鍜岄儴闂ㄥ叧鑱旇〃鏁版嵁 --- ---------------------------- -insert into sys_role_dept values ('2', '100'); -insert into sys_role_dept values ('2', '101'); -insert into sys_role_dept values ('2', '105'); - - --- ---------------------------- --- 9銆佺敤鎴蜂笌宀椾綅鍏宠仈琛 鐢ㄦ埛1-N宀椾綅 --- ---------------------------- -drop table if exists sys_user_post; -create table sys_user_post -( - user_id bigint(20) not null comment '鐢ㄦ埛ID', - post_id bigint(20) not null comment '宀椾綅ID', - primary key (user_id, post_id) -) engine=innodb comment = '鐢ㄦ埛涓庡矖浣嶅叧鑱旇〃'; - --- ---------------------------- --- 鍒濆鍖-鐢ㄦ埛涓庡矖浣嶅叧鑱旇〃鏁版嵁 --- ---------------------------- -insert into sys_user_post values ('1', '1'); -insert into sys_user_post values ('2', '2'); - - --- ---------------------------- --- 10銆佹搷浣滄棩蹇楄褰 --- ---------------------------- -drop table if exists sys_oper_log; -create table sys_oper_log ( - oper_id bigint(20) not null auto_increment comment '鏃ュ織涓婚敭', - title varchar(50) default '' comment '妯″潡鏍囬', - business_type int(2) default 0 comment '涓氬姟绫诲瀷锛0鍏跺畠 1鏂板 2淇敼 3鍒犻櫎锛', - method varchar(100) default '' comment '鏂规硶鍚嶇О', - request_method varchar(10) default '' comment '璇锋眰鏂瑰紡', - operator_type int(1) default 0 comment '鎿嶄綔绫诲埆锛0鍏跺畠 1鍚庡彴鐢ㄦ埛 2鎵嬫満绔敤鎴凤級', - oper_name varchar(50) default '' comment '鎿嶄綔浜哄憳', - dept_name varchar(50) default '' comment '閮ㄩ棬鍚嶇О', - oper_url varchar(255) default '' comment '璇锋眰URL', - oper_ip varchar(128) default '' comment '涓绘満鍦板潃', - oper_location varchar(255) default '' comment '鎿嶄綔鍦扮偣', - oper_param varchar(2000) default '' comment '璇锋眰鍙傛暟', - json_result varchar(2000) default '' comment '杩斿洖鍙傛暟', - status int(1) default 0 comment '鎿嶄綔鐘舵侊紙0姝ｅ父 1寮傚父锛', - error_msg varchar(2000) default '' comment '閿欒娑堟伅', - oper_time datetime comment '鎿嶄綔鏃堕棿', - primary key (oper_id) -) engine=innodb auto_increment=100 comment = '鎿嶄綔鏃ュ織璁板綍'; - - --- ---------------------------- --- 11銆佸瓧鍏哥被鍨嬭〃 --- ---------------------------- -drop table if exists sys_dict_type; -create table sys_dict_type -( - dict_id bigint(20) not null auto_increment comment '瀛楀吀涓婚敭', - dict_name varchar(100) default '' comment '瀛楀吀鍚嶇О', - dict_type varchar(100) default '' comment '瀛楀吀绫诲瀷', - status char(1) default '0' comment '鐘舵侊紙0姝ｅ父 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 null comment '澶囨敞', - primary key (dict_id), - unique (dict_type) -) engine=innodb auto_increment=100 comment = '瀛楀吀绫诲瀷琛'; - -insert into sys_dict_type values(1, '鐢ㄦ埛鎬у埆', 'sys_user_sex', '0', 'admin', sysdate(), '', null, '鐢ㄦ埛鎬у埆鍒楄〃'); -insert into sys_dict_type values(2, '鑿滃崟鐘舵', 'sys_show_hide', '0', 'admin', sysdate(), '', null, '鑿滃崟鐘舵佸垪琛'); -insert into sys_dict_type values(3, '绯荤粺寮鍏', 'sys_normal_disable', '0', 'admin', sysdate(), '', null, '绯荤粺寮鍏冲垪琛'); -insert into sys_dict_type values(4, '浠诲姟鐘舵', 'sys_job_status', '0', 'admin', sysdate(), '', null, '浠诲姟鐘舵佸垪琛'); -insert into sys_dict_type values(5, '浠诲姟鍒嗙粍', 'sys_job_group', '0', 'admin', sysdate(), '', null, '浠诲姟鍒嗙粍鍒楄〃'); -insert into sys_dict_type values(6, '绯荤粺鏄惁', 'sys_yes_no', '0', 'admin', sysdate(), '', null, '绯荤粺鏄惁鍒楄〃'); -insert into sys_dict_type values(7, '閫氱煡绫诲瀷', 'sys_notice_type', '0', 'admin', sysdate(), '', null, '閫氱煡绫诲瀷鍒楄〃'); -insert into sys_dict_type values(8, '閫氱煡鐘舵', 'sys_notice_status', '0', 'admin', sysdate(), '', null, '閫氱煡鐘舵佸垪琛'); -insert into sys_dict_type values(9, '鎿嶄綔绫诲瀷', 'sys_oper_type', '0', 'admin', sysdate(), '', null, '鎿嶄綔绫诲瀷鍒楄〃'); -insert into sys_dict_type values(10, '绯荤粺鐘舵', 'sys_common_status', '0', 'admin', sysdate(), '', null, '鐧诲綍鐘舵佸垪琛'); - --- ---------------------------- --- 12銆佸瓧鍏告暟鎹〃 --- ---------------------------- -drop table if exists sys_dict_data; -create table sys_dict_data -( - dict_code bigint(20) not null auto_increment comment '瀛楀吀缂栫爜', - dict_sort int(4) default 0 comment '瀛楀吀鎺掑簭', - dict_label varchar(100) default '' comment '瀛楀吀鏍囩', - dict_value varchar(100) default '' comment '瀛楀吀閿', - dict_type varchar(100) default '' comment '瀛楀吀绫诲瀷', - css_class varchar(100) default null comment '鏍峰紡灞炴э紙鍏朵粬鏍峰紡鎵╁睍锛', - list_class varchar(100) default null comment '琛ㄦ牸鍥炴樉鏍峰紡', - is_default char(1) default 'N' comment '鏄惁榛樿锛圷鏄 N鍚︼級', - status char(1) default '0' comment '鐘舵侊紙0姝ｅ父 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 null comment '澶囨敞', - primary key (dict_code) -) engine=innodb auto_increment=100 comment = '瀛楀吀鏁版嵁琛'; - -insert into sys_dict_data values(1, 1, '鐢', '0', 'sys_user_sex', '', '', 'Y', '0', 'admin', sysdate(), '', null, '鎬у埆鐢'); -insert into sys_dict_data values(2, 2, '濂', '1', 'sys_user_sex', '', '', 'N', '0', 'admin', sysdate(), '', null, '鎬у埆濂'); -insert into sys_dict_data values(3, 3, '鏈煡', '2', 'sys_user_sex', '', '', 'N', '0', 'admin', sysdate(), '', null, '鎬у埆鏈煡'); -insert into sys_dict_data values(4, 1, '鏄剧ず', '0', 'sys_show_hide', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '鏄剧ず鑿滃崟'); -insert into sys_dict_data values(5, 2, '闅愯棌', '1', 'sys_show_hide', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '闅愯棌鑿滃崟'); -insert into sys_dict_data values(6, 1, '姝ｅ父', '0', 'sys_normal_disable', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '姝ｅ父鐘舵'); -insert into sys_dict_data values(7, 2, '鍋滅敤', '1', 'sys_normal_disable', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '鍋滅敤鐘舵'); -insert into sys_dict_data values(8, 1, '姝ｅ父', '0', 'sys_job_status', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '姝ｅ父鐘舵'); -insert into sys_dict_data values(9, 2, '鏆傚仠', '1', 'sys_job_status', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '鍋滅敤鐘舵'); -insert into sys_dict_data values(10, 1, '榛樿', 'DEFAULT', 'sys_job_group', '', '', 'Y', '0', 'admin', sysdate(), '', null, '榛樿鍒嗙粍'); -insert into sys_dict_data values(11, 2, '绯荤粺', 'SYSTEM', 'sys_job_group', '', '', 'N', '0', 'admin', sysdate(), '', null, '绯荤粺鍒嗙粍'); -insert into sys_dict_data values(12, 1, '鏄', 'Y', 'sys_yes_no', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '绯荤粺榛樿鏄'); -insert into sys_dict_data values(13, 2, '鍚', 'N', 'sys_yes_no', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '绯荤粺榛樿鍚'); -insert into sys_dict_data values(14, 1, '閫氱煡', '1', 'sys_notice_type', '', 'warning', 'Y', '0', 'admin', sysdate(), '', null, '閫氱煡'); -insert into sys_dict_data values(15, 2, '鍏憡', '2', 'sys_notice_type', '', 'success', 'N', '0', 'admin', sysdate(), '', null, '鍏憡'); -insert into sys_dict_data values(16, 1, '姝ｅ父', '0', 'sys_notice_status', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '姝ｅ父鐘舵'); -insert into sys_dict_data values(17, 2, '鍏抽棴', '1', 'sys_notice_status', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '鍏抽棴鐘舵'); -insert into sys_dict_data values(18, 1, '鏂板', '1', 'sys_oper_type', '', 'info', 'N', '0', 'admin', sysdate(), '', null, '鏂板鎿嶄綔'); -insert into sys_dict_data values(19, 2, '淇敼', '2', 'sys_oper_type', '', 'info', 'N', '0', 'admin', sysdate(), '', null, '淇敼鎿嶄綔'); -insert into sys_dict_data values(20, 3, '鍒犻櫎', '3', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '鍒犻櫎鎿嶄綔'); -insert into sys_dict_data values(21, 4, '鎺堟潈', '4', 'sys_oper_type', '', 'primary', 'N', '0', 'admin', sysdate(), '', null, '鎺堟潈鎿嶄綔'); -insert into sys_dict_data values(22, 5, '瀵煎嚭', '5', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', sysdate(), '', null, '瀵煎嚭鎿嶄綔'); -insert into sys_dict_data values(23, 6, '瀵煎叆', '6', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', sysdate(), '', null, '瀵煎叆鎿嶄綔'); -insert into sys_dict_data values(24, 7, '寮洪', '7', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '寮洪鎿嶄綔'); -insert into sys_dict_data values(25, 8, '鐢熸垚浠ｇ爜', '8', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', sysdate(), '', null, '鐢熸垚鎿嶄綔'); -insert into sys_dict_data values(26, 9, '娓呯┖鏁版嵁', '9', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '娓呯┖鎿嶄綔'); -insert into sys_dict_data values(27, 1, '鎴愬姛', '0', 'sys_common_status', '', 'primary', 'N', '0', 'admin', sysdate(), '', null, '姝ｅ父鐘舵'); -insert into sys_dict_data values(28, 2, '澶辫触', '1', 'sys_common_status', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '鍋滅敤鐘舵'); - - --- ---------------------------- --- 13銆佸弬鏁伴厤缃〃 --- ---------------------------- -drop table if exists sys_config; -create table sys_config ( - config_id int(5) not null auto_increment comment '鍙傛暟涓婚敭', - config_name varchar(100) default '' comment '鍙傛暟鍚嶇О', - config_key varchar(100) default '' comment '鍙傛暟閿悕', - config_value varchar(500) default '' comment '鍙傛暟閿', - config_type char(1) default 'N' comment '绯荤粺鍐呯疆锛圷鏄 N鍚︼級', - create_by varchar(64) default '' comment '鍒涘缓鑰', - create_time datetime comment '鍒涘缓鏃堕棿', - update_by varchar(64) default '' comment '鏇存柊鑰', - update_time datetime comment '鏇存柊鏃堕棿', - remark varchar(500) default null comment '澶囨敞', - primary key (config_id) -) engine=innodb auto_increment=100 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(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鍏抽棴锛'); - - --- ---------------------------- --- 14銆佺郴缁熻闂褰 --- ---------------------------- -drop table if exists sys_logininfor; -create table sys_logininfor ( - info_id bigint(20) not null auto_increment comment '璁块棶ID', - user_name varchar(50) default '' comment '鐢ㄦ埛璐﹀彿', - ipaddr varchar(128) default '' comment '鐧诲綍IP鍦板潃', - status char(1) default '0' comment '鐧诲綍鐘舵侊紙0鎴愬姛 1澶辫触锛', - msg varchar(255) default '' comment '鎻愮ず淇℃伅', - access_time datetime comment '璁块棶鏃堕棿', - primary key (info_id) -) engine=innodb auto_increment=100 comment = '绯荤粺璁块棶璁板綍'; - - --- ---------------------------- --- 15銆佸畾鏃朵换鍔¤皟搴﹁〃 --- ---------------------------- -drop table if exists sys_job; -create table sys_job ( - job_id bigint(20) not null auto_increment comment '浠诲姟ID', - job_name varchar(64) default '' comment '浠诲姟鍚嶇О', - job_group varchar(64) default 'DEFAULT' comment '浠诲姟缁勫悕', - invoke_target varchar(500) not null comment '璋冪敤鐩爣瀛楃涓', - cron_expression varchar(255) default '' comment 'cron鎵ц琛ㄨ揪寮', - misfire_policy varchar(20) default '3' comment '璁″垝鎵ц閿欒绛栫暐锛1绔嬪嵆鎵ц 2鎵ц涓娆 3鏀惧純鎵ц锛', - concurrent char(1) default '1' comment '鏄惁骞跺彂鎵ц锛0鍏佽 1绂佹锛', - status char(1) default '0' comment '鐘舵侊紙0姝ｅ父 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 (job_id, job_name, job_group) -) engine=innodb auto_increment=100 comment = '瀹氭椂浠诲姟璋冨害琛'; - -insert into sys_job values(1, '绯荤粺榛樿锛堟棤鍙傦級', 'DEFAULT', 'ryTask.ryNoParams', '0/10 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, ''); -insert into sys_job values(2, '绯荤粺榛樿锛堟湁鍙傦級', 'DEFAULT', 'ryTask.ryParams(\'ry\')', '0/15 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, ''); -insert into sys_job values(3, '绯荤粺榛樿锛堝鍙傦級', 'DEFAULT', 'ryTask.ryMultipleParams(\'ry\', true, 2000L, 316.50D, 100)', '0/20 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, ''); - - --- ---------------------------- --- 16銆佸畾鏃朵换鍔¤皟搴︽棩蹇楄〃 --- ---------------------------- -drop table if exists sys_job_log; -create table sys_job_log ( - job_log_id bigint(20) not null auto_increment comment '浠诲姟鏃ュ織ID', - job_name varchar(64) not null comment '浠诲姟鍚嶇О', - job_group varchar(64) not null comment '浠诲姟缁勫悕', - invoke_target varchar(500) not null comment '璋冪敤鐩爣瀛楃涓', - job_message varchar(500) comment '鏃ュ織淇℃伅', - status char(1) default '0' comment '鎵ц鐘舵侊紙0姝ｅ父 1澶辫触锛', - exception_info varchar(2000) default '' comment '寮傚父淇℃伅', - create_time datetime comment '鍒涘缓鏃堕棿', - primary key (job_log_id) -) engine=innodb comment = '瀹氭椂浠诲姟璋冨害鏃ュ織琛'; - - --- ---------------------------- --- 17銆侀氱煡鍏憡琛 --- ---------------------------- -drop table if exists sys_notice; -create table sys_notice ( - notice_id int(4) not null auto_increment comment '鍏憡ID', - notice_title varchar(50) not null comment '鍏憡鏍囬', - notice_type char(1) not null comment '鍏憡绫诲瀷锛1閫氱煡 2鍏憡锛', - notice_content longblob default null comment '鍏憡鍐呭', - status char(1) default '0' comment '鍏憡鐘舵侊紙0姝ｅ父 1鍏抽棴锛', - create_by varchar(64) default '' comment '鍒涘缓鑰', - create_time datetime comment '鍒涘缓鏃堕棿', - update_by varchar(64) default '' comment '鏇存柊鑰', - update_time datetime comment '鏇存柊鏃堕棿', - remark varchar(255) default null comment '澶囨敞', - primary key (notice_id) -) engine=innodb auto_increment=10 comment = '閫氱煡鍏憡琛'; - --- ---------------------------- --- 鍒濆鍖-鍏憡淇℃伅琛ㄦ暟鎹 --- ---------------------------- -insert into sys_notice values('1', '娓╅Θ鎻愰啋锛2018-07-01 鑻ヤ緷鏂扮増鏈彂甯冨暒', '2', '鏂扮増鏈唴瀹', '0', 'admin', sysdate(), '', null, '绠＄悊鍛'); -insert into sys_notice values('2', '缁存姢閫氱煡锛2018-07-01 鑻ヤ緷绯荤粺鍑屾櫒缁存姢', '1', '缁存姢鍐呭', '0', 'admin', sysdate(), '', null, '绠＄悊鍛'); - - --- ---------------------------- --- 18銆佷唬鐮佺敓鎴愪笟鍔¤〃 --- ---------------------------- -drop table if exists gen_table; -create table gen_table ( - table_id bigint(20) not null auto_increment comment '缂栧彿', - table_name varchar(200) default '' comment '琛ㄥ悕绉', - table_comment varchar(500) default '' comment '琛ㄦ弿杩', - sub_table_name varchar(64) default null comment '鍏宠仈瀛愯〃鐨勮〃鍚', - sub_table_fk_name varchar(64) default null comment '瀛愯〃鍏宠仈鐨勫閿悕', - class_name varchar(100) default '' comment '瀹炰綋绫诲悕绉', - tpl_category varchar(200) default 'crud' comment '浣跨敤鐨勬ā鏉匡紙crud鍗曡〃鎿嶄綔 tree鏍戣〃鎿嶄綔锛', - package_name varchar(100) comment '鐢熸垚鍖呰矾寰', - module_name varchar(30) comment '鐢熸垚妯″潡鍚', - business_name varchar(30) comment '鐢熸垚涓氬姟鍚', - function_name varchar(50) comment '鐢熸垚鍔熻兘鍚', - function_author varchar(50) comment '鐢熸垚鍔熻兘浣滆', - gen_type char(1) default '0' comment '鐢熸垚浠ｇ爜鏂瑰紡锛0zip鍘嬬缉鍖 1鑷畾涔夎矾寰勶級', - gen_path varchar(200) default '/' comment '鐢熸垚璺緞锛堜笉濉粯璁ら」鐩矾寰勶級', - options varchar(1000) comment '鍏跺畠鐢熸垚閫夐」', - create_by varchar(64) default '' comment '鍒涘缓鑰', - create_time datetime comment '鍒涘缓鏃堕棿', - update_by varchar(64) default '' comment '鏇存柊鑰', - update_time datetime comment '鏇存柊鏃堕棿', - remark varchar(500) default null comment '澶囨敞', - primary key (table_id) -) engine=innodb auto_increment=1 comment = '浠ｇ爜鐢熸垚涓氬姟琛'; - - --- ---------------------------- --- 19銆佷唬鐮佺敓鎴愪笟鍔¤〃瀛楁 --- ---------------------------- -drop table if exists gen_table_column; -create table gen_table_column ( - column_id bigint(20) not null auto_increment comment '缂栧彿', - table_id varchar(64) comment '褰掑睘琛ㄧ紪鍙', - column_name varchar(200) comment '鍒楀悕绉', - column_comment varchar(500) comment '鍒楁弿杩', - column_type varchar(100) comment '鍒楃被鍨', - java_type varchar(500) comment 'JAVA绫诲瀷', - java_field varchar(200) comment 'JAVA瀛楁鍚', - is_pk char(1) comment '鏄惁涓婚敭锛1鏄級', - is_increment char(1) comment '鏄惁鑷锛1鏄級', - is_required char(1) comment '鏄惁蹇呭～锛1鏄級', - is_insert char(1) comment '鏄惁涓烘彃鍏ュ瓧娈碉紙1鏄級', - is_edit char(1) comment '鏄惁缂栬緫瀛楁锛1鏄級', - is_list char(1) comment '鏄惁鍒楄〃瀛楁锛1鏄級', - is_query char(1) comment '鏄惁鏌ヨ瀛楁锛1鏄級', - query_type varchar(200) default 'EQ' comment '鏌ヨ鏂瑰紡锛堢瓑浜庛佷笉绛変簬銆佸ぇ浜庛佸皬浜庛佽寖鍥达級', - html_type varchar(200) comment '鏄剧ず绫诲瀷锛堟枃鏈銆佹枃鏈煙銆佷笅鎷夋銆佸閫夋銆佸崟閫夋銆佹棩鏈熸帶浠讹級', - dict_type varchar(200) default '' comment '瀛楀吀绫诲瀷', - sort int comment '鎺掑簭', - create_by varchar(64) default '' comment '鍒涘缓鑰', - create_time datetime comment '鍒涘缓鏃堕棿', - update_by varchar(64) default '' comment '鏇存柊鑰', - update_time datetime comment '鏇存柊鏃堕棿', - primary key (column_id) -) engine=innodb auto_increment=1 comment = '浠ｇ爜鐢熸垚涓氬姟琛ㄥ瓧娈'; diff --git a/sql/ry_config_20220114.sql b/sql/ry_config_20220114.sql deleted file mode 100644 index 7420ed2a..00000000 --- a/sql/ry_config_20220114.sql +++ /dev/null @@ -1,216 +0,0 @@ -DROP DATABASE IF EXISTS `ry-config`; - -CREATE DATABASE `ry-config` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; - -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -USE `ry-config`; - -/******************************************/ -/* 琛ㄥ悕绉 = config_info */ -/******************************************/ -CREATE TABLE `config_info` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(255) DEFAULT NULL, - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '淇敼鏃堕棿', - `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `app_name` varchar(128) DEFAULT NULL, - `tenant_id` varchar(128) DEFAULT '' COMMENT '绉熸埛瀛楁', - `c_desc` varchar(256) DEFAULT NULL, - `c_use` varchar(64) DEFAULT NULL, - `effect` varchar(64) DEFAULT NULL, - `type` varchar(64) DEFAULT NULL, - `c_schema` text, - PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; - -insert into config_info(id, data_id, group_id, content, md5, gmt_create, gmt_modified, src_user, src_ip, app_name, tenant_id, c_desc, c_use, effect, type, c_schema) values -(1,'application-dev.yml','DEFAULT_GROUP','spring:\n main:\n allow-circular-references: true\n allow-bean-definition-overriding: true\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n mvc:\n pathmatch:\n matching-strategy: ant_path_matcher\n cloud:\n sentinel:\n filter:\n # sentinel 鍦 springboot 2.6.x 涓嶅吋瀹归棶棰樼殑澶勭悊\n enabled: false\n\n# feign 閰嶇疆\nfeign:\n sentinel:\n enabled: true\n okhttp:\n enabled: true\n httpclient:\n enabled: false\n client:\n config:\n default:\n connectTimeout: 10000\n readTimeout: 10000\n compression:\n request:\n enabled: true\n response:\n enabled: true\n\n# 鏆撮湶鐩戞帶绔偣\nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'\n','e6a8dafc6fcec97f777836bea3ed5028','2020-05-20 12:00:00','2022-01-14 02:20:19','nacos','0:0:0:0:0:0:0:1','','','閫氱敤閰嶇疆','null','null','yaml','null'), -(2,'ruoyi-gateway-dev.yml','DEFAULT_GROUP','spring:\n redis:\n host: localhost\n port: 6379\n password: \n cloud:\n gateway:\n discovery:\n locator:\n lowerCaseServiceId: true\n enabled: true\n routes:\n # 璁よ瘉涓績\n - id: ruoyi-auth\n uri: lb://ruoyi-auth\n predicates:\n - Path=/auth/**\n filters:\n # 楠岃瘉鐮佸鐞哱n - CacheRequestFilter\n - ValidateCodeFilter\n - StripPrefix=1\n # 浠ｇ爜鐢熸垚\n - id: ruoyi-gen\n uri: lb://ruoyi-gen\n predicates:\n - Path=/code/**\n filters:\n - StripPrefix=1\n # 瀹氭椂浠诲姟\n - id: ruoyi-job\n uri: lb://ruoyi-job\n predicates:\n - Path=/schedule/**\n filters:\n - StripPrefix=1\n # 绯荤粺妯″潡\n - id: ruoyi-system\n uri: lb://ruoyi-system\n predicates:\n - Path=/system/**\n filters:\n - StripPrefix=1\n # 鏂囦欢鏈嶅姟\n - id: ruoyi-file\n uri: lb://ruoyi-file\n predicates:\n - Path=/file/**\n filters:\n - StripPrefix=1\n\n# 瀹夊叏閰嶇疆\nsecurity:\n # 楠岃瘉鐮乗n captcha:\n enabled: true\n type: math\n # 闃叉XSS鏀诲嚮\n xss:\n enabled: true\n excludeUrls:\n - /system/notice\n # 涓嶆牎楠岀櫧鍚嶅崟\n ignore:\n whites:\n - /auth/logout\n - /auth/login\n - /auth/register\n - /*/v2/api-docs\n - /csrf\n','2f5a6b5a4ccf20b5801c5cf842456ec6','2020-05-14 14:17:55','2021-07-30 09:07:14',NULL,'0:0:0:0:0:0:0:1','','','缃戝叧妯″潡','null','null','yaml','null'), -(3,'ruoyi-auth-dev.yml','DEFAULT_GROUP','spring: \r\n redis:\r\n host: localhost\r\n port: 6379\r\n password: \r\n','b7354e1eb62c2d846d44a796d9ec6930','2020-11-20 00:00:00','2021-02-28 21:06:58',NULL,'0:0:0:0:0:0:0:1','','','璁よ瘉涓績','null','null','yaml','null'), -(4,'ruoyi-monitor-dev.yml','DEFAULT_GROUP','# spring\r\nspring: \r\n security:\r\n user:\r\n name: ruoyi\r\n password: 123456\r\n boot:\r\n admin:\r\n ui:\r\n title: 鑻ヤ緷鏈嶅姟鐘舵佺洃鎺r\n','d8997d0707a2fd5d9fc4e8409da38129','2020-11-20 00:00:00','2020-12-21 16:28:07',NULL,'0:0:0:0:0:0:0:1','','','鐩戞帶涓績','null','null','yaml','null'), -(5,'ruoyi-system-dev.yml','DEFAULT_GROUP','# spring閰嶇疆\r\nspring: \r\n redis:\r\n host: localhost\r\n port: 6379\r\n password: \r\n datasource:\r\n druid:\r\n stat-view-servlet:\r\n enabled: true\r\n loginUsername: admin\r\n loginPassword: 123456\r\n dynamic:\r\n druid:\r\n initial-size: 5\r\n min-idle: 5\r\n maxActive: 20\r\n maxWait: 60000\r\n timeBetweenEvictionRunsMillis: 60000\r\n minEvictableIdleTimeMillis: 300000\r\n validationQuery: SELECT 1 FROM DUAL\r\n testWhileIdle: true\r\n testOnBorrow: false\r\n testOnReturn: false\r\n poolPreparedStatements: true\r\n maxPoolPreparedStatementPerConnectionSize: 20\r\n filters: stat,slf4j\r\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\r\n datasource:\r\n # 涓诲簱鏁版嵁婧怽r\n master:\r\n driver-class-name: com.mysql.cj.jdbc.Driver\r\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\r\n username: root\r\n password: password\r\n # 浠庡簱鏁版嵁婧怽r\n # slave:\r\n # username: \r\n # password: \r\n # url: \r\n # driver-class-name: \r\n # seata: true # 寮鍚痵eata浠ｇ悊锛屽紑鍚悗榛樿姣忎釜鏁版嵁婧愰兘浠ｇ悊锛屽鏋滄煇涓笉闇瑕佷唬鐞嗗彲鍗曠嫭鍏抽棴\r\n\r\n# seata閰嶇疆\r\nseata:\r\n # 榛樿鍏抽棴锛屽闇鍚敤spring.datasource.dynami.seata闇瑕佸悓鏃跺紑鍚痋r\n enabled: false\r\n # Seata 搴旂敤缂栧彿锛岄粯璁や负 ${spring.application.name}\r\n application-id: ${spring.application.name}\r\n # Seata 浜嬪姟缁勭紪鍙凤紝鐢ㄤ簬 TC 闆嗙兢鍚峔r\n tx-service-group: ${spring.application.name}-group\r\n # 鍏抽棴鑷姩浠ｇ悊\r\n enable-auto-data-source-proxy: false\r\n # 鏈嶅姟閰嶇疆椤筡r\n service:\r\n # 铏氭嫙缁勫拰鍒嗙粍鐨勬槧灏刓r\n vgroup-mapping:\r\n ruoyi-system-group: default\r\n config:\r\n type: nacos\r\n nacos:\r\n serverAddr: 127.0.0.1:8848\r\n group: SEATA_GROUP\r\n namespace:\r\n registry:\r\n type: nacos\r\n nacos:\r\n application: seata-server\r\n server-addr: 127.0.0.1:8848\r\n namespace:\r\n\r\n# mybatis閰嶇疆\r\nmybatis:\r\n # 鎼滅储鎸囧畾鍖呭埆鍚峔r\n typeAliasesPackage: com.ruoyi.system\r\n # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵鏈夌殑mapper.xml鏄犲皠鏂囦欢\r\n mapperLocations: classpath:mapper/**/*.xml\r\n\r\n# swagger閰嶇疆\r\nswagger:\r\n title: 绯荤粺妯″潡鎺ュ彛鏂囨。\r\n license: Powered By ruoyi\r\n licenseUrl: https://ruoyi.vip','ac8913dee679e65bb7d482df5f267d4e','2020-11-20 00:00:00','2021-01-27 10:42:25',NULL,'0:0:0:0:0:0:0:1','','','绯荤粺妯″潡','null','null','yaml','null'), -(6,'ruoyi-gen-dev.yml','DEFAULT_GROUP','# spring閰嶇疆\r\nspring: \r\n redis:\r\n host: localhost\r\n port: 6379\r\n password: \r\n datasource: \r\n driver-class-name: com.mysql.cj.jdbc.Driver\r\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\r\n username: root\r\n password: password\r\n\r\n# mybatis閰嶇疆\r\nmybatis:\r\n # 鎼滅储鎸囧畾鍖呭埆鍚峔r\n typeAliasesPackage: com.ruoyi.gen.domain\r\n # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵鏈夌殑mapper.xml鏄犲皠鏂囦欢\r\n mapperLocations: classpath:mapper/**/*.xml\r\n\r\n# swagger閰嶇疆\r\nswagger:\r\n title: 浠ｇ爜鐢熸垚鎺ュ彛鏂囨。\r\n license: Powered By ruoyi\r\n licenseUrl: https://ruoyi.vip\r\n\r\n# 浠ｇ爜鐢熸垚\r\ngen: \r\n # 浣滆匼r\n author: ruoyi\r\n # 榛樿鐢熸垚鍖呰矾寰 system 闇鏀规垚鑷繁鐨勬ā鍧楀悕绉 濡 system monitor tool\r\n packageName: com.ruoyi.system\r\n # 鑷姩鍘婚櫎琛ㄥ墠缂锛岄粯璁ゆ槸false\r\n autoRemovePre: false\r\n # 琛ㄥ墠缂锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛塡r\n tablePrefix: sys_\r\n','8c79f64a4cca9b821a03dc8b27a2d8eb','2020-11-20 00:00:00','2021-01-26 10:36:45',NULL,'0:0:0:0:0:0:0:1','','','浠ｇ爜鐢熸垚','null','null','yaml','null'), -(7,'ruoyi-job-dev.yml','DEFAULT_GROUP','# spring閰嶇疆\r\nspring: \r\n redis:\r\n host: localhost\r\n port: 6379\r\n password: \r\n datasource:\r\n driver-class-name: com.mysql.cj.jdbc.Driver\r\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\r\n username: root\r\n password: password\r\n\r\n# mybatis閰嶇疆\r\nmybatis:\r\n # 鎼滅储鎸囧畾鍖呭埆鍚峔r\n typeAliasesPackage: com.ruoyi.job.domain\r\n # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵鏈夌殑mapper.xml鏄犲皠鏂囦欢\r\n mapperLocations: classpath:mapper/**/*.xml\r\n\r\n# swagger閰嶇疆\r\nswagger:\r\n title: 瀹氭椂浠诲姟鎺ュ彛鏂囨。\r\n license: Powered By ruoyi\r\n licenseUrl: https://ruoyi.vip\r\n','d6dfade9a2c93c463ae857cd503cb172','2020-11-20 00:00:00','2021-01-26 10:36:04',NULL,'0:0:0:0:0:0:0:1','','','瀹氭椂浠诲姟','null','null','yaml','null'), -(8,'ruoyi-file-dev.yml','DEFAULT_GROUP','# 鏈湴鏂囦欢涓婁紶 \r\nfile:\r\n domain: http://127.0.0.1:9300\r\n path: D:/ruoyi/uploadPath\r\n prefix: /statics\r\n\r\n# FastDFS閰嶇疆\r\nfdfs:\r\n domain: http://8.129.231.12\r\n soTimeout: 3000\r\n connectTimeout: 2000\r\n trackerList: 8.129.231.12:22122\r\n\r\n# Minio閰嶇疆\r\nminio:\r\n url: http://8.129.231.12:9000\r\n accessKey: minioadmin\r\n secretKey: minioadmin\r\n bucketName: test','5382b93f3d8059d6068c0501fdd41195','2020-11-20 00:00:00','2020-12-21 21:01:59',NULL,'0:0:0:0:0:0:0:1','','','鏂囦欢鏈嶅姟','null','null','yaml','null'), -(9,'sentinel-ruoyi-gateway','DEFAULT_GROUP','[\r\n {\r\n \"resource\": \"ruoyi-auth\",\r\n \"count\": 500,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"ruoyi-system\",\r\n \"count\": 1000,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"ruoyi-gen\",\r\n \"count\": 200,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"ruoyi-job\",\r\n \"count\": 300,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n }\r\n]','9f3a3069261598f74220bc47958ec252','2020-11-20 00:00:00','2020-11-20 00:00:00',NULL,'0:0:0:0:0:0:0:1','','','闄愭祦绛栫暐','null','null','json','null'); - - -/******************************************/ -/* 琛ㄥ悕绉 = config_info_aggr */ -/******************************************/ -CREATE TABLE `config_info_aggr` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(255) NOT NULL COMMENT 'group_id', - `datum_id` varchar(255) NOT NULL COMMENT 'datum_id', - `content` longtext NOT NULL COMMENT '鍐呭', - `gmt_modified` datetime NOT NULL COMMENT '淇敼鏃堕棿', - `app_name` varchar(128) DEFAULT NULL, - `tenant_id` varchar(128) DEFAULT '' COMMENT '绉熸埛瀛楁', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='澧炲姞绉熸埛瀛楁'; - - -/******************************************/ -/* 琛ㄥ悕绉 = config_info_beta */ -/******************************************/ -CREATE TABLE `config_info_beta` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '淇敼鏃堕棿', - `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `tenant_id` varchar(128) DEFAULT '' COMMENT '绉熸埛瀛楁', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta'; - -/******************************************/ -/* 琛ㄥ悕绉 = config_info_tag */ -/******************************************/ -CREATE TABLE `config_info_tag` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', - `tag_id` varchar(128) NOT NULL COMMENT 'tag_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '淇敼鏃堕棿', - `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfotag_datagrouptenanttag` (`data_id`,`group_id`,`tenant_id`,`tag_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_tag'; - -/******************************************/ -/* 琛ㄥ悕绉 = config_tags_relation */ -/******************************************/ -CREATE TABLE `config_tags_relation` ( - `id` bigint(20) NOT NULL COMMENT 'id', - `tag_name` varchar(128) NOT NULL COMMENT 'tag_name', - `tag_type` varchar(64) DEFAULT NULL COMMENT 'tag_type', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', - `nid` bigint(20) NOT NULL AUTO_INCREMENT, - PRIMARY KEY (`nid`), - UNIQUE KEY `uk_configtagrelation_configidtag` (`id`,`tag_name`,`tag_type`), - KEY `idx_tenant_id` (`tenant_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_tag_relation'; - -/******************************************/ -/* 琛ㄥ悕绉 = group_capacity */ -/******************************************/ -CREATE TABLE `group_capacity` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭ID', - `group_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Group ID锛岀┖瀛楃琛ㄧず鏁翠釜闆嗙兢', - `quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '閰嶉锛0琛ㄧず浣跨敤榛樿鍊', - `usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '浣跨敤閲', - `max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '鍗曚釜閰嶇疆澶у皬涓婇檺锛屽崟浣嶄负瀛楄妭锛0琛ㄧず浣跨敤榛樿鍊', - `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '鑱氬悎瀛愰厤缃渶澶т釜鏁帮紝锛0琛ㄧず浣跨敤榛樿鍊', - `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '鍗曚釜鑱氬悎鏁版嵁鐨勫瓙閰嶇疆澶у皬涓婇檺锛屽崟浣嶄负瀛楄妭锛0琛ㄧず浣跨敤榛樿鍊', - `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '鏈澶у彉鏇村巻鍙叉暟閲', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '淇敼鏃堕棿', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_group_id` (`group_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='闆嗙兢銆佸悇Group瀹归噺淇℃伅琛'; - -/******************************************/ -/* 琛ㄥ悕绉 = his_config_info */ -/******************************************/ -CREATE TABLE `his_config_info` ( - `id` bigint(64) unsigned NOT NULL, - `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `data_id` varchar(255) NOT NULL, - `group_id` varchar(128) NOT NULL, - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL, - `md5` varchar(32) DEFAULT NULL, - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - `src_user` text, - `src_ip` varchar(50) DEFAULT NULL, - `op_type` char(10) DEFAULT NULL, - `tenant_id` varchar(128) DEFAULT '' COMMENT '绉熸埛瀛楁', - PRIMARY KEY (`nid`), - KEY `idx_gmt_create` (`gmt_create`), - KEY `idx_gmt_modified` (`gmt_modified`), - KEY `idx_did` (`data_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='澶氱鎴锋敼閫'; - - -/******************************************/ -/* 鏁版嵁搴撳叏鍚 = nacos_config */ -/* 琛ㄥ悕绉 = tenant_capacity */ -/******************************************/ -CREATE TABLE `tenant_capacity` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '涓婚敭ID', - `tenant_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Tenant ID', - `quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '閰嶉锛0琛ㄧず浣跨敤榛樿鍊', - `usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '浣跨敤閲', - `max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '鍗曚釜閰嶇疆澶у皬涓婇檺锛屽崟浣嶄负瀛楄妭锛0琛ㄧず浣跨敤榛樿鍊', - `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '鑱氬悎瀛愰厤缃渶澶т釜鏁', - `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '鍗曚釜鑱氬悎鏁版嵁鐨勫瓙閰嶇疆澶у皬涓婇檺锛屽崟浣嶄负瀛楄妭锛0琛ㄧず浣跨敤榛樿鍊', - `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '鏈澶у彉鏇村巻鍙叉暟閲', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '淇敼鏃堕棿', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_tenant_id` (`tenant_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='绉熸埛瀹归噺淇℃伅琛'; - - -CREATE TABLE `tenant_info` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `kp` varchar(128) NOT NULL COMMENT 'kp', - `tenant_id` varchar(128) default '' COMMENT 'tenant_id', - `tenant_name` varchar(128) default '' COMMENT 'tenant_name', - `tenant_desc` varchar(256) DEFAULT NULL COMMENT 'tenant_desc', - `create_source` varchar(32) DEFAULT NULL COMMENT 'create_source', - `gmt_create` bigint(20) NOT NULL COMMENT '鍒涘缓鏃堕棿', - `gmt_modified` bigint(20) NOT NULL COMMENT '淇敼鏃堕棿', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_tenant_info_kptenantid` (`kp`,`tenant_id`), - KEY `idx_tenant_id` (`tenant_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='tenant_info'; - -CREATE TABLE `users` ( - `username` varchar(50) NOT NULL PRIMARY KEY, - `password` varchar(500) NOT NULL, - `enabled` boolean NOT NULL -); - -CREATE TABLE `roles` ( - `username` varchar(50) NOT NULL, - `role` varchar(50) NOT NULL, - UNIQUE INDEX `idx_user_role` (`username` ASC, `role` ASC) USING BTREE -); - -CREATE TABLE `permissions` ( - `role` varchar(50) NOT NULL, - `resource` varchar(255) NOT NULL, - `action` varchar(8) NOT NULL, - UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE -); - -INSERT INTO users (username, password, enabled) VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); - -INSERT INTO roles (username, role) VALUES ('nacos', 'ROLE_ADMIN'); diff --git a/sql/ry_seata_20210128.sql b/sql/ry_seata_20210128.sql deleted file mode 100644 index 80aeeffd..00000000 --- a/sql/ry_seata_20210128.sql +++ /dev/null @@ -1,80 +0,0 @@ -DROP DATABASE IF EXISTS `ry-seata`; - -CREATE DATABASE `ry-seata` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; - -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -USE `ry-seata`; - --- -------------------------------- The script used when storeMode is 'db' -------------------------------- --- the table to store GlobalSession data -CREATE TABLE IF NOT EXISTS `global_table` -( - `xid` VARCHAR(128) NOT NULL, - `transaction_id` BIGINT, - `status` TINYINT NOT NULL, - `application_id` VARCHAR(32), - `transaction_service_group` VARCHAR(32), - `transaction_name` VARCHAR(128), - `timeout` INT, - `begin_time` BIGINT, - `application_data` VARCHAR(2000), - `gmt_create` DATETIME, - `gmt_modified` DATETIME, - PRIMARY KEY (`xid`), - KEY `idx_gmt_modified_status` (`gmt_modified`, `status`), - KEY `idx_transaction_id` (`transaction_id`) -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4; - --- the table to store BranchSession data -CREATE TABLE IF NOT EXISTS `branch_table` -( - `branch_id` BIGINT NOT NULL, - `xid` VARCHAR(128) NOT NULL, - `transaction_id` BIGINT, - `resource_group_id` VARCHAR(32), - `resource_id` VARCHAR(256), - `branch_type` VARCHAR(8), - `status` TINYINT, - `client_id` VARCHAR(64), - `application_data` VARCHAR(2000), - `gmt_create` DATETIME(6), - `gmt_modified` DATETIME(6), - PRIMARY KEY (`branch_id`), - KEY `idx_xid` (`xid`) -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4; - --- the table to store lock data -CREATE TABLE IF NOT EXISTS `lock_table` -( - `row_key` VARCHAR(128) NOT NULL, - `xid` VARCHAR(96), - `transaction_id` BIGINT, - `branch_id` BIGINT NOT NULL, - `resource_id` VARCHAR(256), - `table_name` VARCHAR(32), - `pk` VARCHAR(36), - `gmt_create` DATETIME, - `gmt_modified` DATETIME, - PRIMARY KEY (`row_key`), - KEY `idx_branch_id` (`branch_id`) -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4; - --- for AT mode you must to init this sql for you business database. the seata server not need it. -CREATE TABLE IF NOT EXISTS `undo_log` -( - `branch_id` BIGINT(20) NOT NULL COMMENT 'branch transaction id', - `xid` VARCHAR(100) NOT NULL COMMENT 'global transaction id', - `context` VARCHAR(128) NOT NULL COMMENT 'undo_log context,such as serialization', - `rollback_info` LONGBLOB NOT NULL COMMENT 'rollback info', - `log_status` INT(11) NOT NULL COMMENT '0:normal status,1:defense status', - `log_created` DATETIME(6) NOT NULL COMMENT 'create datetime', - `log_modified` DATETIME(6) NOT NULL COMMENT 'modify datetime', - UNIQUE KEY `ux_undo_log` (`xid`, `branch_id`) -) ENGINE = InnoDB - AUTO_INCREMENT = 1 - DEFAULT CHARSET = utf8mb4 COMMENT ='AT transaction mode undo table'; \ No newline at end of file From d1783d9d831ac2c337b0dc5743159d1e8e4c30c5 Mon Sep 17 00:00:00 2001 From: 1332987 <13329870472@163.com> Date: Tue, 19 Apr 2022 13:29:25 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0TODO=20=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E7=89=88=E6=9C=AC=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 26 +++++++++++++++++--------- ruoyi-ui/package.json | 2 +- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 662d6e75..ef3f394c 100644 --- a/README.md +++ b/README.md @@ -57,15 +57,15 @@ com.ruoyi ## 鍐呯疆鍔熻兘 -1. 鐢ㄦ埛绠＄悊锛氱敤鎴锋槸绯荤粺鎿嶄綔鑰咃紝璇ュ姛鑳戒富瑕佸畬鎴愮郴缁熺敤鎴烽厤缃 -2. 閮ㄩ棬绠＄悊锛氶厤缃郴缁熺粍缁囨満鏋勶紙鍏徃銆侀儴闂ㄣ佸皬缁勶級锛屾爲缁撴瀯灞曠幇鏀寔鏁版嵁鏉冮檺銆 -3. 宀椾綅绠＄悊锛氶厤缃郴缁熺敤鎴锋墍灞炴媴浠昏亴鍔° -4. 鑿滃崟绠＄悊锛氶厤缃郴缁熻彍鍗曪紝鎿嶄綔鏉冮檺锛屾寜閽潈闄愭爣璇嗙瓑銆 -5. 瑙掕壊绠＄悊锛氳鑹茶彍鍗曟潈闄愬垎閰嶃佽缃鑹叉寜鏈烘瀯杩涜鏁版嵁鑼冨洿鏉冮檺鍒掑垎銆 -6. 瀛楀吀绠＄悊锛氬绯荤粺涓粡甯镐娇鐢ㄧ殑涓浜涜緝涓哄浐瀹氱殑鏁版嵁杩涜缁存姢銆 -7. 鍙傛暟绠＄悊锛氬绯荤粺鍔ㄦ侀厤缃父鐢ㄥ弬鏁般 -8. 閫氱煡鍏憡锛氱郴缁熼氱煡鍏憡淇℃伅鍙戝竷缁存姢銆 -9. 鎿嶄綔鏃ュ織锛氱郴缁熸甯告搷浣滄棩蹇楄褰曞拰鏌ヨ锛涚郴缁熷紓甯镐俊鎭棩蹇楄褰曞拰鏌ヨ銆 +1. 鐢ㄦ埛绠＄悊锛氱敤鎴锋槸绯荤粺鎿嶄綔鑰咃紝璇ュ姛鑳戒富瑕佸畬鎴愮郴缁熺敤鎴烽厤缃 +2. 閮ㄩ棬绠＄悊锛氶厤缃郴缁熺粍缁囨満鏋勶紙鍏徃銆侀儴闂ㄣ佸皬缁勶級锛屾爲缁撴瀯灞曠幇鏀寔鏁版嵁鏉冮檺銆 +3. 宀椾綅绠＄悊锛氶厤缃郴缁熺敤鎴锋墍灞炴媴浠昏亴鍔° +4. 鑿滃崟绠＄悊锛氶厤缃郴缁熻彍鍗曪紝鎿嶄綔鏉冮檺锛屾寜閽潈闄愭爣璇嗙瓑銆 +5. 瑙掕壊绠＄悊锛氳鑹茶彍鍗曟潈闄愬垎閰嶃佽缃鑹叉寜鏈烘瀯杩涜鏁版嵁鑼冨洿鏉冮檺鍒掑垎銆 +6. 瀛楀吀绠＄悊锛氬绯荤粺涓粡甯镐娇鐢ㄧ殑涓浜涜緝涓哄浐瀹氱殑鏁版嵁杩涜缁存姢銆 +7. 鍙傛暟绠＄悊锛氬绯荤粺鍔ㄦ侀厤缃父鐢ㄥ弬鏁般 +8. 閫氱煡鍏憡锛氱郴缁熼氱煡鍏憡淇℃伅鍙戝竷缁存姢銆 +9. 鎿嶄綔鏃ュ織锛氱郴缁熸甯告搷浣滄棩蹇楄褰曞拰鏌ヨ锛涚郴缁熷紓甯镐俊鎭棩蹇楄褰曞拰鏌ヨ銆 10. 鐧诲綍鏃ュ織锛氱郴缁熺櫥褰曟棩蹇楄褰曟煡璇㈠寘鍚櫥褰曞紓甯搞 11. 鍦ㄧ嚎鐢ㄦ埛锛氬綋鍓嶇郴缁熶腑娲昏穬鐢ㄦ埛鐘舵佺洃鎺с 12. 瀹氭椂浠诲姟锛氬湪绾匡紙娣诲姞銆佷慨鏀广佸垹闄)浠诲姟璋冨害鍖呭惈鎵ц缁撴灉鏃ュ織銆 @@ -75,6 +75,14 @@ com.ruoyi 16. 鍦ㄧ嚎鏋勫缓鍣細鎷栧姩琛ㄥ崟鍏冪礌鐢熸垚鐩稿簲鐨凥TML浠ｇ爜銆 17. 杩炴帴姹犵洃瑙嗭細鐩戣褰撳墠绯荤粺鏁版嵁搴撹繛鎺ユ睜鐘舵侊紝鍙繘琛屽垎鏋怱QL鎵惧嚭绯荤粺鎬ц兘鐡堕銆 + + +## TODO + +- 鐢╯mart-doc + Torna 鏇挎崲鎺塻wagger +- 寮曞叆mybatis-plus +- 鏃ュ織浣跨敤ELK + ## 鍦ㄧ嚎浣撻獙 - admin/admin123 diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 7d7438b4..cf5de1da 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -39,7 +39,7 @@ "@riophae/vue-treeselect": "0.4.0", "axios": "0.24.0", "clipboard": "2.0.8", - "core-js": "3.19.1", + "core-js": "^3.22.0", "echarts": "4.9.0", "element-ui": "2.15.8", "file-saver": "2.0.5", From c392e8fb1675b7b0506418334dc0cca1fdabf0ba Mon Sep 17 00:00:00 2001 From: 1332987 <13329870472@163.com> Date: Tue, 19 Apr 2022 18:03:35 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0TODO=20=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=A7=84=E7=BA=A6=E6=89=AB=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 + ruoyi-common/ruoyi-common-core/pom.xml | 5 + .../ruoyi/common/core/annotation/Excel.java | 35 +++- .../ruoyi/common/core/enums/UserStatus.java | 14 +- .../core/exception/GlobalException.java | 3 +- .../core/exception/ServiceException.java | 3 +- .../core/exception/job/TaskException.java | 22 ++- .../com/ruoyi/common/core/text/Convert.java | 12 +- .../common/core/utils/html/HTMLFilter.java | 42 ++--- .../ruoyi/common/core/utils/ip/IpUtils.java | 167 +++++++----------- .../common/core/utils/poi/ExcelUtil.java | 8 +- .../ruoyi/common/core/utils/sign/Base64.java | 64 +++---- .../com/ruoyi/common/core/utils/uuid/Seq.java | 8 +- .../ruoyi/common/core/utils/uuid/UUID.java | 4 +- .../core/exception/ServiceExceptionTest.java | 40 +++++ .../common/security/config/WebMvcConfig.java | 4 +- .../handler/GlobalExceptionHandler.java | 20 +-- .../common/security/service/TokenService.java | 8 +- .../com/ruoyi/file/utils/FileUploadUtils.java | 2 +- 19 files changed, 265 insertions(+), 198 deletions(-) create mode 100644 ruoyi-common/ruoyi-common-core/src/main/test/java/com/ruoyi/common/core/exception/ServiceExceptionTest.java diff --git a/README.md b/README.md index ef3f394c..4497b8c2 100644 --- a/README.md +++ b/README.md @@ -79,6 +79,8 @@ com.ruoyi ## TODO +- 娣诲姞lombok +- 閫氳繃浠ｇ爜瑙勭害鎵弿 - 鐢╯mart-doc + Torna 鏇挎崲鎺塻wagger - 寮曞叆mybatis-plus - 鏃ュ織浣跨敤ELK diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index 8f30556f..a485e339 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -118,6 +118,11 @@ io.swagger swagger-annotations + + org.junit.jupiter + junit-jupiter + test + diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java index f78fbbe7..60b7e839 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java @@ -117,8 +117,11 @@ public @interface Excel public String[] args() default {}; public enum Align - { - AUTO(0), LEFT(1), CENTER(2), RIGHT(3); + { //AUTO( + AUTO(0), + LEFT(1), + CENTER(2), + RIGHT(3); private final int value; Align(int value) @@ -138,8 +141,18 @@ public @interface Excel Type type() default Type.ALL; public enum Type - { - ALL(0), EXPORT(1), IMPORT(2); + { /** + * ALL + */ + ALL(0), + /** + * EXPORT + */ + EXPORT(1), + /** + * IMPORT + */ + IMPORT(2); private final int value; Type(int value) @@ -154,8 +167,18 @@ public @interface Excel } public enum ColumnType - { - NUMERIC(0), STRING(1), IMAGE(2); + { /** + * EXPORT + */ + NUMERIC(0), + /** + * EXPORT + */ + STRING(1), + /** + * EXPORT + */ + IMAGE(2); private final int value; ColumnType(int value) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java index 9ff84960..07665ecd 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java @@ -6,8 +6,18 @@ package com.ruoyi.common.core.enums; * @author ruoyi */ public enum UserStatus -{ - OK("0", "姝ｅ父"), DISABLE("1", "鍋滅敤"), DELETED("2", "鍒犻櫎"); +{ /** + * EXPORT + */ + OK("0", "姝ｅ父"), + /** + * EXPORT + */ + DISABLE("1", "鍋滅敤"), + /** + * EXPORT + */ + DELETED("2", "鍒犻櫎"); private final String code; private final String info; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java index 9beb54bd..05c009e2 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java @@ -18,7 +18,7 @@ public class GlobalException extends RuntimeException /** * 閿欒鏄庣粏锛屽唴閮ㄨ皟璇曢敊璇 * - * 鍜 {@link CommonResult#getDetailMessage()} 涓鑷寸殑璁捐 + * 鍜 CommonResult#getDetailMessage() 涓鑷寸殑璁捐 */ private String detailMessage; @@ -45,6 +45,7 @@ public class GlobalException extends RuntimeException return this; } + @Override public String getMessage() { return message; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java index d2b7763b..00df0f4d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java @@ -22,7 +22,7 @@ public final class ServiceException extends RuntimeException /** * 閿欒鏄庣粏锛屽唴閮ㄨ皟璇曢敊璇 * - * 鍜 {@link CommonResult#getDetailMessage()} 涓鑷寸殑璁捐 + * 鍜 CommonResult#getDetailMessage() 涓鑷寸殑璁捐 */ private String detailMessage; @@ -49,6 +49,7 @@ public final class ServiceException extends RuntimeException return detailMessage; } + @Override public String getMessage() { return message; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java index c98397c1..3ae3a2ea 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java @@ -28,7 +28,25 @@ public class TaskException extends Exception } public enum Code - { - TASK_EXISTS, NO_TASK_EXISTS, TASK_ALREADY_STARTED, UNKNOWN, CONFIG_ERROR, TASK_NODE_NOT_AVAILABLE + { /** + * EXPORT + */ + TASK_EXISTS, + /** + * EXPORT + */ + NO_TASK_EXISTS, + /** + * EXPORT + */ + TASK_ALREADY_STARTED, + /** + * EXPORT + */ + UNKNOWN, CONFIG_ERROR, + /** + * EXPORT + */ + TASK_NODE_NOT_AVAILABLE } } \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java index 95a00b73..e34024ab 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java @@ -893,9 +893,9 @@ public class Convert * @param input String. * @return 鍏ㄨ瀛楃涓. */ - public static String toSBC(String input) + public static String tosbc(String input) { - return toSBC(input, null); + return tosbc(input, null); } /** @@ -905,7 +905,7 @@ public class Convert * @param notConvertSet 涓嶆浛鎹㈢殑瀛楃闆嗗悎 * @return 鍏ㄨ瀛楃涓. */ - public static String toSBC(String input, Set notConvertSet) + public static String tosbc(String input, Set notConvertSet) { char c[] = input.toCharArray(); for (int i = 0; i < c.length; i++) @@ -935,9 +935,9 @@ public class Convert * @param input String. * @return 鍗婅瀛楃涓 */ - public static String toDBC(String input) + public static String todbc(String input) { - return toDBC(input, null); + return todbc(input, null); } /** @@ -947,7 +947,7 @@ public class Convert * @param notConvertSet 涓嶆浛鎹㈢殑瀛楃闆嗗悎 * @return 鏇挎崲鍚庣殑瀛楃 */ - public static String toDBC(String text, Set notConvertSet) + public static String todbc(String text, Set notConvertSet) { char c[] = text.toCharArray(); for (int i = 0; i < c.length; i++) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java index 1052b55a..2ed9f728 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java @@ -104,23 +104,23 @@ public final class HTMLFilter { vAllowed = new HashMap<>(); - final ArrayList a_atts = new ArrayList<>(); - a_atts.add("href"); - a_atts.add("target"); - vAllowed.put("a", a_atts); - - final ArrayList img_atts = new ArrayList<>(); - img_atts.add("src"); - img_atts.add("width"); - img_atts.add("height"); - img_atts.add("alt"); - vAllowed.put("img", img_atts); - - final ArrayList no_atts = new ArrayList<>(); - vAllowed.put("b", no_atts); - vAllowed.put("strong", no_atts); - vAllowed.put("i", no_atts); - vAllowed.put("em", no_atts); + final ArrayList aAtos = new ArrayList<>(); + aAtos.add("href"); + aAtos.add("target"); + vAllowed.put("a", aAtos); + + final ArrayList imgAtts = new ArrayList<>(); + imgAtts.add("src"); + imgAtts.add("width"); + imgAtts.add("height"); + imgAtts.add("alt"); + vAllowed.put("img", imgAtts); + + final ArrayList noAtts = new ArrayList<>(); + vAllowed.put("b", noAtts); + vAllowed.put("strong", noAtts); + vAllowed.put("i", noAtts); + vAllowed.put("em", noAtts); vSelfClosingTags = new String[] { "img" }; vNeedClosingTags = new String[] { "a", "b", "strong", "i", "em" }; @@ -202,7 +202,7 @@ public final class HTMLFilter s = escapeComments(s); - s = balanceHTML(s); + s = balancehtml(s); s = checkTags(s); @@ -237,7 +237,7 @@ public final class HTMLFilter return buf.toString(); } - private String balanceHTML(String s) + private String balancehtml(String s) { if (alwaysMakeTags) { @@ -317,9 +317,9 @@ public final class HTMLFilter return result; } - private static String regexReplace(final Pattern regex_pattern, final String replacement, final String s) + private static String regexReplace(final Pattern regexPattern, final String replacement, final String s) { - Matcher m = regex_pattern.matcher(s); + Matcher m = regexPattern.matcher(s); return m.replaceAll(replacement); } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java index 78186aca..35857802 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java @@ -1,49 +1,43 @@ package com.ruoyi.common.core.utils.ip; +import com.ruoyi.common.core.utils.StringUtils; + +import javax.servlet.http.HttpServletRequest; import java.net.InetAddress; import java.net.UnknownHostException; -import javax.servlet.http.HttpServletRequest; -import com.ruoyi.common.core.utils.StringUtils; /** * 鑾峰彇IP鏂规硶 - * + * * @author ruoyi */ -public class IpUtils -{ +public class IpUtils { /** * 鑾峰彇瀹㈡埛绔疘P - * + * * @param request 璇锋眰瀵硅薄 * @return IP鍦板潃 */ - public static String getIpAddr(HttpServletRequest request) - { - if (request == null) - { - return "unknown"; + public static String getIpAddr(HttpServletRequest request) { + String unknown = "unknown"; + if (request == null) { + return unknown; } String ip = request.getHeader("x-forwarded-for"); - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) - { + if (ip == null || ip.length() == 0 || unknown.equalsIgnoreCase(ip)) { ip = request.getHeader("Proxy-Client-IP"); } - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) - { + if (ip == null || ip.length() == 0 || unknown.equalsIgnoreCase(ip)) { ip = request.getHeader("X-Forwarded-For"); } - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) - { + if (ip == null || ip.length() == 0 || unknown.equalsIgnoreCase(ip)) { ip = request.getHeader("WL-Proxy-Client-IP"); } - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) - { + if (ip == null || ip.length() == 0 || unknown.equalsIgnoreCase(ip)) { ip = request.getHeader("X-Real-IP"); } - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) - { + if (ip == null || ip.length() == 0 || unknown.equalsIgnoreCase(ip)) { ip = request.getRemoteAddr(); } @@ -52,84 +46,79 @@ public class IpUtils /** * 妫鏌ユ槸鍚︿负鍐呴儴IP鍦板潃 - * + * * @param ip IP鍦板潃 * @return 缁撴灉 */ - public static boolean internalIp(String ip) - { + public static boolean internalIp(String ip) { byte[] addr = textToNumericFormatV4(ip); return internalIp(addr) || "127.0.0.1".equals(ip); } /** * 妫鏌ユ槸鍚︿负鍐呴儴IP鍦板潃 - * + * * @param addr byte鍦板潃 * @return 缁撴灉 */ - private static boolean internalIp(byte[] addr) - { - if (StringUtils.isNull(addr) || addr.length < 2) - { + private static boolean internalIp(byte[] addr) { + if (StringUtils.isNull(addr) || addr.length < 2) { return true; } final byte b0 = addr[0]; final byte b1 = addr[1]; // 10.x.x.x/8 - final byte SECTION_1 = 0x0A; + final byte SECTION1 = 0x0A; // 172.16.x.x/12 - final byte SECTION_2 = (byte) 0xAC; - final byte SECTION_3 = (byte) 0x10; - final byte SECTION_4 = (byte) 0x1F; + final byte SECTION2 = (byte) 0xAC; + final byte SECTION3 = (byte) 0x10; + final byte SECTION4 = (byte) 0x1F; // 192.168.x.x/16 - final byte SECTION_5 = (byte) 0xC0; - final byte SECTION_6 = (byte) 0xA8; - switch (b0) - { - case SECTION_1: + final byte SECTION5 = (byte) 0xC0; + final byte SECTION6 = (byte) 0xA8; + switch (b0) { + case SECTION1: return true; - case SECTION_2: - if (b1 >= SECTION_3 && b1 <= SECTION_4) - { + case SECTION2: + if (b1 >= SECTION3 && b1 <= SECTION4) { return true; } - case SECTION_5: - switch (b1) - { - case SECTION_6: + case SECTION5: + switch (b1) { + case SECTION6: { return true; + } + default:{ + break; + } } - default: + default: { return false; + } + } } /** * 灏咺Pv4鍦板潃杞崲鎴愬瓧鑺 - * + * * @param text IPv4鍦板潃 * @return byte 瀛楄妭 */ - public static byte[] textToNumericFormatV4(String text) - { - if (text.length() == 0) - { + public static byte[] textToNumericFormatV4(String text) { + if (text.length() == 0) { return null; } byte[] bytes = new byte[4]; String[] elements = text.split("\\.", -1); - try - { + try { long l; int i; - switch (elements.length) - { + switch (elements.length) { case 1: l = Long.parseLong(elements[0]); - if ((l < 0L) || (l > 4294967295L)) - { + if ((l < 0L) || (l > 4294967295L)) { return null; } bytes[0] = (byte) (int) (l >> 24 & 0xFF); @@ -139,14 +128,12 @@ public class IpUtils break; case 2: l = Integer.parseInt(elements[0]); - if ((l < 0L) || (l > 255L)) - { + if ((l < 0L) || (l > 255L)) { return null; } bytes[0] = (byte) (int) (l & 0xFF); l = Integer.parseInt(elements[1]); - if ((l < 0L) || (l > 16777215L)) - { + if ((l < 0L) || (l > 16777215L)) { return null; } bytes[1] = (byte) (int) (l >> 16 & 0xFF); @@ -154,29 +141,24 @@ public class IpUtils bytes[3] = (byte) (int) (l & 0xFF); break; case 3: - for (i = 0; i < 2; ++i) - { + for (i = 0; i < 2; ++i) { l = Integer.parseInt(elements[i]); - if ((l < 0L) || (l > 255L)) - { + if ((l < 0L) || (l > 255L)) { return null; } bytes[i] = (byte) (int) (l & 0xFF); } l = Integer.parseInt(elements[2]); - if ((l < 0L) || (l > 65535L)) - { + if ((l < 0L) || (l > 65535L)) { return null; } bytes[2] = (byte) (int) (l >> 8 & 0xFF); bytes[3] = (byte) (int) (l & 0xFF); break; case 4: - for (i = 0; i < 4; ++i) - { + for (i = 0; i < 4; ++i) { l = Integer.parseInt(elements[i]); - if ((l < 0L) || (l > 255L)) - { + if ((l < 0L) || (l > 255L)) { return null; } bytes[i] = (byte) (int) (l & 0xFF); @@ -185,9 +167,7 @@ public class IpUtils default: return null; } - } - catch (NumberFormatException e) - { + } catch (NumberFormatException e) { return null; } return bytes; @@ -195,34 +175,26 @@ public class IpUtils /** * 鑾峰彇IP鍦板潃 - * + * * @return 鏈湴IP鍦板潃 */ - public static String getHostIp() - { - try - { + public static String getHostIp() { + try { return InetAddress.getLocalHost().getHostAddress(); - } - catch (UnknownHostException e) - { + } catch (UnknownHostException e) { } return "127.0.0.1"; } /** * 鑾峰彇涓绘満鍚 - * + * * @return 鏈湴涓绘満鍚 */ - public static String getHostName() - { - try - { + public static String getHostName() { + try { return InetAddress.getLocalHost().getHostName(); - } - catch (UnknownHostException e) - { + } catch (UnknownHostException e) { } return "鏈煡"; } @@ -233,16 +205,12 @@ public class IpUtils * @param ip 鑾峰緱鐨処P鍦板潃 * @return 绗竴涓潪unknown IP鍦板潃 */ - public static String getMultistageReverseProxyIp(String ip) - { + public static String getMultistageReverseProxyIp(String ip) { // 澶氱骇鍙嶅悜浠ｇ悊妫娴 - if (ip != null && ip.indexOf(",") > 0) - { + if (ip != null && ip.indexOf(",") > 0) { final String[] ips = ip.trim().split(","); - for (String subIp : ips) - { - if (false == isUnknown(subIp)) - { + for (String subIp : ips) { + if (false == isUnknown(subIp)) { ip = subIp; break; } @@ -257,8 +225,7 @@ public class IpUtils * @param checkString 琚娴嬬殑瀛楃涓 * @return 鏄惁鏈煡 */ - public static boolean isUnknown(String checkString) - { + public static boolean isUnknown(String checkString) { return StringUtils.isBlank(checkString) || "unknown".equalsIgnoreCase(checkString); } } \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java index f9df567e..e920a652 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java @@ -73,7 +73,7 @@ public class ExcelUtil /** * Excel sheet鏈澶ц鏁帮紝榛樿65536 */ - public static final int sheetSize = 65536; + public static final int SHEET_SIZE = 65536; /** * 宸ヤ綔琛ㄥ悕绉 @@ -446,7 +446,7 @@ public class ExcelUtil public void writeSheet() { // 鍙栧嚭涓鍏辨湁澶氬皯涓猻heet. - int sheetNo = Math.max(1, (int) Math.ceil(list.size() * 1.0 / sheetSize)); + int sheetNo = Math.max(1, (int) Math.ceil(list.size() * 1.0 / SHEET_SIZE)); for (int index = 0; index < sheetNo; index++) { createSheet(sheetNo, index); @@ -476,8 +476,8 @@ public class ExcelUtil */ public void fillExcelData(int index, Row row) { - int startNo = index * sheetSize; - int endNo = Math.min(startNo + sheetSize, list.size()); + int startNo = index * SHEET_SIZE; + int endNo = Math.min(startNo + SHEET_SIZE, list.size()); for (int i = startNo; i < endNo; i++) { row = sheet.createRow(i + 1 + rownum - startNo); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java index 6f6e8d3d..0ae664a1 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java @@ -15,48 +15,48 @@ public final class Base64 static private final int FOURBYTE = 4; static private final int SIGN = -128; static private final char PAD = '='; - static final private byte[] base64Alphabet = new byte[BASELENGTH]; - static final private char[] lookUpBase64Alphabet = new char[LOOKUPLENGTH]; + static final private byte[] BASE_64_ALPHABET = new byte[BASELENGTH]; + static final private char[] LOOK_UP_BASE_64_ALPHABET = new char[LOOKUPLENGTH]; static { for (int i = 0; i < BASELENGTH; ++i) { - base64Alphabet[i] = -1; + BASE_64_ALPHABET[i] = -1; } for (int i = 'Z'; i >= 'A'; i--) { - base64Alphabet[i] = (byte) (i - 'A'); + BASE_64_ALPHABET[i] = (byte) (i - 'A'); } for (int i = 'z'; i >= 'a'; i--) { - base64Alphabet[i] = (byte) (i - 'a' + 26); + BASE_64_ALPHABET[i] = (byte) (i - 'a' + 26); } for (int i = '9'; i >= '0'; i--) { - base64Alphabet[i] = (byte) (i - '0' + 52); + BASE_64_ALPHABET[i] = (byte) (i - '0' + 52); } - base64Alphabet['+'] = 62; - base64Alphabet['/'] = 63; + BASE_64_ALPHABET['+'] = 62; + BASE_64_ALPHABET['/'] = 63; for (int i = 0; i <= 25; i++) { - lookUpBase64Alphabet[i] = (char) ('A' + i); + LOOK_UP_BASE_64_ALPHABET[i] = (char) ('A' + i); } for (int i = 26, j = 0; i <= 51; i++, j++) { - lookUpBase64Alphabet[i] = (char) ('a' + j); + LOOK_UP_BASE_64_ALPHABET[i] = (char) ('a' + j); } for (int i = 52, j = 0; i <= 61; i++, j++) { - lookUpBase64Alphabet[i] = (char) ('0' + j); + LOOK_UP_BASE_64_ALPHABET[i] = (char) ('0' + j); } - lookUpBase64Alphabet[62] = (char) '+'; - lookUpBase64Alphabet[63] = (char) '/'; + LOOK_UP_BASE_64_ALPHABET[62] = (char) '+'; + LOOK_UP_BASE_64_ALPHABET[63] = (char) '/'; } private static boolean isWhiteSpace(char octect) @@ -71,7 +71,7 @@ public final class Base64 private static boolean isData(char octect) { - return (octect < BASELENGTH && base64Alphabet[octect] != -1); + return (octect < BASELENGTH && BASE_64_ALPHABET[octect] != -1); } /** @@ -118,10 +118,10 @@ public final class Base64 byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0); byte val3 = ((b3 & SIGN) == 0) ? (byte) (b3 >> 6) : (byte) ((b3) >> 6 ^ 0xfc); - encodedData[encodedIndex++] = lookUpBase64Alphabet[val1]; - encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)]; - encodedData[encodedIndex++] = lookUpBase64Alphabet[(l << 2) | val3]; - encodedData[encodedIndex++] = lookUpBase64Alphabet[b3 & 0x3f]; + encodedData[encodedIndex++] = LOOK_UP_BASE_64_ALPHABET[val1]; + encodedData[encodedIndex++] = LOOK_UP_BASE_64_ALPHABET[val2 | (k << 4)]; + encodedData[encodedIndex++] = LOOK_UP_BASE_64_ALPHABET[(l << 2) | val3]; + encodedData[encodedIndex++] = LOOK_UP_BASE_64_ALPHABET[b3 & 0x3f]; } // form integral number of 6-bit groups @@ -130,8 +130,8 @@ public final class Base64 b1 = binaryData[dataIndex]; k = (byte) (b1 & 0x03); byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0); - encodedData[encodedIndex++] = lookUpBase64Alphabet[val1]; - encodedData[encodedIndex++] = lookUpBase64Alphabet[k << 4]; + encodedData[encodedIndex++] = LOOK_UP_BASE_64_ALPHABET[val1]; + encodedData[encodedIndex++] = LOOK_UP_BASE_64_ALPHABET[k << 4]; encodedData[encodedIndex++] = PAD; encodedData[encodedIndex++] = PAD; } @@ -145,9 +145,9 @@ public final class Base64 byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0); byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0); - encodedData[encodedIndex++] = lookUpBase64Alphabet[val1]; - encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)]; - encodedData[encodedIndex++] = lookUpBase64Alphabet[l << 2]; + encodedData[encodedIndex++] = LOOK_UP_BASE_64_ALPHABET[val1]; + encodedData[encodedIndex++] = LOOK_UP_BASE_64_ALPHABET[val2 | (k << 4)]; + encodedData[encodedIndex++] = LOOK_UP_BASE_64_ALPHABET[l << 2]; encodedData[encodedIndex++] = PAD; } return new String(encodedData); @@ -200,10 +200,10 @@ public final class Base64 return null; } // if found "no data" just return null - b1 = base64Alphabet[d1]; - b2 = base64Alphabet[d2]; - b3 = base64Alphabet[d3]; - b4 = base64Alphabet[d4]; + b1 = BASE_64_ALPHABET[d1]; + b2 = BASE_64_ALPHABET[d2]; + b3 = BASE_64_ALPHABET[d3]; + b4 = BASE_64_ALPHABET[d4]; decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4); decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf)); @@ -215,8 +215,8 @@ public final class Base64 return null;// if found "no data" just return null } - b1 = base64Alphabet[d1]; - b2 = base64Alphabet[d2]; + b1 = BASE_64_ALPHABET[d1]; + b2 = BASE_64_ALPHABET[d2]; d3 = base64Data[dataIndex++]; d4 = base64Data[dataIndex++]; @@ -235,7 +235,7 @@ public final class Base64 } else if (!isPad(d3) && isPad(d4)) { - b3 = base64Alphabet[d3]; + b3 = BASE_64_ALPHABET[d3]; if ((b3 & 0x3) != 0)// last 2 bits should be zero { return null; @@ -253,8 +253,8 @@ public final class Base64 } else { // No PAD e.g 3cQl - b3 = base64Alphabet[d3]; - b4 = base64Alphabet[d4]; + b3 = BASE_64_ALPHABET[d3]; + b4 = BASE_64_ALPHABET[d4]; decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4); decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf)); decodedData[encodedIndex++] = (byte) (b3 << 6 | b4); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java index d0fddd27..d1be983b 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java @@ -10,10 +10,10 @@ import com.ruoyi.common.core.utils.StringUtils; public class Seq { // 閫氱敤搴忓垪绫诲瀷 - public static final String commSeqType = "COMMON"; + public static final String COMM_SEQ_TYPE = "COMMON"; // 涓婁紶搴忓垪绫诲瀷 - public static final String uploadSeqType = "UPLOAD"; + public static final String UPLOAD_SEQ_TYPE = "UPLOAD"; // 閫氱敤鎺ュ彛搴忓垪鏁 private static AtomicInteger commSeq = new AtomicInteger(1); @@ -31,7 +31,7 @@ public class Seq */ public static String getId() { - return getId(commSeqType); + return getId(COMM_SEQ_TYPE); } /** @@ -42,7 +42,7 @@ public class Seq public static String getId(String type) { AtomicInteger atomicInt = commSeq; - if (uploadSeqType.equals(type)) + if (UPLOAD_SEQ_TYPE.equals(type)) { atomicInt = uploadSeq; } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java index b10955af..a0cf8ddf 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java @@ -22,7 +22,7 @@ public final class UUID implements java.io.Serializable, Comparable */ private static class Holder { - static final SecureRandom numberGenerator = getSecureRandom(); + static final SecureRandom NUMBER_GENERATOR = getSecureRandom(); } /** 姝UID鐨勬渶楂64鏈夋晥浣 */ @@ -93,7 +93,7 @@ public final class UUID implements java.io.Serializable, Comparable */ public static UUID randomUUID(boolean isSecure) { - final Random ng = isSecure ? Holder.numberGenerator : getRandom(); + final Random ng = isSecure ? Holder.NUMBER_GENERATOR : getRandom(); byte[] randomBytes = new byte[16]; ng.nextBytes(randomBytes); diff --git a/ruoyi-common/ruoyi-common-core/src/main/test/java/com/ruoyi/common/core/exception/ServiceExceptionTest.java b/ruoyi-common/ruoyi-common-core/src/main/test/java/com/ruoyi/common/core/exception/ServiceExceptionTest.java new file mode 100644 index 00000000..b8977659 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/test/java/com/ruoyi/common/core/exception/ServiceExceptionTest.java @@ -0,0 +1,40 @@ +package com.ruoyi.common.core.exception; + + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +class ServiceExceptionTest { + + @BeforeEach + void setUp() { + System.out.println("up"); + } + + @AfterEach + void tearDown() { + System.out.println("down"); + } + + @Test + void testThirdTest() { + GlobalException globalException2 = new GlobalException(""); + globalException2.getMessage(); + globalException2.getDetailMessage(); + globalException2.setDetailMessage(""); + throw globalException2; + } + + @Test + void testThirdTest2() { + GlobalException globalException2 = new GlobalException(); + globalException2.getMessage(); + globalException2.getDetailMessage(); + System.out.println(globalException2.getMessage()); + System.out.println(globalException2.getDetailMessage()); + System.out.println(globalException2.setDetailMessage("")); + globalException2.setDetailMessage(""); + throw globalException2; + } +} \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java index b3fa247a..b2420261 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java @@ -12,14 +12,14 @@ import com.ruoyi.common.security.interceptor.HeaderInterceptor; public class WebMvcConfig implements WebMvcConfigurer { /** 涓嶉渶瑕佹嫤鎴湴鍧 */ - public static final String[] excludeUrls = { "/login", "/logout", "/refresh" }; + public static final String[] EXCLUDE_URLS = { "/login", "/logout", "/refresh" }; @Override public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(getHeaderInterceptor()) .addPathPatterns("/**") - .excludePathPatterns(excludeUrls) + .excludePathPatterns(EXCLUDE_URLS) .order(-10); } diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java index 998b78f5..5a9da772 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java @@ -33,8 +33,8 @@ public class GlobalExceptionHandler @ExceptionHandler(NotPermissionException.class) public AjaxResult handleNotPermissionException(NotPermissionException e, HttpServletRequest request) { - String requestURI = request.getRequestURI(); - log.error("璇锋眰鍦板潃'{}',鏉冮檺鐮佹牎楠屽け璐'{}'", requestURI, e.getMessage()); + String requestUri = request.getRequestURI(); + log.error("璇锋眰鍦板潃'{}',鏉冮檺鐮佹牎楠屽け璐'{}'", requestUri, e.getMessage()); return AjaxResult.error(HttpStatus.FORBIDDEN, "娌℃湁璁块棶鏉冮檺锛岃鑱旂郴绠＄悊鍛樻巿鏉"); } @@ -44,8 +44,8 @@ public class GlobalExceptionHandler @ExceptionHandler(NotRoleException.class) public AjaxResult handleNotRoleException(NotRoleException e, HttpServletRequest request) { - String requestURI = request.getRequestURI(); - log.error("璇锋眰鍦板潃'{}',瑙掕壊鏉冮檺鏍￠獙澶辫触'{}'", requestURI, e.getMessage()); + String requestUri = request.getRequestURI(); + log.error("璇锋眰鍦板潃'{}',瑙掕壊鏉冮檺鏍￠獙澶辫触'{}'", requestUri, e.getMessage()); return AjaxResult.error(HttpStatus.FORBIDDEN, "娌℃湁璁块棶鏉冮檺锛岃鑱旂郴绠＄悊鍛樻巿鏉"); } @@ -56,8 +56,8 @@ public class GlobalExceptionHandler public AjaxResult handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException e, HttpServletRequest request) { - String requestURI = request.getRequestURI(); - log.error("璇锋眰鍦板潃'{}',涓嶆敮鎸'{}'璇锋眰", requestURI, e.getMethod()); + String requestUri = request.getRequestURI(); + log.error("璇锋眰鍦板潃'{}',涓嶆敮鎸'{}'璇锋眰", requestUri, e.getMethod()); return AjaxResult.error(e.getMessage()); } @@ -78,8 +78,8 @@ public class GlobalExceptionHandler @ExceptionHandler(RuntimeException.class) public AjaxResult handleRuntimeException(RuntimeException e, HttpServletRequest request) { - String requestURI = request.getRequestURI(); - log.error("璇锋眰鍦板潃'{}',鍙戠敓鏈煡寮傚父.", requestURI, e); + String requestUri = request.getRequestURI(); + log.error("璇锋眰鍦板潃'{}',鍙戠敓鏈煡寮傚父.", requestUri, e); return AjaxResult.error(e.getMessage()); } @@ -89,8 +89,8 @@ public class GlobalExceptionHandler @ExceptionHandler(Exception.class) public AjaxResult handleException(Exception e, HttpServletRequest request) { - String requestURI = request.getRequestURI(); - log.error("璇锋眰鍦板潃'{}',鍙戠敓绯荤粺寮傚父.", requestURI, e); + String requestUri = request.getRequestURI(); + log.error("璇锋眰鍦板潃'{}',鍙戠敓绯荤粺寮傚父.", requestUri, e); return AjaxResult.error(e.getMessage()); } diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java index b3093c9c..bcf90b27 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java @@ -32,7 +32,7 @@ public class TokenService protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND; - private final static long expireTime = CacheConstants.EXPIRATION; + private final static long EXPIRE_TIME = CacheConstants.EXPIRATION; private final static String ACCESS_TOKEN = CacheConstants.LOGIN_TOKEN_KEY; @@ -61,7 +61,7 @@ public class TokenService // 鎺ュ彛杩斿洖淇℃伅 Map rspMap = new HashMap(); rspMap.put("access_token", JwtUtils.createToken(claimsMap)); - rspMap.put("expires_in", expireTime); + rspMap.put("expires_in", EXPIRE_TIME); return rspMap; } @@ -156,10 +156,10 @@ public class TokenService public void refreshToken(LoginUser loginUser) { loginUser.setLoginTime(System.currentTimeMillis()); - loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE); + loginUser.setExpireTime(loginUser.getLoginTime() + EXPIRE_TIME * MILLIS_MINUTE); // 鏍规嵁uuid灏唋oginUser缂撳瓨 String userKey = getTokenKey(loginUser.getToken()); - redisService.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES); + redisService.setCacheObject(userKey, loginUser, EXPIRE_TIME, TimeUnit.MINUTES); } private String getTokenKey(String token) diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java index e73631a2..b317ec9d 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java @@ -88,7 +88,7 @@ public class FileUploadUtils public static final String extractFilename(MultipartFile file) { return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(), - FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), getExtension(file)); + FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.UPLOAD_SEQ_TYPE), getExtension(file)); } private static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException From 1157caddfd540738c7fe0a4ef75c5b4e4a2ed68e Mon Sep 17 00:00:00 2001 From: 1332987 <13329870472@163.com> Date: Wed, 20 Apr 2022 09:48:00 +0800 Subject: [PATCH 04/14] =?UTF-8?q?alibaba=E4=BB=A3=E7=A0=81=E8=A7=84?= =?UTF-8?q?=E7=BA=A6=E6=89=AB=E6=8F=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/api/RemoteFileService.java | 4 +- .../ruoyi/system/api/RemoteLogService.java | 6 +- .../ruoyi/system/api/RemoteUserService.java | 6 +- .../factory/RemoteFileFallbackFactory.java | 6 +- .../api/factory/RemoteLogFallbackFactory.java | 6 +- .../factory/RemoteUserFallbackFactory.java | 10 +- .../auth/controller/TokenController.java | 20 +- .../ruoyi/auth/service/SysLoginService.java | 12 +- .../core/context/SecurityContextHolder.java | 2 +- .../common/core/domain/{R.java => Rust.java} | 211 +++--- .../com/ruoyi/common/core/text/Convert.java | 7 +- .../com/ruoyi/common/core/utils/ReUtil.java | 11 +- .../ruoyi/common/core/utils/ServletUtils.java | 6 +- .../ruoyi/common/core/utils/StringUtils.java | 11 +- .../common/core/utils/file/FileTypeUtils.java | 13 +- .../common/core/utils/html/EscapeUtil.java | 2 +- .../html/{HTMLFilter.java => HtmlFilter.java} | 245 ++---- .../ruoyi/common/core/utils/ip/IpUtils.java | 24 +- .../common/core/utils/poi/ExcelUtil.java | 706 +++++++----------- .../core/utils/reflect/ReflectUtils.java | 32 +- .../ruoyi/common/core/utils/sign/Base64.java | 147 ++-- .../ruoyi/common/core/utils/uuid/IdUtils.java | 16 +- .../com/ruoyi/common/core/utils/uuid/Seq.java | 20 +- .../ruoyi/common/core/utils/uuid/UUID.java | 20 +- .../common/core/web/domain/BaseEntity.java | 5 +- .../annotation/EnableCustomConfig.java | 15 +- .../security/aspect/InnerAuthAspect.java | 7 +- .../common/security/service/TokenService.java | 21 +- .../annotation/EnableCustomSwagger2.java | 13 +- .../config/SwaggerAutoConfiguration.java | 22 +- .../swagger/config/SwaggerProperties.java | 10 +- .../gateway/config/KaptchaTextCreator.java | 7 +- .../com/ruoyi/gateway/filter/AuthFilter.java | 6 +- .../com/ruoyi/gateway/filter/XssFilter.java | 21 +- .../ruoyi/gateway/handler/SwaggerHandler.java | 15 +- .../service/impl/ValidateCodeServiceImpl.java | 2 +- .../file/controller/SysFileController.java | 10 +- .../ruoyi/gen/controller/GenController.java | 28 +- .../gen/service/GenTableServiceImpl.java | 58 +- .../java/com/ruoyi/gen/util/GenUtils.java | 149 ++-- .../com/ruoyi/job/config/ScheduleConfig.java | 1 - .../com/ruoyi/job/service/ISysJobService.java | 11 +- .../controller/SysProfileController.java | 4 +- .../system/controller/SysUserController.java | 16 +- .../system/mapper/SysLogininforMapper.java | 4 +- .../ruoyi/system/mapper/SysOperLogMapper.java | 4 +- .../system/service/ISysLogininforService.java | 4 +- .../system/service/ISysPermissionService.java | 3 + .../impl/SysPermissionServiceImpl.java | 12 +- 49 files changed, 820 insertions(+), 1171 deletions(-) rename ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/{R.java => Rust.java} (70%) rename ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/{HTMLFilter.java => HtmlFilter.java} (76%) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java index ae56a54a..b85890b2 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java @@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; import com.ruoyi.common.core.constant.ServiceNameConstants; -import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.Rust; import com.ruoyi.system.api.domain.SysFile; import com.ruoyi.system.api.factory.RemoteFileFallbackFactory; @@ -25,5 +25,5 @@ public interface RemoteFileService * @return 缁撴灉 */ @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - public R upload(@RequestPart(value = "file") MultipartFile file); + public Rust upload(@RequestPart(value = "file") MultipartFile file); } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java index b8df7954..3b3353ec 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java @@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.constant.ServiceNameConstants; -import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.Rust; import com.ruoyi.system.api.domain.SysLogininfor; import com.ruoyi.system.api.domain.SysOperLog; import com.ruoyi.system.api.factory.RemoteLogFallbackFactory; @@ -27,7 +27,7 @@ public interface RemoteLogService * @return 缁撴灉 */ @PostMapping("/operlog") - public R saveLog(@RequestBody SysOperLog sysOperLog, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + public Rust saveLog(@RequestBody SysOperLog sysOperLog, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 淇濆瓨璁块棶璁板綍 @@ -37,5 +37,5 @@ public interface RemoteLogService * @return 缁撴灉 */ @PostMapping("/logininfor") - public R saveLogininfor(@RequestBody SysLogininfor sysLogininfor, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + public Rust saveLogininfor(@RequestBody SysLogininfor sysLogininfor, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java index e7fe34c5..17b19742 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.constant.ServiceNameConstants; -import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.Rust; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.factory.RemoteUserFallbackFactory; import com.ruoyi.system.api.model.LoginUser; @@ -29,7 +29,7 @@ public interface RemoteUserService * @return 缁撴灉 */ @GetMapping("/user/info/{username}") - public R getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + public Rust getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 娉ㄥ唽鐢ㄦ埛淇℃伅 @@ -39,5 +39,5 @@ public interface RemoteUserService * @return 缁撴灉 */ @PostMapping("/user/register") - public R registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + public Rust registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java index bc3b6fff..8c226bc2 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java @@ -5,7 +5,7 @@ import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.Rust; import com.ruoyi.system.api.RemoteFileService; import com.ruoyi.system.api.domain.SysFile; @@ -26,9 +26,9 @@ public class RemoteFileFallbackFactory implements FallbackFactory upload(MultipartFile file) + public Rust upload(MultipartFile file) { - return R.fail("涓婁紶鏂囦欢澶辫触:" + throwable.getMessage()); + return Rust.fail("涓婁紶鏂囦欢澶辫触:" + throwable.getMessage()); } }; } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java index a1b63151..dd2c1f9a 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java @@ -4,7 +4,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; -import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.Rust; import com.ruoyi.system.api.RemoteLogService; import com.ruoyi.system.api.domain.SysLogininfor; import com.ruoyi.system.api.domain.SysOperLog; @@ -26,13 +26,13 @@ public class RemoteLogFallbackFactory implements FallbackFactory saveLog(SysOperLog sysOperLog, String source) + public Rust saveLog(SysOperLog sysOperLog, String source) { return null; } @Override - public R saveLogininfor(SysLogininfor sysLogininfor, String source) + public Rust saveLogininfor(SysLogininfor sysLogininfor, String source) { return null; } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java index 8fd6c677..b9fb99c0 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java @@ -4,7 +4,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; -import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.Rust; import com.ruoyi.system.api.RemoteUserService; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.model.LoginUser; @@ -26,15 +26,15 @@ public class RemoteUserFallbackFactory implements FallbackFactory getUserInfo(String username, String source) + public Rust getUserInfo(String username, String source) { - return R.fail("鑾峰彇鐢ㄦ埛澶辫触:" + throwable.getMessage()); + return Rust.fail("鑾峰彇鐢ㄦ埛澶辫触:" + throwable.getMessage()); } @Override - public R registerUserInfo(SysUser sysUser, String source) + public Rust registerUserInfo(SysUser sysUser, String source) { - return R.fail("娉ㄥ唽鐢ㄦ埛澶辫触:" + throwable.getMessage()); + return Rust.fail("娉ㄥ唽鐢ㄦ埛澶辫触:" + throwable.getMessage()); } }; } diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java index 3b93514e..0d1bb2c7 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RestController; import com.ruoyi.auth.form.LoginBody; import com.ruoyi.auth.form.RegisterBody; import com.ruoyi.auth.service.SysLoginService; -import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.Rust; import com.ruoyi.common.core.utils.JwtUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.security.auth.AuthUtil; @@ -32,16 +32,16 @@ public class TokenController private SysLoginService sysLoginService; @PostMapping("login") - public R login(@RequestBody LoginBody form) + public Rust login(@RequestBody LoginBody form) { // 鐢ㄦ埛鐧诲綍 LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword()); // 鑾峰彇鐧诲綍token - return R.ok(tokenService.createToken(userInfo)); + return Rust.ok(tokenService.createToken(userInfo)); } @DeleteMapping("logout") - public R logout(HttpServletRequest request) + public Rust logout(HttpServletRequest request) { String token = SecurityUtils.getToken(request); if (StringUtils.isNotEmpty(token)) @@ -52,27 +52,27 @@ public class TokenController // 璁板綍鐢ㄦ埛閫鍑烘棩蹇 sysLoginService.logout(username); } - return R.ok(); + return Rust.ok(); } @PostMapping("refresh") - public R refresh(HttpServletRequest request) + public Rust refresh(HttpServletRequest request) { LoginUser loginUser = tokenService.getLoginUser(request); if (StringUtils.isNotNull(loginUser)) { // 鍒锋柊浠ょ墝鏈夋晥鏈 tokenService.refreshToken(loginUser); - return R.ok(); + return Rust.ok(); } - return R.ok(); + return Rust.ok(); } @PostMapping("register") - public R register(@RequestBody RegisterBody registerBody) + public Rust register(@RequestBody RegisterBody registerBody) { // 鐢ㄦ埛娉ㄥ唽 sysLoginService.register(registerBody.getUsername(), registerBody.getPassword()); - return R.ok(); + return Rust.ok(); } } diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java index 48939939..8d46265d 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java @@ -5,7 +5,7 @@ import org.springframework.stereotype.Component; import com.ruoyi.common.core.constant.Constants; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.Rust; import com.ruoyi.common.core.enums.UserStatus; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.utils.ServletUtils; @@ -58,9 +58,9 @@ public class SysLoginService throw new ServiceException("鐢ㄦ埛鍚嶄笉鍦ㄦ寚瀹氳寖鍥"); } // 鏌ヨ鐢ㄦ埛淇℃伅 - R userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER); + Rust userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER); - if (R.FAIL == userResult.getCode()) + if (Rust.FAIL == userResult.getCode()) { throw new ServiceException(userResult.getMsg()); } @@ -122,9 +122,9 @@ public class SysLoginService sysUser.setUserName(username); sysUser.setNickName(username); sysUser.setPassword(SecurityUtils.encryptPassword(password)); - R registerResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER); + Rust registerResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER); - if (R.FAIL == registerResult.getCode()) + if (Rust.FAIL == registerResult.getCode()) { throw new ServiceException(registerResult.getMsg()); } @@ -156,4 +156,4 @@ public class SysLoginService } remoteLogService.saveLogininfor(logininfor, SecurityConstants.INNER); } -} \ No newline at end of file +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java index 0a66f38f..866eee5f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java @@ -40,7 +40,7 @@ public class SecurityContextHolder Map map = THREAD_LOCAL.get(); if (map == null) { - map = new ConcurrentHashMap(); + map = new ConcurrentHashMap(2); THREAD_LOCAL.set(map); } return map; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/Rust.java similarity index 70% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/Rust.java index 8f055531..b80d483f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/Rust.java @@ -1,105 +1,106 @@ -package com.ruoyi.common.core.domain; - -import java.io.Serializable; -import com.ruoyi.common.core.constant.Constants; - -/** - * 鍝嶅簲淇℃伅涓讳綋 - * - * @author ruoyi - */ -public class R implements Serializable -{ - private static final long serialVersionUID = 1L; - - /** 鎴愬姛 */ - public static final int SUCCESS = Constants.SUCCESS; - - /** 澶辫触 */ - public static final int FAIL = Constants.FAIL; - - private int code; - - private String msg; - - private T data; - - public static R ok() - { - return restResult(null, SUCCESS, null); - } - - public static R ok(T data) - { - return restResult(data, SUCCESS, null); - } - - public static R ok(T data, String msg) - { - return restResult(data, SUCCESS, msg); - } - - public static R fail() - { - return restResult(null, FAIL, null); - } - - public static R fail(String msg) - { - return restResult(null, FAIL, msg); - } - - public static R fail(T data) - { - return restResult(data, FAIL, null); - } - - public static R fail(T data, String msg) - { - return restResult(data, FAIL, msg); - } - - public static R fail(int code, String msg) - { - return restResult(null, code, msg); - } - - private static R restResult(T data, int code, String msg) - { - R apiResult = new R<>(); - apiResult.setCode(code); - apiResult.setData(data); - apiResult.setMsg(msg); - return apiResult; - } - - public int getCode() - { - return code; - } - - public void setCode(int code) - { - this.code = code; - } - - public String getMsg() - { - return msg; - } - - public void setMsg(String msg) - { - this.msg = msg; - } - - public T getData() - { - return data; - } - - public void setData(T data) - { - this.data = data; - } -} +package com.ruoyi.common.core.domain; + +import com.ruoyi.common.core.constant.Constants; + +import java.io.Serializable; + +/** + * 鍝嶅簲淇℃伅涓讳綋 + * + * @author ruoyi + */ +public class Rust implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 鎴愬姛 */ + public static final int SUCCESS = Constants.SUCCESS; + + /** 澶辫触 */ + public static final int FAIL = Constants.FAIL; + + private int code; + + private String msg; + + private T data; + + public static Rust ok() + { + return restResult(null, SUCCESS, null); + } + + public static Rust ok(T data) + { + return restResult(data, SUCCESS, null); + } + + public static Rust ok(T data, String msg) + { + return restResult(data, SUCCESS, msg); + } + + public static Rust fail() + { + return restResult(null, FAIL, null); + } + + public static Rust fail(String msg) + { + return restResult(null, FAIL, msg); + } + + public static Rust fail(T data) + { + return restResult(data, FAIL, null); + } + + public static Rust fail(T data, String msg) + { + return restResult(data, FAIL, msg); + } + + public static Rust fail(int code, String msg) + { + return restResult(null, code, msg); + } + + private static Rust restResult(T data, int code, String msg) + { + Rust apiResult = new Rust<>(); + apiResult.setCode(code); + apiResult.setData(data); + apiResult.setMsg(msg); + return apiResult; + } + + public int getCode() + { + return code; + } + + public void setCode(int code) + { + this.code = code; + } + + public String getMsg() + { + return msg; + } + + public void setMsg(String msg) + { + this.msg = msg; + } + + public T getData() + { + return data; + } + + public void setData(T data) + { + this.data = data; + } +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java index e34024ab..ac9c503e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java @@ -1,12 +1,13 @@ package com.ruoyi.common.core.text; +import com.ruoyi.common.core.utils.StringUtils; + import java.math.BigDecimal; import java.math.BigInteger; import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.text.NumberFormat; import java.util.Set; -import com.ruoyi.common.core.utils.StringUtils; /** * 绫诲瀷杞崲鍣 @@ -907,7 +908,7 @@ public class Convert */ public static String tosbc(String input, Set notConvertSet) { - char c[] = input.toCharArray(); + char[] c = input.toCharArray(); for (int i = 0; i < c.length; i++) { if (null != notConvertSet && notConvertSet.contains(c[i])) @@ -949,7 +950,7 @@ public class Convert */ public static String todbc(String text, Set notConvertSet) { - char c[] = text.toCharArray(); + char[] c = text.toCharArray(); for (int i = 0; i < c.length; i++) { if (null != notConvertSet && notConvertSet.contains(c[i])) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ReUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ReUtil.java index 466d14fe..cc4b6a95 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ReUtil.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ReUtil.java @@ -1,5 +1,7 @@ package com.ruoyi.common.core.utils; +import com.ruoyi.common.core.text.Convert; + import java.util.Arrays; import java.util.Collection; import java.util.HashSet; @@ -7,11 +9,10 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.core.utils.StringUtils; - -public class ReUtil -{ +/** + * @author pan + */ +public class ReUtil { public final static Pattern GROUP_VAR = Pattern.compile("\\$(\\d+)"); /** diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java index be2817c9..8f091237 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java @@ -20,7 +20,7 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.core.constant.Constants; -import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.Rust; import com.ruoyi.common.core.text.Convert; import reactor.core.publisher.Mono; @@ -251,7 +251,7 @@ public class ServletUtils */ public static Mono webFluxResponseWriter(ServerHttpResponse response, Object value) { - return webFluxResponseWriter(response, HttpStatus.OK, value, R.FAIL); + return webFluxResponseWriter(response, HttpStatus.OK, value, Rust.FAIL); } /** @@ -295,7 +295,7 @@ public class ServletUtils { response.setStatusCode(status); response.getHeaders().add(HttpHeaders.CONTENT_TYPE, contentType); - R result = R.fail(code, value.toString()); + Rust result = Rust.fail(code, value.toString()); DataBuffer dataBuffer = response.bufferFactory().wrap(JSONObject.toJSONString(result).getBytes()); return response.writeWith(Mono.just(dataBuffer)); } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java index 562a3482..26811285 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java @@ -1,11 +1,12 @@ package com.ruoyi.common.core.utils; +import com.ruoyi.common.core.constant.Constants; +import com.ruoyi.common.core.text.StrFormatter; +import org.springframework.util.AntPathMatcher; + import java.util.Collection; import java.util.List; import java.util.Map; -import org.springframework.util.AntPathMatcher; -import com.ruoyi.common.core.constant.Constants; -import com.ruoyi.common.core.text.StrFormatter; /** * 瀛楃涓插伐鍏风被 @@ -332,9 +333,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase) { sb.append(SEPARATOR); - } - else if ((i != 0 && !preCharIsUpperCase) && curreCharIsUpperCase) - { + } else if (i != 0 && !preCharIsUpperCase && curreCharIsUpperCase) { sb.append(SEPARATOR); } sb.append(Character.toLowerCase(c)); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java index 1629fcd4..387bfbc1 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java @@ -1,8 +1,9 @@ package com.ruoyi.common.core.utils.file; -import java.io.File; import org.apache.commons.lang3.StringUtils; +import java.io.File; + /** * 鏂囦欢绫诲瀷宸ュ叿绫 * @@ -54,10 +55,10 @@ public class FileTypeUtils public static String getFileExtendName(byte[] photoByte) { String strFileExtendName = "JPG"; - if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56) - && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97)) - { - strFileExtendName = "GIF"; + if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56) && (photoByte[5] == 97)) { + if ((photoByte[4] == 55) || (photoByte[4] == 57)) { + strFileExtendName = "GIF"; + } } else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70)) { @@ -73,4 +74,4 @@ public class FileTypeUtils } return strFileExtendName; } -} \ No newline at end of file +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java index 2f5a8721..e8b7357f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java @@ -58,7 +58,7 @@ public class EscapeUtil */ public static String clean(String content) { - return new HTMLFilter().filter(content); + return new HtmlFilter().filter(content); } /** diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HtmlFilter.java similarity index 76% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HtmlFilter.java index 2ed9f728..a79a7512 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HtmlFilter.java @@ -1,10 +1,6 @@ package com.ruoyi.common.core.utils.html; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.regex.Matcher; @@ -15,8 +11,7 @@ import java.util.regex.Pattern; * * @author ruoyi */ -public final class HTMLFilter -{ +public final class HtmlFilter { /** * regex flag union representing /si modifiers in php **/ @@ -45,7 +40,9 @@ public final class HTMLFilter private static final Pattern P_RIGHT_ARROW = Pattern.compile(">"); private static final Pattern P_BOTH_ARROWS = Pattern.compile("<>"); - // @xxx could grow large... maybe use sesat's ReferenceMap + /** + * @xxx could grow large... maybe use sesat's ReferenceMap + */ private static final ConcurrentMap P_REMOVE_PAIR_BLANKS = new ConcurrentHashMap<>(); private static final ConcurrentMap P_REMOVE_SELF_BLANKS = new ConcurrentHashMap<>(); @@ -100,8 +97,7 @@ public final class HTMLFilter /** * Default constructor. */ - public HTMLFilter() - { + public HtmlFilter() { vAllowed = new HashMap<>(); final ArrayList aAtos = new ArrayList<>(); @@ -122,13 +118,13 @@ public final class HTMLFilter vAllowed.put("i", noAtts); vAllowed.put("em", noAtts); - vSelfClosingTags = new String[] { "img" }; - vNeedClosingTags = new String[] { "a", "b", "strong", "i", "em" }; - vDisallowed = new String[] {}; - vAllowedProtocols = new String[] { "http", "mailto", "https" }; // no ftp. - vProtocolAtts = new String[] { "src", "href" }; - vRemoveBlanks = new String[] { "a", "b", "strong", "i", "em" }; - vAllowedEntities = new String[] { "amp", "gt", "lt", "quot" }; + vSelfClosingTags = new String[]{"img"}; + vNeedClosingTags = new String[]{"a", "b", "strong", "i", "em"}; + vDisallowed = new String[]{}; + vAllowedProtocols = new String[]{"http", "mailto", "https"}; // no ftp. + vProtocolAtts = new String[]{"src", "href"}; + vRemoveBlanks = new String[]{"a", "b", "strong", "i", "em"}; + vAllowedEntities = new String[]{"amp", "gt", "lt", "quot"}; stripComment = true; encodeQuotes = true; alwaysMakeTags = false; @@ -140,8 +136,7 @@ public final class HTMLFilter * @param conf map containing configuration. keys match field names. */ @SuppressWarnings("unchecked") - public HTMLFilter(final Map conf) - { + public HtmlFilter(final Map conf) { assert conf.containsKey("vAllowed") : "configuration requires vAllowed"; assert conf.containsKey("vSelfClosingTags") : "configuration requires vSelfClosingTags"; @@ -165,20 +160,22 @@ public final class HTMLFilter alwaysMakeTags = conf.containsKey("alwaysMakeTags") ? (Boolean) conf.get("alwaysMakeTags") : true; } - private void reset() - { + private void reset() { vTagCounts.clear(); } // --------------------------------------------------------------- - // my versions of some PHP library functions - public static String chr(final int decimal) - { + + /** + * my versions of some PHP library functions + * @param decimal / + * @return / + */ + public static String chr(final int decimal) { return String.valueOf((char) decimal); } - public static String htmlSpecialChars(final String s) - { + public static String htmlSpecialChars(final String s) { String result = s; result = regexReplace(P_AMP, "&", result); result = regexReplace(P_QUOTE, """, result); @@ -195,8 +192,7 @@ public final class HTMLFilter * @param input text (i.e. submitted by a user) than may contain html * @return "clean" version of input, with only valid, whitelisted html elements allowed */ - public String filter(final String input) - { + public String filter(final String input) { reset(); String s = input; @@ -213,22 +209,18 @@ public final class HTMLFilter return s; } - public boolean isAlwaysMakeTags() - { + public boolean isAlwaysMakeTags() { return alwaysMakeTags; } - public boolean isStripComments() - { + public boolean isStripComments() { return stripComment; } - private String escapeComments(final String s) - { + private String escapeComments(final String s) { final Matcher m = P_COMMENTS.matcher(s); final StringBuffer buf = new StringBuffer(); - if (m.find()) - { + if (m.find()) { final String match = m.group(1); // (.*?) m.appendReplacement(buf, Matcher.quoteReplacement("")); } @@ -237,10 +229,8 @@ public final class HTMLFilter return buf.toString(); } - private String balancehtml(String s) - { - if (alwaysMakeTags) - { + private String balancehtml(String s) { + if (alwaysMakeTags) { // // try and form html // @@ -249,9 +239,7 @@ public final class HTMLFilter s = regexReplace(P_BODY_TO_END, "<$1>", s); s = regexReplace(P_XML_CONTENT, "$1<$2", s); - } - else - { + } else { // // escape stray brackets // @@ -269,13 +257,11 @@ public final class HTMLFilter return s; } - private String checkTags(String s) - { + private String checkTags(String s) { Matcher m = P_TAGS.matcher(s); final StringBuffer buf = new StringBuffer(); - while (m.find()) - { + while (m.find()) { String replaceStr = m.group(1); replaceStr = processTag(replaceStr); m.appendReplacement(buf, Matcher.quoteReplacement(replaceStr)); @@ -285,10 +271,8 @@ public final class HTMLFilter // these get tallied in processTag // (remember to reset before subsequent calls to filter method) final StringBuilder sBuilder = new StringBuilder(buf.toString()); - for (String key : vTagCounts.keySet()) - { - for (int ii = 0; ii < vTagCounts.get(key); ii++) - { + for (String key : vTagCounts.keySet()) { + for (int ii = 0; ii < vTagCounts.get(key); ii++) { sBuilder.append(""); } } @@ -297,18 +281,14 @@ public final class HTMLFilter return s; } - private String processRemoveBlanks(final String s) - { + private String processRemoveBlanks(final String s) { String result = s; - for (String tag : vRemoveBlanks) - { - if (!P_REMOVE_PAIR_BLANKS.containsKey(tag)) - { + for (String tag : vRemoveBlanks) { + if (!P_REMOVE_PAIR_BLANKS.containsKey(tag)) { P_REMOVE_PAIR_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?>")); } result = regexReplace(P_REMOVE_PAIR_BLANKS.get(tag), "", result); - if (!P_REMOVE_SELF_BLANKS.containsKey(tag)) - { + if (!P_REMOVE_SELF_BLANKS.containsKey(tag)) { P_REMOVE_SELF_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?/>")); } result = regexReplace(P_REMOVE_SELF_BLANKS.get(tag), "", result); @@ -317,136 +297,93 @@ public final class HTMLFilter return result; } - private static String regexReplace(final Pattern regexPattern, final String replacement, final String s) - { + private static String regexReplace(final Pattern regexPattern, final String replacement, final String s) { Matcher m = regexPattern.matcher(s); return m.replaceAll(replacement); } - private String processTag(final String s) - { - // ending tags + private String processTag(final String s) { Matcher m = P_END_TAG.matcher(s); - if (m.find()) - { + if (m.find()) { final String name = m.group(1).toLowerCase(); - if (allowed(name)) - { - if (false == inArray(name, vSelfClosingTags)) - { - if (vTagCounts.containsKey(name)) - { + if (allowed(name)) { + if (false == inArray(name, vSelfClosingTags)) { + if (vTagCounts.containsKey(name)) { vTagCounts.put(name, vTagCounts.get(name) - 1); return ""; } } } } - // starting tags m = P_START_TAG.matcher(s); - if (m.find()) - { + if (m.find()) { final String name = m.group(1).toLowerCase(); final String body = m.group(2); String ending = m.group(3); - // debug( "in a starting tag, name='" + name + "'; body='" + body + "'; ending='" + ending + "'" ); - if (allowed(name)) - { + if (allowed(name)) { final StringBuilder params = new StringBuilder(); - final Matcher m2 = P_QUOTED_ATTRIBUTES.matcher(body); final Matcher m3 = P_UNQUOTED_ATTRIBUTES.matcher(body); final List paramNames = new ArrayList<>(); final List paramValues = new ArrayList<>(); - while (m2.find()) - { + while (m2.find()) { paramNames.add(m2.group(1)); // ([a-z0-9]+) paramValues.add(m2.group(3)); // (.*?) } - while (m3.find()) - { + while (m3.find()) { paramNames.add(m3.group(1)); // ([a-z0-9]+) paramValues.add(m3.group(3)); // ([^\"\\s']+) } - String paramName, paramValue; - for (int ii = 0; ii < paramNames.size(); ii++) - { + for (int ii = 0; ii < paramNames.size(); ii++) { paramName = paramNames.get(ii).toLowerCase(); paramValue = paramValues.get(ii); - - // debug( "paramName='" + paramName + "'" ); - // debug( "paramValue='" + paramValue + "'" ); - // debug( "allowed? " + vAllowed.get( name ).contains( paramName ) ); - - if (allowedAttribute(name, paramName)) - { - if (inArray(paramName, vProtocolAtts)) - { + if (allowedAttribute(name, paramName)) { + if (inArray(paramName, vProtocolAtts)) { paramValue = processParamProtocol(paramValue); } params.append(' ').append(paramName).append("=\\\"").append(paramValue).append("\""); } } - - if (inArray(name, vSelfClosingTags)) - { + if (inArray(name, vSelfClosingTags)) { ending = " /"; } - - if (inArray(name, vNeedClosingTags)) - { + if (inArray(name, vNeedClosingTags)) { ending = ""; } - - if (ending == null || ending.length() < 1) - { - if (vTagCounts.containsKey(name)) - { + if (ending == null || ending.length() < 1) { + if (vTagCounts.containsKey(name)) { vTagCounts.put(name, vTagCounts.get(name) + 1); - } - else - { + } else { vTagCounts.put(name, 1); } - } - else - { + } else { ending = " /"; } return "<" + name + params + ending + ">"; - } - else - { + } else { return ""; } } - // comments m = P_COMMENT.matcher(s); - if (!stripComment && m.find()) - { + if (!stripComment && m.find()) { return "<" + m.group() + ">"; } - return ""; } - private String processParamProtocol(String s) - { + private String processParamProtocol(String s) { s = decodeEntities(s); final Matcher m = P_PROTOCOL.matcher(s); - if (m.find()) - { + if (m.find()) { final String protocol = m.group(1); - if (!inArray(protocol, vAllowedProtocols)) - { + if (!inArray(protocol, vAllowedProtocols)) { // bad protocol, turn into local anchor link instead s = "#" + s.substring(protocol.length() + 1); - if (s.startsWith("#//")) - { + if (s.startsWith("#//")) { s = "#" + s.substring(3); } } @@ -455,13 +392,11 @@ public final class HTMLFilter return s; } - private String decodeEntities(String s) - { + private String decodeEntities(String s) { StringBuffer buf = new StringBuffer(); Matcher m = P_ENTITY.matcher(s); - while (m.find()) - { + while (m.find()) { final String match = m.group(1); final int decimal = Integer.decode(match).intValue(); m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal))); @@ -471,8 +406,7 @@ public final class HTMLFilter buf = new StringBuffer(); m = P_ENTITY_UNICODE.matcher(s); - while (m.find()) - { + while (m.find()) { final String match = m.group(1); final int decimal = Integer.valueOf(match, 16).intValue(); m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal))); @@ -482,8 +416,7 @@ public final class HTMLFilter buf = new StringBuffer(); m = P_ENCODE.matcher(s); - while (m.find()) - { + while (m.find()) { final String match = m.group(1); final int decimal = Integer.valueOf(match, 16).intValue(); m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal))); @@ -495,14 +428,12 @@ public final class HTMLFilter return s; } - private String validateEntities(final String s) - { + private String validateEntities(final String s) { StringBuffer buf = new StringBuffer(); // validate entities throughout the string Matcher m = P_VALID_ENTITIES.matcher(s); - while (m.find()) - { + while (m.find()) { final String one = m.group(1); // ([^&;]*) final String two = m.group(2); // (?=(;|&|$)) m.appendReplacement(buf, Matcher.quoteReplacement(checkEntity(one, two))); @@ -512,14 +443,11 @@ public final class HTMLFilter return encodeQuotes(buf.toString()); } - private String encodeQuotes(final String s) - { - if (encodeQuotes) - { + private String encodeQuotes(final String s) { + if (encodeQuotes) { StringBuffer buf = new StringBuffer(); Matcher m = P_VALID_QUOTES.matcher(s); - while (m.find()) - { + while (m.find()) { final String one = m.group(1); // (>|^) final String two = m.group(2); // ([^<]+?) final String three = m.group(3); // (<|$) @@ -528,43 +456,34 @@ public final class HTMLFilter } m.appendTail(buf); return buf.toString(); - } - else - { + } else { return s; } } - private String checkEntity(final String preamble, final String term) - { + private String checkEntity(final String preamble, final String term) { return ";".equals(term) && isValidEntity(preamble) ? '&' + preamble : "&" + preamble; } - private boolean isValidEntity(final String entity) - { + private boolean isValidEntity(final String entity) { return inArray(entity, vAllowedEntities); } - private static boolean inArray(final String s, final String[] array) - { - for (String item : array) - { - if (item != null && item.equals(s)) - { + private static boolean inArray(final String s, final String[] array) { + for (String item : array) { + if (item != null && item.equals(s)) { return true; } } return false; } - private boolean allowed(final String name) - { + private boolean allowed(final String name) { return (vAllowed.isEmpty() || vAllowed.containsKey(name)) && !inArray(name, vDisallowed); } - private boolean allowedAttribute(final String name, final String paramName) - { + private boolean allowedAttribute(final String name, final String paramName) { return allowed(name) && (vAllowed.isEmpty() || vAllowed.get(name).contains(paramName)); } -} \ No newline at end of file +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java index 35857802..9978afc3 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java @@ -68,24 +68,24 @@ public class IpUtils { final byte b0 = addr[0]; final byte b1 = addr[1]; // 10.x.x.x/8 - final byte SECTION1 = 0x0A; + final byte section1 = 0x0A; // 172.16.x.x/12 - final byte SECTION2 = (byte) 0xAC; - final byte SECTION3 = (byte) 0x10; - final byte SECTION4 = (byte) 0x1F; + final byte section2 = (byte) 0xAC; + final byte section3 = (byte) 0x10; + final byte section4 = (byte) 0x1F; // 192.168.x.x/16 - final byte SECTION5 = (byte) 0xC0; - final byte SECTION6 = (byte) 0xA8; + final byte section5 = (byte) 0xC0; + final byte section6 = (byte) 0xA8; switch (b0) { - case SECTION1: + case section1: return true; - case SECTION2: - if (b1 >= SECTION3 && b1 <= SECTION4) { + case section2: + if (b1 >= section3 && b1 <= section4) { return true; } - case SECTION5: + case section5: switch (b1) { - case SECTION6: { + case section6: { return true; } default:{ @@ -228,4 +228,4 @@ public class IpUtils { public static boolean isUnknown(String checkString) { return StringUtils.isBlank(checkString) || "unknown".equalsIgnoreCase(checkString); } -} \ No newline at end of file +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java index e920a652..461c4f6f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java @@ -1,51 +1,5 @@ package com.ruoyi.common.core.utils.poi; -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.math.BigDecimal; -import java.text.DecimalFormat; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang3.RegExUtils; -import org.apache.poi.ss.usermodel.BorderStyle; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.CellStyle; -import org.apache.poi.ss.usermodel.CellType; -import org.apache.poi.ss.usermodel.ClientAnchor; -import org.apache.poi.ss.usermodel.DataValidation; -import org.apache.poi.ss.usermodel.DataValidationConstraint; -import org.apache.poi.ss.usermodel.DataValidationHelper; -import org.apache.poi.ss.usermodel.DateUtil; -import org.apache.poi.ss.usermodel.Drawing; -import org.apache.poi.ss.usermodel.FillPatternType; -import org.apache.poi.ss.usermodel.Font; -import org.apache.poi.ss.usermodel.HorizontalAlignment; -import org.apache.poi.ss.usermodel.IndexedColors; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.VerticalAlignment; -import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.ss.usermodel.WorkbookFactory; -import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.ss.util.CellRangeAddressList; -import org.apache.poi.util.IOUtils; -import org.apache.poi.xssf.streaming.SXSSFWorkbook; -import org.apache.poi.xssf.usermodel.XSSFClientAnchor; -import org.apache.poi.xssf.usermodel.XSSFDataValidation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.ruoyi.common.core.annotation.Excel.Type; @@ -56,19 +10,40 @@ import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.file.FileTypeUtils; import com.ruoyi.common.core.utils.file.ImageUtils; import com.ruoyi.common.core.utils.reflect.ReflectUtils; +import org.apache.commons.lang3.RegExUtils; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.ss.util.CellRangeAddressList; +import org.apache.poi.util.IOUtils; +import org.apache.poi.xssf.streaming.SXSSFWorkbook; +import org.apache.poi.xssf.usermodel.XSSFClientAnchor; +import org.apache.poi.xssf.usermodel.XSSFDataValidation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.*; +import java.util.stream.Collectors; /** * Excel鐩稿叧澶勭悊 * * @author ruoyi */ -public class ExcelUtil -{ +public class ExcelUtil { private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class); public static final String FORMULA_REGEX_STR = "=|-|\\+|@"; - public static final String[] FORMULA_STR = { "=", "-", "+", "@" }; + public static final String[] FORMULA_STR = {"=", "-", "+", "@"}; /** * Excel sheet鏈澶ц鏁帮紝榛樿65536 @@ -140,15 +115,12 @@ public class ExcelUtil */ public Class clazz; - public ExcelUtil(Class clazz) - { + public ExcelUtil(Class clazz) { this.clazz = clazz; } - public void init(List list, String sheetName, String title, Type type) - { - if (list == null) - { + public void init(List list, String sheetName, String title, Type type) { + if (list == null) { list = new ArrayList(); } this.list = list; @@ -163,10 +135,8 @@ public class ExcelUtil /** * 鍒涘缓excel绗竴琛屾爣棰 */ - public void createTitle() - { - if (StringUtils.isNotEmpty(title)) - { + public void createTitle() { + if (StringUtils.isNotEmpty(title)) { Row titleRow = sheet.createRow(rownum == 0 ? rownum++ : 0); titleRow.setHeightInPoints(30); Cell titleCell = titleRow.createCell(0); @@ -183,20 +153,18 @@ public class ExcelUtil * @param is 杈撳叆娴 * @return 杞崲鍚庨泦鍚 */ - public List importExcel(InputStream is) throws Exception - { + public List importExcel(InputStream is) throws Exception { return importExcel(is, 0); } /** * 瀵筫xcel琛ㄥ崟榛樿绗竴涓储寮曞悕杞崲鎴恖ist * - * @param is 杈撳叆娴 + * @param is 杈撳叆娴 * @param titleNum 鏍囬鍗犵敤琛屾暟 * @return 杞崲鍚庨泦鍚 */ - public List importExcel(InputStream is, int titleNum) throws Exception - { + public List importExcel(InputStream is, int titleNum) throws Exception { return importExcel(StringUtils.EMPTY, is, titleNum); } @@ -204,182 +172,156 @@ public class ExcelUtil * 瀵筫xcel琛ㄥ崟鎸囧畾琛ㄦ牸绱㈠紩鍚嶈浆鎹㈡垚list * * @param sheetName 琛ㄦ牸绱㈠紩鍚 - * @param titleNum 鏍囬鍗犵敤琛屾暟 - * @param is 杈撳叆娴 + * @param titleNum 鏍囬鍗犵敤琛屾暟 + * @param is 杈撳叆娴 * @return 杞崲鍚庨泦鍚 */ - public List importExcel(String sheetName, InputStream is, int titleNum) throws Exception - { + public List importExcel(String sheetName, InputStream is, int titleNum) throws Exception { this.type = Type.IMPORT; this.wb = WorkbookFactory.create(is); List list = new ArrayList(); // 濡傛灉鎸囧畾sheet鍚,鍒欏彇鎸囧畾sheet涓殑鍐呭 鍚﹀垯榛樿鎸囧悜绗1涓猻heet Sheet sheet = StringUtils.isNotEmpty(sheetName) ? wb.getSheet(sheetName) : wb.getSheetAt(0); - if (sheet == null) - { + if (sheet == null) { throw new IOException("鏂囦欢sheet涓嶅瓨鍦"); } - // 鑾峰彇鏈鍚庝竴涓潪绌鸿鐨勮涓嬫爣锛屾瘮濡傛昏鏁颁负n锛屽垯杩斿洖鐨勪负n-1 int rows = sheet.getLastRowNum(); - - if (rows > 0) - { + if (rows > 0) { // 瀹氫箟涓涓猰ap鐢ㄤ簬瀛樻斁excel鍒楃殑搴忓彿鍜宖ield. - Map cellMap = new HashMap(); + Map cellMap = new HashMap(2); // 鑾峰彇琛ㄥご Row heard = sheet.getRow(titleNum); - for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) - { + for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) { Cell cell = heard.getCell(i); - if (StringUtils.isNotNull(cell)) - { + if (StringUtils.isNotNull(cell)) { String value = this.getCellValue(heard, i).toString(); cellMap.put(value, i); - } - else - { + } else { cellMap.put(null, i); } } // 鏈夋暟鎹椂鎵嶅鐞 寰楀埌绫荤殑鎵鏈塮ield. List fields = this.getFields(); - Map fieldsMap = new HashMap(); - for (Object[] objects : fields) - { + Map fieldsMap = new HashMap(2); + for (Object[] objects : fields) { Excel attr = (Excel) objects[1]; Integer column = cellMap.get(attr.name()); - if (column != null) - { + if (column != null) { fieldsMap.put(column, objects); } } - for (int i = titleNum + 1; i <= rows; i++) - { + for (int i = titleNum + 1; i <= rows; i++) { // 浠庣2琛屽紑濮嬪彇鏁版嵁,榛樿绗竴琛屾槸琛ㄥご. Row row = sheet.getRow(i); // 鍒ゆ柇褰撳墠琛屾槸鍚︽槸绌鸿 - if (isRowEmpty(row)) - { + if (isRowEmpty(row)) { continue; } T entity = null; - for (Map.Entry entry : fieldsMap.entrySet()) - { - Object val = this.getCellValue(row, entry.getKey()); - - // 濡傛灉涓嶅瓨鍦ㄥ疄渚嬪垯鏂板缓. - entity = (entity == null ? clazz.newInstance() : entity); - // 浠巑ap涓緱鍒板搴斿垪鐨刦ield. - Field field = (Field) entry.getValue()[0]; - Excel attr = (Excel) entry.getValue()[1]; - // 鍙栧緱绫诲瀷,骞舵牴鎹璞＄被鍨嬭缃. - Class fieldType = field.getType(); - if (String.class == fieldType) - { - String s = Convert.toStr(val); - if (StringUtils.endsWith(s, ".0")) - { - val = StringUtils.substringBefore(s, ".0"); - } - else - { - String dateFormat = field.getAnnotation(Excel.class).dateFormat(); - if (StringUtils.isNotEmpty(dateFormat)) - { - val = parseDateToStr(dateFormat, val); - } - else - { - val = Convert.toStr(val); - } - } + importExcelExpand(entity, fieldsMap.entrySet(), row); + list.add(entity); + } + } + return list; + } + + /** + * importExcel鏂规硶鎷撳睍 鍗曟柟娉曚笉瓒呰繃80琛屼唬鐮 + * + * @param entity / + * @param entries / + * @param row / + * @throws InstantiationException + * @throws IllegalAccessException + */ + public void importExcelExpand(T entity, Set> entries, Row row) throws InstantiationException, IllegalAccessException { + + for (Map.Entry entry : entries) { + Object val = this.getCellValue(row, entry.getKey()); + + // 濡傛灉涓嶅瓨鍦ㄥ疄渚嬪垯鏂板缓. + entity = (entity == null ? clazz.newInstance() : entity); + // 浠巑ap涓緱鍒板搴斿垪鐨刦ield. + Field field = (Field) entry.getValue()[0]; + Excel attr = (Excel) entry.getValue()[1]; + // 鍙栧緱绫诲瀷,骞舵牴鎹璞＄被鍨嬭缃. + Class fieldType = field.getType(); + if (String.class == fieldType) { + String s = Convert.toStr(val); + if (StringUtils.endsWith(s, ".0")) { + val = StringUtils.substringBefore(s, ".0"); + } else { + String dateFormat = field.getAnnotation(Excel.class).dateFormat(); + if (StringUtils.isNotEmpty(dateFormat)) { + val = parseDateToStr(dateFormat, val); + } else { + val = Convert.toStr(val); } - else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val))) - { + } + } else { + if (StringUtils.isNumeric(Convert.toStr(val))) { + if (Integer.TYPE == fieldType || Integer.class == fieldType) { val = Convert.toInt(val); - } - else if ((Long.TYPE == fieldType || Long.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val))) - { + } else if (Long.TYPE == fieldType || Long.class == fieldType) { val = Convert.toLong(val); } - else if (Double.TYPE == fieldType || Double.class == fieldType) - { + } else { + if (Double.TYPE == fieldType || Double.class == fieldType) { val = Convert.toDouble(val); - } - else if (Float.TYPE == fieldType || Float.class == fieldType) - { + } else if (Float.TYPE == fieldType || Float.class == fieldType) { val = Convert.toFloat(val); - } - else if (BigDecimal.class == fieldType) - { + } else if (BigDecimal.class == fieldType) { val = Convert.toBigDecimal(val); - } - else if (Date.class == fieldType) - { - if (val instanceof String) - { + } else if (Date.class == fieldType) { + if (val instanceof String) { val = DateUtils.parseDate(val); - } - else if (val instanceof Double) - { + } else if (val instanceof Double) { val = DateUtil.getJavaDate((Double) val); } - } - else if (Boolean.TYPE == fieldType || Boolean.class == fieldType) - { + } else if (Boolean.TYPE == fieldType || Boolean.class == fieldType) { val = Convert.toBool(val, false); } - if (StringUtils.isNotNull(fieldType)) - { - String propertyName = field.getName(); - if (StringUtils.isNotEmpty(attr.targetAttr())) - { - propertyName = field.getName() + "." + attr.targetAttr(); - } - else if (StringUtils.isNotEmpty(attr.readConverterExp())) - { - val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator()); - } - else if (!attr.handler().equals(ExcelHandlerAdapter.class)) - { - val = dataFormatHandlerAdapter(val, attr); - } - ReflectUtils.invokeSetter(entity, propertyName, val); - } } - list.add(entity); + } + if (StringUtils.isNotNull(fieldType)) { + String propertyName = field.getName(); + if (StringUtils.isNotEmpty(attr.targetAttr())) { + propertyName = field.getName() + "." + attr.targetAttr(); + } else if (StringUtils.isNotEmpty(attr.readConverterExp())) { + val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator()); + } else if (!attr.handler().equals(ExcelHandlerAdapter.class)) { + val = dataFormatHandlerAdapter(val, attr); + } + ReflectUtils.invokeSetter(entity, propertyName, val); } } - return list; } /** * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟 * - * @param response 杩斿洖鏁版嵁 - * @param list 瀵煎嚭鏁版嵁闆嗗悎 + * @param response 杩斿洖鏁版嵁 + * @param list 瀵煎嚭鏁版嵁闆嗗悎 * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О * @return 缁撴灉 * @throws IOException */ - public void exportExcel(HttpServletResponse response, List list, String sheetName) - { + public void exportExcel(HttpServletResponse response, List list, String sheetName) { exportExcel(response, list, sheetName, StringUtils.EMPTY); } /** * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟 * - * @param response 杩斿洖鏁版嵁 - * @param list 瀵煎嚭鏁版嵁闆嗗悎 + * @param response 杩斿洖鏁版嵁 + * @param list 瀵煎嚭鏁版嵁闆嗗悎 * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О - * @param title 鏍囬 + * @param title 鏍囬 * @return 缁撴灉 * @throws IOException */ - public void exportExcel(HttpServletResponse response, List list, String sheetName, String title) - { + public void exportExcel(HttpServletResponse response, List list, String sheetName, String title) { response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setCharacterEncoding("utf-8"); this.init(list, sheetName, title, Type.EXPORT); @@ -398,8 +340,7 @@ public class ExcelUtil * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О * @return 缁撴灉 */ - public void importTemplateExcel(HttpServletResponse response, String sheetName) - { + public void importTemplateExcel(HttpServletResponse response, String sheetName) { importTemplateExcel(response, sheetName, StringUtils.EMPTY); } @@ -407,11 +348,10 @@ public class ExcelUtil * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟 * * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О - * @param title 鏍囬 + * @param title 鏍囬 * @return 缁撴灉 */ - public void importTemplateExcel(HttpServletResponse response, String sheetName, String title) - { + public void importTemplateExcel(HttpServletResponse response, String sheetName, String title) { response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setCharacterEncoding("utf-8"); this.init(null, sheetName, title, Type.IMPORT); @@ -423,19 +363,13 @@ public class ExcelUtil * * @return 缁撴灉 */ - public void exportExcel(HttpServletResponse response) - { - try - { + public void exportExcel(HttpServletResponse response) { + try { writeSheet(); wb.write(response.getOutputStream()); - } - catch (Exception e) - { + } catch (Exception e) { log.error("瀵煎嚭Excel寮傚父{}", e.getMessage()); - } - finally - { + } finally { IOUtils.closeQuietly(wb); } } @@ -443,25 +377,21 @@ public class ExcelUtil /** * 鍒涘缓鍐欏叆鏁版嵁鍒癝heet */ - public void writeSheet() - { + public void writeSheet() { // 鍙栧嚭涓鍏辨湁澶氬皯涓猻heet. int sheetNo = Math.max(1, (int) Math.ceil(list.size() * 1.0 / SHEET_SIZE)); - for (int index = 0; index < sheetNo; index++) - { + for (int index = 0; index < sheetNo; index++) { createSheet(sheetNo, index); // 浜х敓涓琛 Row row = sheet.createRow(rownum); int column = 0; // 鍐欏叆鍚勪釜瀛楁鐨勫垪澶村悕绉 - for (Object[] os : fields) - { + for (Object[] os : fields) { Excel excel = (Excel) os[1]; this.createCell(excel, row, column++); } - if (Type.EXPORT.equals(type)) - { + if (Type.EXPORT.equals(type)) { fillExcelData(index, row); addStatisticsRow(); } @@ -472,20 +402,17 @@ public class ExcelUtil * 濉厖excel鏁版嵁 * * @param index 搴忓彿 - * @param row 鍗曞厓鏍艰 + * @param row 鍗曞厓鏍艰 */ - public void fillExcelData(int index, Row row) - { + public void fillExcelData(int index, Row row) { int startNo = index * SHEET_SIZE; int endNo = Math.min(startNo + SHEET_SIZE, list.size()); - for (int i = startNo; i < endNo; i++) - { + for (int i = startNo; i < endNo; i++) { row = sheet.createRow(i + 1 + rownum - startNo); // 寰楀埌瀵煎嚭瀵硅薄. T vo = (T) list.get(i); int column = 0; - for (Object[] os : fields) - { + for (Object[] os : fields) { Field field = (Field) os[0]; Excel excel = (Excel) os[1]; this.addCell(excel, row, vo, field, column++); @@ -499,10 +426,9 @@ public class ExcelUtil * @param wb 宸ヤ綔钖勫璞 * @return 鏍峰紡鍒楄〃 */ - private Map createStyles(Workbook wb) - { + private Map createStyles(Workbook wb) { // 鍐欏叆鍚勬潯璁板綍,姣忔潯璁板綍瀵瑰簲excel琛ㄤ腑鐨勪竴琛 - Map styles = new HashMap(); + Map styles = new HashMap(2); CellStyle style = wb.createCellStyle(); style.setAlignment(HorizontalAlignment.CENTER); style.setVerticalAlignment(VerticalAlignment.CENTER); @@ -574,8 +500,7 @@ public class ExcelUtil /** * 鍒涘缓鍗曞厓鏍 */ - public Cell createCell(Excel attr, Row row, int column) - { + public Cell createCell(Excel attr, Row row, int column) { // 鍒涘缓鍒 Cell cell = row.createCell(column); // 鍐欏叆鍒椾俊鎭 @@ -589,34 +514,25 @@ public class ExcelUtil * 璁剧疆鍗曞厓鏍间俊鎭 * * @param value 鍗曞厓鏍煎 - * @param attr 娉ㄨВ鐩稿叧 - * @param cell 鍗曞厓鏍间俊鎭 + * @param attr 娉ㄨВ鐩稿叧 + * @param cell 鍗曞厓鏍间俊鎭 */ - public void setCellVo(Object value, Excel attr, Cell cell) - { - if (ColumnType.STRING == attr.cellType()) - { + public void setCellVo(Object value, Excel attr, Cell cell) { + if (ColumnType.STRING == attr.cellType()) { String cellValue = Convert.toStr(value); // 瀵逛簬浠讳綍浠ヨ〃杈惧紡瑙﹀彂瀛楃 =-+@寮澶寸殑鍗曞厓鏍硷紝鐩存帴浣跨敤tab瀛楃浣滀负鍓嶇紑锛岄槻姝SV娉ㄥ叆銆 - if (StringUtils.startsWithAny(cellValue, FORMULA_STR)) - { + if (StringUtils.startsWithAny(cellValue, FORMULA_STR)) { cellValue = RegExUtils.replaceFirst(cellValue, FORMULA_REGEX_STR, "\t$0"); } cell.setCellValue(StringUtils.isNull(cellValue) ? attr.defaultValue() : cellValue + attr.suffix()); - } - else if (ColumnType.NUMERIC == attr.cellType()) - { - if (StringUtils.isNotNull(value)) - { + } else if (ColumnType.NUMERIC == attr.cellType()) { + if (StringUtils.isNotNull(value)) { cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value)); } - } - else if (ColumnType.IMAGE == attr.cellType()) - { + } else if (ColumnType.IMAGE == attr.cellType()) { ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() + 1), cell.getRow().getRowNum() + 1); String imagePath = Convert.toStr(value); - if (StringUtils.isNotEmpty(imagePath)) - { + if (StringUtils.isNotEmpty(imagePath)) { byte[] data = ImageUtils.getImage(imagePath); getDrawingPatriarch(cell.getSheet()).createPicture(anchor, cell.getSheet().getWorkbook().addPicture(data, getImageType(data))); @@ -627,10 +543,8 @@ public class ExcelUtil /** * 鑾峰彇鐢诲竷 */ - public static Drawing getDrawingPatriarch(Sheet sheet) - { - if (sheet.getDrawingPatriarch() == null) - { + public static Drawing getDrawingPatriarch(Sheet sheet) { + if (sheet.getDrawingPatriarch() == null) { sheet.createDrawingPatriarch(); } return sheet.getDrawingPatriarch(); @@ -639,15 +553,11 @@ public class ExcelUtil /** * 鑾峰彇鍥剧墖绫诲瀷,璁剧疆鍥剧墖鎻掑叆绫诲瀷 */ - public int getImageType(byte[] value) - { + public int getImageType(byte[] value) { String type = FileTypeUtils.getFileExtendName(value); - if ("JPG".equalsIgnoreCase(type)) - { + if ("JPG".equalsIgnoreCase(type)) { return Workbook.PICTURE_TYPE_JPEG; - } - else if ("PNG".equalsIgnoreCase(type)) - { + } else if ("PNG".equalsIgnoreCase(type)) { return Workbook.PICTURE_TYPE_PNG; } return Workbook.PICTURE_TYPE_JPEG; @@ -656,19 +566,14 @@ public class ExcelUtil /** * 鍒涘缓琛ㄦ牸鏍峰紡 */ - public void setDataValidation(Excel attr, Row row, int column) - { - if (attr.name().indexOf("娉細") >= 0) - { + public void setDataValidation(Excel attr, Row row, int column) { + if (attr.name().indexOf("娉細") >= 0) { sheet.setColumnWidth(column, 6000); - } - else - { + } else { // 璁剧疆鍒楀 sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256)); } - if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0) - { + if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0) { // 鎻愮ず淇℃伅鎴栧彧鑳介夋嫨涓嶈兘杈撳叆鐨勫垪鍐呭. setPromptOrValidation(sheet, attr.combo(), attr.prompt(), 1, 100, column, column); } @@ -677,16 +582,13 @@ public class ExcelUtil /** * 娣诲姞鍗曞厓鏍 */ - public Cell addCell(Excel attr, Row row, T vo, Field field, int column) - { + public Cell addCell(Excel attr, Row row, T vo, Field field, int column) { Cell cell = null; - try - { + try { // 璁剧疆琛岄珮 row.setHeight(maxHeight); // 鏍规嵁Excel涓缃儏鍐靛喅瀹氭槸鍚﹀鍑,鏈変簺鎯呭喌闇瑕佷繚鎸佷负绌,甯屾湜鐢ㄦ埛濉啓杩欎竴鍒. - if (attr.isExport()) - { + if (attr.isExport()) { // 鍒涘缓cell cell = row.createCell(column); int align = attr.align().value(); @@ -697,32 +599,21 @@ public class ExcelUtil String dateFormat = attr.dateFormat(); String readConverterExp = attr.readConverterExp(); String separator = attr.separator(); - if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value)) - { + if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value)) { cell.setCellValue(parseDateToStr(dateFormat, value)); - } - else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value)) - { + } else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value)) { cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator)); - } - else if (value instanceof BigDecimal && -1 != attr.scale()) - { + } else if (value instanceof BigDecimal && -1 != attr.scale()) { cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).toString()); - } - else if (!attr.handler().equals(ExcelHandlerAdapter.class)) - { + } else if (!attr.handler().equals(ExcelHandlerAdapter.class)) { cell.setCellValue(dataFormatHandlerAdapter(value, attr)); - } - else - { + } else { // 璁剧疆鍒楃被鍨 setCellVo(value, attr, cell); } addStatisticsData(column, Convert.toStr(value), attr); } - } - catch (Exception e) - { + } catch (Exception e) { log.error("瀵煎嚭Excel澶辫触{}", e); } return cell; @@ -730,36 +621,31 @@ public class ExcelUtil /** * 璁剧疆 POI XSSFSheet 鍗曞厓鏍兼彁绀烘垨閫夋嫨妗 - * - * @param sheet 琛ㄥ崟 - * @param textlist 涓嬫媺妗嗘樉绀虹殑鍐呭 + * + * @param sheet 琛ㄥ崟 + * @param textlist 涓嬫媺妗嗘樉绀虹殑鍐呭 * @param promptContent 鎻愮ず鍐呭 - * @param firstRow 寮濮嬭 - * @param endRow 缁撴潫琛 - * @param firstCol 寮濮嬪垪 - * @param endCol 缁撴潫鍒 + * @param firstRow 寮濮嬭 + * @param endRow 缁撴潫琛 + * @param firstCol 寮濮嬪垪 + * @param endCol 缁撴潫鍒 */ public void setPromptOrValidation(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, - int firstCol, int endCol) - { + int firstCol, int endCol) { DataValidationHelper helper = sheet.getDataValidationHelper(); DataValidationConstraint constraint = textlist.length > 0 ? helper.createExplicitListConstraint(textlist) : helper.createCustomConstraint("DD1"); CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol); DataValidation dataValidation = helper.createValidation(constraint, regions); - if (StringUtils.isNotEmpty(promptContent)) - { + if (StringUtils.isNotEmpty(promptContent)) { // 濡傛灉璁剧疆浜嗘彁绀轰俊鎭垯榧犳爣鏀句笂鍘绘彁绀 dataValidation.createPromptBox("", promptContent); dataValidation.setShowPromptBox(true); } // 澶勭悊Excel鍏煎鎬ч棶棰 - if (dataValidation instanceof XSSFDataValidation) - { + if (dataValidation instanceof XSSFDataValidation) { dataValidation.setSuppressDropDownArrow(true); dataValidation.setShowErrorBox(true); - } - else - { + } else { dataValidation.setSuppressDropDownArrow(false); } sheet.addValidationData(dataValidation); @@ -769,32 +655,24 @@ public class ExcelUtil * 瑙ｆ瀽瀵煎嚭鍊 0=鐢,1=濂,2=鏈煡 * * @param propertyValue 鍙傛暟鍊 - * @param converterExp 缈昏瘧娉ㄨВ - * @param separator 鍒嗛殧绗 + * @param converterExp 缈昏瘧娉ㄨВ + * @param separator 鍒嗛殧绗 * @return 瑙ｆ瀽鍚庡 */ - public static String convertByExp(String propertyValue, String converterExp, String separator) - { + public static String convertByExp(String propertyValue, String converterExp, String separator) { StringBuilder propertyString = new StringBuilder(); String[] convertSource = converterExp.split(","); - for (String item : convertSource) - { + for (String item : convertSource) { String[] itemArray = item.split("="); - if (StringUtils.containsAny(separator, propertyValue)) - { - for (String value : propertyValue.split(separator)) - { - if (itemArray[0].equals(value)) - { + if (StringUtils.containsAny(separator, propertyValue)) { + for (String value : propertyValue.split(separator)) { + if (itemArray[0].equals(value)) { propertyString.append(itemArray[1] + separator); break; } } - } - else - { - if (itemArray[0].equals(propertyValue)) - { + } else { + if (itemArray[0].equals(propertyValue)) { return itemArray[1]; } } @@ -806,32 +684,24 @@ public class ExcelUtil * 鍙嶅悜瑙ｆ瀽鍊 鐢=0,濂=1,鏈煡=2 * * @param propertyValue 鍙傛暟鍊 - * @param converterExp 缈昏瘧娉ㄨВ - * @param separator 鍒嗛殧绗 + * @param converterExp 缈昏瘧娉ㄨВ + * @param separator 鍒嗛殧绗 * @return 瑙ｆ瀽鍚庡 */ - public static String reverseByExp(String propertyValue, String converterExp, String separator) - { + public static String reverseByExp(String propertyValue, String converterExp, String separator) { StringBuilder propertyString = new StringBuilder(); String[] convertSource = converterExp.split(","); - for (String item : convertSource) - { + for (String item : convertSource) { String[] itemArray = item.split("="); - if (StringUtils.containsAny(separator, propertyValue)) - { - for (String value : propertyValue.split(separator)) - { - if (itemArray[1].equals(value)) - { + if (StringUtils.containsAny(separator, propertyValue)) { + for (String value : propertyValue.split(separator)) { + if (itemArray[1].equals(value)) { propertyString.append(itemArray[0] + separator); break; } } - } - else - { - if (itemArray[1].equals(propertyValue)) - { + } else { + if (itemArray[1].equals(propertyValue)) { return itemArray[0]; } } @@ -846,16 +716,12 @@ public class ExcelUtil * @param excel 鏁版嵁娉ㄨВ * @return */ - public String dataFormatHandlerAdapter(Object value, Excel excel) - { - try - { + public String dataFormatHandlerAdapter(Object value, Excel excel) { + try { Object instance = excel.handler().newInstance(); - Method formatMethod = excel.handler().getMethod("format", new Class[] { Object.class, String[].class }); + Method formatMethod = excel.handler().getMethod("format", new Class[]{Object.class, String[].class}); value = formatMethod.invoke(instance, value, excel.args()); - } - catch (Exception e) - { + } catch (Exception e) { log.error("涓嶈兘鏍煎紡鍖栨暟鎹 " + excel.handler(), e.getMessage()); } return Convert.toStr(value); @@ -864,21 +730,15 @@ public class ExcelUtil /** * 鍚堣缁熻淇℃伅 */ - private void addStatisticsData(Integer index, String text, Excel entity) - { - if (entity != null && entity.isStatistics()) - { + private void addStatisticsData(Integer index, String text, Excel entity) { + if (entity != null && entity.isStatistics()) { Double temp = 0D; - if (!statistics.containsKey(index)) - { + if (!statistics.containsKey(index)) { statistics.put(index, temp); } - try - { + try { temp = Double.valueOf(text); - } - catch (NumberFormatException e) - { + } catch (NumberFormatException e) { } statistics.put(index, statistics.get(index) + temp); } @@ -887,18 +747,15 @@ public class ExcelUtil /** * 鍒涘缓缁熻琛 */ - public void addStatisticsRow() - { - if (statistics.size() > 0) - { + public void addStatisticsRow() { + if (statistics.size() > 0) { Row row = sheet.createRow(sheet.getLastRowNum() + 1); Set keys = statistics.keySet(); Cell cell = row.createCell(0); cell.setCellStyle(styles.get("total")); cell.setCellValue("鍚堣"); - for (Integer key : keys) - { + for (Integer key : keys) { cell = row.createCell(key); cell.setCellStyle(styles.get("total")); cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key))); @@ -910,28 +767,22 @@ public class ExcelUtil /** * 鑾峰彇bean涓殑灞炴у * - * @param vo 瀹炰綋瀵硅薄 + * @param vo 瀹炰綋瀵硅薄 * @param field 瀛楁 * @param excel 娉ㄨВ * @return 鏈缁堢殑灞炴у * @throws Exception */ - private Object getTargetValue(T vo, Field field, Excel excel) throws Exception - { + private Object getTargetValue(T vo, Field field, Excel excel) throws Exception { Object o = field.get(vo); - if (StringUtils.isNotEmpty(excel.targetAttr())) - { + if (StringUtils.isNotEmpty(excel.targetAttr())) { String target = excel.targetAttr(); - if (target.contains(".")) - { + if (target.contains(".")) { String[] targets = target.split("[.]"); - for (String name : targets) - { + for (String name : targets) { o = getValue(o, name); } - } - else - { + } else { o = getValue(o, target); } } @@ -946,10 +797,8 @@ public class ExcelUtil * @return value * @throws Exception */ - private Object getValue(Object o, String name) throws Exception - { - if (StringUtils.isNotNull(o) && StringUtils.isNotEmpty(name)) - { + private Object getValue(Object o, String name) throws Exception { + if (StringUtils.isNotNull(o) && StringUtils.isNotEmpty(name)) { Class clazz = o.getClass(); Field field = clazz.getDeclaredField(name); field.setAccessible(true); @@ -961,8 +810,7 @@ public class ExcelUtil /** * 寰楀埌鎵鏈夊畾涔夊瓧娈 */ - private void createExcelField() - { + private void createExcelField() { this.fields = getFields(); this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList()); this.maxHeight = getRowHeight(); @@ -971,36 +819,33 @@ public class ExcelUtil /** * 鑾峰彇瀛楁娉ㄨВ淇℃伅 */ - public List getFields() - { + public List getFields() { List fields = new ArrayList(); List tempFields = new ArrayList<>(); tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields())); tempFields.addAll(Arrays.asList(clazz.getDeclaredFields())); - for (Field field : tempFields) - { + for (Field field : tempFields) { // 鍗曟敞瑙 - if (field.isAnnotationPresent(Excel.class)) - { + if (field.isAnnotationPresent(Excel.class)) { Excel attr = field.getAnnotation(Excel.class); - if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) - { - field.setAccessible(true); - fields.add(new Object[] { field, attr }); + if (attr != null) { + if (attr.type() == Type.ALL || attr.type() == type) { + field.setAccessible(true); + fields.add(new Object[]{field, attr}); + } } } // 澶氭敞瑙 - if (field.isAnnotationPresent(Excels.class)) - { + if (field.isAnnotationPresent(Excels.class)) { Excels attrs = field.getAnnotation(Excels.class); Excel[] excels = attrs.value(); - for (Excel attr : excels) - { - if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) - { - field.setAccessible(true); - fields.add(new Object[] { field, attr }); + for (Excel attr : excels) { + if (attr != null) { + if (attr.type() == Type.ALL || attr.type() == type) { + field.setAccessible(true); + fields.add(new Object[]{field, attr}); + } } } } @@ -1011,11 +856,9 @@ public class ExcelUtil /** * 鏍规嵁娉ㄨВ鑾峰彇鏈澶ц楂 */ - public short getRowHeight() - { + public short getRowHeight() { double maxHeight = 0; - for (Object[] os : this.fields) - { + for (Object[] os : this.fields) { Excel excel = (Excel) os[1]; maxHeight = Math.max(maxHeight, excel.height()); } @@ -1025,8 +868,7 @@ public class ExcelUtil /** * 鍒涘缓涓涓伐浣滅翱 */ - public void createWorkbook() - { + public void createWorkbook() { this.wb = new SXSSFWorkbook(500); this.sheet = wb.createSheet(); wb.setSheetName(0, sheetName); @@ -1037,13 +879,11 @@ public class ExcelUtil * 鍒涘缓宸ヤ綔琛 * * @param sheetNo sheet鏁伴噺 - * @param index 搴忓彿 + * @param index 搴忓彿 */ - public void createSheet(int sheetNo, int index) - { + public void createSheet(int sheetNo, int index) { // 璁剧疆宸ヤ綔琛ㄧ殑鍚嶇О. - if (sheetNo > 1 && index > 0) - { + if (sheetNo > 1 && index > 0) { this.sheet = wb.createSheet(); this.createTitle(); wb.setSheetName(index, sheetName + index); @@ -1053,58 +893,39 @@ public class ExcelUtil /** * 鑾峰彇鍗曞厓鏍煎 * - * @param row 鑾峰彇鐨勮 + * @param row 鑾峰彇鐨勮 * @param column 鑾峰彇鍗曞厓鏍煎垪鍙 * @return 鍗曞厓鏍煎 */ - public Object getCellValue(Row row, int column) - { - if (row == null) - { + public Object getCellValue(Row row, int column) { + if (row == null) { return row; } Object val = ""; - try - { + try { Cell cell = row.getCell(column); - if (StringUtils.isNotNull(cell)) - { - if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA) - { + if (StringUtils.isNotNull(cell)) { + if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA) { val = cell.getNumericCellValue(); - if (DateUtil.isCellDateFormatted(cell)) - { + if (DateUtil.isCellDateFormatted(cell)) { val = DateUtil.getJavaDate((Double) val); // POI Excel 鏃ユ湡鏍煎紡杞崲 - } - else - { - if ((Double) val % 1 != 0) - { + } else { + if ((Double) val % 1 != 0) { val = new BigDecimal(val.toString()); - } - else - { + } else { val = new DecimalFormat("0").format(val); } } - } - else if (cell.getCellType() == CellType.STRING) - { + } else if (cell.getCellType() == CellType.STRING) { val = cell.getStringCellValue(); - } - else if (cell.getCellType() == CellType.BOOLEAN) - { + } else if (cell.getCellType() == CellType.BOOLEAN) { val = cell.getBooleanCellValue(); - } - else if (cell.getCellType() == CellType.ERROR) - { + } else if (cell.getCellType() == CellType.ERROR) { val = cell.getErrorCellValue(); } } - } - catch (Exception e) - { + } catch (Exception e) { return val; } return val; @@ -1116,17 +937,13 @@ public class ExcelUtil * @param row 鍒ゆ柇鐨勮 * @return */ - private boolean isRowEmpty(Row row) - { - if (row == null) - { + private boolean isRowEmpty(Row row) { + if (row == null) { return true; } - for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) - { + for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) { Cell cell = row.getCell(i); - if (cell != null && cell.getCellType() != CellType.BLANK) - { + if (cell != null && cell.getCellType() != CellType.BLANK) { return false; } } @@ -1135,32 +952,23 @@ public class ExcelUtil /** * 鏍煎紡鍖栦笉鍚岀被鍨嬬殑鏃ユ湡瀵硅薄 - * + * * @param dateFormat 鏃ユ湡鏍煎紡 - * @param val 琚牸寮忓寲鐨勬棩鏈熷璞 + * @param val 琚牸寮忓寲鐨勬棩鏈熷璞 * @return 鏍煎紡鍖栧悗鐨勬棩鏈熷瓧绗 */ - public String parseDateToStr(String dateFormat, Object val) - { - if (val == null) - { + public String parseDateToStr(String dateFormat, Object val) { + if (val == null) { return ""; } String str; - if (val instanceof Date) - { + if (val instanceof Date) { str = DateUtils.parseDateToStr(dateFormat, (Date) val); - } - else if (val instanceof LocalDateTime) - { + } else if (val instanceof LocalDateTime) { str = DateUtils.parseDateToStr(dateFormat, DateUtils.toDate((LocalDateTime) val)); - } - else if (val instanceof LocalDate) - { + } else if (val instanceof LocalDate) { str = DateUtils.parseDateToStr(dateFormat, DateUtils.toDate((LocalDate) val)); - } - else - { + } else { str = val.toString(); } return str; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java index 3d8382b2..219c5934 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java @@ -1,19 +1,15 @@ package com.ruoyi.common.core.utils.reflect; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.util.Date; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.core.utils.DateUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; import org.apache.poi.ss.usermodel.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.core.utils.DateUtils; + +import java.lang.reflect.*; +import java.util.Date; /** * 鍙嶅皠宸ュ叿绫. 鎻愪緵璋冪敤getter/setter鏂规硶, 璁块棶绉佹湁鍙橀噺, 璋冪敤绉佹湁鏂规硶, 鑾峰彇娉涘瀷绫诲瀷Class, 琚獳OP杩囩殑鐪熷疄绫荤瓑宸ュ叿鍑芥暟. @@ -102,7 +98,6 @@ public class ReflectUtils Field field = getAccessibleField(obj, fieldName); if (field == null) { - // throw new IllegalArgumentException("鍦 [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + fieldName + "] 瀛楁 "); logger.debug("鍦 [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + fieldName + "] 瀛楁 "); return; } @@ -312,10 +307,10 @@ public class ReflectUtils */ public static void makeAccessible(Method method) { - if ((!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers())) - && !method.isAccessible()) - { - method.setAccessible(true); + if (!method.isAccessible()) { + if (!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers())) { + method.setAccessible(true); + } } } @@ -324,10 +319,11 @@ public class ReflectUtils */ public static void makeAccessible(Field field) { - if ((!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers()) - || Modifier.isFinal(field.getModifiers())) && !field.isAccessible()) - { - field.setAccessible(true); + if (!field.isAccessible()) { + if (!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers()) + || Modifier.isFinal(field.getModifiers())) { + field.setAccessible(true); + } } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java index 0ae664a1..e22079ff 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java @@ -2,75 +2,63 @@ package com.ruoyi.common.core.utils.sign; /** * Base64宸ュ叿绫 - * + * * @author ruoyi */ -public final class Base64 -{ - static private final int BASELENGTH = 128; - static private final int LOOKUPLENGTH = 64; - static private final int TWENTYFOURBITGROUP = 24; - static private final int EIGHTBIT = 8; - static private final int SIXTEENBIT = 16; - static private final int FOURBYTE = 4; - static private final int SIGN = -128; - static private final char PAD = '='; +public final class Base64 { + static private final int BASELENGTH = 128; + static private final int LOOKUPLENGTH = 64; + static private final int TWENTYFOURBITGROUP = 24; + static private final int EIGHTBIT = 8; + static private final int SIXTEENBIT = 16; + static private final int FOURBYTE = 4; + static private final int SIGN = -128; + static private final char PAD = '='; static final private byte[] BASE_64_ALPHABET = new byte[BASELENGTH]; static final private char[] LOOK_UP_BASE_64_ALPHABET = new char[LOOKUPLENGTH]; - static - { - for (int i = 0; i < BASELENGTH; ++i) - { + static { + for (int i = 0; i < BASELENGTH; ++i) { BASE_64_ALPHABET[i] = -1; } - for (int i = 'Z'; i >= 'A'; i--) - { + for (int i = 'Z'; i >= 'A'; i--) { BASE_64_ALPHABET[i] = (byte) (i - 'A'); } - for (int i = 'z'; i >= 'a'; i--) - { + for (int i = 'z'; i >= 'a'; i--) { BASE_64_ALPHABET[i] = (byte) (i - 'a' + 26); } - for (int i = '9'; i >= '0'; i--) - { + for (int i = '9'; i >= '0'; i--) { BASE_64_ALPHABET[i] = (byte) (i - '0' + 52); } BASE_64_ALPHABET['+'] = 62; BASE_64_ALPHABET['/'] = 63; - for (int i = 0; i <= 25; i++) - { + for (int i = 0; i <= 25; i++) { LOOK_UP_BASE_64_ALPHABET[i] = (char) ('A' + i); } - for (int i = 26, j = 0; i <= 51; i++, j++) - { + for (int i = 26, j = 0; i <= 51; i++, j++) { LOOK_UP_BASE_64_ALPHABET[i] = (char) ('a' + j); } - for (int i = 52, j = 0; i <= 61; i++, j++) - { + for (int i = 52, j = 0; i <= 61; i++, j++) { LOOK_UP_BASE_64_ALPHABET[i] = (char) ('0' + j); } LOOK_UP_BASE_64_ALPHABET[62] = (char) '+'; LOOK_UP_BASE_64_ALPHABET[63] = (char) '/'; } - private static boolean isWhiteSpace(char octect) - { + private static boolean isWhiteSpace(char octect) { return (octect == 0x20 || octect == 0xd || octect == 0xa || octect == 0x9); } - private static boolean isPad(char octect) - { + private static boolean isPad(char octect) { return (octect == PAD); } - private static boolean isData(char octect) - { + private static boolean isData(char octect) { return (octect < BASELENGTH && BASE_64_ALPHABET[octect] != -1); } @@ -80,23 +68,20 @@ public final class Base64 * @param binaryData Array containing binaryData * @return Encoded Base64 array */ - public static String encode(byte[] binaryData) - { - if (binaryData == null) - { + public static String encode(byte[] binaryData) { + if (binaryData == null) { return null; } int lengthDataBits = binaryData.length * EIGHTBIT; - if (lengthDataBits == 0) - { + if (lengthDataBits == 0) { return ""; } int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP; int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP; int numberQuartet = fewerThan24bits != 0 ? numberTriplets + 1 : numberTriplets; - char encodedData[] = null; + char[] encodedData = null; encodedData = new char[numberQuartet * 4]; @@ -105,8 +90,7 @@ public final class Base64 int encodedIndex = 0; int dataIndex = 0; - for (int i = 0; i < numberTriplets; i++) - { + for (int i = 0; i < numberTriplets; i++) { b1 = binaryData[dataIndex++]; b2 = binaryData[dataIndex++]; b3 = binaryData[dataIndex++]; @@ -125,8 +109,7 @@ public final class Base64 } // form integral number of 6-bit groups - if (fewerThan24bits == EIGHTBIT) - { + if (fewerThan24bits == EIGHTBIT) { b1 = binaryData[dataIndex]; k = (byte) (b1 & 0x03); byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0); @@ -134,9 +117,7 @@ public final class Base64 encodedData[encodedIndex++] = LOOK_UP_BASE_64_ALPHABET[k << 4]; encodedData[encodedIndex++] = PAD; encodedData[encodedIndex++] = PAD; - } - else if (fewerThan24bits == SIXTEENBIT) - { + } else if (fewerThan24bits == SIXTEENBIT) { b1 = binaryData[dataIndex]; b2 = binaryData[dataIndex + 1]; l = (byte) (b2 & 0x0f); @@ -159,71 +140,48 @@ public final class Base64 * @param encoded string containing Base64 data * @return Array containind decoded data. */ - public static byte[] decode(String encoded) - { - if (encoded == null) - { + public static byte[] decode(String encoded) { + if (encoded == null) { return null; } - char[] base64Data = encoded.toCharArray(); - // remove white spaces - int len = removeWhiteSpace(base64Data); - - if (len % FOURBYTE != 0) - { - return null;// should be divisible by four + int len = removeWhiteSpace(base64Data);// 鍒犻櫎绌烘牸 + if (len % FOURBYTE != 0) { + return null;// sho搴旇鑳借鍥涙暣闄 } - int numberQuadruple = (len / FOURBYTE); - - if (numberQuadruple == 0) - { + if (numberQuadruple == 0) { return new byte[0]; } - - byte decodedData[] = null; + byte[] decodedData = null; byte b1 = 0, b2 = 0, b3 = 0, b4 = 0; char d1 = 0, d2 = 0, d3 = 0, d4 = 0; - int i = 0; int encodedIndex = 0; int dataIndex = 0; decodedData = new byte[(numberQuadruple) * 3]; - - for (; i < numberQuadruple - 1; i++) - { - + for (; i < numberQuadruple - 1; i++) { if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++])) - || !isData((d3 = base64Data[dataIndex++])) || !isData((d4 = base64Data[dataIndex++]))) - { + || !isData((d3 = base64Data[dataIndex++])) || !isData((d4 = base64Data[dataIndex++]))) { return null; } // if found "no data" just return null - b1 = BASE_64_ALPHABET[d1]; b2 = BASE_64_ALPHABET[d2]; b3 = BASE_64_ALPHABET[d3]; b4 = BASE_64_ALPHABET[d4]; - decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4); decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf)); decodedData[encodedIndex++] = (byte) (b3 << 6 | b4); } - - if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++]))) - { + if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++]))) { return null;// if found "no data" just return null } - b1 = BASE_64_ALPHABET[d1]; b2 = BASE_64_ALPHABET[d2]; - d3 = base64Data[dataIndex++]; d4 = base64Data[dataIndex++]; - if (!isData((d3)) || !isData((d4))) - {// Check if they are PAD characters - if (isPad(d3) && isPad(d4)) - { + if (!isData((d3)) || !isData((d4))) {// Check if they are PAD characters + if (isPad(d3) && isPad(d4)) { if ((b2 & 0xf) != 0)// last 4 bits should be zero { return null; @@ -232,9 +190,7 @@ public final class Base64 System.arraycopy(decodedData, 0, tmp, 0, i * 3); tmp[encodedIndex] = (byte) (b1 << 2 | b2 >> 4); return tmp; - } - else if (!isPad(d3) && isPad(d4)) - { + } else if (!isPad(d3) && isPad(d4)) { b3 = BASE_64_ALPHABET[d3]; if ((b3 & 0x3) != 0)// last 2 bits should be zero { @@ -245,20 +201,15 @@ public final class Base64 tmp[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4); tmp[encodedIndex] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf)); return tmp; - } - else - { + } else { return null; } - } - else - { // No PAD e.g 3cQl + } else { // No PAD e.g 3cQl b3 = BASE_64_ALPHABET[d3]; b4 = BASE_64_ALPHABET[d4]; decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4); decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf)); decodedData[encodedIndex++] = (byte) (b3 << 6 | b4); - } return decodedData; } @@ -269,20 +220,16 @@ public final class Base64 * @param data the byte array of base64 data (with WS) * @return the new length */ - private static int removeWhiteSpace(char[] data) - { - if (data == null) - { + private static int removeWhiteSpace(char[] data) { + if (data == null) { return 0; } // count characters that's not whitespace int newSize = 0; int len = data.length; - for (int i = 0; i < len; i++) - { - if (!isWhiteSpace(data[i])) - { + for (int i = 0; i < len; i++) { + if (!isWhiteSpace(data[i])) { data[newSize++] = data[i]; } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java index 64d90246..81137027 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java @@ -12,9 +12,9 @@ public class IdUtils * * @return 闅忔満UUID */ - public static String randomUUID() + public static String randomuuid() { - return UUID.randomUUID().toString(); + return UUID.randomuuid().toString(); } /** @@ -22,9 +22,9 @@ public class IdUtils * * @return 绠鍖栫殑UUID锛屽幓鎺変簡妯嚎 */ - public static String simpleUUID() + public static String simpleuuid() { - return UUID.randomUUID().toString(true); + return UUID.randomuuid().toString(true); } /** @@ -32,9 +32,9 @@ public class IdUtils * * @return 闅忔満UUID */ - public static String fastUUID() + public static String fastuuid() { - return UUID.fastUUID().toString(); + return UUID.fastuuid().toString(); } /** @@ -42,8 +42,8 @@ public class IdUtils * * @return 绠鍖栫殑UUID锛屽幓鎺変簡妯嚎 */ - public static String fastSimpleUUID() + public static String fastsimpleuuid() { - return UUID.fastUUID().toString(true); + return UUID.fastuuid().toString(true); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java index d1be983b..c19ad745 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java @@ -9,19 +9,29 @@ import com.ruoyi.common.core.utils.StringUtils; */ public class Seq { - // 閫氱敤搴忓垪绫诲瀷 + /** + * 閫氱敤搴忓垪绫诲瀷 + */ public static final String COMM_SEQ_TYPE = "COMMON"; - // 涓婁紶搴忓垪绫诲瀷 + /** + * 涓婁紶搴忓垪绫诲瀷 + */ public static final String UPLOAD_SEQ_TYPE = "UPLOAD"; - // 閫氱敤鎺ュ彛搴忓垪鏁 + /** + * 閫氱敤鎺ュ彛搴忓垪鏁 + */ private static AtomicInteger commSeq = new AtomicInteger(1); - // 涓婁紶鎺ュ彛搴忓垪鏁 + /** + * 涓婁紶鎺ュ彛搴忓垪鏁 + */ private static AtomicInteger uploadSeq = new AtomicInteger(1); - // 鏈哄櫒鏍囪瘑 + /** + * 鏈哄櫒鏍囪瘑 + */ private static String machineCode = "A"; /** diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java index a0cf8ddf..06a2c9b4 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java @@ -1,11 +1,12 @@ package com.ruoyi.common.core.utils.uuid; +import com.ruoyi.common.core.exception.UtilException; + import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; -import com.ruoyi.common.core.exception.UtilException; /** * 鎻愪緵閫氱敤鍞竴璇嗗埆鐮侊紙universally unique identifier锛夛紙UUID锛夊疄鐜 @@ -70,9 +71,9 @@ public final class UUID implements java.io.Serializable, Comparable * * @return 闅忔満鐢熸垚鐨 {@code UUID} */ - public static UUID fastUUID() + public static UUID fastuuid() { - return randomUUID(false); + return randomuuid(false); } /** @@ -80,9 +81,9 @@ public final class UUID implements java.io.Serializable, Comparable * * @return 闅忔満鐢熸垚鐨 {@code UUID} */ - public static UUID randomUUID() + public static UUID randomuuid() { - return randomUUID(true); + return randomuuid(true); } /** @@ -91,7 +92,7 @@ public final class UUID implements java.io.Serializable, Comparable * @param isSecure 鏄惁浣跨敤{@link SecureRandom}濡傛灉鏄彲浠ヨ幏寰楁洿瀹夊叏鐨勯殢鏈虹爜锛屽惁鍒欏彲浠ュ緱鍒版洿濂界殑鎬ц兘 * @return 闅忔満鐢熸垚鐨 {@code UUID} */ - public static UUID randomUUID(boolean isSecure) + public static UUID randomuuid(boolean isSecure) { final Random ng = isSecure ? Holder.NUMBER_GENERATOR : getRandom(); @@ -111,7 +112,7 @@ public final class UUID implements java.io.Serializable, Comparable * * @return 鏍规嵁鎸囧畾鏁扮粍鐢熸垚鐨 {@code UUID} */ - public static UUID nameUUIDFromBytes(byte[] name) + public static UUID nameUuidFromBytes(byte[] name) { MessageDigest md; try @@ -147,7 +148,10 @@ public final class UUID implements java.io.Serializable, Comparable } for (int i = 0; i < 5; i++) { - components[i] = "0x" + components[i]; + StringBuilder sb = new StringBuilder(); + sb.append(sb); + sb.append(components[i]); + components[i] = sb.toString(); } long mostSigBits = Long.decode(components[0]).longValue(); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java index b316f893..4d4af1bd 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java @@ -1,10 +1,11 @@ package com.ruoyi.common.core.web.domain; +import com.fasterxml.jackson.annotation.JsonFormat; + import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonFormat; /** * Entity鍩虹被 @@ -102,7 +103,7 @@ public class BaseEntity implements Serializable { if (params == null) { - params = new HashMap<>(); + params = new HashMap<>(2); } return params; } diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java index fa2a8b29..4f1399c9 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java @@ -1,18 +1,17 @@ package com.ruoyi.common.security.annotation; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import com.ruoyi.common.security.config.ApplicationConfig; +import com.ruoyi.common.security.feign.FeignAutoConfiguration; import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.context.annotation.Import; import org.springframework.scheduling.annotation.EnableAsync; -import com.ruoyi.common.security.config.ApplicationConfig; -import com.ruoyi.common.security.feign.FeignAutoConfiguration; +import java.lang.annotation.*; + +/** + * @author pan + */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Documented diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java index 780f65e9..15c76e44 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java @@ -33,9 +33,10 @@ public class InnerAuthAspect implements Ordered String userid = ServletUtils.getRequest().getHeader(SecurityConstants.DETAILS_USER_ID); String username = ServletUtils.getRequest().getHeader(SecurityConstants.DETAILS_USERNAME); // 鐢ㄦ埛淇℃伅楠岃瘉 - if (innerAuth.isUser() && (StringUtils.isEmpty(userid) || StringUtils.isEmpty(username))) - { - throw new InnerAuthException("娌℃湁璁剧疆鐢ㄦ埛淇℃伅锛屼笉鍏佽璁块棶 "); + if (innerAuth.isUser()) { + if (StringUtils.isEmpty(userid) || StringUtils.isEmpty(username)) { + throw new InnerAuthException("娌℃湁璁剧疆鐢ㄦ埛淇℃伅锛屼笉鍏佽璁块棶 "); + } } return point.proceed(); } diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java index bcf90b27..0359a3dd 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java @@ -1,11 +1,5 @@ package com.ruoyi.common.security.service; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import javax.servlet.http.HttpServletRequest; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; import com.ruoyi.common.core.constant.CacheConstants; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.utils.JwtUtils; @@ -16,6 +10,13 @@ import com.ruoyi.common.core.utils.uuid.IdUtils; import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.model.LoginUser; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.TimeUnit; /** * token楠岃瘉澶勭悊 @@ -43,7 +44,7 @@ public class TokenService */ public Map createToken(LoginUser loginUser) { - String token = IdUtils.fastUUID(); + String token = IdUtils.fastuuid(); Long userId = loginUser.getSysUser().getUserId(); String userName = loginUser.getSysUser().getUserName(); loginUser.setToken(token); @@ -53,13 +54,13 @@ public class TokenService refreshToken(loginUser); // Jwt瀛樺偍淇℃伅 - Map claimsMap = new HashMap(); + Map claimsMap = new HashMap(2); claimsMap.put(SecurityConstants.USER_KEY, token); claimsMap.put(SecurityConstants.DETAILS_USER_ID, userId); claimsMap.put(SecurityConstants.DETAILS_USERNAME, userName); // 鎺ュ彛杩斿洖淇℃伅 - Map rspMap = new HashMap(); + Map rspMap = new HashMap(2); rspMap.put("access_token", JwtUtils.createToken(claimsMap)); rspMap.put("expires_in", EXPIRE_TIME); return rspMap; @@ -166,4 +167,4 @@ public class TokenService { return ACCESS_TOKEN + token; } -} \ No newline at end of file +} diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/annotation/EnableCustomSwagger2.java b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/annotation/EnableCustomSwagger2.java index 6832fe1b..1e7d276e 100644 --- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/annotation/EnableCustomSwagger2.java +++ b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/annotation/EnableCustomSwagger2.java @@ -1,14 +1,13 @@ package com.ruoyi.common.swagger.annotation; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import org.springframework.context.annotation.Import; import com.ruoyi.common.swagger.config.SwaggerAutoConfiguration; +import org.springframework.context.annotation.Import; + +import java.lang.annotation.*; +/** + * @author pan + */ @Target({ ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) @Documented diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java index 39e9b3af..df273e6e 100644 --- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java +++ b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java @@ -1,9 +1,5 @@ package com.ruoyi.common.swagger.config; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.function.Predicate; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -12,24 +8,26 @@ import org.springframework.context.annotation.Configuration; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.service.ApiKey; -import springfox.documentation.service.AuthorizationScope; -import springfox.documentation.service.Contact; -import springfox.documentation.service.SecurityReference; -import springfox.documentation.service.SecurityScheme; +import springfox.documentation.service.*; import springfox.documentation.spi.DocumentationType; import springfox.documentation.spi.service.contexts.SecurityContext; import springfox.documentation.spring.web.plugins.ApiSelectorBuilder; import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.swagger2.annotations.EnableSwagger2; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.function.Predicate; + +/** + * @author pan + */ @Configuration @EnableSwagger2 @EnableAutoConfiguration @ConditionalOnProperty(name = "swagger.enabled", matchIfMissing = true) -public class SwaggerAutoConfiguration -{ +public class SwaggerAutoConfiguration{ /** * 榛樿鐨勬帓闄よ矾寰勶紝鎺掗櫎Spring Boot榛樿鐨勯敊璇鐞嗚矾寰勫拰绔偣 */ diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerProperties.java b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerProperties.java index 8df48e8e..81619ba4 100644 --- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerProperties.java +++ b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerProperties.java @@ -1,10 +1,14 @@ package com.ruoyi.common.swagger.config; -import java.util.ArrayList; -import java.util.List; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; +import java.util.ArrayList; +import java.util.List; + +/** + * @author pan + */ @Component @ConfigurationProperties("swagger") public class SwaggerProperties @@ -342,4 +346,4 @@ public class SwaggerProperties this.description = description; } } -} \ No newline at end of file +} diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java index 9ec31737..c1f1eb0e 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java @@ -1,8 +1,9 @@ package com.ruoyi.gateway.config; -import java.util.Random; import com.google.code.kaptcha.text.impl.DefaultTextCreator; +import java.util.Random; + /** * 楠岃瘉鐮佹枃鏈敓鎴愬櫒 * @@ -30,7 +31,7 @@ public class KaptchaTextCreator extends DefaultTextCreator } else if (randomoperands == 1) { - if (!(x == 0) && y % x == 0) + if ((x != 0) && y % x == 0) { result = y / x; suChinese.append(CNUMBERS[y]); @@ -72,4 +73,4 @@ public class KaptchaTextCreator extends DefaultTextCreator suChinese.append("=?@" + result); return suChinese.toString(); } -} \ No newline at end of file +} diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java index 101de638..9ea1d8d9 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java @@ -31,7 +31,9 @@ public class AuthFilter implements GlobalFilter, Ordered { private static final Logger log = LoggerFactory.getLogger(AuthFilter.class); - // 鎺掗櫎杩囨护鐨 uri 鍦板潃锛宯acos鑷娣诲姞 + /** + * 鎺掗櫎杩囨护鐨 uri 鍦板潃锛宯acos鑷娣诲姞 + */ @Autowired private IgnoreWhiteProperties ignoreWhite; @@ -132,4 +134,4 @@ public class AuthFilter implements GlobalFilter, Ordered { return -200; } -} \ No newline at end of file +} diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java index 773aa558..89a8fb3d 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java @@ -1,16 +1,15 @@ package com.ruoyi.gateway.filter; -import java.nio.charset.StandardCharsets; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.core.utils.html.EscapeUtil; +import com.ruoyi.gateway.config.properties.XssProperties; +import io.netty.buffer.ByteBufAllocator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.gateway.filter.GatewayFilterChain; import org.springframework.cloud.gateway.filter.GlobalFilter; import org.springframework.core.Ordered; -import org.springframework.core.io.buffer.DataBuffer; -import org.springframework.core.io.buffer.DataBufferFactory; -import org.springframework.core.io.buffer.DataBufferUtils; -import org.springframework.core.io.buffer.DefaultDataBufferFactory; -import org.springframework.core.io.buffer.NettyDataBufferFactory; +import org.springframework.core.io.buffer.*; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; @@ -18,13 +17,11 @@ import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.http.server.reactive.ServerHttpRequestDecorator; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.html.EscapeUtil; -import com.ruoyi.gateway.config.properties.XssProperties; -import io.netty.buffer.ByteBufAllocator; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +import java.nio.charset.StandardCharsets; + /** * 璺ㄧ珯鑴氭湰杩囨护鍣 * @@ -34,7 +31,9 @@ import reactor.core.publisher.Mono; @ConditionalOnProperty(value = "security.xss.enabled", havingValue = "true") public class XssFilter implements GlobalFilter, Ordered { - // 璺ㄧ珯鑴氭湰鐨 xss 閰嶇疆锛宯acos鑷娣诲姞 + /** + * 璺ㄧ珯鑴氭湰鐨 xss 閰嶇疆锛宯acos鑷娣诲姞 + */ @Autowired private XssProperties xss; diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SwaggerHandler.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SwaggerHandler.java index af1e7ad1..726f4310 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SwaggerHandler.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SwaggerHandler.java @@ -1,6 +1,5 @@ package com.ruoyi.gateway.handler; -import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -8,16 +7,16 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import reactor.core.publisher.Mono; -import springfox.documentation.swagger.web.SecurityConfiguration; -import springfox.documentation.swagger.web.SecurityConfigurationBuilder; -import springfox.documentation.swagger.web.SwaggerResourcesProvider; -import springfox.documentation.swagger.web.UiConfiguration; -import springfox.documentation.swagger.web.UiConfigurationBuilder; +import springfox.documentation.swagger.web.*; + +import java.util.Optional; +/** + * @author pan + */ @RestController @RequestMapping("/swagger-resources") -public class SwaggerHandler -{ +public class SwaggerHandler { @Autowired(required = false) private SecurityConfiguration securityConfiguration; diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java index 8d2c180d..fcca15c9 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java @@ -54,7 +54,7 @@ public class ValidateCodeServiceImpl implements ValidateCodeService } // 淇濆瓨楠岃瘉鐮佷俊鎭 - String uuid = IdUtils.simpleUUID(); + String uuid = IdUtils.simpleuuid(); String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid; String capStr = null, code = null; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java index 318db416..4c9aaa2a 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.Rust; import com.ruoyi.common.core.utils.file.FileUtils; import com.ruoyi.file.service.ISysFileService; import com.ruoyi.system.api.domain.SysFile; @@ -28,7 +28,7 @@ public class SysFileController * 鏂囦欢涓婁紶璇锋眰 */ @PostMapping("upload") - public R upload(MultipartFile file) + public Rust upload(MultipartFile file) { try { @@ -37,12 +37,12 @@ public class SysFileController SysFile sysFile = new SysFile(); sysFile.setName(FileUtils.getName(url)); sysFile.setUrl(url); - return R.ok(sysFile); + return Rust.ok(sysFile); } catch (Exception e) { log.error("涓婁紶鏂囦欢澶辫触", e); - return R.fail(e.getMessage()); + return Rust.fail(e.getMessage()); } } -} \ No newline at end of file +} diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java index b9f0142b..d4275c8b 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java @@ -1,21 +1,5 @@ package com.ruoyi.gen.controller; -import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletResponse; -import org.apache.commons.io.IOUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; @@ -27,6 +11,16 @@ import com.ruoyi.gen.domain.GenTable; import com.ruoyi.gen.domain.GenTableColumn; import com.ruoyi.gen.service.IGenTableColumnService; import com.ruoyi.gen.service.IGenTableService; +import org.apache.commons.io.IOUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 浠ｇ爜鐢熸垚 鎿嶄綔澶勭悊 @@ -65,7 +59,7 @@ public class GenController extends BaseController GenTable table = genTableService.selectGenTableById(tableId); List tables = genTableService.selectGenTableAll(); List list = genTableColumnService.selectGenTableColumnListByTableId(tableId); - Map map = new HashMap(); + Map map = new HashMap(2); map.put("info", table); map.put("rows", list); map.put("tables", tables); diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java index 8e6f1596..64631ba3 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java @@ -1,26 +1,5 @@ package com.ruoyi.gen.service; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.StringWriter; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.Velocity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.core.constant.Constants; @@ -36,6 +15,28 @@ import com.ruoyi.gen.mapper.GenTableMapper; import com.ruoyi.gen.util.GenUtils; import com.ruoyi.gen.util.VelocityInitializer; import com.ruoyi.gen.util.VelocityUtils; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.Velocity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.StringWriter; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; /** * 涓氬姟 鏈嶅姟灞傚疄鐜 @@ -308,13 +309,14 @@ public class GenTableServiceImpl implements IGenTableService column.setDictType(prevColumn.getDictType()); column.setQueryType(prevColumn.getQueryType()); } - if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk() - && (column.isInsert() || column.isEdit()) - && ((column.isUsableColumn()) || (!column.isSuperColumn()))) - { - // 濡傛灉鏄(鏂板/淇敼&闈炰富閿/闈炲拷鐣ュ強鐖跺睘鎬)锛岀户缁繚鐣欏繀濉/鏄剧ず绫诲瀷閫夐」 - column.setIsRequired(prevColumn.getIsRequired()); - column.setHtmlType(prevColumn.getHtmlType()); + if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk()) { + if (column.isInsert() || column.isEdit()) { + if (column.isUsableColumn() || (!column.isSuperColumn())) { + // 濡傛灉鏄(鏂板/淇敼&闈炰富閿/闈炲拷鐣ュ強鐖跺睘鎬)锛岀户缁繚鐣欏繀濉/鏄剧ず绫诲瀷閫夐」 + column.setIsRequired(prevColumn.getIsRequired()); + column.setHtmlType(prevColumn.getHtmlType()); + } + } } genTableColumnMapper.updateGenTableColumn(column); } diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java index 2c1c5317..70c301ba 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java @@ -1,25 +1,24 @@ package com.ruoyi.gen.util; -import java.util.Arrays; -import org.apache.commons.lang3.RegExUtils; import com.ruoyi.common.core.constant.GenConstants; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.gen.config.GenConfig; import com.ruoyi.gen.domain.GenTable; import com.ruoyi.gen.domain.GenTableColumn; +import org.apache.commons.lang3.RegExUtils; + +import java.util.Arrays; /** * 浠ｇ爜鐢熸垚鍣 宸ュ叿绫 - * + * * @author ruoyi */ -public class GenUtils -{ +public class GenUtils { /** * 鍒濆鍖栬〃淇℃伅 */ - public static void initTable(GenTable genTable, String operName) - { + public static void initTable(GenTable genTable, String operName) { genTable.setClassName(convertClassName(genTable.getTableName())); genTable.setPackageName(GenConfig.getPackageName()); genTable.setModuleName(getModuleName(GenConfig.getPackageName())); @@ -32,8 +31,7 @@ public class GenUtils /** * 鍒濆鍖栧垪灞炴у瓧娈 */ - public static void initColumnField(GenTableColumn column, GenTable table) - { + public static void initColumnField(GenTableColumn column, GenTable table) { String dataType = getDbType(column.getColumnType()); String columnName = column.getColumnName(); column.setTableId(table.getTableId()); @@ -43,113 +41,77 @@ public class GenUtils // 璁剧疆榛樿绫诲瀷 column.setJavaType(GenConstants.TYPE_STRING); column.setQueryType(GenConstants.QUERY_EQ); - - if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType)) - { + if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType)) { // 瀛楃涓查暱搴﹁秴杩500璁剧疆涓烘枃鏈煙 Integer columnLength = getColumnLength(column.getColumnType()); String htmlType = columnLength >= 500 || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType) ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT; column.setHtmlType(htmlType); - } - else if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType)) - { + } else if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType)) { column.setJavaType(GenConstants.TYPE_DATE); column.setHtmlType(GenConstants.HTML_DATETIME); - } - else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType)) - { + } else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType)) { column.setHtmlType(GenConstants.HTML_INPUT); - // 濡傛灉鏄诞鐐瑰瀷 缁熶竴鐢˙igDecimal String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ","); - if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) - { + if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) { column.setJavaType(GenConstants.TYPE_BIGDECIMAL); - } - // 濡傛灉鏄暣褰 - else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) - { + } else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) { column.setJavaType(GenConstants.TYPE_INTEGER); - } - // 闀挎暣褰 - else - { + } else { column.setJavaType(GenConstants.TYPE_LONG); } } - // 鎻掑叆瀛楁锛堥粯璁ゆ墍鏈夊瓧娈甸兘闇瑕佹彃鍏ワ級 column.setIsInsert(GenConstants.REQUIRE); - // 缂栬緫瀛楁 - if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName) && !column.isPk()) - { + if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName) && !column.isPk()) { column.setIsEdit(GenConstants.REQUIRE); } // 鍒楄〃瀛楁 - if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName) && !column.isPk()) - { + if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName) && !column.isPk()) { column.setIsList(GenConstants.REQUIRE); } // 鏌ヨ瀛楁 - if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk()) - { + if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk()) { column.setIsQuery(GenConstants.REQUIRE); } - // 鏌ヨ瀛楁绫诲瀷 - if (StringUtils.endsWithIgnoreCase(columnName, "name")) - { + if (StringUtils.endsWithIgnoreCase(columnName, "name")) { column.setQueryType(GenConstants.QUERY_LIKE); } // 鐘舵佸瓧娈佃缃崟閫夋 - if (StringUtils.endsWithIgnoreCase(columnName, "status")) - { + if (StringUtils.endsWithIgnoreCase(columnName, "status")) { column.setHtmlType(GenConstants.HTML_RADIO); - } - // 绫诲瀷&鎬у埆瀛楁璁剧疆涓嬫媺妗 - else if (StringUtils.endsWithIgnoreCase(columnName, "type") - || StringUtils.endsWithIgnoreCase(columnName, "sex")) - { + } else if (StringUtils.endsWithIgnoreCase(columnName, "type") + || StringUtils.endsWithIgnoreCase(columnName, "sex")) { column.setHtmlType(GenConstants.HTML_SELECT); - } - // 鍥剧墖瀛楁璁剧疆鍥剧墖涓婁紶鎺т欢 - else if (StringUtils.endsWithIgnoreCase(columnName, "image")) - { + } else if (StringUtils.endsWithIgnoreCase(columnName, "image")) { column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD); - } - // 鏂囦欢瀛楁璁剧疆鏂囦欢涓婁紶鎺т欢 - else if (StringUtils.endsWithIgnoreCase(columnName, "file")) - { + } else if (StringUtils.endsWithIgnoreCase(columnName, "file")) { column.setHtmlType(GenConstants.HTML_FILE_UPLOAD); - } - // 鍐呭瀛楁璁剧疆瀵屾枃鏈帶浠 - else if (StringUtils.endsWithIgnoreCase(columnName, "content")) - { + } else if (StringUtils.endsWithIgnoreCase(columnName, "content")) { column.setHtmlType(GenConstants.HTML_EDITOR); } } /** * 鏍￠獙鏁扮粍鏄惁鍖呭惈鎸囧畾鍊 - * - * @param arr 鏁扮粍 + * + * @param arr 鏁扮粍 * @param targetValue 鍊 * @return 鏄惁鍖呭惈 */ - public static boolean arraysContains(String[] arr, String targetValue) - { + public static boolean arraysContains(String[] arr, String targetValue) { return Arrays.asList(arr).contains(targetValue); } /** * 鑾峰彇妯″潡鍚 - * + * * @param packageName 鍖呭悕 * @return 妯″潡鍚 */ - public static String getModuleName(String packageName) - { + public static String getModuleName(String packageName) { int lastIndex = packageName.lastIndexOf("."); int nameLength = packageName.length(); return StringUtils.substring(packageName, lastIndex + 1, nameLength); @@ -157,12 +119,11 @@ public class GenUtils /** * 鑾峰彇涓氬姟鍚 - * + * * @param tableName 琛ㄥ悕 * @return 涓氬姟鍚 */ - public static String getBusinessName(String tableName) - { + public static String getBusinessName(String tableName) { int lastIndex = tableName.lastIndexOf("_"); int nameLength = tableName.length(); return StringUtils.substring(tableName, lastIndex + 1, nameLength); @@ -170,16 +131,14 @@ public class GenUtils /** * 琛ㄥ悕杞崲鎴怞ava绫诲悕 - * + * * @param tableName 琛ㄥ悕绉 * @return 绫诲悕 */ - public static String convertClassName(String tableName) - { + public static String convertClassName(String tableName) { boolean autoRemovePre = GenConfig.getAutoRemovePre(); String tablePrefix = GenConfig.getTablePrefix(); - if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix)) - { + if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix)) { String[] searchList = StringUtils.split(tablePrefix, ","); tableName = replaceFirst(tableName, searchList); } @@ -188,18 +147,15 @@ public class GenUtils /** * 鎵归噺鏇挎崲鍓嶇紑 - * + * * @param replacementm 鏇挎崲鍊 - * @param searchList 鏇挎崲鍒楄〃 + * @param searchList 鏇挎崲鍒楄〃 * @return */ - public static String replaceFirst(String replacementm, String[] searchList) - { + public static String replaceFirst(String replacementm, String[] searchList) { String text = replacementm; - for (String searchString : searchList) - { - if (replacementm.startsWith(searchString)) - { + for (String searchString : searchList) { + if (replacementm.startsWith(searchString)) { text = replacementm.replaceFirst(searchString, ""); break; } @@ -209,48 +165,39 @@ public class GenUtils /** * 鍏抽敭瀛楁浛鎹 - * + * * @param text 闇瑕佽鏇挎崲鐨勫悕瀛 * @return 鏇挎崲鍚庣殑鍚嶅瓧 */ - public static String replaceText(String text) - { + public static String replaceText(String text) { return RegExUtils.replaceAll(text, "(?:琛▅鑻ヤ緷)", ""); } /** * 鑾峰彇鏁版嵁搴撶被鍨嬪瓧娈 - * + * * @param columnType 鍒楃被鍨 * @return 鎴彇鍚庣殑鍒楃被鍨 */ - public static String getDbType(String columnType) - { - if (StringUtils.indexOf(columnType, "(") > 0) - { + public static String getDbType(String columnType) { + if (StringUtils.indexOf(columnType, "(") > 0) { return StringUtils.substringBefore(columnType, "("); - } - else - { + } else { return columnType; } } /** * 鑾峰彇瀛楁闀垮害 - * + * * @param columnType 鍒楃被鍨 * @return 鎴彇鍚庣殑鍒楃被鍨 */ - public static Integer getColumnLength(String columnType) - { - if (StringUtils.indexOf(columnType, "(") > 0) - { + public static Integer getColumnLength(String columnType) { + if (StringUtils.indexOf(columnType, "(") > 0) { String length = StringUtils.substringBetween(columnType, "(", ")"); return Integer.valueOf(length); - } - else - { + } else { return 0; } } diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java index d0026864..fd73d5cf 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java @@ -37,7 +37,6 @@ public class ScheduleConfig prop.put("org.quartz.jobStore.txIsolationLevelSerializable", "true"); // sqlserver 鍚敤 - // prop.put("org.quartz.jobStore.selectWithLockSQL", "SELECT * FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?"); prop.put("org.quartz.jobStore.misfireThreshold", "12000"); prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_"); factory.setQuartzProperties(prop); diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java index ba17269c..e8a93768 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java @@ -1,9 +1,10 @@ package com.ruoyi.job.service; -import java.util.List; -import org.quartz.SchedulerException; import com.ruoyi.common.core.exception.job.TaskException; import com.ruoyi.job.domain.SysJob; +import org.quartz.SchedulerException; + +import java.util.List; /** * 瀹氭椂浠诲姟璋冨害淇℃伅淇℃伅 鏈嶅姟灞 @@ -30,9 +31,9 @@ public interface ISysJobService /** * 鏆傚仠浠诲姟 - * * @param job 璋冨害淇℃伅 * @return 缁撴灉 + * @throws SchedulerException */ public int pauseJob(SysJob job) throws SchedulerException; @@ -41,6 +42,7 @@ public interface ISysJobService * * @param job 璋冨害淇℃伅 * @return 缁撴灉 + * @throws SchedulerException 寮傚父 */ public int resumeJob(SysJob job) throws SchedulerException; @@ -49,6 +51,7 @@ public interface ISysJobService * * @param job 璋冨害淇℃伅 * @return 缁撴灉 + * @throws SchedulerException 寮傚父 */ public int deleteJob(SysJob job) throws SchedulerException; @@ -99,4 +102,4 @@ public interface ISysJobService * @return 缁撴灉 */ public boolean checkCronExpressionIsValid(String cronExpression); -} \ No newline at end of file +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java index 4b747ab2..36334045 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.Rust; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; @@ -131,7 +131,7 @@ public class SysProfileController extends BaseController if (!file.isEmpty()) { LoginUser loginUser = SecurityUtils.getLoginUser(); - R fileResult = remoteFileService.upload(file); + Rust fileResult = remoteFileService.upload(file); if (StringUtils.isNull(fileResult) || StringUtils.isNull(fileResult.getData())) { return AjaxResult.error("鏂囦欢鏈嶅姟寮傚父锛岃鑱旂郴绠＄悊鍛"); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java index cdd0b2da..d827f8a1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.Rust; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.poi.ExcelUtil; import com.ruoyi.common.core.web.controller.BaseController; @@ -108,12 +108,12 @@ public class SysUserController extends BaseController */ @InnerAuth @GetMapping("/info/{username}") - public R info(@PathVariable("username") String username) + public Rust info(@PathVariable("username") String username) { SysUser sysUser = userService.selectUserByUserName(username); if (StringUtils.isNull(sysUser)) { - return R.fail("鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒"); + return Rust.fail("鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒"); } // 瑙掕壊闆嗗悎 Set roles = permissionService.getRolePermission(sysUser.getUserId()); @@ -123,7 +123,7 @@ public class SysUserController extends BaseController sysUserVo.setSysUser(sysUser); sysUserVo.setRoles(roles); sysUserVo.setPermissions(permissions); - return R.ok(sysUserVo); + return Rust.ok(sysUserVo); } /** @@ -131,18 +131,18 @@ public class SysUserController extends BaseController */ @InnerAuth @PostMapping("/register") - public R register(@RequestBody SysUser sysUser) + public Rust register(@RequestBody SysUser sysUser) { String username = sysUser.getUserName(); if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) { - return R.fail("褰撳墠绯荤粺娌℃湁寮鍚敞鍐屽姛鑳斤紒"); + return Rust.fail("褰撳墠绯荤粺娌℃湁寮鍚敞鍐屽姛鑳斤紒"); } if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(username))) { - return R.fail("淇濆瓨鐢ㄦ埛'" + username + "'澶辫触锛屾敞鍐岃处鍙峰凡瀛樺湪"); + return Rust.fail("淇濆瓨鐢ㄦ埛'" + username + "'澶辫触锛屾敞鍐岃处鍙峰凡瀛樺湪"); } - return R.ok(userService.registerUser(sysUser)); + return Rust.ok(userService.registerUser(sysUser)); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java index 395edf1b..c49b9acb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; import com.ruoyi.system.api.domain.SysLogininfor; +import java.util.List; + /** * 绯荤粺璁块棶鏃ュ織鎯呭喌淇℃伅 鏁版嵁灞 * @@ -14,6 +15,7 @@ public interface SysLogininforMapper * 鏂板绯荤粺鐧诲綍鏃ュ織 * * @param logininfor 璁块棶鏃ュ織瀵硅薄 + * @return int */ public int insertLogininfor(SysLogininfor logininfor); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java index 4e9b8cb6..d829a540 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; import com.ruoyi.system.api.domain.SysOperLog; +import java.util.List; + /** * 鎿嶄綔鏃ュ織 鏁版嵁灞 * @@ -14,6 +15,7 @@ public interface SysOperLogMapper * 鏂板鎿嶄綔鏃ュ織 * * @param operLog 鎿嶄綔鏃ュ織瀵硅薄 + * @return int */ public int insertOperlog(SysOperLog operLog); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java index 724a6a9c..54fab043 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java @@ -1,8 +1,9 @@ package com.ruoyi.system.service; -import java.util.List; import com.ruoyi.system.api.domain.SysLogininfor; +import java.util.List; + /** * 绯荤粺璁块棶鏃ュ織鎯呭喌淇℃伅 鏈嶅姟灞 * @@ -14,6 +15,7 @@ public interface ISysLogininforService * 鏂板绯荤粺鐧诲綍鏃ュ織 * * @param logininfor 璁块棶鏃ュ織瀵硅薄 + * @return int */ public int insertLogininfor(SysLogininfor logininfor); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java index f020bf9e..dfe1913f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java @@ -2,6 +2,9 @@ package com.ruoyi.system.service; import java.util.Set; +/** + * @author pan + */ public interface ISysPermissionService { /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java index 46a8c7a8..632a8814 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java @@ -1,14 +1,18 @@ package com.ruoyi.system.service.impl; -import java.util.HashSet; -import java.util.Set; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.service.ISysMenuService; import com.ruoyi.system.service.ISysPermissionService; import com.ruoyi.system.service.ISysRoleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashSet; +import java.util.Set; +/** + * @author pan + */ @Service public class SysPermissionServiceImpl implements ISysPermissionService { From 7c394a46ace0326b9f8ba7f691140d2bc6262d76 Mon Sep 17 00:00:00 2001 From: 1332987 <13329870472@163.com> Date: Wed, 20 Apr 2022 11:40:55 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0TODO=20=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=A7=84=E7=BA=A6=E6=89=AB=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/utils/html/EscapeUtil.java | 10 +++---- .../common/core/utils/html/HtmlFilter.java | 24 ++++++++-------- .../common/core/utils/poi/ExcelUtil.java | 2 +- .../ruoyi/common/core/utils/sign/Base64.java | 16 +++++------ .../ruoyi/common/core/utils/uuid/UUID.java | 28 +++++++++---------- .../gateway/service/ValidateCodeService.java | 6 ++++ .../com/ruoyi/job/service/ISysJobService.java | 14 ++++++---- 7 files changed, 54 insertions(+), 46 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java index e8b7357f..65c8ba11 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java @@ -21,11 +21,11 @@ public class EscapeUtil } // special HTML characters - TEXT['\''] = "'".toCharArray(); // 鍗曞紩鍙 - TEXT['"'] = """.toCharArray(); // 鍙屽紩鍙 - TEXT['&'] = "&".toCharArray(); // &绗 - TEXT['<'] = "<".toCharArray(); // 灏忎簬鍙 - TEXT['>'] = ">".toCharArray(); // 澶т簬鍙 + TEXT['\''] = "'".toCharArray(); + TEXT['"'] = """.toCharArray(); + TEXT['&'] = "&".toCharArray(); + TEXT['<'] = "<".toCharArray(); + TEXT['>'] = ">".toCharArray(); } /** diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HtmlFilter.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HtmlFilter.java index a79a7512..9ed5f388 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HtmlFilter.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HtmlFilter.java @@ -121,7 +121,7 @@ public final class HtmlFilter { vSelfClosingTags = new String[]{"img"}; vNeedClosingTags = new String[]{"a", "b", "strong", "i", "em"}; vDisallowed = new String[]{}; - vAllowedProtocols = new String[]{"http", "mailto", "https"}; // no ftp. + vAllowedProtocols = new String[]{"http", "mailto", "https"}; vProtocolAtts = new String[]{"src", "href"}; vRemoveBlanks = new String[]{"a", "b", "strong", "i", "em"}; vAllowedEntities = new String[]{"amp", "gt", "lt", "quot"}; @@ -221,7 +221,7 @@ public final class HtmlFilter { final Matcher m = P_COMMENTS.matcher(s); final StringBuffer buf = new StringBuffer(); if (m.find()) { - final String match = m.group(1); // (.*?) + final String match = m.group(1); m.appendReplacement(buf, Matcher.quoteReplacement("")); } m.appendTail(buf); @@ -329,12 +329,12 @@ public final class HtmlFilter { final List paramNames = new ArrayList<>(); final List paramValues = new ArrayList<>(); while (m2.find()) { - paramNames.add(m2.group(1)); // ([a-z0-9]+) - paramValues.add(m2.group(3)); // (.*?) + paramNames.add(m2.group(1)); + paramValues.add(m2.group(3)); } while (m3.find()) { - paramNames.add(m3.group(1)); // ([a-z0-9]+) - paramValues.add(m3.group(3)); // ([^\"\\s']+) + paramNames.add(m3.group(1)); + paramValues.add(m3.group(3)); } String paramName, paramValue; for (int ii = 0; ii < paramNames.size(); ii++) { @@ -434,8 +434,8 @@ public final class HtmlFilter { // validate entities throughout the string Matcher m = P_VALID_ENTITIES.matcher(s); while (m.find()) { - final String one = m.group(1); // ([^&;]*) - final String two = m.group(2); // (?=(;|&|$)) + final String one = m.group(1); + final String two = m.group(2); m.appendReplacement(buf, Matcher.quoteReplacement(checkEntity(one, two))); } m.appendTail(buf); @@ -448,10 +448,10 @@ public final class HtmlFilter { StringBuffer buf = new StringBuffer(); Matcher m = P_VALID_QUOTES.matcher(s); while (m.find()) { - final String one = m.group(1); // (>|^) - final String two = m.group(2); // ([^<]+?) - final String three = m.group(3); // (<|$) - // 涓嶆浛鎹㈠弻寮曞彿涓"锛岄槻姝son鏍煎紡鏃犳晥 regexReplace(P_QUOTE, """, two) + final String one = m.group(1); + final String two = m.group(2); + final String three = m.group(3); + /*涓嶆浛鎹㈠弻寮曞彿涓"锛岄槻姝son鏍煎紡鏃犳晥 regexReplace(P_QUOTE, """, two)*/ m.appendReplacement(buf, Matcher.quoteReplacement(one + two + three)); } m.appendTail(buf); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java index 461c4f6f..a5f5e29d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java @@ -908,7 +908,7 @@ public class ExcelUtil { if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA) { val = cell.getNumericCellValue(); if (DateUtil.isCellDateFormatted(cell)) { - val = DateUtil.getJavaDate((Double) val); // POI Excel 鏃ユ湡鏍煎紡杞崲 + val = DateUtil.getJavaDate((Double) val); } else { if ((Double) val % 1 != 0) { val = new BigDecimal(val.toString()); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java index e22079ff..48fbe7a6 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java @@ -145,9 +145,9 @@ public final class Base64 { return null; } char[] base64Data = encoded.toCharArray(); - int len = removeWhiteSpace(base64Data);// 鍒犻櫎绌烘牸 + int len = removeWhiteSpace(base64Data); if (len % FOURBYTE != 0) { - return null;// sho搴旇鑳借鍥涙暣闄 + return null; } int numberQuadruple = (len / FOURBYTE); if (numberQuadruple == 0) { @@ -164,7 +164,7 @@ public final class Base64 { if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++])) || !isData((d3 = base64Data[dataIndex++])) || !isData((d4 = base64Data[dataIndex++]))) { return null; - } // if found "no data" just return null + } b1 = BASE_64_ALPHABET[d1]; b2 = BASE_64_ALPHABET[d2]; b3 = BASE_64_ALPHABET[d3]; @@ -174,16 +174,15 @@ public final class Base64 { decodedData[encodedIndex++] = (byte) (b3 << 6 | b4); } if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++]))) { - return null;// if found "no data" just return null + return null; } b1 = BASE_64_ALPHABET[d1]; b2 = BASE_64_ALPHABET[d2]; d3 = base64Data[dataIndex++]; d4 = base64Data[dataIndex++]; - if (!isData((d3)) || !isData((d4))) {// Check if they are PAD characters + if (!isData((d3)) || !isData((d4))) { if (isPad(d3) && isPad(d4)) { - if ((b2 & 0xf) != 0)// last 4 bits should be zero - { + if ((b2 & 0xf) != 0) { return null; } byte[] tmp = new byte[i * 3 + 1]; @@ -192,8 +191,7 @@ public final class Base64 { return tmp; } else if (!isPad(d3) && isPad(d4)) { b3 = BASE_64_ALPHABET[d3]; - if ((b3 & 0x3) != 0)// last 2 bits should be zero - { + if ((b3 & 0x3) != 0) { return null; } byte[] tmp = new byte[i * 3 + 2]; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java index 06a2c9b4..70df239d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java @@ -98,10 +98,10 @@ public final class UUID implements java.io.Serializable, Comparable byte[] randomBytes = new byte[16]; ng.nextBytes(randomBytes); - randomBytes[6] &= 0x0f; /* clear version */ - randomBytes[6] |= 0x40; /* set to version 4 */ - randomBytes[8] &= 0x3f; /* clear variant */ - randomBytes[8] |= 0x80; /* set to IETF variant */ + randomBytes[6] &= 0x0f; + randomBytes[6] |= 0x40; + randomBytes[8] &= 0x3f; + randomBytes[8] |= 0x80; return new UUID(randomBytes); } @@ -124,10 +124,10 @@ public final class UUID implements java.io.Serializable, Comparable throw new InternalError("MD5 not supported"); } byte[] md5Bytes = md.digest(name); - md5Bytes[6] &= 0x0f; /* clear version */ - md5Bytes[6] |= 0x30; /* set to version 3 */ - md5Bytes[8] &= 0x3f; /* clear variant */ - md5Bytes[8] |= 0x80; /* set to IETF variant */ + md5Bytes[6] &= 0x0f; + md5Bytes[6] |= 0x30; + md5Bytes[8] &= 0x3f; + md5Bytes[8] |= 0x80; return new UUID(md5Bytes); } @@ -245,8 +245,8 @@ public final class UUID implements java.io.Serializable, Comparable public long timestamp() throws UnsupportedOperationException { checkTimeBase(); - return (mostSigBits & 0x0FFFL) << 48// - | ((mostSigBits >> 16) & 0x0FFFFL) << 32// + return (mostSigBits & 0x0FFFL) << 48 + | ((mostSigBits >> 16) & 0x0FFFFL) << 32 | mostSigBits >>> 32; } @@ -425,10 +425,10 @@ public final class UUID implements java.io.Serializable, Comparable { // The ordering is intentionally set up so that the UUIDs // can simply be numerically compared as two numbers - return (this.mostSigBits < val.mostSigBits ? -1 : // - (this.mostSigBits > val.mostSigBits ? 1 : // - (this.leastSigBits < val.leastSigBits ? -1 : // - (this.leastSigBits > val.leastSigBits ? 1 : // + return (this.mostSigBits < val.mostSigBits ? -1 : + (this.mostSigBits > val.mostSigBits ? 1 : + (this.leastSigBits < val.leastSigBits ? -1 : + (this.leastSigBits > val.leastSigBits ? 1 : 0)))); } diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java index 615fb07b..650be4a1 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java @@ -13,11 +13,17 @@ public interface ValidateCodeService { /** * 鐢熸垚楠岃瘉鐮 + * @return AjaxResult + * @throws IOException / + * @throws CaptchaException / */ public AjaxResult createCaptcha() throws IOException, CaptchaException; /** * 鏍￠獙楠岃瘉鐮 + * @param key 閿 + * @param value 鍊 + * @throws CaptchaException / */ public void checkCaptcha(String key, String value) throws CaptchaException; } diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java index e8a93768..ea7bbbb1 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java @@ -56,42 +56,46 @@ public interface ISysJobService public int deleteJob(SysJob job) throws SchedulerException; /** + * * 鎵归噺鍒犻櫎璋冨害淇℃伅 - * + * * @param jobIds 闇瑕佸垹闄ょ殑浠诲姟ID * @return 缁撴灉 + * @throws SchedulerException / */ public void deleteJobByIds(Long[] jobIds) throws SchedulerException; /** * 浠诲姟璋冨害鐘舵佷慨鏀 - * * @param job 璋冨害淇℃伅 * @return 缁撴灉 + * @throws SchedulerException / */ public int changeStatus(SysJob job) throws SchedulerException; /** * 绔嬪嵆杩愯浠诲姟 - * * @param job 璋冨害淇℃伅 * @return 缁撴灉 + * @throws SchedulerException / */ public void run(SysJob job) throws SchedulerException; /** * 鏂板浠诲姟 - * * @param job 璋冨害淇℃伅 * @return 缁撴灉 + * @throws SchedulerException / + * @throws TaskException / */ public int insertJob(SysJob job) throws SchedulerException, TaskException; /** * 鏇存柊浠诲姟 - * * @param job 璋冨害淇℃伅 * @return 缁撴灉 + * @throws SchedulerException / + * @throws TaskException / */ public int updateJob(SysJob job) throws SchedulerException, TaskException; From ef29194da6770c4291b36ae52684ee8e86ca83c5 Mon Sep 17 00:00:00 2001 From: 1332987 <13329870472@163.com> Date: Wed, 20 Apr 2022 13:08:54 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E7=BA=A6?= =?UTF-8?q?=E6=89=AB=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/common/core/utils/ServletUtils.java | 6 +- .../ruoyi/common/core/utils/StringUtils.java | 64 +++++- .../common/core/utils/file/FileUtils.java | 148 +++++-------- .../common/core/utils/html/EscapeUtil.java | 7 +- .../common/core/utils/html/HtmlFilter.java | 5 +- .../ruoyi/common/core/utils/ip/IpUtils.java | 23 +- .../common/core/utils/poi/ExcelUtil.java | 8 +- .../core/utils/reflect/ReflectUtils.java | 3 +- .../ruoyi/common/core/utils/uuid/UUID.java | 169 ++++++--------- .../common/core/web/page/PageDomain.java | 7 +- .../gateway/config/KaptchaTextCreator.java | 18 +- .../gateway/filter/CacheRequestFilter.java | 4 +- .../com/ruoyi/gateway/filter/XssFilter.java | 2 +- .../service/impl/ValidateCodeServiceImpl.java | 4 +- .../com/ruoyi/gen/domain/GenTableColumn.java | 11 +- .../gen/service/GenTableServiceImpl.java | 2 +- .../java/com/ruoyi/gen/util/GenUtils.java | 39 ++-- .../com/ruoyi/gen/util/VelocityUtils.java | 196 +++++++----------- .../system/controller/SysUserController.java | 2 +- 19 files changed, 323 insertions(+), 395 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java index 8f091237..66907b67 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java @@ -185,19 +185,19 @@ public class ServletUtils public static boolean isAjaxRequest(HttpServletRequest request) { String accept = request.getHeader("accept"); - if (accept != null && accept.contains("application/json")) + if (accept != null && accept.contains(StringUtils.ACCEPT_JSON)) { return true; } String xRequestedWith = request.getHeader("X-Requested-With"); - if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest")) + if (xRequestedWith != null && xRequestedWith.contains(StringUtils.XML_HTTP)) { return true; } String uri = request.getRequestURI(); - if (StringUtils.inStringIgnoreCase(uri, ".json", ".xml")) + if (StringUtils.inStringIgnoreCase(uri, StringUtils.DOT+StringUtils.JSON,StringUtils.DOT+StringUtils.XML)) { return true; } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java index 26811285..4327b236 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java @@ -16,10 +16,60 @@ import java.util.Map; public class StringUtils extends org.apache.commons.lang3.StringUtils { /** 绌哄瓧绗︿覆 */ - private static final String NULLSTR = ""; + public static final String NULLSTR = ""; + /** 绌烘牸瀛楃涓 */ + public static final String BLANK_SPACE = " "; + /** 鏂滄潬瀛楃涓 */ + public static final String SLASH = "/"; + /** 浜曞彿瀛楃涓 */ + public static final String WELL_NO = "#"; + /** 鐐瑰瓧绗︿覆 */ + public static final String DOT = "."; + /** 閫楀彿绗︿覆 */ + public static final String COMMA = ","; + /** (绗︿覆 */ + public static final String LEFT_BRACKETS = "("; + /** get瀛楃涓 */ + public static final String GET = "GET"; + /** POST瀛楃涓 */ + public static final String POST = "POST"; + /** DELETE瀛楃涓 */ + public static final String DELETE = "DELETE"; + /** 鍓嶇鎺掑簭瀛楃涓 */ + public static final String ASC_ENDING = "ascending"; + /** 鍓嶇鎺掑簭瀛楃涓 */ + public static final String DESC_ENDING = "descending"; + /** true瀛楃涓 */ + public static final String TRUE = "true"; + /** registerUser瀛楃涓 */ + public static final String SYS_ACCOUNT_USER = "sys.account.registerUser"; + /** char瀛楃涓 */ + public static final String CHAR = "char"; + /** math瀛楃涓 */ + public static final String MATH = "math"; + /** JPG瀛楃涓 */ + public static final String JPG = "JPG"; + /** PNG瀛楃涓 */ + public static final String PNG = "PNG"; + /** 娉細瀛楃涓 */ + public static final String NOTE = "娉細"; + /** MSIE瀛楃涓 */ + public static final String MSIE = "MSIE"; + /** Firefox瀛楃涓 */ + public static final String FIREFOX = "Firefox"; + /** Chrome瀛楃涓 */ + public static final String CHROME = "Chrome"; + /** json瀛楃涓 */ + public static final String ACCEPT_JSON = "application/json"; + /** XMLHttpRequest瀛楃涓 */ + public static final String XML_HTTP = "XMLHttpRequest"; + /** json瀛楃涓 */ + public static final String JSON = "json"; + /** xml瀛楃涓 */ + public static final String XML = "xml"; /** 涓嬪垝绾 */ - private static final char SEPARATOR = '_'; + public static final char SEPARATOR = '_'; /** * 鑾峰彇鍙傛暟涓嶄负绌哄 @@ -373,19 +423,17 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils public static String convertToCamelCase(String name) { StringBuilder result = new StringBuilder(); + String underline = "_"; // 蹇熸鏌 - if (name == null || name.isEmpty()) - { + if (name == null || name.isEmpty()) { // 娌″繀瑕佽浆鎹 return ""; - } - else if (!name.contains("_")) - { + } else if (!name.contains(underline)) { // 涓嶅惈涓嬪垝绾匡紝浠呭皢棣栧瓧姣嶅ぇ鍐 return name.substring(0, 1).toUpperCase() + name.substring(1); } // 鐢ㄤ笅鍒掔嚎灏嗗師濮嬪瓧绗︿覆鍒嗗壊 - String[] camels = name.split("_"); + String[] camels = name.split(underline); for (String camel : camels) { // 璺宠繃鍘熷瀛楃涓蹭腑寮澶淬佺粨灏剧殑涓嬫崲绾挎垨鍙岄噸涓嬪垝绾 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java index f76bb34b..1da01947 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java @@ -1,83 +1,66 @@ package com.ruoyi.common.core.utils.file; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.OutputStream; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import com.ruoyi.common.core.utils.StringUtils; +import org.apache.commons.lang3.ArrayUtils; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang3.ArrayUtils; -import com.ruoyi.common.core.utils.StringUtils; +import java.io.*; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; /** * 鏂囦欢澶勭悊宸ュ叿绫 - * + * * @author ruoyi */ -public class FileUtils -{ - /** 瀛楃甯搁噺锛氭枩鏉 {@code '/'} */ +public class FileUtils { + /** + * 瀛楃甯搁噺锛氭枩鏉 {@code '/'} + */ public static final char SLASH = '/'; - /** 瀛楃甯搁噺锛氬弽鏂滄潬 {@code '\\'} */ + /** + * 瀛楃甯搁噺锛氬弽鏂滄潬 {@code '\\'} + */ public static final char BACKSLASH = '\\'; public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+"; /** * 杈撳嚭鎸囧畾鏂囦欢鐨刡yte鏁扮粍 - * + * * @param filePath 鏂囦欢璺緞 - * @param os 杈撳嚭娴 + * @param os 杈撳嚭娴 * @return */ - public static void writeBytes(String filePath, OutputStream os) throws IOException - { + public static void writeBytes(String filePath, OutputStream os) throws IOException { FileInputStream fis = null; - try - { + try { File file = new File(filePath); - if (!file.exists()) - { + if (!file.exists()) { throw new FileNotFoundException(filePath); } fis = new FileInputStream(file); byte[] b = new byte[1024]; int length; - while ((length = fis.read(b)) > 0) - { + while ((length = fis.read(b)) > 0) { os.write(b, 0, length); } - } - catch (IOException e) - { + } catch (IOException e) { throw e; - } - finally - { - if (os != null) - { - try - { + } finally { + if (os != null) { + try { os.close(); - } - catch (IOException e1) - { + } catch (IOException e1) { e1.printStackTrace(); } } - if (fis != null) - { - try - { + if (fis != null) { + try { fis.close(); - } - catch (IOException e1) - { + } catch (IOException e1) { e1.printStackTrace(); } } @@ -86,17 +69,15 @@ public class FileUtils /** * 鍒犻櫎鏂囦欢 - * + * * @param filePath 鏂囦欢 * @return */ - public static boolean deleteFile(String filePath) - { + public static boolean deleteFile(String filePath) { boolean flag = false; File file = new File(filePath); // 璺緞涓烘枃浠朵笖涓嶄负绌哄垯杩涜鍒犻櫎 - if (file.isFile() && file.exists()) - { + if (file.isFile() && file.exists()) { file.delete(); flag = true; } @@ -105,32 +86,28 @@ public class FileUtils /** * 鏂囦欢鍚嶇О楠岃瘉 - * + * * @param filename 鏂囦欢鍚嶇О * @return true 姝ｅ父 false 闈炴硶 */ - public static boolean isValidFilename(String filename) - { + public static boolean isValidFilename(String filename) { return filename.matches(FILENAME_PATTERN); } /** * 妫鏌ユ枃浠舵槸鍚﹀彲涓嬭浇 - * + * * @param resource 闇瑕佷笅杞界殑鏂囦欢 * @return true 姝ｅ父 false 闈炴硶 */ - public static boolean checkAllowDownload(String resource) - { + public static boolean checkAllowDownload(String resource) { // 绂佹鐩綍涓婅烦绾у埆 - if (StringUtils.contains(resource, "..")) - { + if (StringUtils.contains(resource, StringUtils.DOT + StringUtils.DOT)) { return false; } // 妫鏌ュ厑璁镐笅杞界殑鏂囦欢瑙勫垯 - if (ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource))) - { + if (ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource))) { return true; } @@ -140,33 +117,25 @@ public class FileUtils /** * 涓嬭浇鏂囦欢鍚嶉噸鏂扮紪鐮 - * - * @param request 璇锋眰瀵硅薄 + * + * @param request 璇锋眰瀵硅薄 * @param fileName 鏂囦欢鍚 * @return 缂栫爜鍚庣殑鏂囦欢鍚 */ - public static String setFileDownloadHeader(HttpServletRequest request, String fileName) throws UnsupportedEncodingException - { + public static String setFileDownloadHeader(HttpServletRequest request, String fileName) throws UnsupportedEncodingException { final String agent = request.getHeader("USER-AGENT"); String filename = fileName; - if (agent.contains("MSIE")) - { + if (agent.contains(StringUtils.MSIE)) { // IE娴忚鍣 filename = URLEncoder.encode(filename, "utf-8"); filename = filename.replace("+", " "); - } - else if (agent.contains("Firefox")) - { + } else if (agent.contains(StringUtils.FIREFOX)) { // 鐏嫄娴忚鍣 filename = new String(fileName.getBytes(), "ISO8859-1"); - } - else if (agent.contains("Chrome")) - { + } else if (agent.contains(StringUtils.CHROME)) { // google娴忚鍣 filename = URLEncoder.encode(filename, "utf-8"); - } - else - { + } else { // 鍏跺畠娴忚鍣 filename = URLEncoder.encode(filename, "utf-8"); } @@ -179,30 +148,24 @@ public class FileUtils * @param filePath 鏂囦欢 * @return 鏂囦欢鍚 */ - public static String getName(String filePath) - { - if (null == filePath) - { + public static String getName(String filePath) { + if (null == filePath) { return null; } int len = filePath.length(); - if (0 == len) - { + if (0 == len) { return filePath; } - if (isFileSeparator(filePath.charAt(len - 1))) - { + if (isFileSeparator(filePath.charAt(len - 1))) { // 浠ュ垎闅旂缁撳熬鐨勫幓鎺夌粨灏惧垎闅旂 len--; } int begin = 0; char c; - for (int i = len - 1; i > -1; i--) - { + for (int i = len - 1; i > -1; i--) { c = filePath.charAt(i); - if (isFileSeparator(c)) - { + if (isFileSeparator(c)) { // 鏌ユ壘鏈鍚庝竴涓矾寰勫垎闅旂锛/鎴栬匼锛 begin = i + 1; break; @@ -219,20 +182,18 @@ public class FileUtils * @param c 瀛楃 * @return 鏄惁涓篧indows鎴栬匧inux锛圲nix锛夋枃浠跺垎闅旂 */ - public static boolean isFileSeparator(char c) - { + public static boolean isFileSeparator(char c) { return SLASH == c || BACKSLASH == c; } /** * 涓嬭浇鏂囦欢鍚嶉噸鏂扮紪鐮 * - * @param response 鍝嶅簲瀵硅薄 + * @param response 鍝嶅簲瀵硅薄 * @param realFileName 鐪熷疄鏂囦欢鍚 * @return */ - public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException - { + public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException { String percentEncodedFileName = percentEncode(realFileName); StringBuilder contentDispositionValue = new StringBuilder(); @@ -253,8 +214,7 @@ public class FileUtils * @param s 闇瑕佺櫨鍒嗗彿缂栫爜鐨勫瓧绗︿覆 * @return 鐧惧垎鍙风紪鐮佸悗鐨勫瓧绗︿覆 */ - public static String percentEncode(String s) throws UnsupportedEncodingException - { + public static String percentEncode(String s) throws UnsupportedEncodingException { String encode = URLEncoder.encode(s, StandardCharsets.UTF_8.toString()); return encode.replaceAll("\\+", "%20"); } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java index 65c8ba11..8e8f3145 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java @@ -13,10 +13,9 @@ public class EscapeUtil private static final char[][] TEXT = new char[64][]; - static - { - for (int i = 0; i < 64; i++) - { + static { + int baseSize = 64; + for (int i = 0; i < baseSize; i++) { TEXT[i] = new char[] { (char) i }; } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HtmlFilter.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HtmlFilter.java index 9ed5f388..82ba91b0 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HtmlFilter.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HtmlFilter.java @@ -1,5 +1,7 @@ package com.ruoyi.common.core.utils.html; +import com.ruoyi.common.core.utils.StringUtils; + import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -168,6 +170,7 @@ public final class HtmlFilter { /** * my versions of some PHP library functions + * * @param decimal / * @return / */ @@ -383,7 +386,7 @@ public final class HtmlFilter { if (!inArray(protocol, vAllowedProtocols)) { // bad protocol, turn into local anchor link instead s = "#" + s.substring(protocol.length() + 1); - if (s.startsWith("#//")) { + if (s.startsWith(StringUtils.WELL_NO + StringUtils.SLASH + StringUtils.SLASH)) { s = "#" + s.substring(3); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java index 9978afc3..aa15afdd 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java @@ -62,7 +62,8 @@ public class IpUtils { * @return 缁撴灉 */ private static boolean internalIp(byte[] addr) { - if (StringUtils.isNull(addr) || addr.length < 2) { + int tow = 2; + if (StringUtils.isNull(addr) || addr.length < tow) { return true; } final byte b0 = addr[0]; @@ -118,7 +119,8 @@ public class IpUtils { switch (elements.length) { case 1: l = Long.parseLong(elements[0]); - if ((l < 0L) || (l > 4294967295L)) { + long l1 = 4294967295L; + if ((l < 0L) || (l > l1)) { return null; } bytes[0] = (byte) (int) (l >> 24 & 0xFF); @@ -128,12 +130,14 @@ public class IpUtils { break; case 2: l = Integer.parseInt(elements[0]); - if ((l < 0L) || (l > 255L)) { + long l2 = 255L; + if ((l < 0L) || (l > l2)) { return null; } bytes[0] = (byte) (int) (l & 0xFF); l = Integer.parseInt(elements[1]); - if ((l < 0L) || (l > 16777215L)) { + long l3 = 16777215L; + if ((l < 0L) || (l > l3)) { return null; } bytes[1] = (byte) (int) (l >> 16 & 0xFF); @@ -141,7 +145,8 @@ public class IpUtils { bytes[3] = (byte) (int) (l & 0xFF); break; case 3: - for (i = 0; i < 2; ++i) { + int i1 = 2; + for (i = 0; i < i1; ++i) { l = Integer.parseInt(elements[i]); if ((l < 0L) || (l > 255L)) { return null; @@ -149,14 +154,16 @@ public class IpUtils { bytes[i] = (byte) (int) (l & 0xFF); } l = Integer.parseInt(elements[2]); - if ((l < 0L) || (l > 65535L)) { + long l4 = 65535L; + if ((l < 0L) || (l > l4)) { return null; } bytes[2] = (byte) (int) (l >> 8 & 0xFF); bytes[3] = (byte) (int) (l & 0xFF); break; case 4: - for (i = 0; i < 4; ++i) { + int i2 = 4; + for (i = 0; i < i2; ++i) { l = Integer.parseInt(elements[i]); if ((l < 0L) || (l > 255L)) { return null; @@ -207,7 +214,7 @@ public class IpUtils { */ public static String getMultistageReverseProxyIp(String ip) { // 澶氱骇鍙嶅悜浠ｇ悊妫娴 - if (ip != null && ip.indexOf(",") > 0) { + if (ip != null && ip.indexOf(StringUtils.COMMA) > 0) { final String[] ips = ip.trim().split(","); for (String subIp : ips) { if (false == isUnknown(subIp)) { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java index a5f5e29d..a461fecf 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java @@ -555,9 +555,9 @@ public class ExcelUtil { */ public int getImageType(byte[] value) { String type = FileTypeUtils.getFileExtendName(value); - if ("JPG".equalsIgnoreCase(type)) { + if (StringUtils.JPG.equalsIgnoreCase(type)) { return Workbook.PICTURE_TYPE_JPEG; - } else if ("PNG".equalsIgnoreCase(type)) { + } else if (StringUtils.PNG.equalsIgnoreCase(type)) { return Workbook.PICTURE_TYPE_PNG; } return Workbook.PICTURE_TYPE_JPEG; @@ -567,7 +567,7 @@ public class ExcelUtil { * 鍒涘缓琛ㄦ牸鏍峰紡 */ public void setDataValidation(Excel attr, Row row, int column) { - if (attr.name().indexOf("娉細") >= 0) { + if (attr.name().indexOf(StringUtils.NOTE) >= 0) { sheet.setColumnWidth(column, 6000); } else { // 璁剧疆鍒楀 @@ -777,7 +777,7 @@ public class ExcelUtil { Object o = field.get(vo); if (StringUtils.isNotEmpty(excel.targetAttr())) { String target = excel.targetAttr(); - if (target.contains(".")) { + if (target.contains(StringUtils.DOT)) { String[] targets = target.split("[.]"); for (String name : targets) { o = getValue(o, name); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java index 219c5934..5e4b3949 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java @@ -35,7 +35,8 @@ public class ReflectUtils public static E invokeGetter(Object obj, String propertyName) { Object object = obj; - for (String name : StringUtils.split(propertyName, ".")) + String point = "."; + for (String name : StringUtils.split(propertyName, point)) { String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name); object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {}); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java index 70df239d..b77d3dfc 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java @@ -13,42 +13,42 @@ import java.util.concurrent.ThreadLocalRandom; * * @author ruoyi */ -public final class UUID implements java.io.Serializable, Comparable -{ +public final class UUID implements java.io.Serializable, Comparable { private static final long serialVersionUID = -1185015143654744140L; /** * SecureRandom 鐨勫崟渚 - * */ - private static class Holder - { + private static class Holder { static final SecureRandom NUMBER_GENERATOR = getSecureRandom(); } - /** 姝UID鐨勬渶楂64鏈夋晥浣 */ + /** + * 姝UID鐨勬渶楂64鏈夋晥浣 + */ private final long mostSigBits; - /** 姝UID鐨勬渶浣64鏈夋晥浣 */ + /** + * 姝UID鐨勬渶浣64鏈夋晥浣 + */ private final long leastSigBits; /** * 绉佹湁鏋勯 - * + * * @param data 鏁版嵁 */ - private UUID(byte[] data) - { + private UUID(byte[] data) { long msb = 0; long lsb = 0; assert data.length == 16 : "data must be 16 bytes in length"; - for (int i = 0; i < 8; i++) - { - msb = (msb << 8) | (data[i] & 0xff); + int eight = 8; + int sixteen = 16; + for (int i = 0; i < eight; i++) { + msb = (msb << eight) | (data[i] & 0xff); } - for (int i = 8; i < 16; i++) - { - lsb = (lsb << 8) | (data[i] & 0xff); + for (int i = eight; i < sixteen; i++) { + lsb = (lsb << eight) | (data[i] & 0xff); } this.mostSigBits = msb; this.leastSigBits = lsb; @@ -57,43 +57,39 @@ public final class UUID implements java.io.Serializable, Comparable /** * 浣跨敤鎸囧畾鐨勬暟鎹瀯閫犳柊鐨 UUID銆 * - * @param mostSigBits 鐢ㄤ簬 {@code UUID} 鐨勬渶楂樻湁鏁 64 浣 + * @param mostSigBits 鐢ㄤ簬 {@code UUID} 鐨勬渶楂樻湁鏁 64 浣 * @param leastSigBits 鐢ㄤ簬 {@code UUID} 鐨勬渶浣庢湁鏁 64 浣 */ - public UUID(long mostSigBits, long leastSigBits) - { + public UUID(long mostSigBits, long leastSigBits) { this.mostSigBits = mostSigBits; this.leastSigBits = leastSigBits; } /** * 鑾峰彇绫诲瀷 4锛堜吉闅忔満鐢熸垚鐨勶級UUID 鐨勯潤鎬佸伐鍘傘 浣跨敤鍔犲瘑鐨勬湰鍦扮嚎绋嬩吉闅忔満鏁扮敓鎴愬櫒鐢熸垚璇 UUID銆 - * + * * @return 闅忔満鐢熸垚鐨 {@code UUID} */ - public static UUID fastuuid() - { + public static UUID fastuuid() { return randomuuid(false); } /** * 鑾峰彇绫诲瀷 4锛堜吉闅忔満鐢熸垚鐨勶級UUID 鐨勯潤鎬佸伐鍘傘 浣跨敤鍔犲瘑鐨勫己浼殢鏈烘暟鐢熸垚鍣ㄧ敓鎴愯 UUID銆 - * + * * @return 闅忔満鐢熸垚鐨 {@code UUID} */ - public static UUID randomuuid() - { + public static UUID randomuuid() { return randomuuid(true); } /** * 鑾峰彇绫诲瀷 4锛堜吉闅忔満鐢熸垚鐨勶級UUID 鐨勯潤鎬佸伐鍘傘 浣跨敤鍔犲瘑鐨勫己浼殢鏈烘暟鐢熸垚鍣ㄧ敓鎴愯 UUID銆 - * + * * @param isSecure 鏄惁浣跨敤{@link SecureRandom}濡傛灉鏄彲浠ヨ幏寰楁洿瀹夊叏鐨勯殢鏈虹爜锛屽惁鍒欏彲浠ュ緱鍒版洿濂界殑鎬ц兘 * @return 闅忔満鐢熸垚鐨 {@code UUID} */ - public static UUID randomuuid(boolean isSecure) - { + public static UUID randomuuid(boolean isSecure) { final Random ng = isSecure ? Holder.NUMBER_GENERATOR : getRandom(); byte[] randomBytes = new byte[16]; @@ -109,18 +105,13 @@ public final class UUID implements java.io.Serializable, Comparable * 鏍规嵁鎸囧畾鐨勫瓧鑺傛暟缁勮幏鍙栫被鍨 3锛堝熀浜庡悕绉扮殑锛塙UID 鐨勯潤鎬佸伐鍘傘 * * @param name 鐢ㄤ簬鏋勯 UUID 鐨勫瓧鑺傛暟缁勩 - * * @return 鏍规嵁鎸囧畾鏁扮粍鐢熸垚鐨 {@code UUID} */ - public static UUID nameUuidFromBytes(byte[] name) - { + public static UUID nameUuidFromBytes(byte[] name) { MessageDigest md; - try - { + try { md = MessageDigest.getInstance("MD5"); - } - catch (NoSuchAlgorithmException nsae) - { + } catch (NoSuchAlgorithmException nsae) { throw new InternalError("MD5 not supported"); } byte[] md5Bytes = md.digest(name); @@ -137,17 +128,14 @@ public final class UUID implements java.io.Serializable, Comparable * @param name 鎸囧畾 {@code UUID} 瀛楃涓 * @return 鍏锋湁鎸囧畾鍊肩殑 {@code UUID} * @throws IllegalArgumentException 濡傛灉 name 涓 {@link #toString} 涓弿杩扮殑瀛楃涓茶〃绀哄舰寮忎笉绗︽姏鍑烘寮傚父 - * */ - public static UUID fromString(String name) - { + public static UUID fromString(String name) { String[] components = name.split("-"); - if (components.length != 5) - { + int fastFive = 5; + if (components.length != fastFive) { throw new IllegalArgumentException("Invalid UUID string: " + name); } - for (int i = 0; i < 5; i++) - { + for (int i = 0; i < fastFive; i++) { StringBuilder sb = new StringBuilder(); sb.append(sb); sb.append(components[i]); @@ -172,8 +160,7 @@ public final class UUID implements java.io.Serializable, Comparable * * @return 姝 UUID 鐨 128 浣嶅间腑鐨勬渶浣庢湁鏁 64 浣嶃 */ - public long getLeastSignificantBits() - { + public long getLeastSignificantBits() { return leastSigBits; } @@ -182,8 +169,7 @@ public final class UUID implements java.io.Serializable, Comparable * * @return 姝 UUID 鐨 128 浣嶅间腑鏈楂樻湁鏁 64 浣嶃 */ - public long getMostSignificantBits() - { + public long getMostSignificantBits() { return mostSigBits; } @@ -200,8 +186,7 @@ public final class UUID implements java.io.Serializable, Comparable * * @return 姝 {@code UUID} 鐨勭増鏈彿 */ - public int version() - { + public int version() { // Version is bits masked by 0x000000000000F000 in MS long return (int) ((mostSigBits >> 12) & 0x0f); } @@ -219,8 +204,7 @@ public final class UUID implements java.io.Serializable, Comparable * * @return 姝 {@code UUID} 鐩稿叧鑱旂殑鍙樹綋鍙 */ - public int variant() - { + public int variant() { // This field is composed of a varying number of bits. // 0 - - Reserved for NCS backward compatibility // 1 0 - The IETF aka Leach-Salz variant (used by this class) @@ -242,8 +226,7 @@ public final class UUID implements java.io.Serializable, Comparable * * @throws UnsupportedOperationException 濡傛灉姝 {@code UUID} 涓嶆槸 version 涓 1 鐨 UUID銆 */ - public long timestamp() throws UnsupportedOperationException - { + public long timestamp() throws UnsupportedOperationException { checkTimeBase(); return (mostSigBits & 0x0FFFL) << 48 | ((mostSigBits >> 16) & 0x0FFFFL) << 32 @@ -260,11 +243,9 @@ public final class UUID implements java.io.Serializable, Comparable * UnsupportedOperationException銆 * * @return 姝 {@code UUID} 鐨勬椂閽熷簭鍒 - * * @throws UnsupportedOperationException 濡傛灉姝 UUID 鐨 version 涓嶄负 1 */ - public int clockSequence() throws UnsupportedOperationException - { + public int clockSequence() throws UnsupportedOperationException { checkTimeBase(); return (int) ((leastSigBits & 0x3FFF000000000000L) >>> 48); } @@ -279,11 +260,9 @@ public final class UUID implements java.io.Serializable, Comparable * 濡傛灉姝 UUID 涓嶆槸鍩轰簬鏃堕棿鐨 UUID锛屽垯姝ゆ柟娉曟姏鍑 UnsupportedOperationException銆 * * @return 姝 {@code UUID} 鐨勮妭鐐瑰 - * * @throws UnsupportedOperationException 濡傛灉姝 UUID 鐨 version 涓嶄负 1 */ - public long node() throws UnsupportedOperationException - { + public long node() throws UnsupportedOperationException { checkTimeBase(); return leastSigBits & 0x0000FFFFFFFFFFFFL; } @@ -293,7 +272,7 @@ public final class UUID implements java.io.Serializable, Comparable * *

* UUID 鐨勫瓧绗︿覆琛ㄧず褰㈠紡鐢辨 BNF 鎻忚堪锛 - * + * * 

      * {@code
      * UUID                   = ----
@@ -306,15 +285,14 @@ public final class UUID implements java.io.Serializable, Comparable
      * hexDigit               = [0-9a-fA-F]
      * }
      *
- * + * * * * @return 姝@code UUID} 鐨勫瓧绗︿覆琛ㄧ幇褰㈠紡 * @see #toString(boolean) */ @Override - public String toString() - { + public String toString() { return toString(false); } @@ -323,7 +301,7 @@ public final class UUID implements java.io.Serializable, Comparable * *

* UUID 鐨勫瓧绗︿覆琛ㄧず褰㈠紡鐢辨 BNF 鎻忚堪锛 - * + * * 

      * {@code
      * UUID                   = ----
@@ -336,37 +314,32 @@ public final class UUID implements java.io.Serializable, Comparable
      * hexDigit               = [0-9a-fA-F]
      * }
      *
- * + * * * * @param isSimple 鏄惁绠鍗曟ā寮忥紝绠鍗曟ā寮忎负涓嶅甫'-'鐨刄UID瀛楃涓 * @return 姝@code UUID} 鐨勫瓧绗︿覆琛ㄧ幇褰㈠紡 */ - public String toString(boolean isSimple) - { + public String toString(boolean isSimple) { final StringBuilder builder = new StringBuilder(isSimple ? 32 : 36); // time_low builder.append(digits(mostSigBits >> 32, 8)); - if (false == isSimple) - { + if (false == isSimple) { builder.append('-'); } // time_mid builder.append(digits(mostSigBits >> 16, 4)); - if (false == isSimple) - { + if (false == isSimple) { builder.append('-'); } // time_high_and_version builder.append(digits(mostSigBits, 4)); - if (false == isSimple) - { + if (false == isSimple) { builder.append('-'); } // variant_and_sequence builder.append(digits(leastSigBits >> 48, 4)); - if (false == isSimple) - { + if (false == isSimple) { builder.append('-'); } // node @@ -381,8 +354,7 @@ public final class UUID implements java.io.Serializable, Comparable * @return UUID 鐨勫搱甯岀爜鍊笺 */ @Override - public int hashCode() - { + public int hashCode() { long hilo = mostSigBits ^ leastSigBits; return ((int) (hilo >> 32)) ^ (int) hilo; } @@ -393,14 +365,11 @@ public final class UUID implements java.io.Serializable, Comparable * 褰撲笖浠呭綋鍙傛暟涓嶄负 {@code null}銆佽屾槸涓涓 UUID 瀵硅薄銆佸叿鏈変笌姝 UUID 鐩稿悓鐨 varriant銆佸寘鍚浉鍚岀殑鍊硷紙姣忎竴浣嶅潎鐩稿悓锛夋椂锛岀粨鏋滄墠涓 {@code true}銆 * * @param obj 瑕佷笌涔嬫瘮杈冪殑瀵硅薄 - * * @return 濡傛灉瀵硅薄鐩稿悓锛屽垯杩斿洖 {@code true}锛涘惁鍒欒繑鍥 {@code false} */ @Override - public boolean equals(Object obj) - { - if ((null == obj) || (obj.getClass() != UUID.class)) - { + public boolean equals(Object obj) { + if ((null == obj) || (obj.getClass() != UUID.class)) { return false; } UUID id = (UUID) obj; @@ -416,13 +385,10 @@ public final class UUID implements java.io.Serializable, Comparable * 濡傛灉涓や釜 UUID 涓嶅悓锛屼笖绗竴涓 UUID 鐨勬渶楂樻湁鏁堝瓧娈靛ぇ浜庣浜屼釜 UUID 鐨勫搴斿瓧娈碉紝鍒欑涓涓 UUID 澶т簬绗簩涓 UUID銆 * * @param val 涓庢 UUID 姣旇緝鐨 UUID - * * @return 鍦ㄦ UUID 灏忎簬銆佺瓑浜庢垨澶т簬 val 鏃讹紝鍒嗗埆杩斿洖 -1銆0 鎴 1銆 - * */ @Override - public int compareTo(UUID val) - { + public int compareTo(UUID val) { // The ordering is intentionally set up so that the UUIDs // can simply be numerically compared as two numbers return (this.mostSigBits < val.mostSigBits ? -1 : @@ -434,15 +400,15 @@ public final class UUID implements java.io.Serializable, Comparable // ------------------------------------------------------------------------------------------------------------------- // Private method start + /** * 杩斿洖鎸囧畾鏁板瓧瀵瑰簲鐨刪ex鍊 - * - * @param val 鍊 + * + * @param val 鍊 * @param digits 浣 * @return 鍊 */ - private static String digits(long val, int digits) - { + private static String digits(long val, int digits) { long hi = 1L << (digits * 4); return Long.toHexString(hi | (val & (hi - 1))).substring(1); } @@ -450,27 +416,21 @@ public final class UUID implements java.io.Serializable, Comparable /** * 妫鏌ユ槸鍚︿负time-based鐗堟湰UUID */ - private void checkTimeBase() - { - if (version() != 1) - { + private void checkTimeBase() { + if (version() != 1) { throw new UnsupportedOperationException("Not a time-based UUID"); } } /** * 鑾峰彇{@link SecureRandom}锛岀被鎻愪緵鍔犲瘑鐨勫己闅忔満鏁扮敓鎴愬櫒 (RNG) - * + * * @return {@link SecureRandom} */ - public static SecureRandom getSecureRandom() - { - try - { + public static SecureRandom getSecureRandom() { + try { return SecureRandom.getInstance("SHA1PRNG"); - } - catch (NoSuchAlgorithmException e) - { + } catch (NoSuchAlgorithmException e) { throw new UtilException(e); } } @@ -478,11 +438,10 @@ public final class UUID implements java.io.Serializable, Comparable /** * 鑾峰彇闅忔満鏁扮敓鎴愬櫒瀵硅薄
* ThreadLocalRandom鏄疛DK 7涔嬪悗鎻愪緵骞跺彂浜х敓闅忔満鏁帮紝鑳藉瑙ｅ喅澶氫釜绾跨▼鍙戠敓鐨勭珵浜変簤澶恒 - * + * * @return {@link ThreadLocalRandom} */ - public static ThreadLocalRandom getRandom() - { + public static ThreadLocalRandom getRandom() { return ThreadLocalRandom.current(); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java index 413aabf2..1fc5910e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java @@ -70,14 +70,13 @@ public class PageDomain public void setIsAsc(String isAsc) { - if (StringUtils.isNotEmpty(isAsc)) - { + if (StringUtils.isNotEmpty(isAsc)) { // 鍏煎鍓嶇鎺掑簭绫诲瀷 - if ("ascending".equals(isAsc)) + if (StringUtils.ASC_ENDING.equals(isAsc)) { isAsc = "asc"; } - else if ("descending".equals(isAsc)) + else if (StringUtils.DESC_ENDING.equals(isAsc)) { isAsc = "desc"; } diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java index c1f1eb0e..ac6bb815 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java @@ -22,32 +22,26 @@ public class KaptchaTextCreator extends DefaultTextCreator int y = random.nextInt(10); StringBuilder suChinese = new StringBuilder(); int randomoperands = (int) Math.round(Math.random() * 2); - if (randomoperands == 0) - { + int randomoperandsInt = 2; + if (randomoperands == 0) { result = x * y; suChinese.append(CNUMBERS[x]); suChinese.append("*"); suChinese.append(CNUMBERS[y]); } - else if (randomoperands == 1) - { - if ((x != 0) && y % x == 0) - { + else if (randomoperands == 1) { + if ((x != 0) && y % x == 0) { result = y / x; suChinese.append(CNUMBERS[y]); suChinese.append("/"); suChinese.append(CNUMBERS[x]); - } - else - { + } else { result = x + y; suChinese.append(CNUMBERS[x]); suChinese.append("+"); suChinese.append(CNUMBERS[y]); } - } - else if (randomoperands == 2) - { + } else if (randomoperands == randomoperandsInt) { if (x >= y) { result = x - y; diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java index c06376dd..a3866065 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java @@ -2,6 +2,8 @@ package com.ruoyi.gateway.filter; import java.util.Collections; import java.util.List; + +import com.ruoyi.common.core.utils.StringUtils; import org.springframework.cloud.gateway.filter.GatewayFilter; import org.springframework.cloud.gateway.filter.GatewayFilterChain; import org.springframework.cloud.gateway.filter.OrderedGatewayFilter; @@ -54,7 +56,7 @@ public class CacheRequestFilter extends AbstractGatewayFilterFactory 0) { + int i = 2; + if (str != null && str.length == i && Integer.parseInt(str[1]) > 0) { column.setJavaType(GenConstants.TYPE_BIGDECIMAL); - } else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) { - column.setJavaType(GenConstants.TYPE_INTEGER); } else { - column.setJavaType(GenConstants.TYPE_LONG); + int i1 = 10; + if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= i1) { + column.setJavaType(GenConstants.TYPE_INTEGER); + } else { + column.setJavaType(GenConstants.TYPE_LONG); + } } } // 鎻掑叆瀛楁锛堥粯璁ゆ墍鏈夊瓧娈甸兘闇瑕佹彃鍏ワ級 @@ -76,20 +80,27 @@ public class GenUtils { column.setIsQuery(GenConstants.REQUIRE); } // 鏌ヨ瀛楁绫诲瀷 - if (StringUtils.endsWithIgnoreCase(columnName, "name")) { + String name = "name"; + if (StringUtils.endsWithIgnoreCase(columnName, name)) { column.setQueryType(GenConstants.QUERY_LIKE); } // 鐘舵佸瓧娈佃缃崟閫夋 - if (StringUtils.endsWithIgnoreCase(columnName, "status")) { + String status = "status"; + String type = "type"; + String sex = "sex"; + String image = "image"; + String file = "file"; + String content = "content"; + if (StringUtils.endsWithIgnoreCase(columnName, status)) { column.setHtmlType(GenConstants.HTML_RADIO); - } else if (StringUtils.endsWithIgnoreCase(columnName, "type") - || StringUtils.endsWithIgnoreCase(columnName, "sex")) { + } else if (StringUtils.endsWithIgnoreCase(columnName, type) + || StringUtils.endsWithIgnoreCase(columnName, sex)) { column.setHtmlType(GenConstants.HTML_SELECT); - } else if (StringUtils.endsWithIgnoreCase(columnName, "image")) { + } else if (StringUtils.endsWithIgnoreCase(columnName, image)) { column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD); - } else if (StringUtils.endsWithIgnoreCase(columnName, "file")) { + } else if (StringUtils.endsWithIgnoreCase(columnName, file)) { column.setHtmlType(GenConstants.HTML_FILE_UPLOAD); - } else if (StringUtils.endsWithIgnoreCase(columnName, "content")) { + } else if (StringUtils.endsWithIgnoreCase(columnName, content)) { column.setHtmlType(GenConstants.HTML_EDITOR); } } @@ -180,8 +191,8 @@ public class GenUtils { * @return 鎴彇鍚庣殑鍒楃被鍨 */ public static String getDbType(String columnType) { - if (StringUtils.indexOf(columnType, "(") > 0) { - return StringUtils.substringBefore(columnType, "("); + if (StringUtils.indexOf(columnType, StringUtils.LEFT_BRACKETS) > 0) { + return StringUtils.substringBefore(columnType, StringUtils.LEFT_BRACKETS); } else { return columnType; } @@ -194,7 +205,7 @@ public class GenUtils { * @return 鎴彇鍚庣殑鍒楃被鍨 */ public static Integer getColumnLength(String columnType) { - if (StringUtils.indexOf(columnType, "(") > 0) { + if (StringUtils.indexOf(columnType, StringUtils.LEFT_BRACKETS) > 0) { String length = StringUtils.substringBetween(columnType, "(", ")"); return Integer.valueOf(length); } else { diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java index 5aa3c7c5..06f25c99 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java @@ -1,31 +1,37 @@ package com.ruoyi.gen.util; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import org.apache.velocity.VelocityContext; import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.core.constant.GenConstants; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.gen.domain.GenTable; import com.ruoyi.gen.domain.GenTableColumn; +import org.apache.velocity.VelocityContext; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * 妯℃澘宸ュ叿绫 - * + * * @author ruoyi */ -public class VelocityUtils -{ - /** 椤圭洰绌洪棿璺緞 */ +public class VelocityUtils { + /** + * 椤圭洰绌洪棿璺緞 + */ private static final String PROJECT_PATH = "main/java"; - /** mybatis绌洪棿璺緞 */ + /** + * mybatis绌洪棿璺緞 + */ private static final String MYBATIS_PATH = "main/resources/mapper"; - /** 榛樿涓婄骇鑿滃崟锛岀郴缁熷伐鍏 */ + /** + * 榛樿涓婄骇鑿滃崟锛岀郴缁熷伐鍏 + */ private static final String DEFAULT_PARENT_MENU_ID = "3"; /** @@ -33,8 +39,7 @@ public class VelocityUtils * * @return 妯℃澘鍒楄〃 */ - public static VelocityContext prepareContext(GenTable genTable) - { + public static VelocityContext prepareContext(GenTable genTable) { String moduleName = genTable.getModuleName(); String businessName = genTable.getBusinessName(); String packageName = genTable.getPackageName(); @@ -61,27 +66,23 @@ public class VelocityUtils velocityContext.put("table", genTable); velocityContext.put("dicts", getDicts(genTable)); setMenuVelocityContext(velocityContext, genTable); - if (GenConstants.TPL_TREE.equals(tplCategory)) - { + if (GenConstants.TPL_TREE.equals(tplCategory)) { setTreeVelocityContext(velocityContext, genTable); } - if (GenConstants.TPL_SUB.equals(tplCategory)) - { + if (GenConstants.TPL_SUB.equals(tplCategory)) { setSubVelocityContext(velocityContext, genTable); } return velocityContext; } - public static void setMenuVelocityContext(VelocityContext context, GenTable genTable) - { + public static void setMenuVelocityContext(VelocityContext context, GenTable genTable) { String options = genTable.getOptions(); JSONObject paramsObj = JSONObject.parseObject(options); String parentMenuId = getParentMenuId(paramsObj); context.put("parentMenuId", parentMenuId); } - public static void setTreeVelocityContext(VelocityContext context, GenTable genTable) - { + public static void setTreeVelocityContext(VelocityContext context, GenTable genTable) { String options = genTable.getOptions(); JSONObject paramsObj = JSONObject.parseObject(options); String treeCode = getTreecode(paramsObj); @@ -92,18 +93,15 @@ public class VelocityUtils context.put("treeParentCode", treeParentCode); context.put("treeName", treeName); context.put("expandColumn", getExpandColumn(genTable)); - if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) - { + if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) { context.put("tree_parent_code", paramsObj.getString(GenConstants.TREE_PARENT_CODE)); } - if (paramsObj.containsKey(GenConstants.TREE_NAME)) - { + if (paramsObj.containsKey(GenConstants.TREE_NAME)) { context.put("tree_name", paramsObj.getString(GenConstants.TREE_NAME)); } } - public static void setSubVelocityContext(VelocityContext context, GenTable genTable) - { + public static void setSubVelocityContext(VelocityContext context, GenTable genTable) { GenTable subTable = genTable.getSubTable(); String subTableName = genTable.getSubTableName(); String subTableFkName = genTable.getSubTableFkName(); @@ -125,8 +123,7 @@ public class VelocityUtils * * @return 妯℃澘鍒楄〃 */ - public static List getTemplateList(String tplCategory) - { + public static List getTemplateList(String tplCategory) { List templates = new ArrayList(); templates.add("vm/java/domain.java.vm"); templates.add("vm/java/mapper.java.vm"); @@ -136,16 +133,11 @@ public class VelocityUtils templates.add("vm/xml/mapper.xml.vm"); templates.add("vm/sql/sql.vm"); templates.add("vm/js/api.js.vm"); - if (GenConstants.TPL_CRUD.equals(tplCategory)) - { + if (GenConstants.TPL_CRUD.equals(tplCategory)) { templates.add("vm/vue/index.vue.vm"); - } - else if (GenConstants.TPL_TREE.equals(tplCategory)) - { + } else if (GenConstants.TPL_TREE.equals(tplCategory)) { templates.add("vm/vue/index-tree.vue.vm"); - } - else if (GenConstants.TPL_SUB.equals(tplCategory)) - { + } else if (GenConstants.TPL_SUB.equals(tplCategory)) { templates.add("vm/vue/index.vue.vm"); templates.add("vm/java/sub-domain.java.vm"); } @@ -155,8 +147,7 @@ public class VelocityUtils /** * 鑾峰彇鏂囦欢鍚 */ - public static String getFileName(String template, GenTable genTable) - { + public static String getFileName(String template, GenTable genTable) { // 鏂囦欢鍚嶇О String fileName = ""; // 鍖呰矾寰 @@ -172,48 +163,30 @@ public class VelocityUtils String mybatisPath = MYBATIS_PATH + "/" + moduleName; String vuePath = "vue"; - if (template.contains("domain.java.vm")) - { + String domainVm = "domain.java.vm"; + if (template.contains(domainVm)) { fileName = StringUtils.format("{}/domain/{}.java", javaPath, className); } - if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory())) - { + + if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory())) { fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName()); - } - else if (template.contains("mapper.java.vm")) - { + } else if (template.contains("mapper.java.vm")) { fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className); - } - else if (template.contains("service.java.vm")) - { + } else if (template.contains("service.java.vm")) { fileName = StringUtils.format("{}/service/I{}Service.java", javaPath, className); - } - else if (template.contains("serviceImpl.java.vm")) - { + } else if (template.contains("serviceImpl.java.vm")) { fileName = StringUtils.format("{}/service/impl/{}ServiceImpl.java", javaPath, className); - } - else if (template.contains("controller.java.vm")) - { + } else if (template.contains("controller.java.vm")) { fileName = StringUtils.format("{}/controller/{}Controller.java", javaPath, className); - } - else if (template.contains("mapper.xml.vm")) - { + } else if (template.contains("mapper.xml.vm")) { fileName = StringUtils.format("{}/{}Mapper.xml", mybatisPath, className); - } - else if (template.contains("sql.vm")) - { + } else if (template.contains("sql.vm")) { fileName = businessName + "Menu.sql"; - } - else if (template.contains("api.js.vm")) - { + } else if (template.contains("api.js.vm")) { fileName = StringUtils.format("{}/api/{}/{}.js", vuePath, moduleName, businessName); - } - else if (template.contains("index.vue.vm")) - { + } else if (template.contains("index.vue.vm")) { fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName); - } - else if (template.contains("index-tree.vue.vm")) - { + } else if (template.contains("index-tree.vue.vm")) { fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName); } return fileName; @@ -225,36 +198,29 @@ public class VelocityUtils * @param packageName 鍖呭悕绉 * @return 鍖呭墠缂鍚嶇О */ - public static String getPackagePrefix(String packageName) - { + public static String getPackagePrefix(String packageName) { int lastIndex = packageName.lastIndexOf("."); return StringUtils.substring(packageName, 0, lastIndex); } /** * 鏍规嵁鍒楃被鍨嬭幏鍙栧鍏ュ寘 - * + * * @param genTable 涓氬姟琛ㄥ璞 * @return 杩斿洖闇瑕佸鍏ョ殑鍖呭垪琛 */ - public static HashSet getImportList(GenTable genTable) - { + public static HashSet getImportList(GenTable genTable) { List columns = genTable.getColumns(); GenTable subGenTable = genTable.getSubTable(); HashSet importList = new HashSet(); - if (StringUtils.isNotNull(subGenTable)) - { + if (StringUtils.isNotNull(subGenTable)) { importList.add("java.util.List"); } - for (GenTableColumn column : columns) - { - if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType())) - { + for (GenTableColumn column : columns) { + if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType())) { importList.add("java.util.Date"); importList.add("com.fasterxml.jackson.annotation.JsonFormat"); - } - else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType())) - { + } else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType())) { importList.add("java.math.BigDecimal"); } } @@ -263,17 +229,15 @@ public class VelocityUtils /** * 鏍规嵁鍒楃被鍨嬭幏鍙栧瓧鍏哥粍 - * + * * @param genTable 涓氬姟琛ㄥ璞 * @return 杩斿洖瀛楀吀缁 */ - public static String getDicts(GenTable genTable) - { + public static String getDicts(GenTable genTable) { List columns = genTable.getColumns(); Set dicts = new HashSet(); addDicts(dicts, columns); - if (StringUtils.isNotNull(genTable.getSubTable())) - { + if (StringUtils.isNotNull(genTable.getSubTable())) { List subColumns = genTable.getSubTable().getColumns(); addDicts(dicts, subColumns); } @@ -282,18 +246,15 @@ public class VelocityUtils /** * 娣诲姞瀛楀吀鍒楄〃 - * - * @param dicts 瀛楀吀鍒楄〃 + * + * @param dicts 瀛楀吀鍒楄〃 * @param columns 鍒楅泦鍚 */ - public static void addDicts(Set dicts, List columns) - { - for (GenTableColumn column : columns) - { + public static void addDicts(Set dicts, List columns) { + for (GenTableColumn column : columns) { if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny( column.getHtmlType(), - new String[] { GenConstants.HTML_SELECT, GenConstants.HTML_RADIO, GenConstants.HTML_CHECKBOX })) - { + new String[]{GenConstants.HTML_SELECT, GenConstants.HTML_RADIO, GenConstants.HTML_CHECKBOX})) { dicts.add("'" + column.getDictType() + "'"); } } @@ -302,12 +263,11 @@ public class VelocityUtils /** * 鑾峰彇鏉冮檺鍓嶇紑 * - * @param moduleName 妯″潡鍚嶇О + * @param moduleName 妯″潡鍚嶇О * @param businessName 涓氬姟鍚嶇О * @return 杩斿洖鏉冮檺鍓嶇紑 */ - public static String getPermissionPrefix(String moduleName, String businessName) - { + public static String getPermissionPrefix(String moduleName, String businessName) { return StringUtils.format("{}:{}", moduleName, businessName); } @@ -317,11 +277,9 @@ public class VelocityUtils * @param paramsObj 鐢熸垚鍏朵粬閫夐」 * @return 涓婄骇鑿滃崟ID瀛楁 */ - public static String getParentMenuId(JSONObject paramsObj) - { + public static String getParentMenuId(JSONObject paramsObj) { if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID) - && StringUtils.isNotEmpty(paramsObj.getString(GenConstants.PARENT_MENU_ID))) - { + && StringUtils.isNotEmpty(paramsObj.getString(GenConstants.PARENT_MENU_ID))) { return paramsObj.getString(GenConstants.PARENT_MENU_ID); } return DEFAULT_PARENT_MENU_ID; @@ -333,10 +291,8 @@ public class VelocityUtils * @param paramsObj 鐢熸垚鍏朵粬閫夐」 * @return 鏍戠紪鐮 */ - public static String getTreecode(JSONObject paramsObj) - { - if (paramsObj.containsKey(GenConstants.TREE_CODE)) - { + public static String getTreecode(JSONObject paramsObj) { + if (paramsObj.containsKey(GenConstants.TREE_CODE)) { return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_CODE)); } return StringUtils.EMPTY; @@ -348,10 +304,8 @@ public class VelocityUtils * @param paramsObj 鐢熸垚鍏朵粬閫夐」 * @return 鏍戠埗缂栫爜 */ - public static String getTreeParentCode(JSONObject paramsObj) - { - if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) - { + public static String getTreeParentCode(JSONObject paramsObj) { + if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) { return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_PARENT_CODE)); } return StringUtils.EMPTY; @@ -363,10 +317,8 @@ public class VelocityUtils * @param paramsObj 鐢熸垚鍏朵粬閫夐」 * @return 鏍戝悕绉 */ - public static String getTreeName(JSONObject paramsObj) - { - if (paramsObj.containsKey(GenConstants.TREE_NAME)) - { + public static String getTreeName(JSONObject paramsObj) { + if (paramsObj.containsKey(GenConstants.TREE_NAME)) { return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_NAME)); } return StringUtils.EMPTY; @@ -378,20 +330,16 @@ public class VelocityUtils * @param genTable 涓氬姟琛ㄥ璞 * @return 灞曞紑鎸夐挳鍒楀簭鍙 */ - public static int getExpandColumn(GenTable genTable) - { + public static int getExpandColumn(GenTable genTable) { String options = genTable.getOptions(); JSONObject paramsObj = JSONObject.parseObject(options); String treeName = paramsObj.getString(GenConstants.TREE_NAME); int num = 0; - for (GenTableColumn column : genTable.getColumns()) - { - if (column.isList()) - { + for (GenTableColumn column : genTable.getColumns()) { + if (column.isList()) { num++; String columnName = column.getColumnName(); - if (columnName.equals(treeName)) - { + if (columnName.equals(treeName)) { break; } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java index d827f8a1..db41e8d9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java @@ -134,7 +134,7 @@ public class SysUserController extends BaseController public Rust register(@RequestBody SysUser sysUser) { String username = sysUser.getUserName(); - if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) + if (!(StringUtils.TRUE.equals(configService.selectConfigByKey(StringUtils.SYS_ACCOUNT_USER)))) { return Rust.fail("褰撳墠绯荤粺娌℃湁寮鍚敞鍐屽姛鑳斤紒"); } From a4cd2e13de60a07698820f1828ecef0c43d4b84e Mon Sep 17 00:00:00 2001 From: 1332987 <13329870472@163.com> Date: Wed, 20 Apr 2022 13:33:31 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E9=80=9A=E8=BF=87alibaba=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=A7=84=E7=BA=A6=E6=89=AB=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/utils/file/FileTypeUtils.java | 30 +++++++++++++++---- .../ruoyi/common/core/utils/sign/Base64.java | 30 ++++++++++++++----- .../com/ruoyi/gen/util/VelocityUtils.java | 30 ++++++++++++------- 3 files changed, 67 insertions(+), 23 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java index 387bfbc1..2fd6183e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java @@ -55,20 +55,40 @@ public class FileTypeUtils public static String getFileExtendName(byte[] photoByte) { String strFileExtendName = "JPG"; - if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56) && (photoByte[5] == 97)) { - if ((photoByte[4] == 55) || (photoByte[4] == 57)) { + int i71 = 71; + int i73 = 73; + int i2 = 2; + int i70 = 70; + int i3 = 3; + int i56 = 56; + int i5 = 5; + int i97 = 97; + int i4 = 4; + int i55 = 55; + int i57 = 57; + int i6 = 6; + int i74 = 74; + int i7 = 7; + int i8 = 8; + int i9 = 9; + int i66 = 66; + int i77 = 77; + int i80 = 80; + int i78 = 78; + if ((photoByte[0] == i71) && (photoByte[1] == i73) && (photoByte[i2] == i70) && (photoByte[i3] == i56) && (photoByte[i5] == i97)) { + if ((photoByte[i4] == i55) || (photoByte[i4] == i57)) { strFileExtendName = "GIF"; } } - else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70)) + else if ((photoByte[i6] == i74) && (photoByte[i7] == i70) && (photoByte[i8] == i73) && (photoByte[i9] == i70)) { strFileExtendName = "JPG"; } - else if ((photoByte[0] == 66) && (photoByte[1] == 77)) + else if ((photoByte[0] == i66) && (photoByte[1] == i77)) { strFileExtendName = "BMP"; } - else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71)) + else if ((photoByte[1] == i80) && (photoByte[i2] == i78) && (photoByte[i3] == i71)) { strFileExtendName = "PNG"; } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java index 48fbe7a6..8b03fe05 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java @@ -21,29 +21,41 @@ public final class Base64 { for (int i = 0; i < BASELENGTH; ++i) { BASE_64_ALPHABET[i] = -1; } - for (int i = 'Z'; i >= 'A'; i--) { + char z = 'Z'; + char a = 'A'; + for (int i = z; i >= a; i--) { BASE_64_ALPHABET[i] = (byte) (i - 'A'); } - for (int i = 'z'; i >= 'a'; i--) { + + char z1 = 'z'; + char a1 = 'a'; + for (int i = z1; i >= a1; i--) { BASE_64_ALPHABET[i] = (byte) (i - 'a' + 26); } - for (int i = '9'; i >= '0'; i--) { + char c = '9'; + char c1 = '0'; + for (int i = c; i >= c1; i--) { BASE_64_ALPHABET[i] = (byte) (i - '0' + 52); } BASE_64_ALPHABET['+'] = 62; BASE_64_ALPHABET['/'] = 63; - for (int i = 0; i <= 25; i++) { + int i1 = 25; + for (int i = 0; i <= i1; i++) { LOOK_UP_BASE_64_ALPHABET[i] = (char) ('A' + i); } - for (int i = 26, j = 0; i <= 51; i++, j++) { + int i2 = 26; + int i3 = 51; + for (int i = i2, j = 0; i <= i3; i++, j++) { LOOK_UP_BASE_64_ALPHABET[i] = (char) ('a' + j); } - for (int i = 52, j = 0; i <= 61; i++, j++) { + int i4 = 52; + int i5 = 61; + for (int i = i4, j = 0; i <= i5; i++, j++) { LOOK_UP_BASE_64_ALPHABET[i] = (char) ('0' + j); } LOOK_UP_BASE_64_ALPHABET[62] = (char) '+'; @@ -182,7 +194,8 @@ public final class Base64 { d4 = base64Data[dataIndex++]; if (!isData((d3)) || !isData((d4))) { if (isPad(d3) && isPad(d4)) { - if ((b2 & 0xf) != 0) { + int i1 = 0xf; + if ((b2 & i1) != 0) { return null; } byte[] tmp = new byte[i * 3 + 1]; @@ -191,7 +204,8 @@ public final class Base64 { return tmp; } else if (!isPad(d3) && isPad(d4)) { b3 = BASE_64_ALPHABET[d3]; - if ((b3 & 0x3) != 0) { + int i1 = 0x3; + if ((b3 & i1) != 0) { return null; } byte[] tmp = new byte[i * 3 + 2]; diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java index 06f25c99..bb668299 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java @@ -168,25 +168,35 @@ public class VelocityUtils { fileName = StringUtils.format("{}/domain/{}.java", javaPath, className); } - if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory())) { + String subdomainVm = "sub-domain.java.vm"; + String mapperVm = "mapper.java.vm"; + String serviceVm = "service.java.vm"; + String serviceImplVm = "serviceImpl.java.vm"; + String controllerVm = "controller.java.vm"; + String mapperXmlVm = "mapper.xml.vm"; + String sqlVm = "sql.vm"; + String apiVm = "api.js.vm"; + String indexVm = "index.vue.vm"; + String indexTreeVm = "index-tree.vue.vm"; + if (template.contains(subdomainVm) && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory())) { fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName()); - } else if (template.contains("mapper.java.vm")) { + } else if (template.contains(mapperVm)) { fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className); - } else if (template.contains("service.java.vm")) { + } else if (template.contains(serviceVm)) { fileName = StringUtils.format("{}/service/I{}Service.java", javaPath, className); - } else if (template.contains("serviceImpl.java.vm")) { + } else if (template.contains(serviceImplVm)) { fileName = StringUtils.format("{}/service/impl/{}ServiceImpl.java", javaPath, className); - } else if (template.contains("controller.java.vm")) { + } else if (template.contains(controllerVm)) { fileName = StringUtils.format("{}/controller/{}Controller.java", javaPath, className); - } else if (template.contains("mapper.xml.vm")) { + } else if (template.contains(mapperXmlVm)) { fileName = StringUtils.format("{}/{}Mapper.xml", mybatisPath, className); - } else if (template.contains("sql.vm")) { + } else if (template.contains(sqlVm)) { fileName = businessName + "Menu.sql"; - } else if (template.contains("api.js.vm")) { + } else if (template.contains(apiVm)) { fileName = StringUtils.format("{}/api/{}/{}.js", vuePath, moduleName, businessName); - } else if (template.contains("index.vue.vm")) { + } else if (template.contains(indexVm)) { fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName); - } else if (template.contains("index-tree.vue.vm")) { + } else if (template.contains(indexTreeVm)) { fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName); } return fileName; From 834d5d27b5c4e9989b768c4b3dd6d0e1e49f1b64 Mon Sep 17 00:00:00 2001 From: 1332987 <13329870472@163.com> Date: Wed, 20 Apr 2022 13:41:23 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-common/ruoyi-common-datasource/pom.xml | 4 ++-- ruoyi-modules/ruoyi-file/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml index 21444bd9..8c642d4f 100644 --- a/ruoyi-common/ruoyi-common-datasource/pom.xml +++ b/ruoyi-common/ruoyi-common-datasource/pom.xml @@ -53,12 +53,12 @@ org.checkerframework checker-qual - 3.19.0 + 3.21.4 com.google.errorprone error_prone_annotations - 2.10.0 + 2.12.1 \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index c67b98bf..f0d2a972 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/ruoyi-modules/ruoyi-file/pom.xml @@ -73,7 +73,7 @@ com.squareup.okhttp3 okhttp - 4.8.1 + 4.9.3 From 34b82b591557da7e568ad43a3115ae9ffda5b2f0 Mon Sep 17 00:00:00 2001 From: 1332987 <13329870472@163.com> Date: Wed, 20 Apr 2022 13:48:56 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/api/RemoteFileService.java | 8 ++--- .../ruoyi/system/api/RemoteLogService.java | 8 ++--- .../ruoyi/system/api/RemoteUserService.java | 8 ++--- .../com/ruoyi/system/api/domain/SysDept.java | 11 +++--- .../ruoyi/system/api/domain/SysDictData.java | 9 ++--- .../ruoyi/system/api/domain/SysDictType.java | 11 +++--- .../system/api/domain/SysLogininfor.java | 3 +- .../ruoyi/system/api/domain/SysOperLog.java | 3 +- .../com/ruoyi/system/api/domain/SysRole.java | 9 ++--- .../com/ruoyi/system/api/domain/SysUser.java | 13 ++++--- .../factory/RemoteFileFallbackFactory.java | 6 ++-- .../api/factory/RemoteLogFallbackFactory.java | 8 ++--- .../factory/RemoteUserFallbackFactory.java | 8 ++--- .../com/ruoyi/system/api/model/LoginUser.java | 3 +- .../com/ruoyi/auth/RuoYiAuthApplication.java | 2 +- .../auth/controller/TokenController.java | 13 +++---- .../ruoyi/auth/service/SysLoginService.java | 4 +-- .../ruoyi/common/core/annotation/Excel.java | 3 +- .../core/context/SecurityContextHolder.java | 5 +-- .../file/InvalidExtensionException.java | 3 +- .../ruoyi/common/core/text/CharsetKit.java | 3 +- .../ruoyi/common/core/utils/DateUtils.java | 9 ++--- .../common/core/utils/ExceptionUtil.java | 3 +- .../com/ruoyi/common/core/utils/JwtUtils.java | 3 +- .../ruoyi/common/core/utils/ServletUtils.java | 29 ++++++++-------- .../core/utils/bean/BeanValidators.java | 2 +- .../common/core/utils/file/ImageUtils.java | 7 ++-- .../com/ruoyi/common/core/utils/uuid/Seq.java | 3 +- .../core/web/controller/BaseController.java | 15 ++++---- .../common/core/web/domain/AjaxResult.java | 3 +- .../ruoyi/common/core/xss/XssValidator.java | 7 ++-- .../datascope/annotation/DataScope.java | 6 +--- .../datascope/aspect/DataScopeAspect.java | 8 ++--- .../common/datasource/annotation/Master.java | 7 ++-- .../common/datasource/annotation/Slave.java | 7 ++-- .../com/ruoyi/common/log/annotation/Log.java | 7 ++-- .../ruoyi/common/log/aspect/LogAspect.java | 27 ++++++++------- .../common/log/service/AsyncLogService.java | 6 ++-- .../FastJson2JsonRedisSerializer.java | 3 +- .../common/redis/configure/RedisConfig.java | 10 +++--- .../common/redis/service/RedisService.java | 9 ++--- .../annotation/EnableRyFeignClients.java | 1 + .../security/aspect/InnerAuthAspect.java | 10 +++--- .../security/aspect/PreAuthorizeAspect.java | 11 +++--- .../ruoyi/common/security/auth/AuthLogic.java | 9 ++--- .../security/config/ApplicationConfig.java | 3 +- .../common/security/config/WebMvcConfig.java | 2 +- .../feign/FeignAutoConfiguration.java | 2 +- .../feign/FeignRequestInterceptor.java | 7 ++-- .../handler/GlobalExceptionHandler.java | 17 +++++----- .../interceptor/HeaderInterceptor.java | 9 ++--- .../common/security/utils/DictUtils.java | 5 +-- .../common/security/utils/SecurityUtils.java | 5 +-- .../config/SwaggerBeanPostProcessor.java | 1 + .../ruoyi/gateway/config/CaptchaConfig.java | 8 +++-- .../ruoyi/gateway/config/GatewayConfig.java | 2 +- .../config/RouterFunctionConfiguration.java | 2 +- .../ruoyi/gateway/config/SwaggerProvider.java | 5 +-- .../properties/IgnoreWhiteProperties.java | 5 +-- .../config/properties/XssProperties.java | 5 +-- .../com/ruoyi/gateway/filter/AuthFilter.java | 18 +++++----- .../gateway/filter/BlackListUrlFilter.java | 9 ++--- .../gateway/filter/CacheRequestFilter.java | 6 ++-- .../gateway/filter/ValidateCodeFilter.java | 17 +++++----- .../handler/GatewayExceptionHandler.java | 4 +-- .../gateway/handler/ValidateCodeHandler.java | 9 ++--- .../gateway/service/ValidateCodeService.java | 3 +- .../service/impl/ValidateCodeServiceImpl.java | 17 +++++----- .../com/ruoyi/file/RuoYiFileApplication.java | 2 +- .../com/ruoyi/file/config/MinioConfig.java | 2 +- .../ruoyi/file/config/ResourcesConfig.java | 3 +- .../file/controller/SysFileController.java | 8 ++--- .../service/FastDfsSysFileServiceImpl.java | 4 +-- .../file/service/LocalSysFileServiceImpl.java | 2 +- .../file/service/MinioSysFileServiceImpl.java | 6 ++-- .../com/ruoyi/file/utils/FileUploadUtils.java | 13 +++---- .../com/ruoyi/gen/RuoYiGenApplication.java | 4 +-- .../java/com/ruoyi/gen/domain/GenTable.java | 9 ++--- .../com/ruoyi/gen/domain/GenTableColumn.java | 4 +-- .../gen/mapper/GenTableColumnMapper.java | 3 +- .../com/ruoyi/gen/mapper/GenTableMapper.java | 3 +- .../service/GenTableColumnServiceImpl.java | 7 ++-- .../gen/service/IGenTableColumnService.java | 3 +- .../ruoyi/gen/service/IGenTableService.java | 3 +- .../ruoyi/gen/util/VelocityInitializer.java | 5 +-- .../com/ruoyi/job/RuoYiJobApplication.java | 4 +-- .../com/ruoyi/job/config/ScheduleConfig.java | 5 +-- .../job/controller/SysJobController.java | 18 ++++------ .../job/controller/SysJobLogController.java | 14 +++----- .../java/com/ruoyi/job/domain/SysJob.java | 11 +++--- .../java/com/ruoyi/job/domain/SysJobLog.java | 7 ++-- .../com/ruoyi/job/mapper/SysJobLogMapper.java | 3 +- .../com/ruoyi/job/mapper/SysJobMapper.java | 3 +- .../ruoyi/job/service/ISysJobLogService.java | 3 +- .../job/service/SysJobLogServiceImpl.java | 7 ++-- .../ruoyi/job/service/SysJobServiceImpl.java | 17 +++++----- .../main/java/com/ruoyi/job/task/RyTask.java | 2 +- .../com/ruoyi/job/util/AbstractQuartzJob.java | 13 +++---- .../java/com/ruoyi/job/util/CronUtils.java | 3 +- .../com/ruoyi/job/util/JobInvokeUtil.java | 7 ++-- .../QuartzDisallowConcurrentExecution.java | 3 +- .../ruoyi/job/util/QuartzJobExecution.java | 3 +- .../com/ruoyi/job/util/ScheduleUtils.java | 11 +----- .../ruoyi/system/RuoYiSystemApplication.java | 4 +-- .../controller/SysConfigController.java | 18 ++++------ .../system/controller/SysDeptController.java | 20 ++++------- .../controller/SysDictDataController.java | 20 ++++------- .../controller/SysDictTypeController.java | 18 ++++------ .../controller/SysLogininforController.java | 15 +++----- .../system/controller/SysMenuController.java | 16 +++------ .../controller/SysNoticeController.java | 16 +++------ .../controller/SysOperlogController.java | 15 +++----- .../system/controller/SysPostController.java | 18 ++++------ .../controller/SysProfileController.java | 15 +++----- .../system/controller/SysRoleController.java | 18 ++++------ .../system/controller/SysUserController.java | 34 +++++++------------ .../controller/SysUserOnlineController.java | 17 ++++------ .../com/ruoyi/system/domain/SysConfig.java | 9 ++--- .../java/com/ruoyi/system/domain/SysMenu.java | 11 +++--- .../com/ruoyi/system/domain/SysNotice.java | 9 ++--- .../java/com/ruoyi/system/domain/SysPost.java | 9 ++--- .../com/ruoyi/system/domain/vo/RouterVo.java | 1 + .../ruoyi/system/domain/vo/TreeSelect.java | 7 ++-- .../ruoyi/system/mapper/SysConfigMapper.java | 3 +- .../ruoyi/system/mapper/SysDeptMapper.java | 5 +-- .../system/mapper/SysDictDataMapper.java | 5 +-- .../system/mapper/SysDictTypeMapper.java | 5 +-- .../ruoyi/system/mapper/SysMenuMapper.java | 5 +-- .../ruoyi/system/mapper/SysNoticeMapper.java | 3 +- .../ruoyi/system/mapper/SysPostMapper.java | 3 +- .../system/mapper/SysRoleDeptMapper.java | 3 +- .../ruoyi/system/mapper/SysRoleMapper.java | 3 +- .../system/mapper/SysRoleMenuMapper.java | 3 +- .../ruoyi/system/mapper/SysUserMapper.java | 5 +-- .../system/mapper/SysUserPostMapper.java | 3 +- .../system/mapper/SysUserRoleMapper.java | 5 +-- .../system/service/ISysConfigService.java | 3 +- .../ruoyi/system/service/ISysDeptService.java | 3 +- .../system/service/ISysDictDataService.java | 3 +- .../system/service/ISysDictTypeService.java | 3 +- .../ruoyi/system/service/ISysMenuService.java | 5 +-- .../system/service/ISysNoticeService.java | 3 +- .../system/service/ISysOperLogService.java | 3 +- .../ruoyi/system/service/ISysPostService.java | 3 +- .../ruoyi/system/service/ISysRoleService.java | 5 +-- .../ruoyi/system/service/ISysUserService.java | 3 +- .../service/impl/SysConfigServiceImpl.java | 11 +++--- .../service/impl/SysDeptServiceImpl.java | 13 +++---- .../service/impl/SysDictDataServiceImpl.java | 7 ++-- .../service/impl/SysDictTypeServiceImpl.java | 17 +++++----- .../impl/SysLogininforServiceImpl.java | 7 ++-- .../service/impl/SysMenuServiceImpl.java | 15 +++----- .../service/impl/SysNoticeServiceImpl.java | 7 ++-- .../service/impl/SysOperLogServiceImpl.java | 7 ++-- .../service/impl/SysPostServiceImpl.java | 7 ++-- .../service/impl/SysRoleServiceImpl.java | 13 +++---- .../impl/SysUserOnlineServiceImpl.java | 2 +- .../service/impl/SysUserServiceImpl.java | 27 +++++++-------- .../monitor/RuoYiMonitorApplication.java | 2 +- 159 files changed, 600 insertions(+), 629 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java index b85890b2..ade1ee8f 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java @@ -1,14 +1,14 @@ package com.ruoyi.system.api; +import com.ruoyi.common.core.constant.ServiceNameConstants; +import com.ruoyi.common.core.domain.Rust; +import com.ruoyi.system.api.domain.SysFile; +import com.ruoyi.system.api.factory.RemoteFileFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.core.constant.ServiceNameConstants; -import com.ruoyi.common.core.domain.Rust; -import com.ruoyi.system.api.domain.SysFile; -import com.ruoyi.system.api.factory.RemoteFileFallbackFactory; /** * 鏂囦欢鏈嶅姟 diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java index 3b3353ec..d225287a 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java @@ -1,15 +1,15 @@ package com.ruoyi.system.api; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.Rust; import com.ruoyi.system.api.domain.SysLogininfor; import com.ruoyi.system.api.domain.SysOperLog; import com.ruoyi.system.api.factory.RemoteLogFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; /** * 鏃ュ織鏈嶅姟 diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java index 17b19742..3f29359b 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java @@ -1,17 +1,13 @@ package com.ruoyi.system.api; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.Rust; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.factory.RemoteUserFallbackFactory; import com.ruoyi.system.api.model.LoginUser; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; /** * 鐢ㄦ埛鏈嶅姟 diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java index 04a4e1b9..8fa55bf3 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java @@ -1,13 +1,14 @@ package com.ruoyi.system.api.domain; -import java.util.ArrayList; -import java.util.List; +import com.ruoyi.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.web.domain.BaseEntity; +import java.util.ArrayList; +import java.util.List; /** * 閮ㄩ棬琛 sys_dept diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java index dadca63b..91546cc2 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java @@ -1,13 +1,14 @@ package com.ruoyi.system.api.domain; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; /** * 瀛楀吀鏁版嵁琛 sys_dict_data diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java index 4a558745..38b6e8e7 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java @@ -1,13 +1,14 @@ package com.ruoyi.system.api.domain; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.ruoyi.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; /** * 瀛楀吀绫诲瀷琛 sys_dict_type diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java index e586c930..115e3efa 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java @@ -1,11 +1,12 @@ package com.ruoyi.system.api.domain; -import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.ruoyi.common.core.web.domain.BaseEntity; +import java.util.Date; + /** * 绯荤粺璁块棶璁板綍琛 sys_logininfor * diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java index f3b54ff4..d57964a3 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java @@ -1,11 +1,12 @@ package com.ruoyi.system.api.domain; -import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.ruoyi.common.core.web.domain.BaseEntity; +import java.util.Date; + /** * 鎿嶄綔鏃ュ織璁板綍琛 oper_log * diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java index 8305b993..637edf48 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java @@ -1,12 +1,13 @@ package com.ruoyi.system.api.domain; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.ruoyi.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; /** * 瑙掕壊琛 sys_role diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java index f11f35fd..c6fcec50 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java @@ -1,10 +1,5 @@ package com.ruoyi.system.api.domain; -import java.util.Date; -import java.util.List; -import javax.validation.constraints.*; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.fasterxml.jackson.annotation.JsonProperty; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel.ColumnType; @@ -12,6 +7,14 @@ import com.ruoyi.common.core.annotation.Excel.Type; import com.ruoyi.common.core.annotation.Excels; import com.ruoyi.common.core.web.domain.BaseEntity; import com.ruoyi.common.core.xss.Xss; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.util.Date; +import java.util.List; /** * 鐢ㄦ埛瀵硅薄 sys_user diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java index 8c226bc2..f101fa3a 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java @@ -1,13 +1,13 @@ package com.ruoyi.system.api.factory; +import com.ruoyi.common.core.domain.Rust; +import com.ruoyi.system.api.RemoteFileService; +import com.ruoyi.system.api.domain.SysFile; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.core.domain.Rust; -import com.ruoyi.system.api.RemoteFileService; -import com.ruoyi.system.api.domain.SysFile; /** * 鏂囦欢鏈嶅姟闄嶇骇澶勭悊 diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java index dd2c1f9a..251ad3a0 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java @@ -1,13 +1,13 @@ package com.ruoyi.system.api.factory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.cloud.openfeign.FallbackFactory; -import org.springframework.stereotype.Component; import com.ruoyi.common.core.domain.Rust; import com.ruoyi.system.api.RemoteLogService; import com.ruoyi.system.api.domain.SysLogininfor; import com.ruoyi.system.api.domain.SysOperLog; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; /** * 鏃ュ織鏈嶅姟闄嶇骇澶勭悊 diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java index b9fb99c0..c7afdfef 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java @@ -1,13 +1,13 @@ package com.ruoyi.system.api.factory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.cloud.openfeign.FallbackFactory; -import org.springframework.stereotype.Component; import com.ruoyi.common.core.domain.Rust; import com.ruoyi.system.api.RemoteUserService; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.model.LoginUser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; /** * 鐢ㄦ埛鏈嶅姟闄嶇骇澶勭悊 diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java index 2f00e102..5522653c 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java @@ -1,8 +1,9 @@ package com.ruoyi.system.api.model; +import com.ruoyi.system.api.domain.SysUser; + import java.io.Serializable; import java.util.Set; -import com.ruoyi.system.api.domain.SysUser; /** * 鐢ㄦ埛淇℃伅 diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java index 00a499df..32b09f88 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java @@ -1,9 +1,9 @@ package com.ruoyi.auth; +import com.ruoyi.common.security.annotation.EnableRyFeignClients; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import com.ruoyi.common.security.annotation.EnableRyFeignClients; /** * 璁よ瘉鎺堟潈涓績 diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java index 0d1bb2c7..6fcbffb6 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java @@ -1,11 +1,5 @@ package com.ruoyi.auth.controller; -import javax.servlet.http.HttpServletRequest; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; import com.ruoyi.auth.form.LoginBody; import com.ruoyi.auth.form.RegisterBody; import com.ruoyi.auth.service.SysLoginService; @@ -16,6 +10,13 @@ import com.ruoyi.common.security.auth.AuthUtil; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.model.LoginUser; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; /** * token 鎺у埗 diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java index 8d46265d..748b43a0 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java @@ -1,7 +1,5 @@ package com.ruoyi.auth.service; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; import com.ruoyi.common.core.constant.Constants; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.constant.UserConstants; @@ -17,6 +15,8 @@ import com.ruoyi.system.api.RemoteUserService; import com.ruoyi.system.api.domain.SysLogininfor; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.model.LoginUser; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; /** * 鐧诲綍鏍￠獙鏂规硶 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java index 60b7e839..d8ff08f7 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java @@ -1,11 +1,12 @@ package com.ruoyi.common.core.annotation; +import com.ruoyi.common.core.utils.poi.ExcelHandlerAdapter; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.math.BigDecimal; -import com.ruoyi.common.core.utils.poi.ExcelHandlerAdapter; /** * 鑷畾涔夊鍑篍xcel鏁版嵁娉ㄨВ diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java index 866eee5f..c350298a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java @@ -1,12 +1,13 @@ package com.ruoyi.common.core.context; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; import com.alibaba.ttl.TransmittableThreadLocal; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.core.utils.StringUtils; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + /** * 鑾峰彇褰撳墠绾跨▼鍙橀噺涓殑 鐢ㄦ埛id銆佺敤鎴峰悕绉般乀oken绛変俊鎭 * 娉ㄦ剰锛 蹇呴』鍦ㄧ綉鍏抽氳繃璇锋眰澶寸殑鏂规硶浼犲叆锛屽悓鏃跺湪HeaderInterceptor鎷︽埅鍣ㄨ缃笺 鍚﹀垯杩欓噷鏃犳硶鑾峰彇 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java index 33b6912a..79b18feb 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java @@ -1,8 +1,9 @@ package com.ruoyi.common.core.exception.file; -import java.util.Arrays; import org.apache.commons.fileupload.FileUploadException; +import java.util.Arrays; + /** * 鏂囦欢涓婁紶 璇紓甯哥被 * diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java index 662f817f..f973dd7d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java @@ -1,8 +1,9 @@ package com.ruoyi.common.core.text; +import com.ruoyi.common.core.utils.StringUtils; + import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import com.ruoyi.common.core.utils.StringUtils; /** * 瀛楃闆嗗伐鍏风被 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java index 9cbb459b..bbec17aa 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java @@ -1,15 +1,12 @@ package com.ruoyi.common.core.utils; +import org.apache.commons.lang3.time.DateFormatUtils; + import java.lang.management.ManagementFactory; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.ZoneId; -import java.time.ZonedDateTime; +import java.time.*; import java.util.Date; -import org.apache.commons.lang3.time.DateFormatUtils; /** * 鏃堕棿宸ュ叿绫 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java index f75e5597..e74c7197 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java @@ -1,8 +1,9 @@ package com.ruoyi.common.core.utils; +import org.apache.commons.lang3.exception.ExceptionUtils; + import java.io.PrintWriter; import java.io.StringWriter; -import org.apache.commons.lang3.exception.ExceptionUtils; /** * 閿欒淇℃伅澶勭悊绫汇 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java index abe93c0c..85c5e2e1 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java @@ -1,6 +1,5 @@ package com.ruoyi.common.core.utils; -import java.util.Map; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.constant.TokenConstants; import com.ruoyi.common.core.text.Convert; @@ -8,6 +7,8 @@ import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; +import java.util.Map; + /** * Jwt宸ュ叿绫 * diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java index 66907b67..307607c7 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java @@ -1,15 +1,9 @@ package com.ruoyi.common.core.utils; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import java.net.URLEncoder; -import java.util.Enumeration; -import java.util.LinkedHashMap; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import com.alibaba.fastjson.JSONObject; +import com.ruoyi.common.core.constant.Constants; +import com.ruoyi.common.core.domain.Rust; +import com.ruoyi.common.core.text.Convert; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; @@ -18,12 +12,19 @@ import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.core.constant.Constants; -import com.ruoyi.common.core.domain.Rust; -import com.ruoyi.common.core.text.Convert; import reactor.core.publisher.Mono; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.net.URLEncoder; +import java.util.Enumeration; +import java.util.LinkedHashMap; +import java.util.Map; + /** * 瀹㈡埛绔伐鍏风被 * diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java index 75877262..322e6876 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java @@ -1,9 +1,9 @@ package com.ruoyi.common.core.utils.bean; -import java.util.Set; import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; import javax.validation.Validator; +import java.util.Set; /** * bean瀵硅薄灞炴ч獙璇 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java index c3b19fc4..cd8de02b 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java @@ -1,13 +1,14 @@ package com.ruoyi.common.core.utils.file; +import org.apache.poi.util.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.ByteArrayInputStream; import java.io.InputStream; import java.net.URL; import java.net.URLConnection; import java.util.Arrays; -import org.apache.poi.util.IOUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * 鍥剧墖澶勭悊宸ュ叿绫 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java index c19ad745..389ea650 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java @@ -1,9 +1,10 @@ package com.ruoyi.common.core.utils.uuid; -import java.util.concurrent.atomic.AtomicInteger; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.StringUtils; +import java.util.concurrent.atomic.AtomicInteger; + /** * @author ruoyi 搴忓垪鐢熸垚绫 */ diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java index 609238e8..06c16449 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java @@ -1,18 +1,19 @@ package com.ruoyi.common.core.web.controller; -import java.beans.PropertyEditorSupport; -import java.util.Date; -import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.web.bind.WebDataBinder; -import org.springframework.web.bind.annotation.InitBinder; import com.github.pagehelper.PageInfo; import com.ruoyi.common.core.constant.HttpStatus; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.PageUtils; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.TableDataInfo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.WebDataBinder; +import org.springframework.web.bind.annotation.InitBinder; + +import java.beans.PropertyEditorSupport; +import java.util.Date; +import java.util.List; /** * web灞傞氱敤鏁版嵁澶勭悊 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java index 626f4afb..2c4993b9 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java @@ -1,9 +1,10 @@ package com.ruoyi.common.core.web.domain; -import java.util.HashMap; import com.ruoyi.common.core.constant.HttpStatus; import com.ruoyi.common.core.utils.StringUtils; +import java.util.HashMap; + /** * 鎿嶄綔娑堟伅鎻愰啋 * diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java index 92405c25..c4de8def 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java @@ -1,10 +1,11 @@ package com.ruoyi.common.core.xss; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import com.ruoyi.common.core.utils.StringUtils; + import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import com.ruoyi.common.core.utils.StringUtils; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * 鑷畾涔墄ss鏍￠獙娉ㄨВ瀹炵幇 diff --git a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java index de78297a..3ba0d376 100644 --- a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java +++ b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java @@ -1,10 +1,6 @@ package com.ruoyi.common.datascope.annotation; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * 鏁版嵁鏉冮檺杩囨护娉ㄨВ diff --git a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java index ad827d15..abf3bab2 100644 --- a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java +++ b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java @@ -1,9 +1,5 @@ package com.ruoyi.common.datascope.aspect; -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; -import org.springframework.stereotype.Component; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.domain.BaseEntity; import com.ruoyi.common.datascope.annotation.DataScope; @@ -11,6 +7,10 @@ import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.domain.SysRole; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.model.LoginUser; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.springframework.stereotype.Component; /** * 鏁版嵁杩囨护澶勭悊 diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java b/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java index 6ebec02c..711ff580 100644 --- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java +++ b/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java @@ -1,12 +1,9 @@ package com.ruoyi.common.datasource.annotation; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; import com.baomidou.dynamic.datasource.annotation.DS; +import java.lang.annotation.*; + /** * 涓诲簱鏁版嵁婧 * diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java b/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java index 9ee09413..86391d9f 100644 --- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java +++ b/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java @@ -1,12 +1,9 @@ package com.ruoyi.common.datasource.annotation; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; import com.baomidou.dynamic.datasource.annotation.DS; +import java.lang.annotation.*; + /** * 浠庡簱鏁版嵁婧 * diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java index 41163441..6fdc6719 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java @@ -1,13 +1,10 @@ package com.ruoyi.common.log.annotation; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.log.enums.OperatorType; +import java.lang.annotation.*; + /** * 鑷畾涔夋搷浣滄棩蹇楄褰曟敞瑙 * diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java index c7237f15..363b52ee 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java @@ -1,9 +1,14 @@ package com.ruoyi.common.log.aspect; -import java.util.Collection; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.alibaba.fastjson.JSON; +import com.ruoyi.common.core.utils.ServletUtils; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.core.utils.ip.IpUtils; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessStatus; +import com.ruoyi.common.log.service.AsyncLogService; +import com.ruoyi.common.security.utils.SecurityUtils; +import com.ruoyi.system.api.domain.SysOperLog; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.AfterThrowing; @@ -15,15 +20,11 @@ import org.springframework.http.HttpMethod; import org.springframework.stereotype.Component; import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; -import com.alibaba.fastjson.JSON; -import com.ruoyi.common.core.utils.ServletUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.ip.IpUtils; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessStatus; -import com.ruoyi.common.log.service.AsyncLogService; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.domain.SysOperLog; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Collection; +import java.util.Map; /** * 鎿嶄綔鏃ュ織璁板綍澶勭悊 diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java index 4f5986d1..6ce39912 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java @@ -1,11 +1,11 @@ package com.ruoyi.common.log.service; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.system.api.RemoteLogService; import com.ruoyi.system.api.domain.SysOperLog; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; /** * 寮傛璋冪敤鏃ュ織鏈嶅姟 diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java index 012eeb8e..c9781099 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java @@ -1,14 +1,15 @@ package com.ruoyi.common.redis.configure; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.parser.ParserConfig; import com.alibaba.fastjson.serializer.SerializerFeature; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.type.TypeFactory; import org.springframework.data.redis.serializer.RedisSerializer; import org.springframework.data.redis.serializer.SerializationException; -import com.alibaba.fastjson.parser.ParserConfig; import org.springframework.util.Assert; + import java.nio.charset.Charset; /** diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java index 31238d63..58afede4 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java @@ -1,5 +1,10 @@ package com.ruoyi.common.redis.configure; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator; import org.springframework.cache.annotation.CachingConfigurerSupport; import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.Bean; @@ -7,11 +12,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.serializer.StringRedisSerializer; -import com.fasterxml.jackson.annotation.JsonAutoDetect; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.PropertyAccessor; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator; /** * redis閰嶇疆 diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java index 82efb9b1..9797ea65 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java @@ -1,11 +1,5 @@ package com.ruoyi.common.redis.service; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.TimeUnit; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.BoundSetOperations; import org.springframework.data.redis.core.HashOperations; @@ -13,6 +7,9 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ValueOperations; import org.springframework.stereotype.Component; +import java.util.*; +import java.util.concurrent.TimeUnit; + /** * spring redis 宸ュ叿绫 * diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java index 066e8349..a15ccb00 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java @@ -1,6 +1,7 @@ package com.ruoyi.common.security.annotation; import org.springframework.cloud.openfeign.EnableFeignClients; + import java.lang.annotation.*; /** diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java index 15c76e44..e9fa384d 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java @@ -1,15 +1,15 @@ package com.ruoyi.common.security.aspect; -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; -import org.springframework.core.Ordered; -import org.springframework.stereotype.Component; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.exception.InnerAuthException; import com.ruoyi.common.core.utils.ServletUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.security.annotation.InnerAuth; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.springframework.core.Ordered; +import org.springframework.stereotype.Component; /** * 鍐呴儴鏈嶅姟璋冪敤楠岃瘉澶勭悊 diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java index 7877820b..e9b15a4e 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java @@ -1,16 +1,17 @@ package com.ruoyi.common.security.aspect; -import java.lang.reflect.Method; +import com.ruoyi.common.security.annotation.RequiresLogin; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.ruoyi.common.security.annotation.RequiresRoles; +import com.ruoyi.common.security.auth.AuthUtil; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; import org.springframework.stereotype.Component; -import com.ruoyi.common.security.annotation.RequiresLogin; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.annotation.RequiresRoles; -import com.ruoyi.common.security.auth.AuthUtil; + +import java.lang.reflect.Method; /** * 鍩轰簬 Spring Aop 鐨勬敞瑙ｉ壌鏉 diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java index 61820df5..fe92dca0 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java @@ -1,9 +1,5 @@ package com.ruoyi.common.security.auth; -import java.util.Collection; -import java.util.HashSet; -import java.util.Set; -import org.springframework.util.PatternMatchUtils; import com.ruoyi.common.core.exception.auth.NotLoginException; import com.ruoyi.common.core.exception.auth.NotPermissionException; import com.ruoyi.common.core.exception.auth.NotRoleException; @@ -16,6 +12,11 @@ import com.ruoyi.common.security.annotation.RequiresRoles; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.model.LoginUser; +import org.springframework.util.PatternMatchUtils; + +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; /** * Token 鏉冮檺楠岃瘉锛岄昏緫瀹炵幇绫 diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java index a7a64c9e..990ebb5b 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java @@ -1,9 +1,10 @@ package com.ruoyi.common.security.config; -import java.util.TimeZone; import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; import org.springframework.context.annotation.Bean; +import java.util.TimeZone; + /** * 绯荤粺閰嶇疆 * diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java index b2420261..8f5d6411 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java @@ -1,8 +1,8 @@ package com.ruoyi.common.security.config; +import com.ruoyi.common.security.interceptor.HeaderInterceptor; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import com.ruoyi.common.security.interceptor.HeaderInterceptor; /** * 鎷︽埅鍣ㄩ厤缃 diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java index 934a9598..a3462a82 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java @@ -1,8 +1,8 @@ package com.ruoyi.common.security.feign; +import feign.RequestInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import feign.RequestInterceptor; /** * Feign 閰嶇疆娉ㄥ唽 diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java index ccfa07f4..4cd5b471 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java @@ -1,14 +1,15 @@ package com.ruoyi.common.security.feign; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import org.springframework.stereotype.Component; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.utils.ServletUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.ip.IpUtils; import feign.RequestInterceptor; import feign.RequestTemplate; +import org.springframework.stereotype.Component; + +import javax.servlet.http.HttpServletRequest; +import java.util.Map; /** * feign 璇锋眰鎷︽埅鍣 diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java index 5a9da772..c39de53f 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java @@ -1,13 +1,5 @@ package com.ruoyi.common.security.handler; -import javax.servlet.http.HttpServletRequest; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.validation.BindException; -import org.springframework.web.HttpRequestMethodNotSupportedException; -import org.springframework.web.bind.MethodArgumentNotValidException; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.RestControllerAdvice; import com.ruoyi.common.core.constant.HttpStatus; import com.ruoyi.common.core.exception.DemoModeException; import com.ruoyi.common.core.exception.InnerAuthException; @@ -16,6 +8,15 @@ import com.ruoyi.common.core.exception.auth.NotPermissionException; import com.ruoyi.common.core.exception.auth.NotRoleException; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.domain.AjaxResult; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.validation.BindException; +import org.springframework.web.HttpRequestMethodNotSupportedException; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +import javax.servlet.http.HttpServletRequest; /** * 鍏ㄥ眬寮傚父澶勭悊鍣 diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java index 3453e1d1..bfc58ffe 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java @@ -1,9 +1,5 @@ package com.ruoyi.common.security.interceptor; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.springframework.web.method.HandlerMethod; -import org.springframework.web.servlet.AsyncHandlerInterceptor; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.context.SecurityContextHolder; import com.ruoyi.common.core.utils.ServletUtils; @@ -11,6 +7,11 @@ import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.security.auth.AuthUtil; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.model.LoginUser; +import org.springframework.web.method.HandlerMethod; +import org.springframework.web.servlet.AsyncHandlerInterceptor; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * 鑷畾涔夎姹傚ご鎷︽埅鍣紝灏咹eader鏁版嵁灏佽鍒扮嚎绋嬪彉閲忎腑鏂逛究鑾峰彇 diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java index 9768c6d8..4fdd4eb2 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java @@ -1,13 +1,14 @@ package com.ruoyi.common.security.utils; -import java.util.Collection; -import java.util.List; import com.ruoyi.common.core.constant.Constants; import com.ruoyi.common.core.utils.SpringUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.system.api.domain.SysDictData; +import java.util.Collection; +import java.util.List; + /** * 瀛楀吀宸ュ叿绫 * diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java index 78a53932..90a7807d 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java @@ -1,13 +1,14 @@ package com.ruoyi.common.security.utils; -import javax.servlet.http.HttpServletRequest; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.constant.TokenConstants; import com.ruoyi.common.core.context.SecurityContextHolder; import com.ruoyi.common.core.utils.ServletUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.system.api.model.LoginUser; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; + +import javax.servlet.http.HttpServletRequest; /** * 鏉冮檺鑾峰彇宸ュ叿绫 diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerBeanPostProcessor.java b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerBeanPostProcessor.java index 8498f65b..8929adfb 100644 --- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerBeanPostProcessor.java +++ b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerBeanPostProcessor.java @@ -7,6 +7,7 @@ import org.springframework.util.ReflectionUtils; import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping; import springfox.documentation.spring.web.plugins.WebFluxRequestHandlerProvider; import springfox.documentation.spring.web.plugins.WebMvcRequestHandlerProvider; + import java.lang.reflect.Field; import java.util.List; import java.util.stream.Collectors; diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java index 963425e6..0679f991 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java @@ -1,10 +1,12 @@ package com.ruoyi.gateway.config; -import java.util.Properties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import com.google.code.kaptcha.impl.DefaultKaptcha; import com.google.code.kaptcha.util.Config; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.Properties; + import static com.google.code.kaptcha.Constants.*; /** diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java index 8d0fee4e..b133a7d8 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java @@ -1,10 +1,10 @@ package com.ruoyi.gateway.config; +import com.ruoyi.gateway.handler.SentinelFallbackHandler; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; -import com.ruoyi.gateway.handler.SentinelFallbackHandler; /** * 缃戝叧闄愭祦閰嶇疆 diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java index 7e4cdf23..8643b8af 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java @@ -1,5 +1,6 @@ package com.ruoyi.gateway.config; +import com.ruoyi.gateway.handler.ValidateCodeHandler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -7,7 +8,6 @@ import org.springframework.http.MediaType; import org.springframework.web.reactive.function.server.RequestPredicates; import org.springframework.web.reactive.function.server.RouterFunction; import org.springframework.web.reactive.function.server.RouterFunctions; -import com.ruoyi.gateway.handler.ValidateCodeHandler; /** * 璺敱閰嶇疆淇℃伅 diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java index 67f18b7d..256f2d79 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java @@ -1,7 +1,5 @@ package com.ruoyi.gateway.config; -import java.util.ArrayList; -import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.gateway.config.GatewayProperties; import org.springframework.cloud.gateway.route.RouteLocator; @@ -12,6 +10,9 @@ import org.springframework.web.reactive.config.WebFluxConfigurer; import springfox.documentation.swagger.web.SwaggerResource; import springfox.documentation.swagger.web.SwaggerResourcesProvider; +import java.util.ArrayList; +import java.util.List; + /** * 鑱氬悎绯荤粺鎺ュ彛 * diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java index 7df11713..6a44df18 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java @@ -1,11 +1,12 @@ package com.ruoyi.gateway.config.properties; -import java.util.ArrayList; -import java.util.List; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.annotation.Configuration; +import java.util.ArrayList; +import java.util.List; + /** * 鏀捐鐧藉悕鍗曢厤缃 * diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java index 834188ba..09ca80bc 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java @@ -1,11 +1,12 @@ package com.ruoyi.gateway.config.properties; -import java.util.ArrayList; -import java.util.List; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.annotation.Configuration; +import java.util.ArrayList; +import java.util.List; + /** * XSS璺ㄧ珯鑴氭湰閰嶇疆 * diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java index 9ea1d8d9..b08f9915 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java @@ -1,14 +1,5 @@ package com.ruoyi.gateway.filter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.gateway.filter.GatewayFilterChain; -import org.springframework.cloud.gateway.filter.GlobalFilter; -import org.springframework.core.Ordered; -import org.springframework.http.server.reactive.ServerHttpRequest; -import org.springframework.stereotype.Component; -import org.springframework.web.server.ServerWebExchange; import com.ruoyi.common.core.constant.CacheConstants; import com.ruoyi.common.core.constant.HttpStatus; import com.ruoyi.common.core.constant.SecurityConstants; @@ -19,6 +10,15 @@ import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.gateway.config.properties.IgnoreWhiteProperties; import io.jsonwebtoken.Claims; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.gateway.filter.GatewayFilterChain; +import org.springframework.cloud.gateway.filter.GlobalFilter; +import org.springframework.core.Ordered; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.stereotype.Component; +import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Mono; /** diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java index ec7801b2..a17a8a1a 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java @@ -1,12 +1,13 @@ package com.ruoyi.gateway.filter; -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Pattern; +import com.ruoyi.common.core.utils.ServletUtils; import org.springframework.cloud.gateway.filter.GatewayFilter; import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory; import org.springframework.stereotype.Component; -import com.ruoyi.common.core.utils.ServletUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Pattern; /** * 榛戝悕鍗曡繃婊ゅ櫒 diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java index a3866065..87cb8db4 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java @@ -1,8 +1,5 @@ package com.ruoyi.gateway.filter; -import java.util.Collections; -import java.util.List; - import com.ruoyi.common.core.utils.StringUtils; import org.springframework.cloud.gateway.filter.GatewayFilter; import org.springframework.cloud.gateway.filter.GatewayFilterChain; @@ -18,6 +15,9 @@ import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +import java.util.Collections; +import java.util.List; + /** * 鑾峰彇body璇锋眰鏁版嵁锛堣В鍐虫祦涓嶈兘閲嶅璇诲彇闂锛 * diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java index 39fcd15d..69cf1450 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java @@ -1,8 +1,10 @@ package com.ruoyi.gateway.filter; -import java.nio.CharBuffer; -import java.nio.charset.StandardCharsets; -import java.util.concurrent.atomic.AtomicReference; +import com.alibaba.fastjson.JSONObject; +import com.ruoyi.common.core.utils.ServletUtils; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.gateway.config.properties.CaptchaProperties; +import com.ruoyi.gateway.service.ValidateCodeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.gateway.filter.GatewayFilter; import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory; @@ -10,13 +12,12 @@ import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DataBufferUtils; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.stereotype.Component; -import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.core.utils.ServletUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.gateway.config.properties.CaptchaProperties; -import com.ruoyi.gateway.service.ValidateCodeService; import reactor.core.publisher.Flux; +import java.nio.CharBuffer; +import java.nio.charset.StandardCharsets; +import java.util.concurrent.atomic.AtomicReference; + /** * 楠岃瘉鐮佽繃婊ゅ櫒 * diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java index 593e7e62..81deac6c 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java @@ -1,15 +1,15 @@ package com.ruoyi.gateway.handler; -import org.springframework.cloud.gateway.support.NotFoundException; +import com.ruoyi.common.core.utils.ServletUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.web.reactive.error.ErrorWebExceptionHandler; +import org.springframework.cloud.gateway.support.NotFoundException; import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.Order; import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.web.server.ResponseStatusException; import org.springframework.web.server.ServerWebExchange; -import com.ruoyi.common.core.utils.ServletUtils; import reactor.core.publisher.Mono; /** diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java index ef197deb..2e26eca3 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java @@ -1,6 +1,8 @@ package com.ruoyi.gateway.handler; -import java.io.IOException; +import com.ruoyi.common.core.exception.CaptchaException; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.gateway.service.ValidateCodeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Component; @@ -8,11 +10,10 @@ import org.springframework.web.reactive.function.BodyInserters; import org.springframework.web.reactive.function.server.HandlerFunction; import org.springframework.web.reactive.function.server.ServerRequest; import org.springframework.web.reactive.function.server.ServerResponse; -import com.ruoyi.common.core.exception.CaptchaException; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.gateway.service.ValidateCodeService; import reactor.core.publisher.Mono; +import java.io.IOException; + /** * 楠岃瘉鐮佽幏鍙 * diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java index 650be4a1..3a7bd981 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java @@ -1,9 +1,10 @@ package com.ruoyi.gateway.service; -import java.io.IOException; import com.ruoyi.common.core.exception.CaptchaException; import com.ruoyi.common.core.web.domain.AjaxResult; +import java.io.IOException; + /** * 楠岃瘉鐮佸鐞 * diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java index c15c8af3..e078eff1 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java @@ -1,13 +1,5 @@ package com.ruoyi.gateway.service.impl; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.util.concurrent.TimeUnit; -import javax.annotation.Resource; -import javax.imageio.ImageIO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.FastByteArrayOutputStream; import com.google.code.kaptcha.Producer; import com.ruoyi.common.core.constant.Constants; import com.ruoyi.common.core.exception.CaptchaException; @@ -18,6 +10,15 @@ import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.gateway.config.properties.CaptchaProperties; import com.ruoyi.gateway.service.ValidateCodeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.FastByteArrayOutputStream; + +import javax.annotation.Resource; +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.util.concurrent.TimeUnit; /** * 楠岃瘉鐮佸疄鐜板鐞 diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java index 1f320da9..dcd3e600 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java @@ -1,9 +1,9 @@ package com.ruoyi.file; +import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2; /** * 鏂囦欢鏈嶅姟 diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java index ee3e14c2..89ab2742 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java @@ -1,9 +1,9 @@ package com.ruoyi.file.config; +import io.minio.MinioClient; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import io.minio.MinioClient; /** * Minio 閰嶇疆淇℃伅 diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java index 3bca6686..f70c8a92 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java @@ -1,12 +1,13 @@ package com.ruoyi.file.config; -import java.io.File; 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; + /** * 閫氱敤鏄犲皠閰嶇疆 * diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java index 4c9aaa2a..98908316 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java @@ -1,15 +1,15 @@ package com.ruoyi.file.controller; +import com.ruoyi.common.core.domain.Rust; +import com.ruoyi.common.core.utils.file.FileUtils; +import com.ruoyi.file.service.ISysFileService; +import com.ruoyi.system.api.domain.SysFile; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.core.domain.Rust; -import com.ruoyi.common.core.utils.file.FileUtils; -import com.ruoyi.file.service.ISysFileService; -import com.ruoyi.system.api.domain.SysFile; /** * 鏂囦欢璇锋眰澶勭悊 diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java index deee22ee..cd8c354d 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java @@ -1,12 +1,12 @@ package com.ruoyi.file.service; +import com.github.tobato.fastdfs.domain.fdfs.StorePath; +import com.github.tobato.fastdfs.service.FastFileStorageClient; import org.apache.commons.io.FilenameUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import com.github.tobato.fastdfs.domain.fdfs.StorePath; -import com.github.tobato.fastdfs.service.FastFileStorageClient; /** * FastDFS 鏂囦欢瀛樺偍 diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java index c0e20681..1b26bf41 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java @@ -1,10 +1,10 @@ package com.ruoyi.file.service; +import com.ruoyi.file.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; -import com.ruoyi.file.utils.FileUploadUtils; /** * 鏈湴鏂囦欢瀛樺偍 diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java index 3dd2fc6f..49b15faf 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java @@ -1,12 +1,12 @@ package com.ruoyi.file.service; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; import com.ruoyi.file.config.MinioConfig; import com.ruoyi.file.utils.FileUploadUtils; import io.minio.MinioClient; import io.minio.PutObjectArgs; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; /** * Minio 鏂囦欢瀛樺偍 diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java index b317ec9d..22954c5f 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java @@ -1,11 +1,5 @@ package com.ruoyi.file.utils; -import java.io.File; -import java.io.IOException; -import java.nio.file.Paths; -import java.util.Objects; -import org.apache.commons.io.FilenameUtils; -import org.springframework.web.multipart.MultipartFile; import com.ruoyi.common.core.exception.file.FileNameLengthLimitExceededException; import com.ruoyi.common.core.exception.file.FileSizeLimitExceededException; import com.ruoyi.common.core.exception.file.InvalidExtensionException; @@ -13,6 +7,13 @@ import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.file.MimeTypeUtils; import com.ruoyi.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; /** * 鏂囦欢涓婁紶宸ュ叿绫 diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java index ebfa433e..b5c60f24 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java @@ -1,10 +1,10 @@ package com.ruoyi.gen; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; import com.ruoyi.common.security.annotation.EnableCustomConfig; import com.ruoyi.common.security.annotation.EnableRyFeignClients; import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; /** * 浠ｇ爜鐢熸垚 diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java index d08b7325..619f9aaf 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java @@ -1,12 +1,13 @@ package com.ruoyi.gen.domain; -import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import org.apache.commons.lang3.ArrayUtils; import com.ruoyi.common.core.constant.GenConstants; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.ArrayUtils; + +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import java.util.List; /** * 涓氬姟琛 gen_table diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java index 61c5c482..cdb5a68c 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java @@ -1,10 +1,10 @@ package com.ruoyi.gen.domain; -import javax.validation.constraints.NotBlank; - import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.domain.BaseEntity; +import javax.validation.constraints.NotBlank; + /** * 浠ｇ爜鐢熸垚涓氬姟瀛楁琛 gen_table_column * diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java index e5df0027..71ba93a3 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.gen.mapper; -import java.util.List; import com.ruoyi.gen.domain.GenTableColumn; +import java.util.List; + /** * 涓氬姟瀛楁 鏁版嵁灞 * diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java index 3d36d88e..a8f56692 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.gen.mapper; -import java.util.List; import com.ruoyi.gen.domain.GenTable; +import java.util.List; + /** * 涓氬姟 鏁版嵁灞 * diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java index 8aac0e40..0084755b 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java @@ -1,11 +1,12 @@ package com.ruoyi.gen.service; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.common.core.text.Convert; import com.ruoyi.gen.domain.GenTableColumn; import com.ruoyi.gen.mapper.GenTableColumnMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 涓氬姟瀛楁 鏈嶅姟灞傚疄鐜 diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java index f7dec848..74cb289c 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java @@ -1,8 +1,9 @@ package com.ruoyi.gen.service; -import java.util.List; import com.ruoyi.gen.domain.GenTableColumn; +import java.util.List; + /** * 涓氬姟瀛楁 鏈嶅姟灞 * diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java index 3d6e0ff6..69bfc2ba 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java @@ -1,8 +1,9 @@ package com.ruoyi.gen.service; +import com.ruoyi.gen.domain.GenTable; + import java.util.List; import java.util.Map; -import com.ruoyi.gen.domain.GenTable; /** * 涓氬姟 鏈嶅姟灞 diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java index c0736626..aba0fd44 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java @@ -1,8 +1,9 @@ package com.ruoyi.gen.util; -import java.util.Properties; -import org.apache.velocity.app.Velocity; import com.ruoyi.common.core.constant.Constants; +import org.apache.velocity.app.Velocity; + +import java.util.Properties; /** * VelocityEngine宸ュ巶 diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java index e06d6793..eab7e4c7 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java @@ -1,10 +1,10 @@ package com.ruoyi.job; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; import com.ruoyi.common.security.annotation.EnableCustomConfig; import com.ruoyi.common.security.annotation.EnableRyFeignClients; import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; /** * 瀹氭椂浠诲姟 diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java index fd73d5cf..827ab792 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java @@ -1,11 +1,12 @@ package com.ruoyi.job.config; -import java.util.Properties; -import javax.sql.DataSource; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.quartz.SchedulerFactoryBean; +import javax.sql.DataSource; +import java.util.Properties; + /** * 瀹氭椂浠诲姟閰嶇疆锛堝崟鏈洪儴缃插缓璁垹闄ゆ绫诲拰qrtz鏁版嵁搴撹〃锛岄粯璁よ蛋鍐呭瓨浼氭渶楂樻晥锛 * diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java index fec09a5c..ab41d14c 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java @@ -1,17 +1,5 @@ package com.ruoyi.job.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.quartz.SchedulerException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.core.constant.Constants; import com.ruoyi.common.core.exception.job.TaskException; import com.ruoyi.common.core.utils.StringUtils; @@ -27,6 +15,12 @@ import com.ruoyi.job.domain.SysJob; import com.ruoyi.job.service.ISysJobService; import com.ruoyi.job.util.CronUtils; import com.ruoyi.job.util.ScheduleUtils; +import org.quartz.SchedulerException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 璋冨害浠诲姟淇℃伅鎿嶄綔澶勭悊 diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java index 9b133efa..4107d897 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java @@ -1,14 +1,5 @@ package com.ruoyi.job.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.core.utils.poi.ExcelUtil; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; @@ -18,6 +9,11 @@ import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.job.domain.SysJobLog; import com.ruoyi.job.service.ISysJobLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 璋冨害鏃ュ織鎿嶄綔澶勭悊 diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java index 7877b687..b1fb2cc9 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java @@ -1,10 +1,5 @@ package com.ruoyi.job.domain; -import java.util.Date; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel.ColumnType; @@ -12,6 +7,12 @@ import com.ruoyi.common.core.constant.ScheduleConstants; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.domain.BaseEntity; import com.ruoyi.job.util.CronUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.util.Date; /** * 瀹氭椂浠诲姟璋冨害琛 sys_job diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java index ec863c9a..662c93fe 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java @@ -1,10 +1,11 @@ package com.ruoyi.job.domain; -import java.util.Date; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; /** * 瀹氭椂浠诲姟璋冨害鏃ュ織琛 sys_job_log diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java index 742eba54..170c5ef3 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.job.mapper; -import java.util.List; import com.ruoyi.job.domain.SysJobLog; +import java.util.List; + /** * 璋冨害浠诲姟鏃ュ織淇℃伅 鏁版嵁灞 * diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java index 352fa874..dead5a7f 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.job.mapper; -import java.util.List; import com.ruoyi.job.domain.SysJob; +import java.util.List; + /** * 璋冨害浠诲姟淇℃伅 鏁版嵁灞 * diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java index 0e804e20..9b788b31 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java @@ -1,8 +1,9 @@ package com.ruoyi.job.service; -import java.util.List; import com.ruoyi.job.domain.SysJobLog; +import java.util.List; + /** * 瀹氭椂浠诲姟璋冨害鏃ュ織淇℃伅淇℃伅 鏈嶅姟灞 * diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java index 0886f310..e982c8e1 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java @@ -1,10 +1,11 @@ package com.ruoyi.job.service; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.job.domain.SysJobLog; import com.ruoyi.job.mapper.SysJobLogMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 瀹氭椂浠诲姟璋冨害鏃ュ織淇℃伅 鏈嶅姟灞 diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java index 3ac34626..a28a931c 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java @@ -1,7 +1,11 @@ package com.ruoyi.job.service; -import java.util.List; -import javax.annotation.PostConstruct; +import com.ruoyi.common.core.constant.ScheduleConstants; +import com.ruoyi.common.core.exception.job.TaskException; +import com.ruoyi.job.domain.SysJob; +import com.ruoyi.job.mapper.SysJobMapper; +import com.ruoyi.job.util.CronUtils; +import com.ruoyi.job.util.ScheduleUtils; import org.quartz.JobDataMap; import org.quartz.JobKey; import org.quartz.Scheduler; @@ -9,12 +13,9 @@ import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.core.constant.ScheduleConstants; -import com.ruoyi.common.core.exception.job.TaskException; -import com.ruoyi.job.domain.SysJob; -import com.ruoyi.job.mapper.SysJobMapper; -import com.ruoyi.job.util.CronUtils; -import com.ruoyi.job.util.ScheduleUtils; + +import javax.annotation.PostConstruct; +import java.util.List; /** * 瀹氭椂浠诲姟璋冨害淇℃伅 鏈嶅姟灞 diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java index 01bd14a8..d63e0cc3 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java @@ -1,7 +1,7 @@ package com.ruoyi.job.task; -import org.springframework.stereotype.Component; import com.ruoyi.common.core.utils.StringUtils; +import org.springframework.stereotype.Component; /** * 瀹氭椂浠诲姟璋冨害娴嬭瘯 diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java index 0097d1e6..36b698de 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java @@ -1,11 +1,5 @@ package com.ruoyi.job.util; -import java.util.Date; -import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.ruoyi.common.core.constant.ScheduleConstants; import com.ruoyi.common.core.utils.ExceptionUtil; import com.ruoyi.common.core.utils.SpringUtils; @@ -14,6 +8,13 @@ import com.ruoyi.common.core.utils.bean.BeanUtils; import com.ruoyi.job.domain.SysJob; import com.ruoyi.job.domain.SysJobLog; import com.ruoyi.job.service.ISysJobLogService; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Date; /** * 鎶借薄quartz璋冪敤 diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java index 98a4147d..66b3a625 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java @@ -1,8 +1,9 @@ package com.ruoyi.job.util; +import org.quartz.CronExpression; + import java.text.ParseException; import java.util.Date; -import org.quartz.CronExpression; /** * cron琛ㄨ揪寮忓伐鍏风被 diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java index 0bfc2f74..c718fdeb 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java @@ -1,12 +1,13 @@ package com.ruoyi.job.util; +import com.ruoyi.common.core.utils.SpringUtils; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.job.domain.SysJob; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.LinkedList; import java.util.List; -import com.ruoyi.common.core.utils.SpringUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.job.domain.SysJob; /** * 浠诲姟鎵ц宸ュ叿 diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java index 88e27d34..9b7a644b 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java @@ -1,10 +1,9 @@ package com.ruoyi.job.util; +import com.ruoyi.job.domain.SysJob; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; -import com.ruoyi.job.domain.SysJob; - /** * 瀹氭椂浠诲姟澶勭悊锛堢姝㈠苟鍙戞墽琛岋級 * diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java index 246b693a..4ceb2c3a 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java @@ -1,8 +1,7 @@ package com.ruoyi.job.util; -import org.quartz.JobExecutionContext; - import com.ruoyi.job.domain.SysJob; +import org.quartz.JobExecutionContext; /** * 瀹氭椂浠诲姟澶勭悊锛堝厑璁稿苟鍙戞墽琛岋級 diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java index 72590b00..af1afac5 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java @@ -1,15 +1,5 @@ package com.ruoyi.job.util; -import org.quartz.CronScheduleBuilder; -import org.quartz.CronTrigger; -import org.quartz.Job; -import org.quartz.JobBuilder; -import org.quartz.JobDetail; -import org.quartz.JobKey; -import org.quartz.Scheduler; -import org.quartz.SchedulerException; -import org.quartz.TriggerBuilder; -import org.quartz.TriggerKey; import com.ruoyi.common.core.constant.Constants; import com.ruoyi.common.core.constant.ScheduleConstants; import com.ruoyi.common.core.exception.job.TaskException; @@ -17,6 +7,7 @@ import com.ruoyi.common.core.exception.job.TaskException.Code; import com.ruoyi.common.core.utils.SpringUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.job.domain.SysJob; +import org.quartz.*; /** * 瀹氭椂浠诲姟宸ュ叿绫 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java index dfe390fa..d072517e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java @@ -1,10 +1,10 @@ package com.ruoyi.system; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; import com.ruoyi.common.security.annotation.EnableCustomConfig; import com.ruoyi.common.security.annotation.EnableRyFeignClients; import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; /** * 绯荤粺妯″潡 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java index d0821aa8..7f4f7432 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java @@ -1,17 +1,5 @@ package com.ruoyi.system.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.utils.poi.ExcelUtil; import com.ruoyi.common.core.web.controller.BaseController; @@ -23,6 +11,12 @@ import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.service.ISysConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 鍙傛暟閰嶇疆 淇℃伅鎿嶄綔澶勭悊 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java index 43bddd62..2b98d33a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java @@ -1,18 +1,5 @@ package com.ruoyi.system.controller; -import java.util.Iterator; -import java.util.List; -import org.apache.commons.lang3.ArrayUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.controller.BaseController; @@ -23,6 +10,13 @@ import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.domain.SysDept; import com.ruoyi.system.service.ISysDeptService; +import org.apache.commons.lang3.ArrayUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Iterator; +import java.util.List; /** * 閮ㄩ棬淇℃伅 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java index a5981f97..4f863452 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java @@ -1,18 +1,5 @@ package com.ruoyi.system.controller; -import java.util.ArrayList; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.poi.ExcelUtil; import com.ruoyi.common.core.web.controller.BaseController; @@ -25,6 +12,13 @@ import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.domain.SysDictData; import com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.system.service.ISysDictTypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.List; /** * 鏁版嵁瀛楀吀淇℃伅 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java index dabd6b25..ef95d57a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java @@ -1,17 +1,5 @@ package com.ruoyi.system.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.utils.poi.ExcelUtil; import com.ruoyi.common.core.web.controller.BaseController; @@ -23,6 +11,12 @@ import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.domain.SysDictType; import com.ruoyi.system.service.ISysDictTypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 鏁版嵁瀛楀吀淇℃伅 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java index 1ed6c000..01d5a2ad 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java @@ -1,15 +1,5 @@ package com.ruoyi.system.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.core.utils.poi.ExcelUtil; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; @@ -20,6 +10,11 @@ import com.ruoyi.common.security.annotation.InnerAuth; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.system.api.domain.SysLogininfor; import com.ruoyi.system.service.ISysLogininforService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 绯荤粺璁块棶璁板綍 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java index c5ae0e3c..77a01a74 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java @@ -1,16 +1,5 @@ package com.ruoyi.system.controller; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.controller.BaseController; @@ -21,6 +10,11 @@ import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.domain.SysMenu; import com.ruoyi.system.service.ISysMenuService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 鑿滃崟淇℃伅 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java index e59453d9..84deee72 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java @@ -1,16 +1,5 @@ package com.ruoyi.system.controller; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.TableDataInfo; @@ -20,6 +9,11 @@ import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.domain.SysNotice; import com.ruoyi.system.service.ISysNoticeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 鍏憡 淇℃伅鎿嶄綔澶勭悊 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java index a6a7fbc9..aac6ae8c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java @@ -1,15 +1,5 @@ package com.ruoyi.system.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.core.utils.poi.ExcelUtil; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; @@ -20,6 +10,11 @@ import com.ruoyi.common.security.annotation.InnerAuth; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.system.api.domain.SysOperLog; import com.ruoyi.system.service.ISysOperLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 鎿嶄綔鏃ュ織璁板綍 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java index b08f0f2a..29de163a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java @@ -1,17 +1,5 @@ package com.ruoyi.system.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.utils.poi.ExcelUtil; import com.ruoyi.common.core.web.controller.BaseController; @@ -23,6 +11,12 @@ import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.service.ISysPostService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 宀椾綅淇℃伅鎿嶄綔澶勭悊 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java index 36334045..e40999a3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java @@ -1,15 +1,5 @@ package com.ruoyi.system.controller; -import java.io.IOException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.domain.Rust; import com.ruoyi.common.core.utils.StringUtils; @@ -24,6 +14,11 @@ import com.ruoyi.system.api.domain.SysFile; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.model.LoginUser; import com.ruoyi.system.service.ISysUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; /** * 涓汉淇℃伅 涓氬姟澶勭悊 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java index 5329e8ea..4134c3c4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java @@ -1,17 +1,5 @@ package com.ruoyi.system.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.utils.poi.ExcelUtil; import com.ruoyi.common.core.web.controller.BaseController; @@ -26,6 +14,12 @@ import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 瑙掕壊淇℃伅 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java index db41e8d9..2d9c43cd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java @@ -1,22 +1,5 @@ package com.ruoyi.system.controller; -import java.io.IOException; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang3.ArrayUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.domain.Rust; import com.ruoyi.common.core.utils.StringUtils; @@ -32,11 +15,18 @@ import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.domain.SysRole; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.model.LoginUser; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.ISysPermissionService; -import com.ruoyi.system.service.ISysPostService; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysUserService; +import com.ruoyi.system.service.*; +import org.apache.commons.lang3.ArrayUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; /** * 鐢ㄦ埛淇℃伅 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java index 4863d3bb..2c9158b5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java @@ -1,15 +1,5 @@ package com.ruoyi.system.controller; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.core.constant.CacheConstants; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.controller.BaseController; @@ -22,6 +12,13 @@ import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.system.api.model.LoginUser; import com.ruoyi.system.domain.SysUserOnline; import com.ruoyi.system.service.ISysUserOnlineService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; /** * 鍦ㄧ嚎鐢ㄦ埛鐩戞帶 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java index 5b3c5408..410fd13a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java @@ -1,12 +1,13 @@ package com.ruoyi.system.domain; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.ruoyi.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; /** * 鍙傛暟閰嶇疆琛 sys_config diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java index 4e22a578..76fe6eba 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java @@ -1,13 +1,14 @@ package com.ruoyi.system.domain; -import java.util.ArrayList; -import java.util.List; +import com.ruoyi.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.web.domain.BaseEntity; +import java.util.ArrayList; +import java.util.List; /** * 鑿滃崟鏉冮檺琛 sys_menu diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java index 6e157638..578d7be4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java @@ -1,11 +1,12 @@ package com.ruoyi.system.domain; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.web.domain.BaseEntity; import com.ruoyi.common.core.xss.Xss; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; /** * 閫氱煡鍏憡琛 sys_notice diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java index b5a1e9d3..8fe13dea 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java @@ -1,12 +1,13 @@ package com.ruoyi.system.domain; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.ruoyi.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; /** * 宀椾綅琛 sys_post diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java index 2d4a2b80..2f42763f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java @@ -1,6 +1,7 @@ package com.ruoyi.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; + import java.util.List; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java index 9dc14268..edad8283 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java @@ -1,12 +1,13 @@ package com.ruoyi.system.domain.vo; -import java.io.Serializable; -import java.util.List; -import java.util.stream.Collectors; import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.system.api.domain.SysDept; import com.ruoyi.system.domain.SysMenu; +import java.io.Serializable; +import java.util.List; +import java.util.stream.Collectors; + /** * Treeselect鏍戠粨鏋勫疄浣撶被 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java index 71a0bce8..41618c63 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; import com.ruoyi.system.domain.SysConfig; +import java.util.List; + /** * 鍙傛暟閰嶇疆 鏁版嵁灞 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java index 803b879f..cad521cc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; import com.ruoyi.system.api.domain.SysDept; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 閮ㄩ棬绠＄悊 鏁版嵁灞 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java index 6e416f7f..0fc77aed 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; import com.ruoyi.system.api.domain.SysDictData; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 瀛楀吀琛 鏁版嵁灞 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java index 4b93bc88..5b9f867f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; -import org.apache.ibatis.annotations.Mapper; import com.ruoyi.system.api.domain.SysDictType; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; /** * 瀛楀吀琛 鏁版嵁灞 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java index 8a141a4e..5ad84eb6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; import com.ruoyi.system.domain.SysMenu; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 鑿滃崟琛 鏁版嵁灞 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java index ec8700d6..a5765d09 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; import com.ruoyi.system.domain.SysNotice; +import java.util.List; + /** * 閫氱煡鍏憡琛 鏁版嵁灞 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java index 8603d9ae..d65faa2b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; import com.ruoyi.system.domain.SysPost; +import java.util.List; + /** * 宀椾綅淇℃伅 鏁版嵁灞 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java index a4ad4de2..45e1c0cb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; import com.ruoyi.system.domain.SysRoleDept; +import java.util.List; + /** * 瑙掕壊涓庨儴闂ㄥ叧鑱旇〃 鏁版嵁灞 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java index b49511ca..1a1762ea 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; import com.ruoyi.system.api.domain.SysRole; +import java.util.List; + /** * 瑙掕壊琛 鏁版嵁灞 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java index 23391557..a86886b8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; import com.ruoyi.system.domain.SysRoleMenu; +import java.util.List; + /** * 瑙掕壊涓庤彍鍗曞叧鑱旇〃 鏁版嵁灞 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index 7b8c4c6b..260c4f04 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; import com.ruoyi.system.api.domain.SysUser; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 鐢ㄦ埛琛 鏁版嵁灞 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java index 9c33e546..8ed12044 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; import com.ruoyi.system.domain.SysUserPost; +import java.util.List; + /** * 鐢ㄦ埛涓庡矖浣嶅叧鑱旇〃 鏁版嵁灞 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java index ad3fe62c..dd0afc54 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; import com.ruoyi.system.domain.SysUserRole; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 鐢ㄦ埛涓庤鑹插叧鑱旇〃 鏁版嵁灞 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java index 0ea11893..f127d307 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java @@ -1,8 +1,9 @@ package com.ruoyi.system.service; -import java.util.List; import com.ruoyi.system.domain.SysConfig; +import java.util.List; + /** * 鍙傛暟閰嶇疆 鏈嶅姟灞 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java index ed1f6115..afd6ddaf 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java @@ -1,9 +1,10 @@ package com.ruoyi.system.service; -import java.util.List; import com.ruoyi.system.api.domain.SysDept; import com.ruoyi.system.domain.vo.TreeSelect; +import java.util.List; + /** * 閮ㄩ棬绠＄悊 鏈嶅姟灞 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java index 6e06bfde..eb8928f2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java @@ -1,8 +1,9 @@ package com.ruoyi.system.service; -import java.util.List; import com.ruoyi.system.api.domain.SysDictData; +import java.util.List; + /** * 瀛楀吀 涓氬姟灞 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java index 65e8b03f..b2863b71 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java @@ -1,9 +1,10 @@ package com.ruoyi.system.service; -import java.util.List; import com.ruoyi.system.api.domain.SysDictData; import com.ruoyi.system.api.domain.SysDictType; +import java.util.List; + /** * 瀛楀吀 涓氬姟灞 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java index 9c4daf4a..d0838a76 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java @@ -1,11 +1,12 @@ package com.ruoyi.system.service; -import java.util.List; -import java.util.Set; import com.ruoyi.system.domain.SysMenu; import com.ruoyi.system.domain.vo.RouterVo; import com.ruoyi.system.domain.vo.TreeSelect; +import java.util.List; +import java.util.Set; + /** * 鑿滃崟 涓氬姟灞 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java index fb1e420f..826758c4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java @@ -1,8 +1,9 @@ package com.ruoyi.system.service; -import java.util.List; import com.ruoyi.system.domain.SysNotice; +import java.util.List; + /** * 鍏憡 鏈嶅姟灞 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java index 42c94f18..a95fe2ab 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java @@ -1,8 +1,9 @@ package com.ruoyi.system.service; -import java.util.List; import com.ruoyi.system.api.domain.SysOperLog; +import java.util.List; + /** * 鎿嶄綔鏃ュ織 鏈嶅姟灞 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java index d21568bf..14aaef09 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java @@ -1,8 +1,9 @@ package com.ruoyi.system.service; -import java.util.List; import com.ruoyi.system.domain.SysPost; +import java.util.List; + /** * 宀椾綅淇℃伅 鏈嶅姟灞 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java index d1b45ac8..fd5586a9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java @@ -1,10 +1,11 @@ package com.ruoyi.system.service; -import java.util.List; -import java.util.Set; import com.ruoyi.system.api.domain.SysRole; import com.ruoyi.system.domain.SysUserRole; +import java.util.List; +import java.util.Set; + /** * 瑙掕壊涓氬姟灞 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java index 1fc220ad..a85b7475 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -1,8 +1,9 @@ package com.ruoyi.system.service; -import java.util.List; import com.ruoyi.system.api.domain.SysUser; +import java.util.List; + /** * 鐢ㄦ埛 涓氬姟灞 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java index bbda508a..36982541 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java @@ -1,10 +1,5 @@ package com.ruoyi.system.service.impl; -import java.util.Collection; -import java.util.List; -import javax.annotation.PostConstruct; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.common.core.constant.Constants; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.exception.ServiceException; @@ -14,6 +9,12 @@ import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.mapper.SysConfigMapper; import com.ruoyi.system.service.ISysConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.PostConstruct; +import java.util.Collection; +import java.util.List; /** * 鍙傛暟閰嶇疆 鏈嶅姟灞傚疄鐜 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index 544b6b59..0e71ae26 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -1,11 +1,5 @@ package com.ruoyi.system.service.impl; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.text.Convert; @@ -20,6 +14,13 @@ import com.ruoyi.system.domain.vo.TreeSelect; import com.ruoyi.system.mapper.SysDeptMapper; import com.ruoyi.system.mapper.SysRoleMapper; import com.ruoyi.system.service.ISysDeptService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.stream.Collectors; /** * 閮ㄩ棬绠＄悊 鏈嶅姟瀹炵幇 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java index 791db697..4b1a0014 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java @@ -1,12 +1,13 @@ package com.ruoyi.system.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.common.security.utils.DictUtils; import com.ruoyi.system.api.domain.SysDictData; import com.ruoyi.system.mapper.SysDictDataMapper; import com.ruoyi.system.service.ISysDictDataService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 瀛楀吀 涓氬姟灞傚鐞 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java index e0e672cf..2ba5f1b9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java @@ -1,13 +1,5 @@ package com.ruoyi.system.service.impl; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.utils.StringUtils; @@ -17,6 +9,15 @@ import com.ruoyi.system.api.domain.SysDictType; import com.ruoyi.system.mapper.SysDictDataMapper; import com.ruoyi.system.mapper.SysDictTypeMapper; import com.ruoyi.system.service.ISysDictTypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.PostConstruct; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 瀛楀吀 涓氬姟灞傚鐞 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java index ca823ab4..f3f1d167 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java @@ -1,11 +1,12 @@ package com.ruoyi.system.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.system.api.domain.SysLogininfor; import com.ruoyi.system.mapper.SysLogininforMapper; import com.ruoyi.system.service.ISysLogininforService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 绯荤粺璁块棶鏃ュ織鎯呭喌淇℃伅 鏈嶅姟灞傚鐞 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java index 79a0f7ea..5db0eb3f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java @@ -1,15 +1,5 @@ package com.ruoyi.system.service.impl; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.common.core.constant.Constants; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.utils.StringUtils; @@ -24,6 +14,11 @@ import com.ruoyi.system.mapper.SysMenuMapper; import com.ruoyi.system.mapper.SysRoleMapper; import com.ruoyi.system.mapper.SysRoleMenuMapper; import com.ruoyi.system.service.ISysMenuService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; +import java.util.stream.Collectors; /** * 鑿滃崟 涓氬姟灞傚鐞 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java index 8bebd9c6..d3cfd6ab 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java @@ -1,11 +1,12 @@ package com.ruoyi.system.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.system.domain.SysNotice; import com.ruoyi.system.mapper.SysNoticeMapper; import com.ruoyi.system.service.ISysNoticeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 鍏憡 鏈嶅姟灞傚疄鐜 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java index 57764cf8..0b5b65aa 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java @@ -1,11 +1,12 @@ package com.ruoyi.system.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.system.api.domain.SysOperLog; import com.ruoyi.system.mapper.SysOperLogMapper; import com.ruoyi.system.service.ISysOperLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 鎿嶄綔鏃ュ織 鏈嶅姟灞傚鐞 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java index d260e17d..f46f41b7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java @@ -1,8 +1,5 @@ package com.ruoyi.system.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.utils.StringUtils; @@ -10,6 +7,10 @@ import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.mapper.SysPostMapper; import com.ruoyi.system.mapper.SysUserPostMapper; import com.ruoyi.system.service.ISysPostService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 宀椾綅淇℃伅 鏈嶅姟灞傚鐞 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index 916e9897..ca8191a0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -1,13 +1,5 @@ package com.ruoyi.system.service.impl; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.utils.SpringUtils; @@ -24,6 +16,11 @@ import com.ruoyi.system.mapper.SysRoleMapper; import com.ruoyi.system.mapper.SysRoleMenuMapper; import com.ruoyi.system.mapper.SysUserRoleMapper; import com.ruoyi.system.service.ISysRoleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; /** * 瑙掕壊 涓氬姟灞傚鐞 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java index dcb03250..bb577203 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java @@ -1,10 +1,10 @@ package com.ruoyi.system.service.impl; -import org.springframework.stereotype.Service; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.system.api.model.LoginUser; import com.ruoyi.system.domain.SysUserOnline; import com.ruoyi.system.service.ISysUserOnlineService; +import org.springframework.stereotype.Service; /** * 鍦ㄧ嚎鐢ㄦ埛 鏈嶅姟灞傚鐞 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index fcc90335..4fd12cfd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -1,15 +1,5 @@ package com.ruoyi.system.service.impl; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; -import javax.validation.Validator; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.utils.SpringUtils; @@ -22,13 +12,20 @@ import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.domain.SysUserPost; import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.mapper.SysPostMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysUserMapper; -import com.ruoyi.system.mapper.SysUserPostMapper; -import com.ruoyi.system.mapper.SysUserRoleMapper; +import com.ruoyi.system.mapper.*; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysUserService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import javax.validation.Validator; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; /** * 鐢ㄦ埛 涓氬姟灞傚鐞 diff --git a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java b/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java index 73628b3b..d9dc9916 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java +++ b/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java @@ -1,8 +1,8 @@ package com.ruoyi.modules.monitor; +import de.codecentric.boot.admin.server.config.EnableAdminServer; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import de.codecentric.boot.admin.server.config.EnableAdminServer; /** * 鐩戞帶涓績 From 3e16a5cbcab6cf805e87197977d3db6f614f8e6b Mon Sep 17 00:00:00 2001 From: 1332987 <13329870472@163.com> Date: Wed, 20 Apr 2022 14:01:33 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/api/RemoteFileService.java | 5 +- .../ruoyi/system/api/RemoteLogService.java | 9 +- .../ruoyi/system/api/RemoteUserService.java | 9 +- .../com/ruoyi/system/api/domain/SysDept.java | 159 +++-- .../ruoyi/system/api/domain/SysDictData.java | 132 ++-- .../ruoyi/system/api/domain/SysDictType.java | 69 +-- .../com/ruoyi/system/api/domain/SysFile.java | 25 +- .../system/api/domain/SysLogininfor.java | 65 +- .../ruoyi/system/api/domain/SysOperLog.java | 165 +++-- .../com/ruoyi/system/api/domain/SysRole.java | 175 +++--- .../com/ruoyi/system/api/domain/SysUser.java | 250 ++++---- .../factory/RemoteFileFallbackFactory.java | 14 +- .../api/factory/RemoteLogFallbackFactory.java | 17 +- .../factory/RemoteUserFallbackFactory.java | 17 +- .../com/ruoyi/system/api/model/LoginUser.java | 57 +- .../com/ruoyi/auth/RuoYiAuthApplication.java | 10 +- .../auth/controller/TokenController.java | 23 +- .../java/com/ruoyi/auth/form/LoginBody.java | 17 +- .../com/ruoyi/auth/form/RegisterBody.java | 5 +- .../ruoyi/auth/service/SysLoginService.java | 66 +- .../ruoyi/common/core/annotation/Excel.java | 44 +- .../ruoyi/common/core/annotation/Excels.java | 5 +- .../common/core/constant/CacheConstants.java | 5 +- .../ruoyi/common/core/constant/Constants.java | 11 +- .../common/core/constant/GenConstants.java | 187 ++++-- .../common/core/constant/HttpStatus.java | 5 +- .../core/constant/ScheduleConstants.java | 34 +- .../core/constant/SecurityConstants.java | 5 +- .../core/constant/ServiceNameConstants.java | 5 +- .../common/core/constant/TokenConstants.java | 5 +- .../common/core/constant/UserConstants.java | 73 ++- .../core/context/SecurityContextHolder.java | 44 +- .../com/ruoyi/common/core/domain/Rust.java | 61 +- .../ruoyi/common/core/enums/UserStatus.java | 15 +- .../core/exception/CaptchaException.java | 8 +- .../core/exception/CheckedException.java | 17 +- .../core/exception/DemoModeException.java | 8 +- .../core/exception/GlobalException.java | 25 +- .../core/exception/InnerAuthException.java | 8 +- .../core/exception/PreAuthorizeException.java | 8 +- .../core/exception/ServiceException.java | 41 +- .../common/core/exception/UtilException.java | 14 +- .../exception/auth/NotLoginException.java | 8 +- .../auth/NotPermissionException.java | 11 +- .../core/exception/auth/NotRoleException.java | 11 +- .../core/exception/base/BaseException.java | 32 +- .../core/exception/file/FileException.java | 8 +- .../FileNameLengthLimitExceededException.java | 10 +- .../file/FileSizeLimitExceededException.java | 10 +- .../file/InvalidExtensionException.java | 43 +- .../core/exception/job/TaskException.java | 18 +- .../user/CaptchaExpireException.java | 8 +- .../core/exception/user/UserException.java | 8 +- .../user/UserPasswordNotMatchException.java | 8 +- .../ruoyi/common/core/text/CharsetKit.java | 64 +- .../com/ruoyi/common/core/text/Convert.java | 582 +++++++----------- .../ruoyi/common/core/text/StrFormatter.java | 46 +- .../ruoyi/common/core/utils/DateUtils.java | 65 +- .../common/core/utils/ExceptionUtil.java | 15 +- .../com/ruoyi/common/core/utils/JwtUtils.java | 46 +- .../ruoyi/common/core/utils/PageUtils.java | 11 +- .../com/ruoyi/common/core/utils/ReUtil.java | 69 +-- .../ruoyi/common/core/utils/ServletUtils.java | 155 ++--- .../ruoyi/common/core/utils/SpringUtils.java | 48 +- .../ruoyi/common/core/utils/StringUtils.java | 393 ++++++------ .../common/core/utils/bean/BeanUtils.java | 58 +- .../core/utils/bean/BeanValidators.java | 11 +- .../common/core/utils/file/FileTypeUtils.java | 34 +- .../common/core/utils/file/ImageUtils.java | 43 +- .../common/core/utils/file/MimeTypeUtils.java | 23 +- .../common/core/utils/html/EscapeUtil.java | 81 +-- .../common/core/utils/html/HtmlFilter.java | 40 +- .../ruoyi/common/core/utils/ip/IpUtils.java | 2 +- .../core/utils/poi/ExcelHandlerAdapter.java | 10 +- .../common/core/utils/poi/ExcelUtil.java | 175 +++--- .../core/utils/reflect/ReflectUtils.java | 218 +++---- .../ruoyi/common/core/utils/sql/SqlUtil.java | 26 +- .../ruoyi/common/core/utils/uuid/IdUtils.java | 25 +- .../com/ruoyi/common/core/utils/uuid/Seq.java | 33 +- .../ruoyi/common/core/utils/uuid/UUID.java | 88 ++- .../core/web/controller/BaseController.java | 47 +- .../common/core/web/domain/AjaxResult.java | 115 ++-- .../common/core/web/domain/BaseEntity.java | 78 ++- .../common/core/web/domain/TreeEntity.java | 55 +- .../common/core/web/page/PageDomain.java | 71 +-- .../common/core/web/page/TableDataInfo.java | 55 +- .../common/core/web/page/TableSupport.java | 11 +- .../java/com/ruoyi/common/core/xss/Xss.java | 11 +- .../ruoyi/common/core/xss/XssValidator.java | 24 +- .../datascope/annotation/DataScope.java | 5 +- .../datascope/aspect/DataScopeAspect.java | 95 ++- .../common/datasource/annotation/Master.java | 7 +- .../common/datasource/annotation/Slave.java | 7 +- .../env/ApplicationSeataInitializer.java | 9 +- .../com/ruoyi/common/log/annotation/Log.java | 8 +- .../ruoyi/common/log/aspect/LogAspect.java | 95 +-- .../common/log/enums/BusinessStatus.java | 6 +- .../ruoyi/common/log/enums/BusinessType.java | 5 +- .../ruoyi/common/log/enums/OperatorType.java | 5 +- .../common/log/service/AsyncLogService.java | 8 +- .../FastJson2JsonRedisSerializer.java | 38 +- .../common/redis/configure/RedisConfig.java | 10 +- .../common/redis/service/RedisService.java | 95 ++- .../annotation/EnableCustomConfig.java | 5 +- .../annotation/EnableRyFeignClients.java | 7 +- .../common/security/annotation/InnerAuth.java | 5 +- .../common/security/annotation/Logical.java | 6 +- .../security/annotation/RequiresLogin.java | 8 +- .../annotation/RequiresPermissions.java | 8 +- .../security/annotation/RequiresRoles.java | 7 +- .../security/aspect/InnerAuthAspect.java | 14 +- .../security/aspect/PreAuthorizeAspect.java | 45 +- .../ruoyi/common/security/auth/AuthLogic.java | 211 +++---- .../ruoyi/common/security/auth/AuthUtil.java | 72 +-- .../security/config/ApplicationConfig.java | 6 +- .../common/security/config/WebMvcConfig.java | 15 +- .../feign/FeignAutoConfiguration.java | 6 +- .../feign/FeignRequestInterceptor.java | 20 +- .../handler/GlobalExceptionHandler.java | 35 +- .../interceptor/HeaderInterceptor.java | 18 +- .../common/security/service/TokenService.java | 75 +-- .../common/security/utils/DictUtils.java | 33 +- .../common/security/utils/SecurityUtils.java | 42 +- .../annotation/EnableCustomSwagger2.java | 7 +- .../config/SwaggerAutoConfiguration.java | 44 +- .../config/SwaggerBeanPostProcessor.java | 22 +- .../swagger/config/SwaggerProperties.java | 144 ++--- .../config/SwaggerWebConfiguration.java | 8 +- .../gateway/RuoYiGatewayApplication.java | 10 +- .../ruoyi/gateway/config/CaptchaConfig.java | 13 +- .../ruoyi/gateway/config/GatewayConfig.java | 8 +- .../gateway/config/KaptchaTextCreator.java | 22 +- .../config/RouterFunctionConfiguration.java | 8 +- .../ruoyi/gateway/config/SwaggerProvider.java | 16 +- .../config/properties/CaptchaProperties.java | 17 +- .../properties/IgnoreWhiteProperties.java | 11 +- .../config/properties/XssProperties.java | 17 +- .../com/ruoyi/gateway/filter/AuthFilter.java | 47 +- .../gateway/filter/BlackListUrlFilter.java | 32 +- .../gateway/filter/CacheRequestFilter.java | 55 +- .../gateway/filter/ValidateCodeFilter.java | 29 +- .../com/ruoyi/gateway/filter/XssFilter.java | 35 +- .../handler/GatewayExceptionHandler.java | 20 +- .../handler/SentinelFallbackHandler.java | 18 +- .../ruoyi/gateway/handler/SwaggerHandler.java | 16 +- .../gateway/handler/ValidateCodeHandler.java | 13 +- .../gateway/service/ValidateCodeService.java | 9 +- .../service/impl/ValidateCodeServiceImpl.java | 35 +- .../com/ruoyi/file/RuoYiFileApplication.java | 10 +- .../com/ruoyi/file/config/MinioConfig.java | 30 +- .../ruoyi/file/config/ResourcesConfig.java | 23 +- .../file/controller/SysFileController.java | 15 +- .../service/FastDfsSysFileServiceImpl.java | 10 +- .../ruoyi/file/service/ISysFileService.java | 7 +- .../file/service/LocalSysFileServiceImpl.java | 12 +- .../file/service/MinioSysFileServiceImpl.java | 10 +- .../com/ruoyi/file/utils/FileUploadUtils.java | 97 +-- .../com/ruoyi/gen/RuoYiGenApplication.java | 10 +- .../java/com/ruoyi/gen/config/GenConfig.java | 45 +- .../ruoyi/gen/controller/GenController.java | 44 +- .../java/com/ruoyi/gen/domain/GenTable.java | 292 +++++---- .../com/ruoyi/gen/domain/GenTableColumn.java | 319 +++++----- .../gen/mapper/GenTableColumnMapper.java | 17 +- .../com/ruoyi/gen/mapper/GenTableMapper.java | 23 +- .../service/GenTableColumnServiceImpl.java | 63 +- .../gen/service/GenTableServiceImpl.java | 244 +++----- .../gen/service/IGenTableColumnService.java | 13 +- .../ruoyi/gen/service/IGenTableService.java | 33 +- .../ruoyi/gen/util/VelocityInitializer.java | 15 +- .../com/ruoyi/job/RuoYiJobApplication.java | 10 +- .../com/ruoyi/job/config/ScheduleConfig.java | 8 +- .../job/controller/SysJobController.java | 75 +-- .../job/controller/SysJobLogController.java | 20 +- .../java/com/ruoyi/job/domain/SysJob.java | 121 ++-- .../java/com/ruoyi/job/domain/SysJobLog.java | 117 ++-- .../com/ruoyi/job/mapper/SysJobLogMapper.java | 15 +- .../com/ruoyi/job/mapper/SysJobMapper.java | 19 +- .../ruoyi/job/service/ISysJobLogService.java | 15 +- .../com/ruoyi/job/service/ISysJobService.java | 25 +- .../job/service/SysJobLogServiceImpl.java | 33 +- .../ruoyi/job/service/SysJobServiceImpl.java | 101 ++- .../main/java/com/ruoyi/job/task/RyTask.java | 14 +- .../com/ruoyi/job/util/AbstractQuartzJob.java | 35 +- .../java/com/ruoyi/job/util/CronUtils.java | 29 +- .../com/ruoyi/job/util/JobInvokeUtil.java | 94 ++- .../QuartzDisallowConcurrentExecution.java | 9 +- .../ruoyi/job/util/QuartzJobExecution.java | 9 +- .../com/ruoyi/job/util/ScheduleUtils.java | 38 +- .../ruoyi/system/RuoYiSystemApplication.java | 8 +- .../controller/SysConfigController.java | 35 +- .../system/controller/SysDeptController.java | 55 +- .../controller/SysDictDataController.java | 31 +- .../controller/SysDictTypeController.java | 35 +- .../controller/SysLogininforController.java | 20 +- .../system/controller/SysMenuController.java | 55 +- .../controller/SysNoticeController.java | 20 +- .../controller/SysOperlogController.java | 20 +- .../system/controller/SysPostController.java | 40 +- .../controller/SysProfileController.java | 53 +- .../system/controller/SysRoleController.java | 62 +- .../system/controller/SysUserController.java | 93 +-- .../controller/SysUserOnlineController.java | 38 +- .../com/ruoyi/system/domain/SysConfig.java | 81 ++- .../java/com/ruoyi/system/domain/SysMenu.java | 209 ++++--- .../com/ruoyi/system/domain/SysNotice.java | 91 ++- .../java/com/ruoyi/system/domain/SysPost.java | 91 ++- .../com/ruoyi/system/domain/SysRoleDept.java | 35 +- .../com/ruoyi/system/domain/SysRoleMenu.java | 35 +- .../ruoyi/system/domain/SysUserOnline.java | 75 ++- .../com/ruoyi/system/domain/SysUserPost.java | 35 +- .../com/ruoyi/system/domain/SysUserRole.java | 35 +- .../com/ruoyi/system/domain/vo/MetaVo.java | 47 +- .../com/ruoyi/system/domain/vo/RouterVo.java | 59 +- .../ruoyi/system/domain/vo/TreeSelect.java | 44 +- .../ruoyi/system/mapper/SysConfigMapper.java | 19 +- .../ruoyi/system/mapper/SysDeptMapper.java | 33 +- .../system/mapper/SysDictDataMapper.java | 27 +- .../system/mapper/SysDictTypeMapper.java | 23 +- .../system/mapper/SysLogininforMapper.java | 13 +- .../ruoyi/system/mapper/SysMenuMapper.java | 33 +- .../ruoyi/system/mapper/SysNoticeMapper.java | 17 +- .../ruoyi/system/mapper/SysOperLogMapper.java | 13 +- .../ruoyi/system/mapper/SysPostMapper.java | 27 +- .../system/mapper/SysRoleDeptMapper.java | 13 +- .../ruoyi/system/mapper/SysRoleMapper.java | 29 +- .../system/mapper/SysRoleMenuMapper.java | 13 +- .../ruoyi/system/mapper/SysUserMapper.java | 31 +- .../system/mapper/SysUserPostMapper.java | 13 +- .../system/mapper/SysUserRoleMapper.java | 19 +- .../system/service/ISysConfigService.java | 19 +- .../ruoyi/system/service/ISysDeptService.java | 31 +- .../system/service/ISysDictDataService.java | 19 +- .../system/service/ISysDictTypeService.java | 23 +- .../system/service/ISysLogininforService.java | 11 +- .../ruoyi/system/service/ISysMenuService.java | 37 +- .../system/service/ISysNoticeService.java | 19 +- .../system/service/ISysOperLogService.java | 13 +- .../system/service/ISysPermissionService.java | 7 +- .../ruoyi/system/service/ISysPostService.java | 27 +- .../ruoyi/system/service/ISysRoleService.java | 49 +- .../system/service/ISysUserOnlineService.java | 21 +- .../ruoyi/system/service/ISysUserService.java | 57 +- .../service/impl/SysConfigServiceImpl.java | 81 +-- .../service/impl/SysDeptServiceImpl.java | 139 ++--- .../service/impl/SysDictDataServiceImpl.java | 46 +- .../service/impl/SysDictTypeServiceImpl.java | 86 +-- .../impl/SysLogininforServiceImpl.java | 23 +- .../service/impl/SysMenuServiceImpl.java | 227 +++---- .../service/impl/SysNoticeServiceImpl.java | 35 +- .../service/impl/SysOperLogServiceImpl.java | 28 +- .../impl/SysPermissionServiceImpl.java | 27 +- .../service/impl/SysPostServiceImpl.java | 72 +-- .../service/impl/SysRoleServiceImpl.java | 168 ++--- .../impl/SysUserOnlineServiceImpl.java | 45 +- .../service/impl/SysUserServiceImpl.java | 242 +++----- .../monitor/RuoYiMonitorApplication.java | 8 +- .../monitor/config/WebSecurityConfigurer.java | 43 +- 257 files changed, 5030 insertions(+), 7024 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java index ade1ee8f..b41b9de4 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java @@ -12,12 +12,11 @@ import org.springframework.web.multipart.MultipartFile; /** * 鏂囦欢鏈嶅姟 - * + * * @author ruoyi */ @FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class) -public interface RemoteFileService -{ +public interface RemoteFileService { /** * 涓婁紶鏂囦欢 * diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java index d225287a..58a85c3e 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java @@ -13,17 +13,16 @@ import org.springframework.web.bind.annotation.RequestHeader; /** * 鏃ュ織鏈嶅姟 - * + * * @author ruoyi */ @FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteLogFallbackFactory.class) -public interface RemoteLogService -{ +public interface RemoteLogService { /** * 淇濆瓨绯荤粺鏃ュ織 * * @param sysOperLog 鏃ュ織瀹炰綋 - * @param source 璇锋眰鏉ユ簮 + * @param source 璇锋眰鏉ユ簮 * @return 缁撴灉 */ @PostMapping("/operlog") @@ -33,7 +32,7 @@ public interface RemoteLogService * 淇濆瓨璁块棶璁板綍 * * @param sysLogininfor 璁块棶瀹炰綋 - * @param source 璇锋眰鏉ユ簮 + * @param source 璇锋眰鏉ユ簮 * @return 缁撴灉 */ @PostMapping("/logininfor") diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java index 3f29359b..0ae532bb 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java @@ -11,17 +11,16 @@ import org.springframework.web.bind.annotation.*; /** * 鐢ㄦ埛鏈嶅姟 - * + * * @author ruoyi */ @FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class) -public interface RemoteUserService -{ +public interface RemoteUserService { /** * 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤鎴蜂俊鎭 * * @param username 鐢ㄦ埛鍚 - * @param source 璇锋眰鏉ユ簮 + * @param source 璇锋眰鏉ユ簮 * @return 缁撴灉 */ @GetMapping("/user/info/{username}") @@ -31,7 +30,7 @@ public interface RemoteUserService * 娉ㄥ唽鐢ㄦ埛淇℃伅 * * @param sysUser 鐢ㄦ埛淇℃伅 - * @param source 璇锋眰鏉ユ簮 + * @param source 璇锋眰鏉ユ簮 * @return 缁撴灉 */ @PostMapping("/user/register") diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java index 8fa55bf3..c44f5c4e 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java @@ -12,192 +12,191 @@ import java.util.List; /** * 閮ㄩ棬琛 sys_dept - * + * * @author ruoyi */ -public class SysDept extends BaseEntity -{ +public class SysDept extends BaseEntity { private static final long serialVersionUID = 1L; - /** 閮ㄩ棬ID */ + /** + * 閮ㄩ棬ID + */ private Long deptId; - /** 鐖堕儴闂↖D */ + /** + * 鐖堕儴闂↖D + */ private Long parentId; - /** 绁栫骇鍒楄〃 */ + /** + * 绁栫骇鍒楄〃 + */ private String ancestors; - /** 閮ㄩ棬鍚嶇О */ + /** + * 閮ㄩ棬鍚嶇О + */ private String deptName; - /** 鏄剧ず椤哄簭 */ + /** + * 鏄剧ず椤哄簭 + */ private String orderNum; - /** 璐熻矗浜 */ + /** + * 璐熻矗浜 + */ private String leader; - /** 鑱旂郴鐢佃瘽 */ + /** + * 鑱旂郴鐢佃瘽 + */ private String phone; - /** 閭 */ + /** + * 閭 + */ private String email; - /** 閮ㄩ棬鐘舵:0姝ｅ父,1鍋滅敤 */ + /** + * 閮ㄩ棬鐘舵:0姝ｅ父,1鍋滅敤 + */ private String status; - /** 鍒犻櫎鏍囧織锛0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛 */ + /** + * 鍒犻櫎鏍囧織锛0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛 + */ private String delFlag; - /** 鐖堕儴闂ㄥ悕绉 */ + /** + * 鐖堕儴闂ㄥ悕绉 + */ private String parentName; - - /** 瀛愰儴闂 */ + + /** + * 瀛愰儴闂 + */ private List children = new ArrayList(); - public Long getDeptId() - { + public Long getDeptId() { return deptId; } - public void setDeptId(Long deptId) - { + public void setDeptId(Long deptId) { this.deptId = deptId; } - public Long getParentId() - { + public Long getParentId() { return parentId; } - public void setParentId(Long parentId) - { + public void setParentId(Long parentId) { this.parentId = parentId; } - public String getAncestors() - { + public String getAncestors() { return ancestors; } - public void setAncestors(String ancestors) - { + public void setAncestors(String ancestors) { this.ancestors = ancestors; } @NotBlank(message = "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖") @Size(min = 0, max = 30, message = "閮ㄩ棬鍚嶇О闀垮害涓嶈兘瓒呰繃30涓瓧绗") - public String getDeptName() - { + public String getDeptName() { return deptName; } - public void setDeptName(String deptName) - { + public void setDeptName(String deptName) { this.deptName = deptName; } @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖") - public String getOrderNum() - { + public String getOrderNum() { return orderNum; } - public void setOrderNum(String orderNum) - { + public void setOrderNum(String orderNum) { this.orderNum = orderNum; } - public String getLeader() - { + public String getLeader() { return leader; } - public void setLeader(String leader) - { + public void setLeader(String leader) { this.leader = leader; } @Size(min = 0, max = 11, message = "鑱旂郴鐢佃瘽闀垮害涓嶈兘瓒呰繃11涓瓧绗") - public String getPhone() - { + public String getPhone() { return phone; } - public void setPhone(String phone) - { + public void setPhone(String phone) { this.phone = phone; } @Email(message = "閭鏍煎紡涓嶆纭") @Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗") - public String getEmail() - { + public String getEmail() { return email; } - public void setEmail(String email) - { + public void setEmail(String email) { this.email = email; } - public String getStatus() - { + public String getStatus() { return status; } - public void setStatus(String status) - { + public void setStatus(String status) { this.status = status; } - public String getDelFlag() - { + public String getDelFlag() { return delFlag; } - public void setDelFlag(String delFlag) - { + public void setDelFlag(String delFlag) { this.delFlag = delFlag; } - public String getParentName() - { + public String getParentName() { return parentName; } - public void setParentName(String parentName) - { + public void setParentName(String parentName) { this.parentName = parentName; } - public List getChildren() - { + public List getChildren() { return children; } - public void setChildren(List children) - { + public void setChildren(List children) { this.children = children; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("deptId", getDeptId()) - .append("parentId", getParentId()) - .append("ancestors", getAncestors()) - .append("deptName", getDeptName()) - .append("orderNum", getOrderNum()) - .append("leader", getLeader()) - .append("phone", getPhone()) - .append("email", getEmail()) - .append("status", getStatus()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("deptId", getDeptId()) + .append("parentId", getParentId()) + .append("ancestors", getAncestors()) + .append("deptName", getDeptName()) + .append("orderNum", getOrderNum()) + .append("leader", getLeader()) + .append("phone", getPhone()) + .append("email", getEmail()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); } } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java index 91546cc2..11534523 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java @@ -12,166 +12,164 @@ import javax.validation.constraints.Size; /** * 瀛楀吀鏁版嵁琛 sys_dict_data - * + * * @author ruoyi */ -public class SysDictData extends BaseEntity -{ +public class SysDictData extends BaseEntity { private static final long serialVersionUID = 1L; - /** 瀛楀吀缂栫爜 */ + /** + * 瀛楀吀缂栫爜 + */ @Excel(name = "瀛楀吀缂栫爜", cellType = ColumnType.NUMERIC) private Long dictCode; - /** 瀛楀吀鎺掑簭 */ + /** + * 瀛楀吀鎺掑簭 + */ @Excel(name = "瀛楀吀鎺掑簭", cellType = ColumnType.NUMERIC) private Long dictSort; - /** 瀛楀吀鏍囩 */ + /** + * 瀛楀吀鏍囩 + */ @Excel(name = "瀛楀吀鏍囩") private String dictLabel; - /** 瀛楀吀閿 */ + /** + * 瀛楀吀閿 + */ @Excel(name = "瀛楀吀閿") private String dictValue; - /** 瀛楀吀绫诲瀷 */ + /** + * 瀛楀吀绫诲瀷 + */ @Excel(name = "瀛楀吀绫诲瀷") private String dictType; - /** 鏍峰紡灞炴э紙鍏朵粬鏍峰紡鎵╁睍锛 */ + /** + * 鏍峰紡灞炴э紙鍏朵粬鏍峰紡鎵╁睍锛 + */ private String cssClass; - /** 琛ㄦ牸瀛楀吀鏍峰紡 */ + /** + * 琛ㄦ牸瀛楀吀鏍峰紡 + */ private String listClass; - /** 鏄惁榛樿锛圷鏄 N鍚︼級 */ + /** + * 鏄惁榛樿锛圷鏄 N鍚︼級 + */ @Excel(name = "鏄惁榛樿", readConverterExp = "Y=鏄,N=鍚") private String isDefault; - /** 鐘舵侊紙0姝ｅ父 1鍋滅敤锛 */ + /** + * 鐘舵侊紙0姝ｅ父 1鍋滅敤锛 + */ @Excel(name = "鐘舵", readConverterExp = "0=姝ｅ父,1=鍋滅敤") private String status; - public Long getDictCode() - { + public Long getDictCode() { return dictCode; } - public void setDictCode(Long dictCode) - { + public void setDictCode(Long dictCode) { this.dictCode = dictCode; } - public Long getDictSort() - { + public Long getDictSort() { return dictSort; } - public void setDictSort(Long dictSort) - { + public void setDictSort(Long dictSort) { this.dictSort = dictSort; } @NotBlank(message = "瀛楀吀鏍囩涓嶈兘涓虹┖") @Size(min = 0, max = 100, message = "瀛楀吀鏍囩闀垮害涓嶈兘瓒呰繃100涓瓧绗") - public String getDictLabel() - { + public String getDictLabel() { return dictLabel; } - public void setDictLabel(String dictLabel) - { + public void setDictLabel(String dictLabel) { this.dictLabel = dictLabel; } @NotBlank(message = "瀛楀吀閿间笉鑳戒负绌") @Size(min = 0, max = 100, message = "瀛楀吀閿奸暱搴︿笉鑳借秴杩100涓瓧绗") - public String getDictValue() - { + public String getDictValue() { return dictValue; } - public void setDictValue(String dictValue) - { + public void setDictValue(String dictValue) { this.dictValue = dictValue; } @NotBlank(message = "瀛楀吀绫诲瀷涓嶈兘涓虹┖") @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷闀垮害涓嶈兘瓒呰繃100涓瓧绗") - public String getDictType() - { + public String getDictType() { return dictType; } - public void setDictType(String dictType) - { + public void setDictType(String dictType) { this.dictType = dictType; } @Size(min = 0, max = 100, message = "鏍峰紡灞炴ч暱搴︿笉鑳借秴杩100涓瓧绗") - public String getCssClass() - { + public String getCssClass() { return cssClass; } - public void setCssClass(String cssClass) - { + public void setCssClass(String cssClass) { this.cssClass = cssClass; } - public String getListClass() - { + public String getListClass() { return listClass; } - public void setListClass(String listClass) - { + public void setListClass(String listClass) { this.listClass = listClass; } - public boolean getDefault() - { + public boolean getDefault() { return UserConstants.YES.equals(this.isDefault) ? true : false; } - public String getIsDefault() - { + public String getIsDefault() { return isDefault; } - public void setIsDefault(String isDefault) - { + public void setIsDefault(String isDefault) { this.isDefault = isDefault; } - public String getStatus() - { + public String getStatus() { return status; } - public void setStatus(String status) - { + public void setStatus(String status) { this.status = status; } - + @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("dictCode", getDictCode()) - .append("dictSort", getDictSort()) - .append("dictLabel", getDictLabel()) - .append("dictValue", getDictValue()) - .append("dictType", getDictType()) - .append("cssClass", getCssClass()) - .append("listClass", getListClass()) - .append("isDefault", getIsDefault()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("dictCode", getDictCode()) + .append("dictSort", getDictSort()) + .append("dictLabel", getDictLabel()) + .append("dictValue", getDictValue()) + .append("dictType", getDictType()) + .append("cssClass", getCssClass()) + .append("listClass", getListClass()) + .append("isDefault", getIsDefault()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); } } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java index 38b6e8e7..bf63d1e5 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java @@ -12,86 +12,85 @@ import javax.validation.constraints.Size; /** * 瀛楀吀绫诲瀷琛 sys_dict_type - * + * * @author ruoyi */ -public class SysDictType extends BaseEntity -{ +public class SysDictType extends BaseEntity { private static final long serialVersionUID = 1L; - /** 瀛楀吀涓婚敭 */ + /** + * 瀛楀吀涓婚敭 + */ @Excel(name = "瀛楀吀涓婚敭", cellType = ColumnType.NUMERIC) private Long dictId; - /** 瀛楀吀鍚嶇О */ + /** + * 瀛楀吀鍚嶇О + */ @Excel(name = "瀛楀吀鍚嶇О") private String dictName; - /** 瀛楀吀绫诲瀷 */ + /** + * 瀛楀吀绫诲瀷 + */ @Excel(name = "瀛楀吀绫诲瀷") private String dictType; - /** 鐘舵侊紙0姝ｅ父 1鍋滅敤锛 */ + /** + * 鐘舵侊紙0姝ｅ父 1鍋滅敤锛 + */ @Excel(name = "鐘舵", readConverterExp = "0=姝ｅ父,1=鍋滅敤") private String status; - public Long getDictId() - { + public Long getDictId() { return dictId; } - public void setDictId(Long dictId) - { + public void setDictId(Long dictId) { this.dictId = dictId; } @NotBlank(message = "瀛楀吀鍚嶇О涓嶈兘涓虹┖") @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷鍚嶇О闀垮害涓嶈兘瓒呰繃100涓瓧绗") - public String getDictName() - { + public String getDictName() { return dictName; } - public void setDictName(String dictName) - { + public void setDictName(String dictName) { this.dictName = dictName; } @NotBlank(message = "瀛楀吀绫诲瀷涓嶈兘涓虹┖") @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷绫诲瀷闀垮害涓嶈兘瓒呰繃100涓瓧绗") @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "瀛楀吀绫诲瀷蹇呴』浠ュ瓧姣嶅紑澶达紝涓斿彧鑳戒负锛堝皬鍐欏瓧姣嶏紝鏁板瓧锛屼笅婊戠嚎锛") - public String getDictType() - { + public String getDictType() { return dictType; } - public void setDictType(String dictType) - { + public void setDictType(String dictType) { this.dictType = dictType; } - public String getStatus() - { + public String getStatus() { return status; } - public void setStatus(String status) - { + public void setStatus(String status) { this.status = status; } - + @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("dictId", getDictId()) - .append("dictName", getDictName()) - .append("dictType", getDictType()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("dictId", getDictId()) + .append("dictName", getDictName()) + .append("dictType", getDictType()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); } } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysFile.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysFile.java index 440df49d..0117358d 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysFile.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysFile.java @@ -5,11 +5,10 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 鏂囦欢淇℃伅 - * + * * @author ruoyi */ -public class SysFile -{ +public class SysFile { /** * 鏂囦欢鍚嶇О */ @@ -20,31 +19,27 @@ public class SysFile */ private String url; - public String getName() - { + public String getName() { return name; } - public void setName(String name) - { + public void setName(String name) { this.name = name; } - public String getUrl() - { + public String getUrl() { return url; } - public void setUrl(String url) - { + public void setUrl(String url) { this.url = url; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("name", getName()) - .append("url", getUrl()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("name", getName()) + .append("url", getUrl()) + .toString(); } } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java index 115e3efa..e6317bbf 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java @@ -9,95 +9,94 @@ import java.util.Date; /** * 绯荤粺璁块棶璁板綍琛 sys_logininfor - * + * * @author ruoyi */ -public class SysLogininfor extends BaseEntity -{ +public class SysLogininfor extends BaseEntity { private static final long serialVersionUID = 1L; - /** ID */ + /** + * ID + */ @Excel(name = "搴忓彿", cellType = ColumnType.NUMERIC) private Long infoId; - /** 鐢ㄦ埛璐﹀彿 */ + /** + * 鐢ㄦ埛璐﹀彿 + */ @Excel(name = "鐢ㄦ埛璐﹀彿") private String userName; - /** 鐘舵 0鎴愬姛 1澶辫触 */ + /** + * 鐘舵 0鎴愬姛 1澶辫触 + */ @Excel(name = "鐘舵", readConverterExp = "0=鎴愬姛,1=澶辫触") private String status; - /** 鍦板潃 */ + /** + * 鍦板潃 + */ @Excel(name = "鍦板潃") private String ipaddr; - /** 鎻忚堪 */ + /** + * 鎻忚堪 + */ @Excel(name = "鎻忚堪") private String msg; - /** 璁块棶鏃堕棿 */ + /** + * 璁块棶鏃堕棿 + */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "璁块棶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date accessTime; - public Long getInfoId() - { + public Long getInfoId() { return infoId; } - public void setInfoId(Long infoId) - { + public void setInfoId(Long infoId) { this.infoId = infoId; } - public String getUserName() - { + public String getUserName() { return userName; } - public void setUserName(String userName) - { + public void setUserName(String userName) { this.userName = userName; } - public String getStatus() - { + public String getStatus() { return status; } - public void setStatus(String status) - { + public void setStatus(String status) { this.status = status; } - public String getIpaddr() - { + public String getIpaddr() { return ipaddr; } - public void setIpaddr(String ipaddr) - { + public void setIpaddr(String ipaddr) { this.ipaddr = ipaddr; } - public String getMsg() - { + public String getMsg() { return msg; } - public void setMsg(String msg) - { + public void setMsg(String msg) { this.msg = msg; } - public Date getAccessTime() - { + public Date getAccessTime() { return accessTime; } - public void setAccessTime(Date accessTime) - { + public void setAccessTime(Date accessTime) { this.accessTime = accessTime; } } \ No newline at end of file diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java index d57964a3..5dc06227 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java @@ -9,234 +9,233 @@ import java.util.Date; /** * 鎿嶄綔鏃ュ織璁板綍琛 oper_log - * + * * @author ruoyi */ -public class SysOperLog extends BaseEntity -{ +public class SysOperLog extends BaseEntity { private static final long serialVersionUID = 1L; - /** 鏃ュ織涓婚敭 */ + /** + * 鏃ュ織涓婚敭 + */ @Excel(name = "鎿嶄綔搴忓彿", cellType = ColumnType.NUMERIC) private Long operId; - /** 鎿嶄綔妯″潡 */ + /** + * 鎿嶄綔妯″潡 + */ @Excel(name = "鎿嶄綔妯″潡") private String title; - /** 涓氬姟绫诲瀷锛0鍏跺畠 1鏂板 2淇敼 3鍒犻櫎锛 */ + /** + * 涓氬姟绫诲瀷锛0鍏跺畠 1鏂板 2淇敼 3鍒犻櫎锛 + */ @Excel(name = "涓氬姟绫诲瀷", readConverterExp = "0=鍏跺畠,1=鏂板,2=淇敼,3=鍒犻櫎,4=鎺堟潈,5=瀵煎嚭,6=瀵煎叆,7=寮洪,8=鐢熸垚浠ｇ爜,9=娓呯┖鏁版嵁") private Integer businessType; - /** 涓氬姟绫诲瀷鏁扮粍 */ + /** + * 涓氬姟绫诲瀷鏁扮粍 + */ private Integer[] businessTypes; - /** 璇锋眰鏂规硶 */ + /** + * 璇锋眰鏂规硶 + */ @Excel(name = "璇锋眰鏂规硶") private String method; - /** 璇锋眰鏂瑰紡 */ + /** + * 璇锋眰鏂瑰紡 + */ @Excel(name = "璇锋眰鏂瑰紡") private String requestMethod; - /** 鎿嶄綔绫诲埆锛0鍏跺畠 1鍚庡彴鐢ㄦ埛 2鎵嬫満绔敤鎴凤級 */ + /** + * 鎿嶄綔绫诲埆锛0鍏跺畠 1鍚庡彴鐢ㄦ埛 2鎵嬫満绔敤鎴凤級 + */ @Excel(name = "鎿嶄綔绫诲埆", readConverterExp = "0=鍏跺畠,1=鍚庡彴鐢ㄦ埛,2=鎵嬫満绔敤鎴") private Integer operatorType; - /** 鎿嶄綔浜哄憳 */ + /** + * 鎿嶄綔浜哄憳 + */ @Excel(name = "鎿嶄綔浜哄憳") private String operName; - /** 閮ㄩ棬鍚嶇О */ + /** + * 閮ㄩ棬鍚嶇О + */ @Excel(name = "閮ㄩ棬鍚嶇О") private String deptName; - /** 璇锋眰url */ + /** + * 璇锋眰url + */ @Excel(name = "璇锋眰鍦板潃") private String operUrl; - /** 鎿嶄綔鍦板潃 */ + /** + * 鎿嶄綔鍦板潃 + */ @Excel(name = "鎿嶄綔鍦板潃") private String operIp; - /** 璇锋眰鍙傛暟 */ + /** + * 璇锋眰鍙傛暟 + */ @Excel(name = "璇锋眰鍙傛暟") private String operParam; - /** 杩斿洖鍙傛暟 */ + /** + * 杩斿洖鍙傛暟 + */ @Excel(name = "杩斿洖鍙傛暟") private String jsonResult; - /** 鎿嶄綔鐘舵侊紙0姝ｅ父 1寮傚父锛 */ + /** + * 鎿嶄綔鐘舵侊紙0姝ｅ父 1寮傚父锛 + */ @Excel(name = "鐘舵", readConverterExp = "0=姝ｅ父,1=寮傚父") private Integer status; - /** 閿欒娑堟伅 */ + /** + * 閿欒娑堟伅 + */ @Excel(name = "閿欒娑堟伅") private String errorMsg; - /** 鎿嶄綔鏃堕棿 */ + /** + * 鎿嶄綔鏃堕棿 + */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "鎿嶄綔鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date operTime; - public Long getOperId() - { + public Long getOperId() { return operId; } - public void setOperId(Long operId) - { + public void setOperId(Long operId) { this.operId = operId; } - public String getTitle() - { + public String getTitle() { return title; } - public void setTitle(String title) - { + public void setTitle(String title) { this.title = title; } - public Integer getBusinessType() - { + public Integer getBusinessType() { return businessType; } - public void setBusinessType(Integer businessType) - { + public void setBusinessType(Integer businessType) { this.businessType = businessType; } - public Integer[] getBusinessTypes() - { + public Integer[] getBusinessTypes() { return businessTypes; } - public void setBusinessTypes(Integer[] businessTypes) - { + public void setBusinessTypes(Integer[] businessTypes) { this.businessTypes = businessTypes; } - public String getMethod() - { + public String getMethod() { return method; } - public void setMethod(String method) - { + public void setMethod(String method) { this.method = method; } - public String getRequestMethod() - { + public String getRequestMethod() { return requestMethod; } - public void setRequestMethod(String requestMethod) - { + public void setRequestMethod(String requestMethod) { this.requestMethod = requestMethod; } - public Integer getOperatorType() - { + public Integer getOperatorType() { return operatorType; } - public void setOperatorType(Integer operatorType) - { + public void setOperatorType(Integer operatorType) { this.operatorType = operatorType; } - public String getOperName() - { + public String getOperName() { return operName; } - public void setOperName(String operName) - { + public void setOperName(String operName) { this.operName = operName; } - public String getDeptName() - { + public String getDeptName() { return deptName; } - public void setDeptName(String deptName) - { + public void setDeptName(String deptName) { this.deptName = deptName; } - public String getOperUrl() - { + public String getOperUrl() { return operUrl; } - public void setOperUrl(String operUrl) - { + public void setOperUrl(String operUrl) { this.operUrl = operUrl; } - public String getOperIp() - { + public String getOperIp() { return operIp; } - public void setOperIp(String operIp) - { + public void setOperIp(String operIp) { this.operIp = operIp; } - public String getOperParam() - { + public String getOperParam() { return operParam; } - public void setOperParam(String operParam) - { + public void setOperParam(String operParam) { this.operParam = operParam; } - public String getJsonResult() - { + public String getJsonResult() { return jsonResult; } - public void setJsonResult(String jsonResult) - { + public void setJsonResult(String jsonResult) { this.jsonResult = jsonResult; } - public Integer getStatus() - { + public Integer getStatus() { return status; } - public void setStatus(Integer status) - { + public void setStatus(Integer status) { this.status = status; } - public String getErrorMsg() - { + public String getErrorMsg() { return errorMsg; } - public void setErrorMsg(String errorMsg) - { + public void setErrorMsg(String errorMsg) { this.errorMsg = errorMsg; } - public Date getOperTime() - { + public Date getOperTime() { return operTime; } - public void setOperTime(Date operTime) - { + public void setOperTime(Date operTime) { this.operTime = operTime; } } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java index 637edf48..ea6d4dd5 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java @@ -11,217 +11,212 @@ import javax.validation.constraints.Size; /** * 瑙掕壊琛 sys_role - * + * * @author ruoyi */ -public class SysRole extends BaseEntity -{ +public class SysRole extends BaseEntity { private static final long serialVersionUID = 1L; - /** 瑙掕壊ID */ + /** + * 瑙掕壊ID + */ @Excel(name = "瑙掕壊搴忓彿", cellType = ColumnType.NUMERIC) private Long roleId; - /** 瑙掕壊鍚嶇О */ + /** + * 瑙掕壊鍚嶇О + */ @Excel(name = "瑙掕壊鍚嶇О") private String roleName; - /** 瑙掕壊鏉冮檺 */ + /** + * 瑙掕壊鏉冮檺 + */ @Excel(name = "瑙掕壊鏉冮檺") private String roleKey; - /** 瑙掕壊鎺掑簭 */ + /** + * 瑙掕壊鎺掑簭 + */ @Excel(name = "瑙掕壊鎺掑簭") private String roleSort; - /** 鏁版嵁鑼冨洿锛1锛氭墍鏈夋暟鎹潈闄愶紱2锛氳嚜瀹氫箟鏁版嵁鏉冮檺锛3锛氭湰閮ㄩ棬鏁版嵁鏉冮檺锛4锛氭湰閮ㄩ棬鍙婁互涓嬫暟鎹潈闄愶紱5锛氫粎鏈汉鏁版嵁鏉冮檺锛 */ + /** + * 鏁版嵁鑼冨洿锛1锛氭墍鏈夋暟鎹潈闄愶紱2锛氳嚜瀹氫箟鏁版嵁鏉冮檺锛3锛氭湰閮ㄩ棬鏁版嵁鏉冮檺锛4锛氭湰閮ㄩ棬鍙婁互涓嬫暟鎹潈闄愶紱5锛氫粎鏈汉鏁版嵁鏉冮檺锛 + */ @Excel(name = "鏁版嵁鑼冨洿", readConverterExp = "1=鎵鏈夋暟鎹潈闄,2=鑷畾涔夋暟鎹潈闄,3=鏈儴闂ㄦ暟鎹潈闄,4=鏈儴闂ㄥ強浠ヤ笅鏁版嵁鏉冮檺,5=浠呮湰浜烘暟鎹潈闄") private String dataScope; - /** 鑿滃崟鏍戦夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙 0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀猴級 */ + /** + * 鑿滃崟鏍戦夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙 0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀猴級 + */ private boolean menuCheckStrictly; - /** 閮ㄩ棬鏍戦夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀 锛 */ + /** + * 閮ㄩ棬鏍戦夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀 锛 + */ private boolean deptCheckStrictly; - /** 瑙掕壊鐘舵侊紙0姝ｅ父 1鍋滅敤锛 */ + /** + * 瑙掕壊鐘舵侊紙0姝ｅ父 1鍋滅敤锛 + */ @Excel(name = "瑙掕壊鐘舵", readConverterExp = "0=姝ｅ父,1=鍋滅敤") private String status; - /** 鍒犻櫎鏍囧織锛0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛 */ + /** + * 鍒犻櫎鏍囧織锛0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛 + */ private String delFlag; - /** 鐢ㄦ埛鏄惁瀛樺湪姝よ鑹叉爣璇 榛樿涓嶅瓨鍦 */ + /** + * 鐢ㄦ埛鏄惁瀛樺湪姝よ鑹叉爣璇 榛樿涓嶅瓨鍦 + */ private boolean flag = false; - /** 鑿滃崟缁 */ + /** + * 鑿滃崟缁 + */ private Long[] menuIds; - /** 閮ㄩ棬缁勶紙鏁版嵁鏉冮檺锛 */ + /** + * 閮ㄩ棬缁勶紙鏁版嵁鏉冮檺锛 + */ private Long[] deptIds; - public SysRole() - { + public SysRole() { } - public SysRole(Long roleId) - { + public SysRole(Long roleId) { this.roleId = roleId; } - public Long getRoleId() - { + public static boolean isAdmin(Long roleId) { + return roleId != null && 1L == roleId; + } + + public Long getRoleId() { return roleId; } - public void setRoleId(Long roleId) - { + public void setRoleId(Long roleId) { this.roleId = roleId; } - public boolean isAdmin() - { + public boolean isAdmin() { return isAdmin(this.roleId); } - public static boolean isAdmin(Long roleId) - { - return roleId != null && 1L == roleId; - } - @NotBlank(message = "瑙掕壊鍚嶇О涓嶈兘涓虹┖") @Size(min = 0, max = 30, message = "瑙掕壊鍚嶇О闀垮害涓嶈兘瓒呰繃30涓瓧绗") - public String getRoleName() - { + public String getRoleName() { return roleName; } - public void setRoleName(String roleName) - { + public void setRoleName(String roleName) { this.roleName = roleName; } @NotBlank(message = "鏉冮檺瀛楃涓嶈兘涓虹┖") @Size(min = 0, max = 100, message = "鏉冮檺瀛楃闀垮害涓嶈兘瓒呰繃100涓瓧绗") - public String getRoleKey() - { + public String getRoleKey() { return roleKey; } - public void setRoleKey(String roleKey) - { + public void setRoleKey(String roleKey) { this.roleKey = roleKey; } @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖") - public String getRoleSort() - { + public String getRoleSort() { return roleSort; } - public void setRoleSort(String roleSort) - { + public void setRoleSort(String roleSort) { this.roleSort = roleSort; } - public String getDataScope() - { + public String getDataScope() { return dataScope; } - public void setDataScope(String dataScope) - { + public void setDataScope(String dataScope) { this.dataScope = dataScope; } - public boolean isMenuCheckStrictly() - { + public boolean isMenuCheckStrictly() { return menuCheckStrictly; } - public void setMenuCheckStrictly(boolean menuCheckStrictly) - { + public void setMenuCheckStrictly(boolean menuCheckStrictly) { this.menuCheckStrictly = menuCheckStrictly; } - public boolean isDeptCheckStrictly() - { + public boolean isDeptCheckStrictly() { return deptCheckStrictly; } - public void setDeptCheckStrictly(boolean deptCheckStrictly) - { + public void setDeptCheckStrictly(boolean deptCheckStrictly) { this.deptCheckStrictly = deptCheckStrictly; } - public String getStatus() - { + public String getStatus() { return status; } - public void setStatus(String status) - { + public void setStatus(String status) { this.status = status; } - public String getDelFlag() - { + public String getDelFlag() { return delFlag; } - public void setDelFlag(String delFlag) - { + public void setDelFlag(String delFlag) { this.delFlag = delFlag; } - public boolean isFlag() - { + public boolean isFlag() { return flag; } - public void setFlag(boolean flag) - { + public void setFlag(boolean flag) { this.flag = flag; } - public Long[] getMenuIds() - { + public Long[] getMenuIds() { return menuIds; } - public void setMenuIds(Long[] menuIds) - { + public void setMenuIds(Long[] menuIds) { this.menuIds = menuIds; } - public Long[] getDeptIds() - { + public Long[] getDeptIds() { return deptIds; } - public void setDeptIds(Long[] deptIds) - { + public void setDeptIds(Long[] deptIds) { this.deptIds = deptIds; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("roleId", getRoleId()) - .append("roleName", getRoleName()) - .append("roleKey", getRoleKey()) - .append("roleSort", getRoleSort()) - .append("dataScope", getDataScope()) - .append("menuCheckStrictly", isMenuCheckStrictly()) - .append("deptCheckStrictly", isDeptCheckStrictly()) - .append("status", getStatus()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("roleId", getRoleId()) + .append("roleName", getRoleName()) + .append("roleKey", getRoleKey()) + .append("roleSort", getRoleSort()) + .append("dataScope", getDataScope()) + .append("menuCheckStrictly", isMenuCheckStrictly()) + .append("deptCheckStrictly", isDeptCheckStrictly()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); } } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java index c6fcec50..d1e933e1 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java @@ -18,311 +18,307 @@ import java.util.List; /** * 鐢ㄦ埛瀵硅薄 sys_user - * + * * @author ruoyi */ -public class SysUser extends BaseEntity -{ +public class SysUser extends BaseEntity { private static final long serialVersionUID = 1L; - /** 鐢ㄦ埛ID */ + /** + * 鐢ㄦ埛ID + */ @Excel(name = "鐢ㄦ埛搴忓彿", cellType = ColumnType.NUMERIC, prompt = "鐢ㄦ埛缂栧彿") private Long userId; - /** 閮ㄩ棬ID */ + /** + * 閮ㄩ棬ID + */ @Excel(name = "閮ㄩ棬缂栧彿", type = Type.IMPORT) private Long deptId; - /** 鐢ㄦ埛璐﹀彿 */ + /** + * 鐢ㄦ埛璐﹀彿 + */ @Excel(name = "鐧诲綍鍚嶇О") private String userName; - /** 鐢ㄦ埛鏄电О */ + /** + * 鐢ㄦ埛鏄电О + */ @Excel(name = "鐢ㄦ埛鍚嶇О") private String nickName; - /** 鐢ㄦ埛閭 */ + /** + * 鐢ㄦ埛閭 + */ @Excel(name = "鐢ㄦ埛閭") private String email; - /** 鎵嬫満鍙风爜 */ + /** + * 鎵嬫満鍙风爜 + */ @Excel(name = "鎵嬫満鍙风爜") private String phonenumber; - /** 鐢ㄦ埛鎬у埆 */ + /** + * 鐢ㄦ埛鎬у埆 + */ @Excel(name = "鐢ㄦ埛鎬у埆", readConverterExp = "0=鐢,1=濂,2=鏈煡") private String sex; - /** 鐢ㄦ埛澶村儚 */ + /** + * 鐢ㄦ埛澶村儚 + */ private String avatar; - /** 瀵嗙爜 */ + /** + * 瀵嗙爜 + */ private String password; - /** 甯愬彿鐘舵侊紙0姝ｅ父 1鍋滅敤锛 */ + /** + * 甯愬彿鐘舵侊紙0姝ｅ父 1鍋滅敤锛 + */ @Excel(name = "甯愬彿鐘舵", readConverterExp = "0=姝ｅ父,1=鍋滅敤") private String status; - /** 鍒犻櫎鏍囧織锛0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛 */ + /** + * 鍒犻櫎鏍囧織锛0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛 + */ private String delFlag; - /** 鏈鍚庣櫥褰旾P */ + /** + * 鏈鍚庣櫥褰旾P + */ @Excel(name = "鏈鍚庣櫥褰旾P", type = Type.EXPORT) private String loginIp; - /** 鏈鍚庣櫥褰曟椂闂 */ + /** + * 鏈鍚庣櫥褰曟椂闂 + */ @Excel(name = "鏈鍚庣櫥褰曟椂闂", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT) private Date loginDate; - /** 閮ㄩ棬瀵硅薄 */ + /** + * 閮ㄩ棬瀵硅薄 + */ @Excels({ - @Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT), - @Excel(name = "閮ㄩ棬璐熻矗浜", targetAttr = "leader", type = Type.EXPORT) + @Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT), + @Excel(name = "閮ㄩ棬璐熻矗浜", targetAttr = "leader", type = Type.EXPORT) }) private SysDept dept; - /** 瑙掕壊瀵硅薄 */ + /** + * 瑙掕壊瀵硅薄 + */ private List roles; - /** 瑙掕壊缁 */ + /** + * 瑙掕壊缁 + */ private Long[] roleIds; - /** 宀椾綅缁 */ + /** + * 宀椾綅缁 + */ private Long[] postIds; - /** 瑙掕壊ID */ + /** + * 瑙掕壊ID + */ private Long roleId; - public SysUser() - { + public SysUser() { } - public SysUser(Long userId) - { + public SysUser(Long userId) { this.userId = userId; } - public Long getUserId() - { + public static boolean isAdmin(Long userId) { + return userId != null && 1L == userId; + } + + public Long getUserId() { return userId; } - public void setUserId(Long userId) - { + public void setUserId(Long userId) { this.userId = userId; } - public boolean isAdmin() - { + public boolean isAdmin() { return isAdmin(this.userId); } - public static boolean isAdmin(Long userId) - { - return userId != null && 1L == userId; - } - - public Long getDeptId() - { + public Long getDeptId() { return deptId; } - public void setDeptId(Long deptId) - { + public void setDeptId(Long deptId) { this.deptId = deptId; } @Xss(message = "鐢ㄦ埛鏄电О涓嶈兘鍖呭惈鑴氭湰瀛楃") @Size(min = 0, max = 30, message = "鐢ㄦ埛鏄电О闀垮害涓嶈兘瓒呰繃30涓瓧绗") - public String getNickName() - { + public String getNickName() { return nickName; } - public void setNickName(String nickName) - { + public void setNickName(String nickName) { this.nickName = nickName; } @Xss(message = "鐢ㄦ埛璐﹀彿涓嶈兘鍖呭惈鑴氭湰瀛楃") @NotBlank(message = "鐢ㄦ埛璐﹀彿涓嶈兘涓虹┖") @Size(min = 0, max = 30, message = "鐢ㄦ埛璐﹀彿闀垮害涓嶈兘瓒呰繃30涓瓧绗") - public String getUserName() - { + public String getUserName() { return userName; } - public void setUserName(String userName) - { + public void setUserName(String userName) { this.userName = userName; } @Email(message = "閭鏍煎紡涓嶆纭") @Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗") - public String getEmail() - { + public String getEmail() { return email; } - public void setEmail(String email) - { + public void setEmail(String email) { this.email = email; } @Size(min = 0, max = 11, message = "鎵嬫満鍙风爜闀垮害涓嶈兘瓒呰繃11涓瓧绗") - public String getPhonenumber() - { + public String getPhonenumber() { return phonenumber; } - public void setPhonenumber(String phonenumber) - { + public void setPhonenumber(String phonenumber) { this.phonenumber = phonenumber; } - public String getSex() - { + public String getSex() { return sex; } - public void setSex(String sex) - { + public void setSex(String sex) { this.sex = sex; } - public String getAvatar() - { + public String getAvatar() { return avatar; } - public void setAvatar(String avatar) - { + public void setAvatar(String avatar) { this.avatar = avatar; } @JsonProperty - public String getPassword() - { + public String getPassword() { return password; } - public void setPassword(String password) - { + public void setPassword(String password) { this.password = password; } - public String getStatus() - { + public String getStatus() { return status; } - public void setStatus(String status) - { + public void setStatus(String status) { this.status = status; } - public String getDelFlag() - { + public String getDelFlag() { return delFlag; } - public void setDelFlag(String delFlag) - { + public void setDelFlag(String delFlag) { this.delFlag = delFlag; } - public String getLoginIp() - { + public String getLoginIp() { return loginIp; } - public void setLoginIp(String loginIp) - { + public void setLoginIp(String loginIp) { this.loginIp = loginIp; } - public Date getLoginDate() - { + public Date getLoginDate() { return loginDate; } - public void setLoginDate(Date loginDate) - { + public void setLoginDate(Date loginDate) { this.loginDate = loginDate; } - public SysDept getDept() - { + public SysDept getDept() { return dept; } - public void setDept(SysDept dept) - { + public void setDept(SysDept dept) { this.dept = dept; } - public List getRoles() - { + public List getRoles() { return roles; } - public void setRoles(List roles) - { + public void setRoles(List roles) { this.roles = roles; } - public Long[] getRoleIds() - { + public Long[] getRoleIds() { return roleIds; } - public void setRoleIds(Long[] roleIds) - { + public void setRoleIds(Long[] roleIds) { this.roleIds = roleIds; } - public Long[] getPostIds() - { + public Long[] getPostIds() { return postIds; } - public void setPostIds(Long[] postIds) - { + public void setPostIds(Long[] postIds) { this.postIds = postIds; } - public Long getRoleId() - { + public Long getRoleId() { return roleId; } - public void setRoleId(Long roleId) - { + public void setRoleId(Long roleId) { this.roleId = roleId; } + @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("userId", getUserId()) - .append("deptId", getDeptId()) - .append("userName", getUserName()) - .append("nickName", getNickName()) - .append("email", getEmail()) - .append("phonenumber", getPhonenumber()) - .append("sex", getSex()) - .append("avatar", getAvatar()) - .append("password", getPassword()) - .append("status", getStatus()) - .append("delFlag", getDelFlag()) - .append("loginIp", getLoginIp()) - .append("loginDate", getLoginDate()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .append("dept", getDept()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("userId", getUserId()) + .append("deptId", getDeptId()) + .append("userName", getUserName()) + .append("nickName", getNickName()) + .append("email", getEmail()) + .append("phonenumber", getPhonenumber()) + .append("sex", getSex()) + .append("avatar", getAvatar()) + .append("password", getPassword()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("loginIp", getLoginIp()) + .append("loginDate", getLoginDate()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .append("dept", getDept()) + .toString(); } } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java index f101fa3a..a7973b81 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java @@ -11,23 +11,19 @@ import org.springframework.web.multipart.MultipartFile; /** * 鏂囦欢鏈嶅姟闄嶇骇澶勭悊 - * + * * @author ruoyi */ @Component -public class RemoteFileFallbackFactory implements FallbackFactory -{ +public class RemoteFileFallbackFactory implements FallbackFactory { private static final Logger log = LoggerFactory.getLogger(RemoteFileFallbackFactory.class); @Override - public RemoteFileService create(Throwable throwable) - { + public RemoteFileService create(Throwable throwable) { log.error("鏂囦欢鏈嶅姟璋冪敤澶辫触:{}", throwable.getMessage()); - return new RemoteFileService() - { + return new RemoteFileService() { @Override - public Rust upload(MultipartFile file) - { + public Rust upload(MultipartFile file) { return Rust.fail("涓婁紶鏂囦欢澶辫触:" + throwable.getMessage()); } }; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java index 251ad3a0..d29591bf 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java @@ -11,29 +11,24 @@ import org.springframework.stereotype.Component; /** * 鏃ュ織鏈嶅姟闄嶇骇澶勭悊 - * + * * @author ruoyi */ @Component -public class RemoteLogFallbackFactory implements FallbackFactory -{ +public class RemoteLogFallbackFactory implements FallbackFactory { private static final Logger log = LoggerFactory.getLogger(RemoteLogFallbackFactory.class); @Override - public RemoteLogService create(Throwable throwable) - { + public RemoteLogService create(Throwable throwable) { log.error("鏃ュ織鏈嶅姟璋冪敤澶辫触:{}", throwable.getMessage()); - return new RemoteLogService() - { + return new RemoteLogService() { @Override - public Rust saveLog(SysOperLog sysOperLog, String source) - { + public Rust saveLog(SysOperLog sysOperLog, String source) { return null; } @Override - public Rust saveLogininfor(SysLogininfor sysLogininfor, String source) - { + public Rust saveLogininfor(SysLogininfor sysLogininfor, String source) { return null; } }; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java index c7afdfef..793caf30 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java @@ -11,29 +11,24 @@ import org.springframework.stereotype.Component; /** * 鐢ㄦ埛鏈嶅姟闄嶇骇澶勭悊 - * + * * @author ruoyi */ @Component -public class RemoteUserFallbackFactory implements FallbackFactory -{ +public class RemoteUserFallbackFactory implements FallbackFactory { private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class); @Override - public RemoteUserService create(Throwable throwable) - { + public RemoteUserService create(Throwable throwable) { log.error("鐢ㄦ埛鏈嶅姟璋冪敤澶辫触:{}", throwable.getMessage()); - return new RemoteUserService() - { + return new RemoteUserService() { @Override - public Rust getUserInfo(String username, String source) - { + public Rust getUserInfo(String username, String source) { return Rust.fail("鑾峰彇鐢ㄦ埛澶辫触:" + throwable.getMessage()); } @Override - public Rust registerUserInfo(SysUser sysUser, String source) - { + public Rust registerUserInfo(SysUser sysUser, String source) { return Rust.fail("娉ㄥ唽鐢ㄦ埛澶辫触:" + throwable.getMessage()); } }; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java index 5522653c..c2157372 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java @@ -10,8 +10,7 @@ import java.util.Set; * * @author ruoyi */ -public class LoginUser implements Serializable -{ +public class LoginUser implements Serializable { private static final long serialVersionUID = 1L; /** @@ -59,93 +58,75 @@ public class LoginUser implements Serializable */ private SysUser sysUser; - public String getToken() - { + public String getToken() { return token; } - public void setToken(String token) - { + public void setToken(String token) { this.token = token; } - public Long getUserid() - { + public Long getUserid() { return userid; } - public void setUserid(Long userid) - { + public void setUserid(Long userid) { this.userid = userid; } - public String getUsername() - { + public String getUsername() { return username; } - public void setUsername(String username) - { + public void setUsername(String username) { this.username = username; } - public Long getLoginTime() - { + public Long getLoginTime() { return loginTime; } - public void setLoginTime(Long loginTime) - { + public void setLoginTime(Long loginTime) { this.loginTime = loginTime; } - public Long getExpireTime() - { + public Long getExpireTime() { return expireTime; } - public void setExpireTime(Long expireTime) - { + public void setExpireTime(Long expireTime) { this.expireTime = expireTime; } - public String getIpaddr() - { + public String getIpaddr() { return ipaddr; } - public void setIpaddr(String ipaddr) - { + public void setIpaddr(String ipaddr) { this.ipaddr = ipaddr; } - public Set getPermissions() - { + public Set getPermissions() { return permissions; } - public void setPermissions(Set permissions) - { + public void setPermissions(Set permissions) { this.permissions = permissions; } - public Set getRoles() - { + public Set getRoles() { return roles; } - public void setRoles(Set roles) - { + public void setRoles(Set roles) { this.roles = roles; } - public SysUser getSysUser() - { + public SysUser getSysUser() { return sysUser; } - public void setSysUser(SysUser sysUser) - { + public void setSysUser(SysUser sysUser) { this.sysUser = sysUser; } } diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java index 32b09f88..e4f934c8 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java @@ -7,15 +7,13 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; /** * 璁よ瘉鎺堟潈涓績 - * + * * @author ruoyi */ @EnableRyFeignClients -@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) -public class RuoYiAuthApplication -{ - public static void main(String[] args) - { +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) +public class RuoYiAuthApplication { + public static void main(String[] args) { SpringApplication.run(RuoYiAuthApplication.class, args); System.out.println("(鈾モ棤鈥库棤)锞夛緸 璁よ瘉鎺堟潈涓績鍚姩鎴愬姛 醿(麓凇`醿)锞 \n" + " .-------. ____ __ \n" + diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java index 6fcbffb6..87371c12 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java @@ -20,12 +20,11 @@ import javax.servlet.http.HttpServletRequest; /** * token 鎺у埗 - * + * * @author ruoyi */ @RestController -public class TokenController -{ +public class TokenController { @Autowired private TokenService tokenService; @@ -33,8 +32,7 @@ public class TokenController private SysLoginService sysLoginService; @PostMapping("login") - public Rust login(@RequestBody LoginBody form) - { + public Rust login(@RequestBody LoginBody form) { // 鐢ㄦ埛鐧诲綍 LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword()); // 鑾峰彇鐧诲綍token @@ -42,11 +40,9 @@ public class TokenController } @DeleteMapping("logout") - public Rust logout(HttpServletRequest request) - { + public Rust logout(HttpServletRequest request) { String token = SecurityUtils.getToken(request); - if (StringUtils.isNotEmpty(token)) - { + if (StringUtils.isNotEmpty(token)) { String username = JwtUtils.getUserName(token); // 鍒犻櫎鐢ㄦ埛缂撳瓨璁板綍 AuthUtil.logoutByToken(token); @@ -57,11 +53,9 @@ public class TokenController } @PostMapping("refresh") - public Rust refresh(HttpServletRequest request) - { + public Rust refresh(HttpServletRequest request) { LoginUser loginUser = tokenService.getLoginUser(request); - if (StringUtils.isNotNull(loginUser)) - { + if (StringUtils.isNotNull(loginUser)) { // 鍒锋柊浠ょ墝鏈夋晥鏈 tokenService.refreshToken(loginUser); return Rust.ok(); @@ -70,8 +64,7 @@ public class TokenController } @PostMapping("register") - public Rust register(@RequestBody RegisterBody registerBody) - { + public Rust register(@RequestBody RegisterBody registerBody) { // 鐢ㄦ埛娉ㄥ唽 sysLoginService.register(registerBody.getUsername(), registerBody.getPassword()); return Rust.ok(); diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java index b12fb314..b729da49 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java @@ -2,11 +2,10 @@ package com.ruoyi.auth.form; /** * 鐢ㄦ埛鐧诲綍瀵硅薄 - * + * * @author ruoyi */ -public class LoginBody -{ +public class LoginBody { /** * 鐢ㄦ埛鍚 */ @@ -17,23 +16,19 @@ public class LoginBody */ private String password; - public String getUsername() - { + public String getUsername() { return username; } - public void setUsername(String username) - { + public void setUsername(String username) { this.username = username; } - public String getPassword() - { + public String getPassword() { return password; } - public void setPassword(String password) - { + public void setPassword(String password) { this.password = password; } } diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java index a8e16eed..3001037c 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java @@ -2,10 +2,9 @@ package com.ruoyi.auth.form; /** * 鐢ㄦ埛娉ㄥ唽瀵硅薄 - * + * * @author ruoyi */ -public class RegisterBody extends LoginBody -{ +public class RegisterBody extends LoginBody { } diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java index 748b43a0..4062bd0f 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java @@ -20,12 +20,11 @@ import org.springframework.stereotype.Component; /** * 鐧诲綍鏍￠獙鏂规硶 - * + * * @author ruoyi */ @Component -public class SysLoginService -{ +public class SysLoginService { @Autowired private RemoteLogService remoteLogService; @@ -35,55 +34,46 @@ public class SysLoginService /** * 鐧诲綍 */ - public LoginUser login(String username, String password) - { + public LoginUser login(String username, String password) { // 鐢ㄦ埛鍚嶆垨瀵嗙爜涓虹┖ 閿欒 - if (StringUtils.isAnyBlank(username, password)) - { + if (StringUtils.isAnyBlank(username, password)) { recordLogininfor(username, Constants.LOGIN_FAIL, "鐢ㄦ埛/瀵嗙爜蹇呴』濉啓"); throw new ServiceException("鐢ㄦ埛/瀵嗙爜蹇呴』濉啓"); } // 瀵嗙爜濡傛灉涓嶅湪鎸囧畾鑼冨洿鍐 閿欒 if (password.length() < UserConstants.PASSWORD_MIN_LENGTH - || password.length() > UserConstants.PASSWORD_MAX_LENGTH) - { + || password.length() > UserConstants.PASSWORD_MAX_LENGTH) { recordLogininfor(username, Constants.LOGIN_FAIL, "鐢ㄦ埛瀵嗙爜涓嶅湪鎸囧畾鑼冨洿"); throw new ServiceException("鐢ㄦ埛瀵嗙爜涓嶅湪鎸囧畾鑼冨洿"); } // 鐢ㄦ埛鍚嶄笉鍦ㄦ寚瀹氳寖鍥村唴 閿欒 if (username.length() < UserConstants.USERNAME_MIN_LENGTH - || username.length() > UserConstants.USERNAME_MAX_LENGTH) - { + || username.length() > UserConstants.USERNAME_MAX_LENGTH) { recordLogininfor(username, Constants.LOGIN_FAIL, "鐢ㄦ埛鍚嶄笉鍦ㄦ寚瀹氳寖鍥"); throw new ServiceException("鐢ㄦ埛鍚嶄笉鍦ㄦ寚瀹氳寖鍥"); } // 鏌ヨ鐢ㄦ埛淇℃伅 Rust userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER); - if (Rust.FAIL == userResult.getCode()) - { + if (Rust.FAIL == userResult.getCode()) { throw new ServiceException(userResult.getMsg()); } - if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) - { + if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) { recordLogininfor(username, Constants.LOGIN_FAIL, "鐧诲綍鐢ㄦ埛涓嶅瓨鍦"); throw new ServiceException("鐧诲綍鐢ㄦ埛锛" + username + " 涓嶅瓨鍦"); } LoginUser userInfo = userResult.getData(); SysUser user = userResult.getData().getSysUser(); - if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) - { + if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) { recordLogininfor(username, Constants.LOGIN_FAIL, "瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿宸茶鍒犻櫎"); throw new ServiceException("瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿锛" + username + " 宸茶鍒犻櫎"); } - if (UserStatus.DISABLE.getCode().equals(user.getStatus())) - { + if (UserStatus.DISABLE.getCode().equals(user.getStatus())) { recordLogininfor(username, Constants.LOGIN_FAIL, "鐢ㄦ埛宸插仠鐢紝璇疯仈绯荤鐞嗗憳"); throw new ServiceException("瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿锛" + username + " 宸插仠鐢"); } - if (!SecurityUtils.matchesPassword(password, user.getPassword())) - { + if (!SecurityUtils.matchesPassword(password, user.getPassword())) { recordLogininfor(username, Constants.LOGIN_FAIL, "鐢ㄦ埛瀵嗙爜閿欒"); throw new ServiceException("鐢ㄦ埛涓嶅瓨鍦/瀵嗙爜閿欒"); } @@ -91,29 +81,24 @@ public class SysLoginService return userInfo; } - public void logout(String loginName) - { + public void logout(String loginName) { recordLogininfor(loginName, Constants.LOGOUT, "閫鍑烘垚鍔"); } /** * 娉ㄥ唽 */ - public void register(String username, String password) - { + public void register(String username, String password) { // 鐢ㄦ埛鍚嶆垨瀵嗙爜涓虹┖ 閿欒 - if (StringUtils.isAnyBlank(username, password)) - { + if (StringUtils.isAnyBlank(username, password)) { throw new ServiceException("鐢ㄦ埛/瀵嗙爜蹇呴』濉啓"); } if (username.length() < UserConstants.USERNAME_MIN_LENGTH - || username.length() > UserConstants.USERNAME_MAX_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) - { + || password.length() > UserConstants.PASSWORD_MAX_LENGTH) { throw new ServiceException("瀵嗙爜闀垮害蹇呴』鍦5鍒20涓瓧绗︿箣闂"); } @@ -124,8 +109,7 @@ public class SysLoginService sysUser.setPassword(SecurityUtils.encryptPassword(password)); Rust registerResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER); - if (Rust.FAIL == registerResult.getCode()) - { + if (Rust.FAIL == registerResult.getCode()) { throw new ServiceException(registerResult.getMsg()); } recordLogininfor(username, Constants.REGISTER, "娉ㄥ唽鎴愬姛"); @@ -133,25 +117,21 @@ public class SysLoginService /** * 璁板綍鐧诲綍淇℃伅 - * + * * @param username 鐢ㄦ埛鍚 - * @param status 鐘舵 - * @param message 娑堟伅鍐呭 + * @param status 鐘舵 + * @param message 娑堟伅鍐呭 * @return */ - public void recordLogininfor(String username, String status, String message) - { + public void recordLogininfor(String username, String status, String message) { SysLogininfor logininfor = new SysLogininfor(); logininfor.setUserName(username); logininfor.setIpaddr(IpUtils.getIpAddr(ServletUtils.getRequest())); logininfor.setMsg(message); // 鏃ュ織鐘舵 - if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER)) - { + if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER)) { logininfor.setStatus(Constants.LOGIN_SUCCESS_STATUS); - } - else if (Constants.LOGIN_FAIL.equals(status)) - { + } else if (Constants.LOGIN_FAIL.equals(status)) { logininfor.setStatus(Constants.LOGIN_FAIL_STATUS); } remoteLogService.saveLogininfor(logininfor, SecurityConstants.INNER); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java index d8ff08f7..79c17ff6 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java @@ -10,13 +10,12 @@ import java.math.BigDecimal; /** * 鑷畾涔夊鍑篍xcel鏁版嵁娉ㄨВ - * + * * @author ruoyi */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) -public @interface Excel -{ +public @interface Excel { /** * 瀵煎嚭鏃跺湪excel涓帓搴 */ @@ -117,32 +116,29 @@ public @interface Excel */ public String[] args() default {}; - public enum Align - { //AUTO( + /** + * 瀛楁绫诲瀷锛0锛氬鍑哄鍏ワ紱1锛氫粎瀵煎嚭锛2锛氫粎瀵煎叆锛 + */ + Type type() default Type.ALL; + + public enum Align { //AUTO( AUTO(0), LEFT(1), CENTER(2), RIGHT(3); private final int value; - Align(int value) - { + Align(int value) { this.value = value; } - public int value() - { + public int value() { return this.value; } } - /** - * 瀛楁绫诲瀷锛0锛氬鍑哄鍏ワ紱1锛氫粎瀵煎嚭锛2锛氫粎瀵煎叆锛 - */ - Type type() default Type.ALL; - - public enum Type - { /** + public enum Type { + /** * ALL */ ALL(0), @@ -156,19 +152,17 @@ public @interface Excel IMPORT(2); private final int value; - Type(int value) - { + Type(int value) { this.value = value; } - public int value() - { + public int value() { return this.value; } } - public enum ColumnType - { /** + public enum ColumnType { + /** * EXPORT */ NUMERIC(0), @@ -182,13 +176,11 @@ public @interface Excel IMAGE(2); private final int value; - ColumnType(int value) - { + ColumnType(int value) { this.value = value; } - public int value() - { + public int value() { return this.value; } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java index af2d9503..fe2d4d10 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java @@ -7,12 +7,11 @@ import java.lang.annotation.Target; /** * Excel娉ㄨВ闆 - * + * * @author ruoyi */ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) -public @interface Excels -{ +public @interface Excels { Excel[] value(); } \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java index 913a891d..958cfa20 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java @@ -2,11 +2,10 @@ package com.ruoyi.common.core.constant; /** * 缂撳瓨鐨刱ey 甯搁噺 - * + * * @author ruoyi */ -public class CacheConstants -{ +public class CacheConstants { /** * 缂撳瓨鏈夋晥鏈燂紝榛樿720锛堝垎閽燂級 */ diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java index 038c221e..91256e15 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java @@ -2,11 +2,10 @@ package com.ruoyi.common.core.constant; /** * 閫氱敤甯搁噺淇℃伅 - * + * * @author ruoyi */ -public class Constants -{ +public class Constants { /** * UTF-8 瀛楃闆 */ @@ -131,11 +130,11 @@ public class Constants /** * 瀹氭椂浠诲姟鐧藉悕鍗曢厤缃紙浠呭厑璁歌闂殑鍖呭悕锛屽鍏朵粬闇瑕佸彲浠ヨ嚜琛屾坊鍔狅級 */ - public static final String[] JOB_WHITELIST_STR = { "com.ruoyi" }; + public static final String[] JOB_WHITELIST_STR = {"com.ruoyi"}; /** * 瀹氭椂浠诲姟杩濊鐨勫瓧绗 */ - public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml", - "org.springframework", "org.apache", "com.ruoyi.common.core.utils.file" }; + public static final String[] JOB_ERROR_STR = {"java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml", + "org.springframework", "org.apache", "com.ruoyi.common.core.utils.file"}; } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java index 97866586..df897b79 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java @@ -2,116 +2,185 @@ package com.ruoyi.common.core.constant; /** * 浠ｇ爜鐢熸垚閫氱敤甯搁噺 - * + * * @author ruoyi */ -public class GenConstants -{ - /** 鍗曡〃锛堝鍒犳敼鏌ワ級 */ +public class GenConstants { + /** + * 鍗曡〃锛堝鍒犳敼鏌ワ級 + */ public static final String TPL_CRUD = "crud"; - /** 鏍戣〃锛堝鍒犳敼鏌ワ級 */ + /** + * 鏍戣〃锛堝鍒犳敼鏌ワ級 + */ public static final String TPL_TREE = "tree"; - /** 涓诲瓙琛紙澧炲垹鏀规煡锛 */ + /** + * 涓诲瓙琛紙澧炲垹鏀规煡锛 + */ public static final String TPL_SUB = "sub"; - /** 鏍戠紪鐮佸瓧娈 */ + /** + * 鏍戠紪鐮佸瓧娈 + */ public static final String TREE_CODE = "treeCode"; - /** 鏍戠埗缂栫爜瀛楁 */ + /** + * 鏍戠埗缂栫爜瀛楁 + */ public static final String TREE_PARENT_CODE = "treeParentCode"; - /** 鏍戝悕绉板瓧娈 */ + /** + * 鏍戝悕绉板瓧娈 + */ public static final String TREE_NAME = "treeName"; - /** 涓婄骇鑿滃崟ID瀛楁 */ + /** + * 涓婄骇鑿滃崟ID瀛楁 + */ public static final String PARENT_MENU_ID = "parentMenuId"; - /** 涓婄骇鑿滃崟鍚嶇О瀛楁 */ + /** + * 涓婄骇鑿滃崟鍚嶇О瀛楁 + */ public static final String PARENT_MENU_NAME = "parentMenuName"; - /** 鏁版嵁搴撳瓧绗︿覆绫诲瀷 */ - public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2" }; - - /** 鏁版嵁搴撴枃鏈被鍨 */ - public static final String[] COLUMNTYPE_TEXT = { "tinytext", "text", "mediumtext", "longtext" }; - - /** 鏁版嵁搴撴椂闂寸被鍨 */ - public static final String[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp" }; - - /** 鏁版嵁搴撴暟瀛楃被鍨 */ - public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer", - "bigint", "float", "double", "decimal" }; - - /** 椤甸潰涓嶉渶瑕佺紪杈戝瓧娈 */ - public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" }; - - /** 椤甸潰涓嶉渶瑕佹樉绀虹殑鍒楄〃瀛楁 */ - public static final String[] COLUMNNAME_NOT_LIST = { "id", "create_by", "create_time", "del_flag", "update_by", - "update_time" }; - - /** 椤甸潰涓嶉渶瑕佹煡璇㈠瓧娈 */ - public static final String[] COLUMNNAME_NOT_QUERY = { "id", "create_by", "create_time", "del_flag", "update_by", - "update_time", "remark" }; - - /** Entity鍩虹被瀛楁 */ - public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime", "remark" }; - - /** Tree鍩虹被瀛楁 */ - public static final String[] TREE_ENTITY = { "parentName", "parentId", "orderNum", "ancestors" }; - - /** 鏂囨湰妗 */ + /** + * 鏁版嵁搴撳瓧绗︿覆绫诲瀷 + */ + public static final String[] COLUMNTYPE_STR = {"char", "varchar", "nvarchar", "varchar2"}; + + /** + * 鏁版嵁搴撴枃鏈被鍨 + */ + public static final String[] COLUMNTYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext"}; + + /** + * 鏁版嵁搴撴椂闂寸被鍨 + */ + public static final String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp"}; + + /** + * 鏁版嵁搴撴暟瀛楃被鍨 + */ + public static final String[] COLUMNTYPE_NUMBER = {"tinyint", "smallint", "mediumint", "int", "number", "integer", + "bigint", "float", "double", "decimal"}; + + /** + * 椤甸潰涓嶉渶瑕佺紪杈戝瓧娈 + */ + public static final String[] COLUMNNAME_NOT_EDIT = {"id", "create_by", "create_time", "del_flag"}; + + /** + * 椤甸潰涓嶉渶瑕佹樉绀虹殑鍒楄〃瀛楁 + */ + public static final String[] COLUMNNAME_NOT_LIST = {"id", "create_by", "create_time", "del_flag", "update_by", + "update_time"}; + + /** + * 椤甸潰涓嶉渶瑕佹煡璇㈠瓧娈 + */ + public static final String[] COLUMNNAME_NOT_QUERY = {"id", "create_by", "create_time", "del_flag", "update_by", + "update_time", "remark"}; + + /** + * Entity鍩虹被瀛楁 + */ + public static final String[] BASE_ENTITY = {"createBy", "createTime", "updateBy", "updateTime", "remark"}; + + /** + * Tree鍩虹被瀛楁 + */ + public static final String[] TREE_ENTITY = {"parentName", "parentId", "orderNum", "ancestors"}; + + /** + * 鏂囨湰妗 + */ public static final String HTML_INPUT = "input"; - /** 鏂囨湰鍩 */ + /** + * 鏂囨湰鍩 + */ public static final String HTML_TEXTAREA = "textarea"; - /** 涓嬫媺妗 */ + /** + * 涓嬫媺妗 + */ public static final String HTML_SELECT = "select"; - /** 鍗曢夋 */ + /** + * 鍗曢夋 + */ public static final String HTML_RADIO = "radio"; - /** 澶嶉夋 */ + /** + * 澶嶉夋 + */ public static final String HTML_CHECKBOX = "checkbox"; - /** 鏃ユ湡鎺т欢 */ + /** + * 鏃ユ湡鎺т欢 + */ public static final String HTML_DATETIME = "datetime"; - /** 鍥剧墖涓婁紶鎺т欢 */ + /** + * 鍥剧墖涓婁紶鎺т欢 + */ public static final String HTML_IMAGE_UPLOAD = "imageUpload"; - /** 鏂囦欢涓婁紶鎺т欢 */ + /** + * 鏂囦欢涓婁紶鎺т欢 + */ public static final String HTML_FILE_UPLOAD = "fileUpload"; - /** 瀵屾枃鏈帶浠 */ + /** + * 瀵屾枃鏈帶浠 + */ public static final String HTML_EDITOR = "editor"; - /** 瀛楃涓茬被鍨 */ + /** + * 瀛楃涓茬被鍨 + */ public static final String TYPE_STRING = "String"; - /** 鏁村瀷 */ + /** + * 鏁村瀷 + */ public static final String TYPE_INTEGER = "Integer"; - /** 闀挎暣鍨 */ + /** + * 闀挎暣鍨 + */ public static final String TYPE_LONG = "Long"; - /** 娴偣鍨 */ + /** + * 娴偣鍨 + */ public static final String TYPE_DOUBLE = "Double"; - /** 楂樼簿搴﹁绠楃被鍨 */ + /** + * 楂樼簿搴﹁绠楃被鍨 + */ public static final String TYPE_BIGDECIMAL = "BigDecimal"; - /** 鏃堕棿绫诲瀷 */ + /** + * 鏃堕棿绫诲瀷 + */ public static final String TYPE_DATE = "Date"; - /** 妯＄硦鏌ヨ */ + /** + * 妯＄硦鏌ヨ + */ public static final String QUERY_LIKE = "LIKE"; - /** 鐩哥瓑鏌ヨ */ + /** + * 鐩哥瓑鏌ヨ + */ public static final String QUERY_EQ = "EQ"; - /** 闇瑕 */ + /** + * 闇瑕 + */ public static final String REQUIRE = "1"; } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java index 0af327cd..a6fe3525 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java @@ -2,11 +2,10 @@ package com.ruoyi.common.core.constant; /** * 杩斿洖鐘舵佺爜 - * + * * @author ruoyi */ -public class HttpStatus -{ +public class HttpStatus { /** * 鎿嶄綔鎴愬姛 */ diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java index b562cff1..c1ab39be 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java @@ -2,30 +2,38 @@ package com.ruoyi.common.core.constant; /** * 浠诲姟璋冨害閫氱敤甯搁噺 - * + * * @author ruoyi */ -public class ScheduleConstants -{ +public class ScheduleConstants { public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME"; - /** 鎵ц鐩爣key */ + /** + * 鎵ц鐩爣key + */ public static final String TASK_PROPERTIES = "TASK_PROPERTIES"; - /** 榛樿 */ + /** + * 榛樿 + */ public static final String MISFIRE_DEFAULT = "0"; - /** 绔嬪嵆瑙﹀彂鎵ц */ + /** + * 绔嬪嵆瑙﹀彂鎵ц + */ public static final String MISFIRE_IGNORE_MISFIRES = "1"; - /** 瑙﹀彂涓娆℃墽琛 */ + /** + * 瑙﹀彂涓娆℃墽琛 + */ public static final String MISFIRE_FIRE_AND_PROCEED = "2"; - /** 涓嶈Е鍙戠珛鍗虫墽琛 */ + /** + * 涓嶈Е鍙戠珛鍗虫墽琛 + */ public static final String MISFIRE_DO_NOTHING = "3"; - public enum Status - { + public enum Status { /** * 姝ｅ父 */ @@ -37,13 +45,11 @@ public class ScheduleConstants private String value; - private Status(String value) - { + private Status(String value) { this.value = value; } - public String getValue() - { + public String getValue() { return value; } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java index aecbd95a..c642241b 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java @@ -2,11 +2,10 @@ package com.ruoyi.common.core.constant; /** * 鏉冮檺鐩稿叧閫氱敤甯搁噺 - * + * * @author ruoyi */ -public class SecurityConstants -{ +public class SecurityConstants { /** * 鐢ㄦ埛ID瀛楁 */ diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java index a7dcfdd6..d6887446 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java @@ -2,11 +2,10 @@ package com.ruoyi.common.core.constant; /** * 鏈嶅姟鍚嶇О - * + * * @author ruoyi */ -public class ServiceNameConstants -{ +public class ServiceNameConstants { /** * 璁よ瘉鏈嶅姟鐨剆erviceid */ diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java index f6c6b8d4..27c21539 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java @@ -2,11 +2,10 @@ package com.ruoyi.common.core.constant; /** * Token鐨凨ey甯搁噺 - * + * * @author ruoyi */ -public class TokenConstants -{ +public class TokenConstants { /** * 浠ょ墝鑷畾涔夋爣璇 */ diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java index 2d7f1e8a..396364b0 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java @@ -2,65 +2,98 @@ package com.ruoyi.common.core.constant; /** * 鐢ㄦ埛甯搁噺淇℃伅 - * + * * @author ruoyi */ -public class UserConstants -{ +public class UserConstants { /** * 骞冲彴鍐呯郴缁熺敤鎴风殑鍞竴鏍囧織 */ public static final String SYS_USER = "SYS_USER"; - /** 姝ｅ父鐘舵 */ + /** + * 姝ｅ父鐘舵 + */ public static final String NORMAL = "0"; - /** 寮傚父鐘舵 */ + /** + * 寮傚父鐘舵 + */ public static final String EXCEPTION = "1"; - /** 鐢ㄦ埛灏佺鐘舵 */ + /** + * 鐢ㄦ埛灏佺鐘舵 + */ public static final String USER_DISABLE = "1"; - /** 瑙掕壊灏佺鐘舵 */ + /** + * 瑙掕壊灏佺鐘舵 + */ public static final String ROLE_DISABLE = "1"; - /** 閮ㄩ棬姝ｅ父鐘舵 */ + /** + * 閮ㄩ棬姝ｅ父鐘舵 + */ public static final String DEPT_NORMAL = "0"; - /** 閮ㄩ棬鍋滅敤鐘舵 */ + /** + * 閮ㄩ棬鍋滅敤鐘舵 + */ public static final String DEPT_DISABLE = "1"; - /** 瀛楀吀姝ｅ父鐘舵 */ + /** + * 瀛楀吀姝ｅ父鐘舵 + */ public static final String DICT_NORMAL = "0"; - /** 鏄惁涓虹郴缁熼粯璁わ紙鏄級 */ + /** + * 鏄惁涓虹郴缁熼粯璁わ紙鏄級 + */ public static final String YES = "Y"; - /** 鏄惁鑿滃崟澶栭摼锛堟槸锛 */ + /** + * 鏄惁鑿滃崟澶栭摼锛堟槸锛 + */ public static final String YES_FRAME = "0"; - /** 鏄惁鑿滃崟澶栭摼锛堝惁锛 */ + /** + * 鏄惁鑿滃崟澶栭摼锛堝惁锛 + */ public static final String NO_FRAME = "1"; - /** 鑿滃崟绫诲瀷锛堢洰褰曪級 */ + /** + * 鑿滃崟绫诲瀷锛堢洰褰曪級 + */ public static final String TYPE_DIR = "M"; - /** 鑿滃崟绫诲瀷锛堣彍鍗曪級 */ + /** + * 鑿滃崟绫诲瀷锛堣彍鍗曪級 + */ public static final String TYPE_MENU = "C"; - /** 鑿滃崟绫诲瀷锛堟寜閽級 */ + /** + * 鑿滃崟绫诲瀷锛堟寜閽級 + */ public static final String TYPE_BUTTON = "F"; - /** Layout缁勪欢鏍囪瘑 */ + /** + * Layout缁勪欢鏍囪瘑 + */ public final static String LAYOUT = "Layout"; - /** ParentView缁勪欢鏍囪瘑 */ + /** + * ParentView缁勪欢鏍囪瘑 + */ public final static String PARENT_VIEW = "ParentView"; - /** InnerLink缁勪欢鏍囪瘑 */ + /** + * InnerLink缁勪欢鏍囪瘑 + */ public final static String INNER_LINK = "InnerLink"; - /** 鏍￠獙杩斿洖缁撴灉鐮 */ + /** + * 鏍￠獙杩斿洖缁撴灉鐮 + */ public final static String UNIQUE = "0"; public final static String NOT_UNIQUE = "1"; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java index c350298a..8f843d54 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java @@ -9,81 +9,67 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; /** - * 鑾峰彇褰撳墠绾跨▼鍙橀噺涓殑 鐢ㄦ埛id銆佺敤鎴峰悕绉般乀oken绛変俊鎭 + * 鑾峰彇褰撳墠绾跨▼鍙橀噺涓殑 鐢ㄦ埛id銆佺敤鎴峰悕绉般乀oken绛変俊鎭 * 娉ㄦ剰锛 蹇呴』鍦ㄧ綉鍏抽氳繃璇锋眰澶寸殑鏂规硶浼犲叆锛屽悓鏃跺湪HeaderInterceptor鎷︽埅鍣ㄨ缃笺 鍚﹀垯杩欓噷鏃犳硶鑾峰彇 * * @author ruoyi */ -public class SecurityContextHolder -{ +public class SecurityContextHolder { private static final TransmittableThreadLocal> THREAD_LOCAL = new TransmittableThreadLocal<>(); - public static void set(String key, Object value) - { + public static void set(String key, Object value) { Map map = getLocalMap(); map.put(key, value == null ? StringUtils.EMPTY : value); } - public static String get(String key) - { + public static String get(String key) { Map map = getLocalMap(); return Convert.toStr(map.getOrDefault(key, StringUtils.EMPTY)); } - public static T get(String key, Class clazz) - { + public static T get(String key, Class clazz) { Map map = getLocalMap(); return StringUtils.cast(map.getOrDefault(key, null)); } - public static Map getLocalMap() - { + public static Map getLocalMap() { Map map = THREAD_LOCAL.get(); - if (map == null) - { + if (map == null) { map = new ConcurrentHashMap(2); THREAD_LOCAL.set(map); } return map; } - public static void setLocalMap(Map threadLocalMap) - { + public static void setLocalMap(Map threadLocalMap) { THREAD_LOCAL.set(threadLocalMap); } - public static Long getUserId() - { + public static Long getUserId() { return Convert.toLong(get(SecurityConstants.DETAILS_USER_ID), 0L); } - public static void setUserId(String account) - { + public static void setUserId(String account) { set(SecurityConstants.DETAILS_USER_ID, account); } - public static String getUserName() - { + public static String getUserName() { return get(SecurityConstants.DETAILS_USERNAME); } - public static void setUserName(String username) - { + public static void setUserName(String username) { set(SecurityConstants.DETAILS_USERNAME, username); } - public static String getUserKey() - { + public static String getUserKey() { return get(SecurityConstants.USER_KEY); } - public static void setUserKey(String userKey) - { + public static void setUserKey(String userKey) { set(SecurityConstants.USER_KEY, userKey); } - public static void remove() - { + public static void remove() { THREAD_LOCAL.remove(); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/Rust.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/Rust.java index b80d483f..03ec80ed 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/Rust.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/Rust.java @@ -9,64 +9,55 @@ import java.io.Serializable; * * @author ruoyi */ -public class Rust implements Serializable -{ - private static final long serialVersionUID = 1L; - - /** 鎴愬姛 */ +public class Rust implements Serializable { + /** + * 鎴愬姛 + */ public static final int SUCCESS = Constants.SUCCESS; - - /** 澶辫触 */ + /** + * 澶辫触 + */ public static final int FAIL = Constants.FAIL; - + private static final long serialVersionUID = 1L; private int code; private String msg; private T data; - public static Rust ok() - { + public static Rust ok() { return restResult(null, SUCCESS, null); } - public static Rust ok(T data) - { + public static Rust ok(T data) { return restResult(data, SUCCESS, null); } - public static Rust ok(T data, String msg) - { + public static Rust ok(T data, String msg) { return restResult(data, SUCCESS, msg); } - public static Rust fail() - { + public static Rust fail() { return restResult(null, FAIL, null); } - public static Rust fail(String msg) - { + public static Rust fail(String msg) { return restResult(null, FAIL, msg); } - public static Rust fail(T data) - { + public static Rust fail(T data) { return restResult(data, FAIL, null); } - public static Rust fail(T data, String msg) - { + public static Rust fail(T data, String msg) { return restResult(data, FAIL, msg); } - public static Rust fail(int code, String msg) - { + public static Rust fail(int code, String msg) { return restResult(null, code, msg); } - private static Rust restResult(T data, int code, String msg) - { + private static Rust restResult(T data, int code, String msg) { Rust apiResult = new Rust<>(); apiResult.setCode(code); apiResult.setData(data); @@ -74,33 +65,27 @@ public class Rust implements Serializable return apiResult; } - public int getCode() - { + public int getCode() { return code; } - public void setCode(int code) - { + public void setCode(int code) { this.code = code; } - public String getMsg() - { + public String getMsg() { return msg; } - public void setMsg(String msg) - { + public void setMsg(String msg) { this.msg = msg; } - public T getData() - { + public T getData() { return data; } - public void setData(T data) - { + public void setData(T data) { this.data = data; } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java index 07665ecd..66ce7340 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java @@ -2,11 +2,11 @@ package com.ruoyi.common.core.enums; /** * 鐢ㄦ埛鐘舵 - * + * * @author ruoyi */ -public enum UserStatus -{ /** +public enum UserStatus { + /** * EXPORT */ OK("0", "姝ｅ父"), @@ -22,19 +22,16 @@ public enum UserStatus private final String code; private final String info; - UserStatus(String code, String info) - { + UserStatus(String code, String info) { this.code = code; this.info = info; } - public String getCode() - { + public String getCode() { return code; } - public String getInfo() - { + public String getInfo() { return info; } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java index 3e018510..961f6045 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java @@ -2,15 +2,13 @@ package com.ruoyi.common.core.exception; /** * 楠岃瘉鐮侀敊璇紓甯哥被 - * + * * @author ruoyi */ -public class CaptchaException extends RuntimeException -{ +public class CaptchaException extends RuntimeException { private static final long serialVersionUID = 1L; - public CaptchaException(String msg) - { + public CaptchaException(String msg) { super(msg); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java index 862eefa5..f4724f75 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java @@ -2,30 +2,25 @@ package com.ruoyi.common.core.exception; /** * 妫鏌ュ紓甯 - * + * * @author ruoyi */ -public class CheckedException extends RuntimeException -{ +public class CheckedException extends RuntimeException { private static final long serialVersionUID = 1L; - public CheckedException(String message) - { + public CheckedException(String message) { super(message); } - public CheckedException(Throwable cause) - { + public CheckedException(Throwable cause) { super(cause); } - public CheckedException(String message, Throwable cause) - { + public CheckedException(String message, Throwable cause) { super(message, cause); } - public CheckedException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) - { + public CheckedException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { super(message, cause, enableSuppression, writableStackTrace); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java index ac2a19e9..3af32a38 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java @@ -2,14 +2,12 @@ package com.ruoyi.common.core.exception; /** * 婕旂ず妯″紡寮傚父 - * + * * @author ruoyi */ -public class DemoModeException extends RuntimeException -{ +public class DemoModeException extends RuntimeException { private static final long serialVersionUID = 1L; - public DemoModeException() - { + public DemoModeException() { } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java index 05c009e2..baf744eb 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java @@ -2,11 +2,10 @@ package com.ruoyi.common.core.exception; /** * 鍏ㄥ眬寮傚父 - * + * * @author ruoyi */ -public class GlobalException extends RuntimeException -{ +public class GlobalException extends RuntimeException { private static final long serialVersionUID = 1L; @@ -17,7 +16,7 @@ public class GlobalException extends RuntimeException /** * 閿欒鏄庣粏锛屽唴閮ㄨ皟璇曢敊璇 - * + *

* 鍜 CommonResult#getDetailMessage() 涓鑷寸殑璁捐 */ private String detailMessage; @@ -25,34 +24,28 @@ public class GlobalException extends RuntimeException /** * 绌烘瀯閫犳柟娉曪紝閬垮厤鍙嶅簭鍒楀寲闂 */ - public GlobalException() - { + public GlobalException() { } - public GlobalException(String message) - { + public GlobalException(String message) { this.message = message; } - public String getDetailMessage() - { + public String getDetailMessage() { return detailMessage; } - public GlobalException setDetailMessage(String detailMessage) - { + public GlobalException setDetailMessage(String detailMessage) { this.detailMessage = detailMessage; return this; } @Override - public String getMessage() - { + public String getMessage() { return message; } - public GlobalException setMessage(String message) - { + public GlobalException setMessage(String message) { this.message = message; return this; } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java index 8a7abe9f..5cc2eadc 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java @@ -2,15 +2,13 @@ package com.ruoyi.common.core.exception; /** * 鍐呴儴璁よ瘉寮傚父 - * + * * @author ruoyi */ -public class InnerAuthException extends RuntimeException -{ +public class InnerAuthException extends RuntimeException { private static final long serialVersionUID = 1L; - public InnerAuthException(String message) - { + public InnerAuthException(String message) { super(message); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java index 3d420c41..5d786c3a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java @@ -2,14 +2,12 @@ package com.ruoyi.common.core.exception; /** * 鏉冮檺寮傚父 - * + * * @author ruoyi */ -public class PreAuthorizeException extends RuntimeException -{ +public class PreAuthorizeException extends RuntimeException { private static final long serialVersionUID = 1L; - public PreAuthorizeException() - { + public PreAuthorizeException() { } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java index 00df0f4d..2eb680f8 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java @@ -2,11 +2,10 @@ package com.ruoyi.common.core.exception; /** * 涓氬姟寮傚父 - * + * * @author ruoyi */ -public final class ServiceException extends RuntimeException -{ +public final class ServiceException extends RuntimeException { private static final long serialVersionUID = 1L; /** @@ -21,7 +20,7 @@ public final class ServiceException extends RuntimeException /** * 閿欒鏄庣粏锛屽唴閮ㄨ皟璇曢敊璇 - * + *

* 鍜 CommonResult#getDetailMessage() 涓鑷寸殑璁捐 */ private String detailMessage; @@ -29,46 +28,38 @@ public final class ServiceException extends RuntimeException /** * 绌烘瀯閫犳柟娉曪紝閬垮厤鍙嶅簭鍒楀寲闂 */ - public ServiceException() - { + public ServiceException() { } - public ServiceException(String message) - { + public ServiceException(String message) { this.message = message; } - public ServiceException(String message, Integer code) - { + public ServiceException(String message, Integer code) { this.message = message; this.code = code; } - public String getDetailMessage() - { + public String getDetailMessage() { return detailMessage; } - @Override - public String getMessage() - { - return message; + public ServiceException setDetailMessage(String detailMessage) { + this.detailMessage = detailMessage; + return this; } - public Integer getCode() - { - return code; + @Override + public String getMessage() { + return message; } - public ServiceException setMessage(String message) - { + public ServiceException setMessage(String message) { this.message = message; return this; } - public ServiceException setDetailMessage(String detailMessage) - { - this.detailMessage = detailMessage; - return this; + public Integer getCode() { + return code; } } \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java index a1c16b53..ed5e4e82 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java @@ -2,25 +2,21 @@ package com.ruoyi.common.core.exception; /** * 宸ュ叿绫诲紓甯 - * + * * @author ruoyi */ -public class UtilException extends RuntimeException -{ +public class UtilException extends RuntimeException { private static final long serialVersionUID = 8247610319171014183L; - public UtilException(Throwable e) - { + public UtilException(Throwable e) { super(e.getMessage(), e); } - public UtilException(String message) - { + public UtilException(String message) { super(message); } - public UtilException(String message, Throwable throwable) - { + public UtilException(String message, Throwable throwable) { super(message, throwable); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java index eb6c3ae9..47ce5aba 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java @@ -2,15 +2,13 @@ package com.ruoyi.common.core.exception.auth; /** * 鏈兘閫氳繃鐨勭櫥褰曡璇佸紓甯 - * + * * @author ruoyi */ -public class NotLoginException extends RuntimeException -{ +public class NotLoginException extends RuntimeException { private static final long serialVersionUID = 1L; - public NotLoginException(String message) - { + public NotLoginException(String message) { super(message); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java index a578a42e..82994f02 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java @@ -4,20 +4,17 @@ import org.apache.commons.lang3.StringUtils; /** * 鏈兘閫氳繃鐨勬潈闄愯璇佸紓甯 - * + * * @author ruoyi */ -public class NotPermissionException extends RuntimeException -{ +public class NotPermissionException extends RuntimeException { private static final long serialVersionUID = 1L; - public NotPermissionException(String permission) - { + public NotPermissionException(String permission) { super(permission); } - public NotPermissionException(String[] permissions) - { + public NotPermissionException(String[] permissions) { super(StringUtils.join(permissions, ",")); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java index d07118fb..84abe137 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java @@ -4,20 +4,17 @@ import org.apache.commons.lang3.StringUtils; /** * 鏈兘閫氳繃鐨勮鑹茶璇佸紓甯 - * + * * @author ruoyi */ -public class NotRoleException extends RuntimeException -{ +public class NotRoleException extends RuntimeException { private static final long serialVersionUID = 1L; - public NotRoleException(String role) - { + public NotRoleException(String role) { super(role); } - public NotRoleException(String[] roles) - { + public NotRoleException(String[] roles) { super(StringUtils.join(roles, ",")); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java index 3d2fa105..d37252bb 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java @@ -2,11 +2,10 @@ package com.ruoyi.common.core.exception.base; /** * 鍩虹寮傚父 - * + * * @author ruoyi */ -public class BaseException extends RuntimeException -{ +public class BaseException extends RuntimeException { private static final long serialVersionUID = 1L; /** @@ -29,51 +28,42 @@ public class BaseException extends RuntimeException */ private String defaultMessage; - public BaseException(String module, String code, Object[] args, String defaultMessage) - { + public BaseException(String module, String code, Object[] args, String defaultMessage) { this.module = module; this.code = code; this.args = args; this.defaultMessage = defaultMessage; } - public BaseException(String module, String code, Object[] args) - { + public BaseException(String module, String code, Object[] args) { this(module, code, args, null); } - public BaseException(String module, String defaultMessage) - { + public BaseException(String module, String defaultMessage) { this(module, null, null, defaultMessage); } - public BaseException(String code, Object[] args) - { + public BaseException(String code, Object[] args) { this(null, code, args, null); } - public BaseException(String defaultMessage) - { + public BaseException(String defaultMessage) { this(null, null, null, defaultMessage); } - public String getModule() - { + public String getModule() { return module; } - public String getCode() - { + public String getCode() { return code; } - public Object[] getArgs() - { + public Object[] getArgs() { return args; } - public String getDefaultMessage() - { + public String getDefaultMessage() { return defaultMessage; } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java index ae615432..a2766911 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java @@ -4,15 +4,13 @@ import com.ruoyi.common.core.exception.base.BaseException; /** * 鏂囦欢淇℃伅寮傚父绫 - * + * * @author ruoyi */ -public class FileException extends BaseException -{ +public class FileException extends BaseException { private static final long serialVersionUID = 1L; - public FileException(String code, Object[] args) - { + public FileException(String code, Object[] args) { super("file", code, args, null); } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java index c425acdf..16a2f773 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java @@ -2,15 +2,13 @@ package com.ruoyi.common.core.exception.file; /** * 鏂囦欢鍚嶇О瓒呴暱闄愬埗寮傚父绫 - * + * * @author ruoyi */ -public class FileNameLengthLimitExceededException extends FileException -{ +public class FileNameLengthLimitExceededException extends FileException { private static final long serialVersionUID = 1L; - public FileNameLengthLimitExceededException(int defaultFileNameLength) - { - super("upload.filename.exceed.length", new Object[] { defaultFileNameLength }); + public FileNameLengthLimitExceededException(int defaultFileNameLength) { + super("upload.filename.exceed.length", new Object[]{defaultFileNameLength}); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java index 0426067a..35c85cd2 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java @@ -2,15 +2,13 @@ package com.ruoyi.common.core.exception.file; /** * 鏂囦欢鍚嶅ぇ灏忛檺鍒跺紓甯哥被 - * + * * @author ruoyi */ -public class FileSizeLimitExceededException extends FileException -{ +public class FileSizeLimitExceededException extends FileException { private static final long serialVersionUID = 1L; - public FileSizeLimitExceededException(long defaultMaxSize) - { - super("upload.exceed.maxSize", new Object[] { defaultMaxSize }); + public FileSizeLimitExceededException(long defaultMaxSize) { + super("upload.exceed.maxSize", new Object[]{defaultMaxSize}); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java index 79b18feb..7e23a0f1 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java @@ -6,76 +6,63 @@ import java.util.Arrays; /** * 鏂囦欢涓婁紶 璇紓甯哥被 - * + * * @author ruoyi */ -public class InvalidExtensionException extends FileUploadException -{ +public class InvalidExtensionException extends FileUploadException { private static final long serialVersionUID = 1L; private String[] allowedExtension; private String extension; private String filename; - public InvalidExtensionException(String[] allowedExtension, String extension, String filename) - { + public InvalidExtensionException(String[] allowedExtension, String extension, String filename) { super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]"); this.allowedExtension = allowedExtension; this.extension = extension; this.filename = filename; } - public String[] getAllowedExtension() - { + public String[] getAllowedExtension() { return allowedExtension; } - public String getExtension() - { + public String getExtension() { return extension; } - public String getFilename() - { + public String getFilename() { return filename; } - public static class InvalidImageExtensionException extends InvalidExtensionException - { + public static class InvalidImageExtensionException extends InvalidExtensionException { private static final long serialVersionUID = 1L; - public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename) - { + public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename) { super(allowedExtension, extension, filename); } } - public static class InvalidFlashExtensionException extends InvalidExtensionException - { + public static class InvalidFlashExtensionException extends InvalidExtensionException { private static final long serialVersionUID = 1L; - public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename) - { + public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename) { super(allowedExtension, extension, filename); } } - public static class InvalidMediaExtensionException extends InvalidExtensionException - { + public static class InvalidMediaExtensionException extends InvalidExtensionException { private static final long serialVersionUID = 1L; - public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename) - { + public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename) { super(allowedExtension, extension, filename); } } - - public static class InvalidVideoExtensionException extends InvalidExtensionException - { + + public static class InvalidVideoExtensionException extends InvalidExtensionException { private static final long serialVersionUID = 1L; - public InvalidVideoExtensionException(String[] allowedExtension, String extension, String filename) - { + public InvalidVideoExtensionException(String[] allowedExtension, String extension, String filename) { super(allowedExtension, extension, filename); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java index 3ae3a2ea..069da970 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java @@ -2,33 +2,29 @@ package com.ruoyi.common.core.exception.job; /** * 璁″垝绛栫暐寮傚父 - * + * * @author ruoyi */ -public class TaskException extends Exception -{ +public class TaskException extends Exception { private static final long serialVersionUID = 1L; private Code code; - public TaskException(String msg, Code code) - { + public TaskException(String msg, Code code) { this(msg, code, null); } - public TaskException(String msg, Code code, Exception nestedEx) - { + public TaskException(String msg, Code code, Exception nestedEx) { super(msg, nestedEx); this.code = code; } - public Code getCode() - { + public Code getCode() { return code; } - public enum Code - { /** + public enum Code { + /** * EXPORT */ TASK_EXISTS, diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java index 6924d7e5..87d5fe3f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java @@ -2,15 +2,13 @@ package com.ruoyi.common.core.exception.user; /** * 楠岃瘉鐮佸け鏁堝紓甯哥被 - * + * * @author ruoyi */ -public class CaptchaExpireException extends UserException -{ +public class CaptchaExpireException extends UserException { private static final long serialVersionUID = 1L; - public CaptchaExpireException() - { + public CaptchaExpireException() { super("user.jcaptcha.expire", null); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java index 5493804c..c7b8aefd 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java @@ -4,15 +4,13 @@ import com.ruoyi.common.core.exception.base.BaseException; /** * 鐢ㄦ埛淇℃伅寮傚父绫 - * + * * @author ruoyi */ -public class UserException extends BaseException -{ +public class UserException extends BaseException { private static final long serialVersionUID = 1L; - public UserException(String code, Object[] args) - { + public UserException(String code, Object[] args) { super("user", code, args, null); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java index 7f514a60..0a9aa5c2 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java @@ -2,15 +2,13 @@ package com.ruoyi.common.core.exception.user; /** * 鐢ㄦ埛瀵嗙爜涓嶆纭垨涓嶇鍚堣鑼冨紓甯哥被 - * + * * @author ruoyi */ -public class UserPasswordNotMatchException extends UserException -{ +public class UserPasswordNotMatchException extends UserException { private static final long serialVersionUID = 1L; - public UserPasswordNotMatchException() - { + public UserPasswordNotMatchException() { super("user.password.not.match", null); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java index f973dd7d..c377f383 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java @@ -7,71 +7,76 @@ import java.nio.charset.StandardCharsets; /** * 瀛楃闆嗗伐鍏风被 - * + * * @author ruoyi */ -public class CharsetKit -{ - /** ISO-8859-1 */ +public class CharsetKit { + /** + * ISO-8859-1 + */ public static final String ISO_8859_1 = "ISO-8859-1"; - /** UTF-8 */ + /** + * UTF-8 + */ public static final String UTF_8 = "UTF-8"; - /** GBK */ + /** + * GBK + */ public static final String GBK = "GBK"; - /** ISO-8859-1 */ + /** + * ISO-8859-1 + */ public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1); - /** UTF-8 */ + /** + * UTF-8 + */ public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8); - /** GBK */ + /** + * GBK + */ public static final Charset CHARSET_GBK = Charset.forName(GBK); /** * 杞崲涓篊harset瀵硅薄 - * + * * @param charset 瀛楃闆嗭紝涓虹┖鍒欒繑鍥為粯璁ゅ瓧绗﹂泦 * @return Charset */ - public static Charset charset(String charset) - { + public static Charset charset(String charset) { return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset); } /** * 杞崲瀛楃涓茬殑瀛楃闆嗙紪鐮 - * - * @param source 瀛楃涓 - * @param srcCharset 婧愬瓧绗﹂泦锛岄粯璁SO-8859-1 + * + * @param source 瀛楃涓 + * @param srcCharset 婧愬瓧绗﹂泦锛岄粯璁SO-8859-1 * @param destCharset 鐩爣瀛楃闆嗭紝榛樿UTF-8 * @return 杞崲鍚庣殑瀛楃闆 */ - public static String convert(String source, String srcCharset, String destCharset) - { + public static String convert(String source, String srcCharset, String destCharset) { return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset)); } /** * 杞崲瀛楃涓茬殑瀛楃闆嗙紪鐮 - * - * @param source 瀛楃涓 - * @param srcCharset 婧愬瓧绗﹂泦锛岄粯璁SO-8859-1 + * + * @param source 瀛楃涓 + * @param srcCharset 婧愬瓧绗﹂泦锛岄粯璁SO-8859-1 * @param destCharset 鐩爣瀛楃闆嗭紝榛樿UTF-8 * @return 杞崲鍚庣殑瀛楃闆 */ - public static String convert(String source, Charset srcCharset, Charset destCharset) - { - if (null == srcCharset) - { + public static String convert(String source, Charset srcCharset, Charset destCharset) { + if (null == srcCharset) { srcCharset = StandardCharsets.ISO_8859_1; } - if (null == destCharset) - { + if (null == destCharset) { destCharset = StandardCharsets.UTF_8; } - if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset)) - { + if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset)) { return source; } return new String(source.getBytes(srcCharset), destCharset); @@ -80,8 +85,7 @@ public class CharsetKit /** * @return 绯荤粺瀛楃闆嗙紪鐮 */ - public static String systemCharset() - { + public static String systemCharset() { return Charset.defaultCharset().name(); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java index ac9c503e..7dc1f0f3 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java @@ -11,28 +11,24 @@ import java.util.Set; /** * 绫诲瀷杞崲鍣 - * + * * @author ruoyi */ -public class Convert -{ +public class Convert { /** * 杞崲涓哄瓧绗︿覆
* 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
* 杞崲澶辫触涓嶄細鎶ラ敊 - * - * @param value 琚浆鎹㈢殑鍊 + * + * @param value 琚浆鎹㈢殑鍊 * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊 * @return 缁撴灉 */ - public static String toStr(Object value, String defaultValue) - { - if (null == value) - { + public static String toStr(Object value, String defaultValue) { + if (null == value) { return defaultValue; } - if (value instanceof String) - { + if (value instanceof String) { return (String) value; } return value.toString(); @@ -42,12 +38,11 @@ public class Convert * 杞崲涓哄瓧绗︿覆
* 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
* 杞崲澶辫触涓嶄細鎶ラ敊 - * + * * @param value 琚浆鎹㈢殑鍊 * @return 缁撴灉 */ - public static String toStr(Object value) - { + public static String toStr(Object value) { return toStr(value, null); } @@ -55,19 +50,16 @@ public class Convert * 杞崲涓哄瓧绗
* 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
* 杞崲澶辫触涓嶄細鎶ラ敊 - * - * @param value 琚浆鎹㈢殑鍊 + * + * @param value 琚浆鎹㈢殑鍊 * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊 * @return 缁撴灉 */ - public static Character toChar(Object value, Character defaultValue) - { - if (null == value) - { + public static Character toChar(Object value, Character defaultValue) { + if (null == value) { return defaultValue; } - if (value instanceof Character) - { + if (value instanceof Character) { return (Character) value; } @@ -79,12 +71,11 @@ public class Convert * 杞崲涓哄瓧绗
* 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
* 杞崲澶辫触涓嶄細鎶ラ敊 - * + * * @param value 琚浆鎹㈢殑鍊 * @return 缁撴灉 */ - public static Character toChar(Object value) - { + public static Character toChar(Object value) { return toChar(value, null); } @@ -92,36 +83,28 @@ public class Convert * 杞崲涓篵yte
* 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
* 杞崲澶辫触涓嶄細鎶ラ敊 - * - * @param value 琚浆鎹㈢殑鍊 + * + * @param value 琚浆鎹㈢殑鍊 * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊 * @return 缁撴灉 */ - public static Byte toByte(Object value, Byte defaultValue) - { - if (value == null) - { + public static Byte toByte(Object value, Byte defaultValue) { + if (value == null) { return defaultValue; } - if (value instanceof Byte) - { + if (value instanceof Byte) { return (Byte) value; } - if (value instanceof Number) - { + if (value instanceof Number) { return ((Number) value).byteValue(); } final String valueStr = toStr(value, null); - if (StringUtils.isEmpty(valueStr)) - { + if (StringUtils.isEmpty(valueStr)) { return defaultValue; } - try - { + try { return Byte.parseByte(valueStr); - } - catch (Exception e) - { + } catch (Exception e) { return defaultValue; } } @@ -130,12 +113,11 @@ public class Convert * 杞崲涓篵yte
* 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
* 杞崲澶辫触涓嶄細鎶ラ敊 - * + * * @param value 琚浆鎹㈢殑鍊 * @return 缁撴灉 */ - public static Byte toByte(Object value) - { + public static Byte toByte(Object value) { return toByte(value, null); } @@ -143,36 +125,28 @@ public class Convert * 杞崲涓篠hort
* 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
* 杞崲澶辫触涓嶄細鎶ラ敊 - * - * @param value 琚浆鎹㈢殑鍊 + * + * @param value 琚浆鎹㈢殑鍊 * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊 * @return 缁撴灉 */ - public static Short toShort(Object value, Short defaultValue) - { - if (value == null) - { + public static Short toShort(Object value, Short defaultValue) { + if (value == null) { return defaultValue; } - if (value instanceof Short) - { + if (value instanceof Short) { return (Short) value; } - if (value instanceof Number) - { + if (value instanceof Number) { return ((Number) value).shortValue(); } final String valueStr = toStr(value, null); - if (StringUtils.isEmpty(valueStr)) - { + if (StringUtils.isEmpty(valueStr)) { return defaultValue; } - try - { + try { return Short.parseShort(valueStr.trim()); - } - catch (Exception e) - { + } catch (Exception e) { return defaultValue; } } @@ -181,12 +155,11 @@ public class Convert * 杞崲涓篠hort
* 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
* 杞崲澶辫触涓嶄細鎶ラ敊 - * + * * @param value 琚浆鎹㈢殑鍊 * @return 缁撴灉 */ - public static Short toShort(Object value) - { + public static Short toShort(Object value) { return toShort(value, null); } @@ -194,32 +167,25 @@ public class Convert * 杞崲涓篘umber
* 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
* 杞崲澶辫触涓嶄細鎶ラ敊 - * - * @param value 琚浆鎹㈢殑鍊 + * + * @param value 琚浆鎹㈢殑鍊 * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊 * @return 缁撴灉 */ - public static Number toNumber(Object value, Number defaultValue) - { - if (value == null) - { + public static Number toNumber(Object value, Number defaultValue) { + if (value == null) { return defaultValue; } - if (value instanceof Number) - { + if (value instanceof Number) { return (Number) value; } final String valueStr = toStr(value, null); - if (StringUtils.isEmpty(valueStr)) - { + if (StringUtils.isEmpty(valueStr)) { return defaultValue; } - try - { + try { return NumberFormat.getInstance().parse(valueStr); - } - catch (Exception e) - { + } catch (Exception e) { return defaultValue; } } @@ -228,12 +194,11 @@ public class Convert * 杞崲涓篘umber
* 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
* 杞崲澶辫触涓嶄細鎶ラ敊 - * + * * @param value 琚浆鎹㈢殑鍊 * @return 缁撴灉 */ - public static Number toNumber(Object value) - { + public static Number toNumber(Object value) { return toNumber(value, null); } @@ -241,36 +206,28 @@ public class Convert * 杞崲涓篿nt
* 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
* 杞崲澶辫触涓嶄細鎶ラ敊 - * - * @param value 琚浆鎹㈢殑鍊 + * + * @param value 琚浆鎹㈢殑鍊 * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊 * @return 缁撴灉 */ - public static Integer toInt(Object value, Integer defaultValue) - { - if (value == null) - { + public static Integer toInt(Object value, Integer defaultValue) { + if (value == null) { return defaultValue; } - if (value instanceof Integer) - { + if (value instanceof Integer) { return (Integer) value; } - if (value instanceof Number) - { + if (value instanceof Number) { return ((Number) value).intValue(); } final String valueStr = toStr(value, null); - if (StringUtils.isEmpty(valueStr)) - { + if (StringUtils.isEmpty(valueStr)) { return defaultValue; } - try - { + try { return Integer.parseInt(valueStr.trim()); - } - catch (Exception e) - { + } catch (Exception e) { return defaultValue; } } @@ -279,54 +236,48 @@ public class Convert * 杞崲涓篿nt
* 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
* 杞崲澶辫触涓嶄細鎶ラ敊 - * + * * @param value 琚浆鎹㈢殑鍊 * @return 缁撴灉 */ - public static Integer toInt(Object value) - { + public static Integer toInt(Object value) { return toInt(value, null); } /** * 杞崲涓篒nteger鏁扮粍
- * + * * @param str 琚浆鎹㈢殑鍊 * @return 缁撴灉 */ - public static Integer[] toIntArray(String str) - { + public static Integer[] toIntArray(String str) { return toIntArray(",", str); } /** * 杞崲涓篖ong鏁扮粍
- * + * * @param str 琚浆鎹㈢殑鍊 * @return 缁撴灉 */ - public static Long[] toLongArray(String str) - { + public static Long[] toLongArray(String str) { return toLongArray(",", str); } /** * 杞崲涓篒nteger鏁扮粍
- * + * * @param split 鍒嗛殧绗 * @param split 琚浆鎹㈢殑鍊 * @return 缁撴灉 */ - public static Integer[] toIntArray(String split, String str) - { - if (StringUtils.isEmpty(str)) - { - return new Integer[] {}; + public static Integer[] toIntArray(String split, String str) { + if (StringUtils.isEmpty(str)) { + return new Integer[]{}; } String[] arr = str.split(split); final Integer[] ints = new Integer[arr.length]; - for (int i = 0; i < arr.length; i++) - { + for (int i = 0; i < arr.length; i++) { final Integer v = toInt(arr[i], 0); ints[i] = v; } @@ -335,21 +286,18 @@ public class Convert /** * 杞崲涓篖ong鏁扮粍
- * + * * @param split 鍒嗛殧绗 - * @param str 琚浆鎹㈢殑鍊 + * @param str 琚浆鎹㈢殑鍊 * @return 缁撴灉 */ - public static Long[] toLongArray(String split, String str) - { - if (StringUtils.isEmpty(str)) - { - return new Long[] {}; + public static Long[] toLongArray(String split, String str) { + if (StringUtils.isEmpty(str)) { + return new Long[]{}; } String[] arr = str.split(split); final Long[] longs = new Long[arr.length]; - for (int i = 0; i < arr.length; i++) - { + for (int i = 0; i < arr.length; i++) { final Long v = toLong(arr[i], null); longs[i] = v; } @@ -358,24 +306,22 @@ public class Convert /** * 杞崲涓篠tring鏁扮粍
- * + * * @param str 琚浆鎹㈢殑鍊 * @return 缁撴灉 */ - public static String[] toStrArray(String str) - { + public static String[] toStrArray(String str) { return toStrArray(",", str); } /** * 杞崲涓篠tring鏁扮粍
- * + * * @param split 鍒嗛殧绗 * @param split 琚浆鎹㈢殑鍊 * @return 缁撴灉 */ - public static String[] toStrArray(String split, String str) - { + public static String[] toStrArray(String split, String str) { return str.split(split); } @@ -383,37 +329,29 @@ public class Convert * 杞崲涓簂ong
* 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
* 杞崲澶辫触涓嶄細鎶ラ敊 - * - * @param value 琚浆鎹㈢殑鍊 + * + * @param value 琚浆鎹㈢殑鍊 * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊 * @return 缁撴灉 */ - public static Long toLong(Object value, Long defaultValue) - { - if (value == null) - { + public static Long toLong(Object value, Long defaultValue) { + if (value == null) { return defaultValue; } - if (value instanceof Long) - { + if (value instanceof Long) { return (Long) value; } - if (value instanceof Number) - { + if (value instanceof Number) { return ((Number) value).longValue(); } final String valueStr = toStr(value, null); - if (StringUtils.isEmpty(valueStr)) - { + if (StringUtils.isEmpty(valueStr)) { return defaultValue; } - try - { + try { // 鏀寔绉戝璁℃暟娉 return new BigDecimal(valueStr.trim()).longValue(); - } - catch (Exception e) - { + } catch (Exception e) { return defaultValue; } } @@ -422,12 +360,11 @@ public class Convert * 杞崲涓簂ong
* 濡傛灉缁欏畾鐨勫间负null锛屾垨鑰呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
* 杞崲澶辫触涓嶄細鎶ラ敊 - * + * * @param value 琚浆鎹㈢殑鍊 * @return 缁撴灉 */ - public static Long toLong(Object value) - { + public static Long toLong(Object value) { return toLong(value, null); } @@ -435,37 +372,29 @@ public class Convert * 杞崲涓篸ouble
* 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
* 杞崲澶辫触涓嶄細鎶ラ敊 - * - * @param value 琚浆鎹㈢殑鍊 + * + * @param value 琚浆鎹㈢殑鍊 * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊 * @return 缁撴灉 */ - public static Double toDouble(Object value, Double defaultValue) - { - if (value == null) - { + public static Double toDouble(Object value, Double defaultValue) { + if (value == null) { return defaultValue; } - if (value instanceof Double) - { + if (value instanceof Double) { return (Double) value; } - if (value instanceof Number) - { + if (value instanceof Number) { return ((Number) value).doubleValue(); } final String valueStr = toStr(value, null); - if (StringUtils.isEmpty(valueStr)) - { + if (StringUtils.isEmpty(valueStr)) { return defaultValue; } - try - { + try { // 鏀寔绉戝璁℃暟娉 return new BigDecimal(valueStr.trim()).doubleValue(); - } - catch (Exception e) - { + } catch (Exception e) { return defaultValue; } } @@ -474,12 +403,11 @@ public class Convert * 杞崲涓篸ouble
* 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
* 杞崲澶辫触涓嶄細鎶ラ敊 - * + * * @param value 琚浆鎹㈢殑鍊 * @return 缁撴灉 */ - public static Double toDouble(Object value) - { + public static Double toDouble(Object value) { return toDouble(value, null); } @@ -487,36 +415,28 @@ public class Convert * 杞崲涓篎loat
* 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
* 杞崲澶辫触涓嶄細鎶ラ敊 - * - * @param value 琚浆鎹㈢殑鍊 + * + * @param value 琚浆鎹㈢殑鍊 * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊 * @return 缁撴灉 */ - public static Float toFloat(Object value, Float defaultValue) - { - if (value == null) - { + public static Float toFloat(Object value, Float defaultValue) { + if (value == null) { return defaultValue; } - if (value instanceof Float) - { + if (value instanceof Float) { return (Float) value; } - if (value instanceof Number) - { + if (value instanceof Number) { return ((Number) value).floatValue(); } final String valueStr = toStr(value, null); - if (StringUtils.isEmpty(valueStr)) - { + if (StringUtils.isEmpty(valueStr)) { return defaultValue; } - try - { + try { return Float.parseFloat(valueStr.trim()); - } - catch (Exception e) - { + } catch (Exception e) { return defaultValue; } } @@ -525,12 +445,11 @@ public class Convert * 杞崲涓篎loat
* 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
* 杞崲澶辫触涓嶄細鎶ラ敊 - * + * * @param value 琚浆鎹㈢殑鍊 * @return 缁撴灉 */ - public static Float toFloat(Object value) - { + public static Float toFloat(Object value) { return toFloat(value, null); } @@ -538,29 +457,24 @@ public class Convert * 杞崲涓篵oolean
* String鏀寔鐨勫间负锛歵rue銆乫alse銆亂es銆乷k銆乶o锛1,0 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
* 杞崲澶辫触涓嶄細鎶ラ敊 - * - * @param value 琚浆鎹㈢殑鍊 + * + * @param value 琚浆鎹㈢殑鍊 * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊 * @return 缁撴灉 */ - public static Boolean toBool(Object value, Boolean defaultValue) - { - if (value == null) - { + public static Boolean toBool(Object value, Boolean defaultValue) { + if (value == null) { return defaultValue; } - if (value instanceof Boolean) - { + if (value instanceof Boolean) { return (Boolean) value; } String valueStr = toStr(value, null); - if (StringUtils.isEmpty(valueStr)) - { + if (StringUtils.isEmpty(valueStr)) { return defaultValue; } valueStr = valueStr.trim().toLowerCase(); - switch (valueStr) - { + switch (valueStr) { case "true": return true; case "false": @@ -584,47 +498,39 @@ public class Convert * 杞崲涓篵oolean
* 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
* 杞崲澶辫触涓嶄細鎶ラ敊 - * + * * @param value 琚浆鎹㈢殑鍊 * @return 缁撴灉 */ - public static Boolean toBool(Object value) - { + public static Boolean toBool(Object value) { return toBool(value, null); } /** * 杞崲涓篍num瀵硅薄
* 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
- * - * @param clazz Enum鐨凜lass - * @param value 鍊 + * + * @param clazz Enum鐨凜lass + * @param value 鍊 * @param defaultValue 榛樿鍊 * @return Enum */ - public static > E toEnum(Class clazz, Object value, E defaultValue) - { - if (value == null) - { + public static > E toEnum(Class clazz, Object value, E defaultValue) { + if (value == null) { return defaultValue; } - if (clazz.isAssignableFrom(value.getClass())) - { + if (clazz.isAssignableFrom(value.getClass())) { @SuppressWarnings("unchecked") E myE = (E) value; return myE; } final String valueStr = toStr(value, null); - if (StringUtils.isEmpty(valueStr)) - { + if (StringUtils.isEmpty(valueStr)) { return defaultValue; } - try - { + try { return Enum.valueOf(clazz, valueStr); - } - catch (Exception e) - { + } catch (Exception e) { return defaultValue; } } @@ -632,13 +538,12 @@ public class Convert /** * 杞崲涓篍num瀵硅薄
* 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
- * + * * @param clazz Enum鐨凜lass * @param value 鍊 * @return Enum */ - public static > E toEnum(Class clazz, Object value) - { + public static > E toEnum(Class clazz, Object value) { return toEnum(clazz, value, null); } @@ -646,36 +551,28 @@ public class Convert * 杞崲涓築igInteger
* 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
* 杞崲澶辫触涓嶄細鎶ラ敊 - * - * @param value 琚浆鎹㈢殑鍊 + * + * @param value 琚浆鎹㈢殑鍊 * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊 * @return 缁撴灉 */ - public static BigInteger toBigInteger(Object value, BigInteger defaultValue) - { - if (value == null) - { + public static BigInteger toBigInteger(Object value, BigInteger defaultValue) { + if (value == null) { return defaultValue; } - if (value instanceof BigInteger) - { + if (value instanceof BigInteger) { return (BigInteger) value; } - if (value instanceof Long) - { + if (value instanceof Long) { return BigInteger.valueOf((Long) value); } final String valueStr = toStr(value, null); - if (StringUtils.isEmpty(valueStr)) - { + if (StringUtils.isEmpty(valueStr)) { return defaultValue; } - try - { + try { return new BigInteger(valueStr); - } - catch (Exception e) - { + } catch (Exception e) { return defaultValue; } } @@ -684,12 +581,11 @@ public class Convert * 杞崲涓築igInteger
* 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊null
* 杞崲澶辫触涓嶄細鎶ラ敊 - * + * * @param value 琚浆鎹㈢殑鍊 * @return 缁撴灉 */ - public static BigInteger toBigInteger(Object value) - { + public static BigInteger toBigInteger(Object value) { return toBigInteger(value, null); } @@ -697,44 +593,34 @@ public class Convert * 杞崲涓築igDecimal
* 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
* 杞崲澶辫触涓嶄細鎶ラ敊 - * - * @param value 琚浆鎹㈢殑鍊 + * + * @param value 琚浆鎹㈢殑鍊 * @param defaultValue 杞崲閿欒鏃剁殑榛樿鍊 * @return 缁撴灉 */ - public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue) - { - if (value == null) - { + public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue) { + if (value == null) { return defaultValue; } - if (value instanceof BigDecimal) - { + if (value instanceof BigDecimal) { return (BigDecimal) value; } - if (value instanceof Long) - { + if (value instanceof Long) { return new BigDecimal((Long) value); } - if (value instanceof Double) - { + if (value instanceof Double) { return new BigDecimal((Double) value); } - if (value instanceof Integer) - { + if (value instanceof Integer) { return new BigDecimal((Integer) value); } final String valueStr = toStr(value, null); - if (StringUtils.isEmpty(valueStr)) - { + if (StringUtils.isEmpty(valueStr)) { return defaultValue; } - try - { + try { return new BigDecimal(valueStr); - } - catch (Exception e) - { + } catch (Exception e) { return defaultValue; } } @@ -743,79 +629,65 @@ public class Convert * 杞崲涓築igDecimal
* 濡傛灉缁欏畾鐨勫间负绌猴紝鎴栬呰浆鎹㈠け璐ワ紝杩斿洖榛樿鍊
* 杞崲澶辫触涓嶄細鎶ラ敊 - * + * * @param value 琚浆鎹㈢殑鍊 * @return 缁撴灉 */ - public static BigDecimal toBigDecimal(Object value) - { + public static BigDecimal toBigDecimal(Object value) { return toBigDecimal(value, null); } /** * 灏嗗璞¤浆涓哄瓧绗︿覆
* 1銆丅yte鏁扮粍鍜孊yteBuffer浼氳杞崲涓哄搴斿瓧绗︿覆鐨勬暟缁 2銆佸璞℃暟缁勪細璋冪敤Arrays.toString鏂规硶 - * + * * @param obj 瀵硅薄 * @return 瀛楃涓 */ - public static String utf8Str(Object obj) - { + public static String utf8Str(Object obj) { return str(obj, CharsetKit.CHARSET_UTF_8); } /** * 灏嗗璞¤浆涓哄瓧绗︿覆
* 1銆丅yte鏁扮粍鍜孊yteBuffer浼氳杞崲涓哄搴斿瓧绗︿覆鐨勬暟缁 2銆佸璞℃暟缁勪細璋冪敤Arrays.toString鏂规硶 - * - * @param obj 瀵硅薄 + * + * @param obj 瀵硅薄 * @param charsetName 瀛楃闆 * @return 瀛楃涓 */ - public static String str(Object obj, String charsetName) - { + public static String str(Object obj, String charsetName) { return str(obj, Charset.forName(charsetName)); } /** * 灏嗗璞¤浆涓哄瓧绗︿覆
* 1銆丅yte鏁扮粍鍜孊yteBuffer浼氳杞崲涓哄搴斿瓧绗︿覆鐨勬暟缁 2銆佸璞℃暟缁勪細璋冪敤Arrays.toString鏂规硶 - * - * @param obj 瀵硅薄 + * + * @param obj 瀵硅薄 * @param charset 瀛楃闆 * @return 瀛楃涓 */ - public static String str(Object obj, Charset charset) - { - if (null == obj) - { + public static String str(Object obj, Charset charset) { + if (null == obj) { return null; } - if (obj instanceof String) - { + if (obj instanceof String) { return (String) obj; - } - else if (obj instanceof byte[] || obj instanceof Byte[]) - { - if (obj instanceof byte[]) - { + } else if (obj instanceof byte[] || obj instanceof Byte[]) { + if (obj instanceof byte[]) { return str((byte[]) obj, charset); - } - else - { + } else { Byte[] bytes = (Byte[]) obj; int length = bytes.length; byte[] dest = new byte[length]; - for (int i = 0; i < length; i++) - { + for (int i = 0; i < length; i++) { dest[i] = bytes[i]; } return str(dest, charset); } - } - else if (obj instanceof ByteBuffer) - { + } else if (obj instanceof ByteBuffer) { return str((ByteBuffer) obj, charset); } return obj.toString(); @@ -823,32 +695,28 @@ public class Convert /** * 灏哹yte鏁扮粍杞负瀛楃涓 - * - * @param bytes byte鏁扮粍 + * + * @param bytes byte鏁扮粍 * @param charset 瀛楃闆 * @return 瀛楃涓 */ - public static String str(byte[] bytes, String charset) - { + public static String str(byte[] bytes, String charset) { return str(bytes, StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset)); } /** * 瑙ｇ爜瀛楄妭鐮 - * - * @param data 瀛楃涓 + * + * @param data 瀛楃涓 * @param charset 瀛楃闆嗭紝濡傛灉姝ゅ瓧娈典负绌猴紝鍒欒В鐮佺殑缁撴灉鍙栧喅浜庡钩鍙 * @return 瑙ｇ爜鍚庣殑瀛楃涓 */ - public static String str(byte[] data, Charset charset) - { - if (data == null) - { + public static String str(byte[] data, Charset charset) { + if (data == null) { return null; } - if (null == charset) - { + if (null == charset) { return new String(data); } return new String(data, charset); @@ -856,15 +724,13 @@ public class Convert /** * 灏嗙紪鐮佺殑byteBuffer鏁版嵁杞崲涓哄瓧绗︿覆 - * - * @param data 鏁版嵁 + * + * @param data 鏁版嵁 * @param charset 瀛楃闆嗭紝濡傛灉涓虹┖浣跨敤褰撳墠绯荤粺瀛楃闆 * @return 瀛楃涓 */ - public static String str(ByteBuffer data, String charset) - { - if (data == null) - { + public static String str(ByteBuffer data, String charset) { + if (data == null) { return null; } @@ -873,56 +739,48 @@ public class Convert /** * 灏嗙紪鐮佺殑byteBuffer鏁版嵁杞崲涓哄瓧绗︿覆 - * - * @param data 鏁版嵁 + * + * @param data 鏁版嵁 * @param charset 瀛楃闆嗭紝濡傛灉涓虹┖浣跨敤褰撳墠绯荤粺瀛楃闆 * @return 瀛楃涓 */ - public static String str(ByteBuffer data, Charset charset) - { - if (null == charset) - { + public static String str(ByteBuffer data, Charset charset) { + if (null == charset) { charset = Charset.defaultCharset(); } return charset.decode(data).toString(); } // ----------------------------------------------------------------------- 鍏ㄨ鍗婅杞崲 + /** * 鍗婅杞叏瑙 - * + * * @param input String. * @return 鍏ㄨ瀛楃涓. */ - public static String tosbc(String input) - { + public static String tosbc(String input) { return tosbc(input, null); } /** * 鍗婅杞叏瑙 - * - * @param input String + * + * @param input String * @param notConvertSet 涓嶆浛鎹㈢殑瀛楃闆嗗悎 * @return 鍏ㄨ瀛楃涓. */ - public static String tosbc(String input, Set notConvertSet) - { + public static String tosbc(String input, Set notConvertSet) { char[] c = input.toCharArray(); - for (int i = 0; i < c.length; i++) - { - if (null != notConvertSet && notConvertSet.contains(c[i])) - { + for (int i = 0; i < c.length; i++) { + if (null != notConvertSet && notConvertSet.contains(c[i])) { // 璺宠繃涓嶆浛鎹㈢殑瀛楃 continue; } - if (c[i] == ' ') - { + if (c[i] == ' ') { c[i] = '\u3000'; - } - else if (c[i] < '\177') - { + } else if (c[i] < '\177') { c[i] = (char) (c[i] + 65248); } @@ -932,39 +790,32 @@ public class Convert /** * 鍏ㄨ杞崐瑙 - * + * * @param input String. * @return 鍗婅瀛楃涓 */ - public static String todbc(String input) - { + public static String todbc(String input) { return todbc(input, null); } /** * 鏇挎崲鍏ㄨ涓哄崐瑙 - * - * @param text 鏂囨湰 + * + * @param text 鏂囨湰 * @param notConvertSet 涓嶆浛鎹㈢殑瀛楃闆嗗悎 * @return 鏇挎崲鍚庣殑瀛楃 */ - public static String todbc(String text, Set notConvertSet) - { + public static String todbc(String text, Set notConvertSet) { char[] c = text.toCharArray(); - for (int i = 0; i < c.length; i++) - { - if (null != notConvertSet && notConvertSet.contains(c[i])) - { + for (int i = 0; i < c.length; i++) { + if (null != notConvertSet && notConvertSet.contains(c[i])) { // 璺宠繃涓嶆浛鎹㈢殑瀛楃 continue; } - if (c[i] == '\u3000') - { + if (c[i] == '\u3000') { c[i] = ' '; - } - else if (c[i] > '\uFF00' && c[i] < '\uFF5F') - { + } else if (c[i] > '\uFF00' && c[i] < '\uFF5F') { c[i] = (char) (c[i] - 65248); } } @@ -975,35 +826,30 @@ public class Convert /** * 鏁板瓧閲戦澶у啓杞崲 鍏堝啓涓畬鏁寸殑鐒跺悗灏嗗闆舵嬀鏇挎崲鎴愰浂 - * + * * @param n 鏁板瓧 * @return 涓枃澶у啓鏁板瓧 */ - public static String digitUppercase(double n) - { - String[] fraction = { "瑙", "鍒" }; - String[] digit = { "闆", "澹", "璐", "鍙", "鑲", "浼", "闄", "鏌", "鎹", "鐜" }; - String[][] unit = { { "鍏", "涓", "浜" }, { "", "鎷", "浣", "浠" } }; + public static String digitUppercase(double n) { + String[] fraction = {"瑙", "鍒"}; + String[] digit = {"闆", "澹", "璐", "鍙", "鑲", "浼", "闄", "鏌", "鎹", "鐜"}; + String[][] unit = {{"鍏", "涓", "浜"}, {"", "鎷", "浣", "浠"}}; String head = n < 0 ? "璐" : ""; n = Math.abs(n); String s = ""; - for (int i = 0; i < fraction.length; i++) - { + for (int i = 0; i < fraction.length; i++) { s += (digit[(int) (Math.floor(n * 10 * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(闆.)+", ""); } - if (s.length() < 1) - { + if (s.length() < 1) { s = "鏁"; } int integerPart = (int) Math.floor(n); - for (int i = 0; i < unit[0].length && integerPart > 0; i++) - { + for (int i = 0; i < unit[0].length && integerPart > 0; i++) { String p = ""; - for (int j = 0; j < unit[1].length && n > 0; j++) - { + for (int j = 0; j < unit[1].length && n > 0; j++) { p = digit[integerPart % 10] + unit[1][j] + p; integerPart = integerPart / 10; } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java index a7d4d84c..cf4f6e23 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java @@ -4,11 +4,10 @@ import com.ruoyi.common.core.utils.StringUtils; /** * 瀛楃涓叉牸寮忓寲 - * + * * @author ruoyi */ -public class StrFormatter -{ +public class StrFormatter { public static final String EMPTY_JSON = "{}"; public static final char C_BACKSLASH = '\\'; public static final char C_DELIM_START = '{'; @@ -22,15 +21,13 @@ public class StrFormatter * 閫氬父浣跨敤锛歠ormat("this is {} for {}", "a", "b") -> this is a for b
* 杞箟{}锛 format("this is \\{} for {}", "a", "b") -> this is \{} for a
* 杞箟\锛 format("this is \\\\{} for {}", "a", "b") -> this is \a for b
- * + * * @param strPattern 瀛楃涓叉ā鏉 - * @param argArray 鍙傛暟鍒楄〃 + * @param argArray 鍙傛暟鍒楄〃 * @return 缁撴灉 */ - public static String format(final String strPattern, final Object... argArray) - { - if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray)) - { + public static String format(final String strPattern, final Object... argArray) { + if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray)) { return strPattern; } final int strPatternLength = strPattern.length(); @@ -40,43 +37,30 @@ public class StrFormatter int handledPosition = 0; int delimIndex;// 鍗犱綅绗︽墍鍦ㄤ綅缃 - for (int argIndex = 0; argIndex < argArray.length; argIndex++) - { + for (int argIndex = 0; argIndex < argArray.length; argIndex++) { delimIndex = strPattern.indexOf(EMPTY_JSON, handledPosition); - if (delimIndex == -1) - { - if (handledPosition == 0) - { + if (delimIndex == -1) { + if (handledPosition == 0) { return strPattern; - } - else - { // 瀛楃涓叉ā鏉垮墿浣欓儴鍒嗕笉鍐嶅寘鍚崰浣嶇锛屽姞鍏ュ墿浣欓儴鍒嗗悗杩斿洖缁撴灉 + } else { // 瀛楃涓叉ā鏉垮墿浣欓儴鍒嗕笉鍐嶅寘鍚崰浣嶇锛屽姞鍏ュ墿浣欓儴鍒嗗悗杩斿洖缁撴灉 sbuf.append(strPattern, handledPosition, strPatternLength); return sbuf.toString(); } - } - else - { - if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH) - { - if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH) - { + } else { + if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH) { + if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH) { // 杞箟绗︿箣鍓嶈繕鏈変竴涓浆涔夌锛屽崰浣嶇渚濇棫鏈夋晥 sbuf.append(strPattern, handledPosition, delimIndex - 1); sbuf.append(Convert.utf8Str(argArray[argIndex])); handledPosition = delimIndex + 2; - } - else - { + } else { // 鍗犱綅绗﹁杞箟 argIndex--; sbuf.append(strPattern, handledPosition, delimIndex - 1); sbuf.append(C_DELIM_START); handledPosition = delimIndex + 1; } - } - else - { + } else { // 姝ｅ父鍗犱綅绗 sbuf.append(strPattern, handledPosition, delimIndex); sbuf.append(Convert.utf8Str(argArray[argIndex])); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java index bbec17aa..bec3d5d8 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java @@ -13,8 +13,7 @@ import java.util.Date; * * @author ruoyi */ -public class DateUtils extends org.apache.commons.lang3.time.DateUtils -{ +public class DateUtils extends org.apache.commons.lang3.time.DateUtils { public static String YYYY = "yyyy"; public static String YYYY_MM = "yyyy-MM"; @@ -35,8 +34,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils * * @return Date() 褰撳墠鏃ユ湡 */ - public static Date getNowDate() - { + public static Date getNowDate() { return new Date(); } @@ -45,44 +43,34 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils * * @return String */ - public static String getDate() - { + public static String getDate() { return dateTimeNow(YYYY_MM_DD); } - public static final String getTime() - { + public static final String getTime() { return dateTimeNow(YYYY_MM_DD_HH_MM_SS); } - public static final String dateTimeNow() - { + public static final String dateTimeNow() { return dateTimeNow(YYYYMMDDHHMMSS); } - public static final String dateTimeNow(final String format) - { + public static final String dateTimeNow(final String format) { return parseDateToStr(format, new Date()); } - public static final String dateTime(final Date date) - { + public static final String dateTime(final Date date) { return parseDateToStr(YYYY_MM_DD, date); } - public static final String parseDateToStr(final String format, final Date date) - { + public static final String parseDateToStr(final String format, final Date date) { return new SimpleDateFormat(format).format(date); } - public static final Date dateTime(final String format, final String ts) - { - try - { + public static final Date dateTime(final String format, final String ts) { + try { return new SimpleDateFormat(format).parse(ts); - } - catch (ParseException e) - { + } catch (ParseException e) { throw new RuntimeException(e); } } @@ -90,8 +78,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils /** * 鏃ユ湡璺緞 鍗冲勾/鏈/鏃 濡2018/08/08 */ - public static final String datePath() - { + public static final String datePath() { Date now = new Date(); return DateFormatUtils.format(now, "yyyy/MM/dd"); } @@ -99,8 +86,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils /** * 鏃ユ湡璺緞 鍗冲勾/鏈/鏃 濡20180808 */ - public static final String dateTime() - { + public static final String dateTime() { Date now = new Date(); return DateFormatUtils.format(now, "yyyyMMdd"); } @@ -108,18 +94,13 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils /** * 鏃ユ湡鍨嬪瓧绗︿覆杞寲涓烘棩鏈 鏍煎紡 */ - public static Date parseDate(Object str) - { - if (str == null) - { + public static Date parseDate(Object str) { + if (str == null) { return null; } - try - { + try { return parseDate(str.toString(), parsePatterns); - } - catch (ParseException e) - { + } catch (ParseException e) { return null; } } @@ -127,8 +108,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils /** * 鑾峰彇鏈嶅姟鍣ㄥ惎鍔ㄦ椂闂 */ - public static Date getServerStartDate() - { + public static Date getServerStartDate() { long time = ManagementFactory.getRuntimeMXBean().getStartTime(); return new Date(time); } @@ -136,8 +116,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils /** * 璁＄畻涓や釜鏃堕棿宸 */ - public static String getDatePoor(Date endDate, Date nowDate) - { + public static String getDatePoor(Date endDate, Date nowDate) { long nd = 1000 * 24 * 60 * 60; long nh = 1000 * 60 * 60; long nm = 1000 * 60; @@ -158,8 +137,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils /** * 澧炲姞 LocalDateTime ==> Date */ - public static Date toDate(LocalDateTime temporalAccessor) - { + public static Date toDate(LocalDateTime temporalAccessor) { ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault()); return Date.from(zdt.toInstant()); } @@ -167,8 +145,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils /** * 澧炲姞 LocalDate ==> Date */ - public static Date toDate(LocalDate temporalAccessor) - { + public static Date toDate(LocalDate temporalAccessor) { LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0)); ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault()); return Date.from(zdt.toInstant()); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java index e74c7197..44f3f360 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java @@ -10,29 +10,24 @@ import java.io.StringWriter; * * @author ruoyi */ -public class ExceptionUtil -{ +public class ExceptionUtil { /** * 鑾峰彇exception鐨勮缁嗛敊璇俊鎭 */ - public static String getExceptionMessage(Throwable e) - { + public static String getExceptionMessage(Throwable e) { StringWriter sw = new StringWriter(); e.printStackTrace(new PrintWriter(sw, true)); return sw.toString(); } - public static String getRootErrorMessage(Exception e) - { + public static String getRootErrorMessage(Exception e) { Throwable root = ExceptionUtils.getRootCause(e); root = (root == null ? e : root); - if (root == null) - { + if (root == null) { return ""; } String msg = root.getMessage(); - if (msg == null) - { + if (msg == null) { return "null"; } return StringUtils.defaultString(msg); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java index 85c5e2e1..29d20d8f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java @@ -14,8 +14,7 @@ import java.util.Map; * * @author ruoyi */ -public class JwtUtils -{ +public class JwtUtils { public static String secret = TokenConstants.SECRET; /** @@ -24,8 +23,7 @@ public class JwtUtils * @param claims 鏁版嵁澹版槑 * @return 浠ょ墝 */ - public static String createToken(Map claims) - { + public static String createToken(Map claims) { String token = Jwts.builder().setClaims(claims).signWith(SignatureAlgorithm.HS512, secret).compact(); return token; } @@ -36,89 +34,81 @@ public class JwtUtils * @param token 浠ょ墝 * @return 鏁版嵁澹版槑 */ - public static Claims parseToken(String token) - { + public static Claims parseToken(String token) { return Jwts.parser().setSigningKey(secret).parseClaimsJws(token).getBody(); } /** * 鏍规嵁浠ょ墝鑾峰彇鐢ㄦ埛鏍囪瘑 - * + * * @param token 浠ょ墝 * @return 鐢ㄦ埛ID */ - public static String getUserKey(String token) - { + public static String getUserKey(String token) { Claims claims = parseToken(token); return getValue(claims, SecurityConstants.USER_KEY); } /** * 鏍规嵁浠ょ墝鑾峰彇鐢ㄦ埛鏍囪瘑 - * + * * @param claims 韬唤淇℃伅 * @return 鐢ㄦ埛ID */ - public static String getUserKey(Claims claims) - { + public static String getUserKey(Claims claims) { return getValue(claims, SecurityConstants.USER_KEY); } /** * 鏍规嵁浠ょ墝鑾峰彇鐢ㄦ埛ID - * + * * @param token 浠ょ墝 * @return 鐢ㄦ埛ID */ - public static String getUserId(String token) - { + public static String getUserId(String token) { Claims claims = parseToken(token); return getValue(claims, SecurityConstants.DETAILS_USER_ID); } /** * 鏍规嵁韬唤淇℃伅鑾峰彇鐢ㄦ埛ID - * + * * @param claims 韬唤淇℃伅 * @return 鐢ㄦ埛ID */ - public static String getUserId(Claims claims) - { + public static String getUserId(Claims claims) { return getValue(claims, SecurityConstants.DETAILS_USER_ID); } /** * 鏍规嵁浠ょ墝鑾峰彇鐢ㄦ埛鍚 - * + * * @param token 浠ょ墝 * @return 鐢ㄦ埛鍚 */ - public static String getUserName(String token) - { + public static String getUserName(String token) { Claims claims = parseToken(token); return getValue(claims, SecurityConstants.DETAILS_USERNAME); } /** * 鏍规嵁韬唤淇℃伅鑾峰彇鐢ㄦ埛鍚 - * + * * @param claims 韬唤淇℃伅 * @return 鐢ㄦ埛鍚 */ - public static String getUserName(Claims claims) - { + public static String getUserName(Claims claims) { return getValue(claims, SecurityConstants.DETAILS_USERNAME); } /** * 鏍规嵁韬唤淇℃伅鑾峰彇閿 - * + * * @param claims 韬唤淇℃伅 - * @param key 閿 + * @param key 閿 * @return 鍊 */ - public static String getValue(Claims claims, String key) - { + public static String getValue(Claims claims, String key) { return Convert.toStr(claims.get(key), ""); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java index 95ee25b3..a7dc61ec 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java @@ -7,16 +7,14 @@ import com.ruoyi.common.core.web.page.TableSupport; /** * 鍒嗛〉宸ュ叿绫 - * + * * @author ruoyi */ -public class PageUtils extends PageHelper -{ +public class PageUtils extends PageHelper { /** * 璁剧疆璇锋眰鍒嗛〉鏁版嵁 */ - public static void startPage() - { + public static void startPage() { PageDomain pageDomain = TableSupport.buildPageRequest(); Integer pageNum = pageDomain.getPageNum(); Integer pageSize = pageDomain.getPageSize(); @@ -28,8 +26,7 @@ public class PageUtils extends PageHelper /** * 娓呯悊鍒嗛〉鐨勭嚎绋嬪彉閲 */ - public static void clearPage() - { + public static void clearPage() { PageHelper.clearPage(); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ReUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ReUtil.java index cc4b6a95..447f46da 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ReUtil.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ReUtil.java @@ -19,7 +19,8 @@ public class ReUtil { * 姝ｅ垯涓渶瑕佽杞箟鐨勫叧閿瓧 */ public final static Set RE_KEYS = new HashSet<>( - Arrays.asList('$', '(', ')', '*', '+', '.', '[', ']', '?', '\\', '^', '{', '}', '|'));; + Arrays.asList('$', '(', ')', '*', '+', '.', '[', ']', '?', '\\', '^', '{', '}', '|')); + ; /** * 姝ｅ垯鏇挎崲鎸囧畾鍊
@@ -34,13 +35,12 @@ public class ReUtil { * 缁撴灉锛氫腑鏂(1234) * * - * @param content 鏂囨湰 - * @param regex 姝ｅ垯 + * @param content 鏂囨湰 + * @param regex 姝ｅ垯 * @param replacementTemplate 鏇挎崲鐨勬枃鏈ā鏉匡紝鍙互浣跨敤$1绫讳技鐨勫彉閲忔彁鍙栨鍒欏尮閰嶅嚭鐨勫唴瀹 * @return 澶勭悊鍚庣殑鏂囨湰 */ - public static String replaceAll(CharSequence content, String regex, String replacementTemplate) - { + public static String replaceAll(CharSequence content, String regex, String replacementTemplate) { final Pattern pattern = Pattern.compile(regex, Pattern.DOTALL); return replaceAll(content, pattern, replacementTemplate); } @@ -49,30 +49,25 @@ public class ReUtil { * 姝ｅ垯鏇挎崲鎸囧畾鍊
* 閫氳繃姝ｅ垯鏌ユ壘鍒板瓧绗︿覆锛岀劧鍚庢妸鍖归厤鍒扮殑瀛楃涓插姞鍏ュ埌replacementTemplate涓紝$1琛ㄧず鍒嗙粍1鐨勫瓧绗︿覆 * - * @param content 鏂囨湰 - * @param pattern {@link Pattern} + * @param content 鏂囨湰 + * @param pattern {@link Pattern} * @param replacementTemplate 鏇挎崲鐨勬枃鏈ā鏉匡紝鍙互浣跨敤$1绫讳技鐨勫彉閲忔彁鍙栨鍒欏尮閰嶅嚭鐨勫唴瀹 * @return 澶勭悊鍚庣殑鏂囨湰 * @since 3.0.4 */ - public static String replaceAll(CharSequence content, Pattern pattern, String replacementTemplate) - { - if (StringUtils.isEmpty(content)) - { + public static String replaceAll(CharSequence content, Pattern pattern, String replacementTemplate) { + if (StringUtils.isEmpty(content)) { return StringUtils.EMPTY; } final Matcher matcher = pattern.matcher(content); boolean result = matcher.find(); - if (result) - { + if (result) { final Set varNums = findAll(GROUP_VAR, replacementTemplate, 1, new HashSet<>()); final StringBuffer sb = new StringBuffer(); - do - { + do { String replacement = replacementTemplate; - for (String var : varNums) - { + for (String var : varNums) { int group = Integer.parseInt(var); replacement = replacement.replace("$" + var, matcher.group(group)); } @@ -85,33 +80,29 @@ public class ReUtil { } return Convert.toStr(content); } - + /** * 鍙栧緱鍐呭涓尮閰嶇殑鎵鏈夌粨鏋 * - * @param 闆嗗悎绫诲瀷 - * @param pattern 缂栬瘧鍚庣殑姝ｅ垯妯″紡 - * @param content 琚煡鎵剧殑鍐呭 - * @param group 姝ｅ垯鐨勫垎缁 + * @param 闆嗗悎绫诲瀷 + * @param pattern 缂栬瘧鍚庣殑姝ｅ垯妯″紡 + * @param content 琚煡鎵剧殑鍐呭 + * @param group 姝ｅ垯鐨勫垎缁 * @param collection 杩斿洖鐨勯泦鍚堢被鍨 * @return 缁撴灉闆 */ public static > T findAll(Pattern pattern, CharSequence content, int group, - T collection) - { - if (null == pattern || null == content) - { + T collection) { + if (null == pattern || null == content) { return null; } - if (null == collection) - { + if (null == collection) { throw new NullPointerException("Null collection param provided!"); } final Matcher matcher = pattern.matcher(content); - while (matcher.find()) - { + while (matcher.find()) { collection.add(matcher.group(group)); } return collection; @@ -123,11 +114,9 @@ public class ReUtil { * @param c 瀛楃 * @return 杞箟鍚庣殑鏂囨湰 */ - public static String escape(char c) - { + public static String escape(char c) { final StringBuilder builder = new StringBuilder(); - if (RE_KEYS.contains(c)) - { + if (RE_KEYS.contains(c)) { builder.append('\\'); } builder.append(c); @@ -140,21 +129,17 @@ public class ReUtil { * @param content 鏂囨湰 * @return 杞箟鍚庣殑鏂囨湰 */ - public static String escape(CharSequence content) - { - if (StringUtils.isBlank(content)) - { + public static String escape(CharSequence content) { + if (StringUtils.isBlank(content)) { return StringUtils.EMPTY; } final StringBuilder builder = new StringBuilder(); int len = content.length(); char current; - for (int i = 0; i < len; i++) - { + for (int i = 0; i < len; i++) { current = content.charAt(i); - if (RE_KEYS.contains(current)) - { + if (RE_KEYS.contains(current)) { builder.append('\\'); } builder.append(current); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java index 307607c7..94dc1727 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java @@ -27,70 +27,59 @@ import java.util.Map; /** * 瀹㈡埛绔伐鍏风被 - * + * * @author ruoyi */ -public class ServletUtils -{ +public class ServletUtils { /** * 鑾峰彇String鍙傛暟 */ - public static String getParameter(String name) - { + public static String getParameter(String name) { return getRequest().getParameter(name); } /** * 鑾峰彇String鍙傛暟 */ - public static String getParameter(String name, String defaultValue) - { + public static String getParameter(String name, String defaultValue) { return Convert.toStr(getRequest().getParameter(name), defaultValue); } /** * 鑾峰彇Integer鍙傛暟 */ - public static Integer getParameterToInt(String name) - { + public static Integer getParameterToInt(String name) { return Convert.toInt(getRequest().getParameter(name)); } /** * 鑾峰彇Integer鍙傛暟 */ - public static Integer getParameterToInt(String name, Integer defaultValue) - { + public static Integer getParameterToInt(String name, Integer defaultValue) { return Convert.toInt(getRequest().getParameter(name), defaultValue); } /** * 鑾峰彇Boolean鍙傛暟 */ - public static Boolean getParameterToBool(String name) - { + public static Boolean getParameterToBool(String name) { return Convert.toBool(getRequest().getParameter(name)); } /** * 鑾峰彇Boolean鍙傛暟 */ - public static Boolean getParameterToBool(String name, Boolean defaultValue) - { + public static Boolean getParameterToBool(String name, Boolean defaultValue) { return Convert.toBool(getRequest().getParameter(name), defaultValue); } /** * 鑾峰彇request */ - public static HttpServletRequest getRequest() - { - try - { + public static HttpServletRequest getRequest() { + try { return getRequestAttributes().getRequest(); - } - catch (Exception e) - { + } catch (Exception e) { return null; } } @@ -98,14 +87,10 @@ public class ServletUtils /** * 鑾峰彇response */ - public static HttpServletResponse getResponse() - { - try - { + public static HttpServletResponse getResponse() { + try { return getRequestAttributes().getResponse(); - } - catch (Exception e) - { + } catch (Exception e) { return null; } } @@ -113,42 +98,32 @@ public class ServletUtils /** * 鑾峰彇session */ - public static HttpSession getSession() - { + public static HttpSession getSession() { return getRequest().getSession(); } - public static ServletRequestAttributes getRequestAttributes() - { - try - { + public static ServletRequestAttributes getRequestAttributes() { + try { RequestAttributes attributes = RequestContextHolder.getRequestAttributes(); return (ServletRequestAttributes) attributes; - } - catch (Exception e) - { + } catch (Exception e) { return null; } } - public static String getHeader(HttpServletRequest request, String name) - { + public static String getHeader(HttpServletRequest request, String name) { String value = request.getHeader(name); - if (StringUtils.isEmpty(value)) - { + if (StringUtils.isEmpty(value)) { return StringUtils.EMPTY; } return urlDecode(value); } - public static Map getHeaders(HttpServletRequest request) - { + public static Map getHeaders(HttpServletRequest request) { Map map = new LinkedHashMap<>(); Enumeration enumeration = request.getHeaderNames(); - if (enumeration != null) - { - while (enumeration.hasMoreElements()) - { + if (enumeration != null) { + while (enumeration.hasMoreElements()) { String key = enumeration.nextElement(); String value = request.getHeader(key); map.put(key, value); @@ -159,47 +134,39 @@ public class ServletUtils /** * 灏嗗瓧绗︿覆娓叉煋鍒板鎴风 - * + * * @param response 娓叉煋瀵硅薄 - * @param string 寰呮覆鏌撶殑瀛楃涓 + * @param string 寰呮覆鏌撶殑瀛楃涓 */ - public static void renderString(HttpServletResponse response, String string) - { - try - { + public static void renderString(HttpServletResponse response, String string) { + try { response.setStatus(200); response.setContentType("application/json"); response.setCharacterEncoding("utf-8"); response.getWriter().print(string); - } - catch (IOException e) - { + } catch (IOException e) { e.printStackTrace(); } } /** * 鏄惁鏄疉jax寮傛璇锋眰 - * + * * @param request */ - public static boolean isAjaxRequest(HttpServletRequest request) - { + public static boolean isAjaxRequest(HttpServletRequest request) { String accept = request.getHeader("accept"); - if (accept != null && accept.contains(StringUtils.ACCEPT_JSON)) - { + if (accept != null && accept.contains(StringUtils.ACCEPT_JSON)) { return true; } String xRequestedWith = request.getHeader("X-Requested-With"); - if (xRequestedWith != null && xRequestedWith.contains(StringUtils.XML_HTTP)) - { + if (xRequestedWith != null && xRequestedWith.contains(StringUtils.XML_HTTP)) { return true; } String uri = request.getRequestURI(); - if (StringUtils.inStringIgnoreCase(uri, StringUtils.DOT+StringUtils.JSON,StringUtils.DOT+StringUtils.XML)) - { + if (StringUtils.inStringIgnoreCase(uri, StringUtils.DOT + StringUtils.JSON, StringUtils.DOT + StringUtils.XML)) { return true; } @@ -209,36 +176,28 @@ public class ServletUtils /** * 鍐呭缂栫爜 - * + * * @param str 鍐呭 * @return 缂栫爜鍚庣殑鍐呭 */ - public static String urlEncode(String str) - { - try - { + public static String urlEncode(String str) { + try { return URLEncoder.encode(str, Constants.UTF8); - } - catch (UnsupportedEncodingException e) - { + } catch (UnsupportedEncodingException e) { return StringUtils.EMPTY; } } /** * 鍐呭瑙ｇ爜 - * + * * @param str 鍐呭 * @return 瑙ｇ爜鍚庣殑鍐呭 */ - public static String urlDecode(String str) - { - try - { + public static String urlDecode(String str) { + try { return URLDecoder.decode(str, Constants.UTF8); - } - catch (UnsupportedEncodingException e) - { + } catch (UnsupportedEncodingException e) { return StringUtils.EMPTY; } } @@ -247,11 +206,10 @@ public class ServletUtils * 璁剧疆webflux妯″瀷鍝嶅簲 * * @param response ServerHttpResponse - * @param value 鍝嶅簲鍐呭 + * @param value 鍝嶅簲鍐呭 * @return Mono */ - public static Mono webFluxResponseWriter(ServerHttpResponse response, Object value) - { + public static Mono webFluxResponseWriter(ServerHttpResponse response, Object value) { return webFluxResponseWriter(response, HttpStatus.OK, value, Rust.FAIL); } @@ -259,12 +217,11 @@ public class ServletUtils * 璁剧疆webflux妯″瀷鍝嶅簲 * * @param response ServerHttpResponse - * @param code 鍝嶅簲鐘舵佺爜 - * @param value 鍝嶅簲鍐呭 + * @param code 鍝嶅簲鐘舵佺爜 + * @param value 鍝嶅簲鍐呭 * @return Mono */ - public static Mono webFluxResponseWriter(ServerHttpResponse response, Object value, int code) - { + public static Mono webFluxResponseWriter(ServerHttpResponse response, Object value, int code) { return webFluxResponseWriter(response, HttpStatus.OK, value, code); } @@ -272,28 +229,26 @@ public class ServletUtils * 璁剧疆webflux妯″瀷鍝嶅簲 * * @param response ServerHttpResponse - * @param status http鐘舵佺爜 - * @param code 鍝嶅簲鐘舵佺爜 - * @param value 鍝嶅簲鍐呭 + * @param status http鐘舵佺爜 + * @param code 鍝嶅簲鐘舵佺爜 + * @param value 鍝嶅簲鍐呭 * @return Mono */ - public static Mono webFluxResponseWriter(ServerHttpResponse response, HttpStatus status, Object value, int code) - { + public static Mono webFluxResponseWriter(ServerHttpResponse response, HttpStatus status, Object value, int code) { return webFluxResponseWriter(response, MediaType.APPLICATION_JSON_VALUE, status, value, code); } /** * 璁剧疆webflux妯″瀷鍝嶅簲 * - * @param response ServerHttpResponse + * @param response ServerHttpResponse * @param contentType content-type - * @param status http鐘舵佺爜 - * @param code 鍝嶅簲鐘舵佺爜 - * @param value 鍝嶅簲鍐呭 + * @param status http鐘舵佺爜 + * @param code 鍝嶅簲鐘舵佺爜 + * @param value 鍝嶅簲鍐呭 * @return Mono */ - public static Mono webFluxResponseWriter(ServerHttpResponse response, String contentType, HttpStatus status, Object value, int code) - { + public static Mono webFluxResponseWriter(ServerHttpResponse response, String contentType, HttpStatus status, Object value, int code) { response.setStatusCode(status); response.getHeaders().add(HttpHeaders.CONTENT_TYPE, contentType); Rust result = Rust.fail(code, value.toString()); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java index 9dcbceb1..c253d47c 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java @@ -9,32 +9,25 @@ import org.springframework.stereotype.Component; /** * spring宸ュ叿绫 鏂逛究鍦ㄩ潪spring绠＄悊鐜涓幏鍙朾ean - * + * * @author ruoyi */ @Component -public final class SpringUtils implements BeanFactoryPostProcessor -{ - /** Spring搴旂敤涓婁笅鏂囩幆澧 */ +public final class SpringUtils implements BeanFactoryPostProcessor { + /** + * Spring搴旂敤涓婁笅鏂囩幆澧 + */ private static ConfigurableListableBeanFactory beanFactory; - @Override - public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException - { - SpringUtils.beanFactory = beanFactory; - } - /** * 鑾峰彇瀵硅薄 * * @param name * @return Object 涓涓互鎵缁欏悕瀛楁敞鍐岀殑bean鐨勫疄渚 * @throws org.springframework.beans.BeansException - * */ @SuppressWarnings("unchecked") - public static T getBean(String name) throws BeansException - { + public static T getBean(String name) throws BeansException { return (T) beanFactory.getBean(name); } @@ -44,10 +37,8 @@ public final class SpringUtils implements BeanFactoryPostProcessor * @param clz * @return * @throws org.springframework.beans.BeansException - * */ - public static T getBean(Class clz) throws BeansException - { + public static T getBean(Class clz) throws BeansException { T result = (T) beanFactory.getBean(clz); return result; } @@ -58,8 +49,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor * @param name * @return boolean */ - public static boolean containsBean(String name) - { + public static boolean containsBean(String name) { return beanFactory.containsBean(name); } @@ -69,10 +59,8 @@ public final class SpringUtils implements BeanFactoryPostProcessor * @param name * @return boolean * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException - * */ - public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException - { + public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException { return beanFactory.isSingleton(name); } @@ -80,10 +68,8 @@ public final class SpringUtils implements BeanFactoryPostProcessor * @param name * @return Class 娉ㄥ唽瀵硅薄鐨勭被鍨 * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException - * */ - public static Class getType(String name) throws NoSuchBeanDefinitionException - { + public static Class getType(String name) throws NoSuchBeanDefinitionException { return beanFactory.getType(name); } @@ -93,22 +79,24 @@ public final class SpringUtils implements BeanFactoryPostProcessor * @param name * @return * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException - * */ - public static String[] getAliases(String name) throws NoSuchBeanDefinitionException - { + public static String[] getAliases(String name) throws NoSuchBeanDefinitionException { return beanFactory.getAliases(name); } /** * 鑾峰彇aop浠ｇ悊瀵硅薄 - * + * * @param invoker * @return */ @SuppressWarnings("unchecked") - public static T getAopProxy(T invoker) - { + public static T getAopProxy(T invoker) { return (T) AopContext.currentProxy(); } + + @Override + public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { + SpringUtils.beanFactory = beanFactory; + } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java index 4327b236..ed114f5c 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java @@ -10,232 +10,267 @@ import java.util.Map; /** * 瀛楃涓插伐鍏风被 - * + * * @author ruoyi */ -public class StringUtils extends org.apache.commons.lang3.StringUtils -{ - /** 绌哄瓧绗︿覆 */ +public class StringUtils extends org.apache.commons.lang3.StringUtils { + /** + * 绌哄瓧绗︿覆 + */ public static final String NULLSTR = ""; - /** 绌烘牸瀛楃涓 */ + /** + * 绌烘牸瀛楃涓 + */ public static final String BLANK_SPACE = " "; - /** 鏂滄潬瀛楃涓 */ + /** + * 鏂滄潬瀛楃涓 + */ public static final String SLASH = "/"; - /** 浜曞彿瀛楃涓 */ + /** + * 浜曞彿瀛楃涓 + */ public static final String WELL_NO = "#"; - /** 鐐瑰瓧绗︿覆 */ + /** + * 鐐瑰瓧绗︿覆 + */ public static final String DOT = "."; - /** 閫楀彿绗︿覆 */ + /** + * 閫楀彿绗︿覆 + */ public static final String COMMA = ","; - /** (绗︿覆 */ + /** + * (绗︿覆 + */ public static final String LEFT_BRACKETS = "("; - /** get瀛楃涓 */ + /** + * get瀛楃涓 + */ public static final String GET = "GET"; - /** POST瀛楃涓 */ + /** + * POST瀛楃涓 + */ public static final String POST = "POST"; - /** DELETE瀛楃涓 */ + /** + * DELETE瀛楃涓 + */ public static final String DELETE = "DELETE"; - /** 鍓嶇鎺掑簭瀛楃涓 */ + /** + * 鍓嶇鎺掑簭瀛楃涓 + */ public static final String ASC_ENDING = "ascending"; - /** 鍓嶇鎺掑簭瀛楃涓 */ + /** + * 鍓嶇鎺掑簭瀛楃涓 + */ public static final String DESC_ENDING = "descending"; - /** true瀛楃涓 */ + /** + * true瀛楃涓 + */ public static final String TRUE = "true"; - /** registerUser瀛楃涓 */ + /** + * registerUser瀛楃涓 + */ public static final String SYS_ACCOUNT_USER = "sys.account.registerUser"; - /** char瀛楃涓 */ + /** + * char瀛楃涓 + */ public static final String CHAR = "char"; - /** math瀛楃涓 */ + /** + * math瀛楃涓 + */ public static final String MATH = "math"; - /** JPG瀛楃涓 */ + /** + * JPG瀛楃涓 + */ public static final String JPG = "JPG"; - /** PNG瀛楃涓 */ + /** + * PNG瀛楃涓 + */ public static final String PNG = "PNG"; - /** 娉細瀛楃涓 */ + /** + * 娉細瀛楃涓 + */ public static final String NOTE = "娉細"; - /** MSIE瀛楃涓 */ + /** + * MSIE瀛楃涓 + */ public static final String MSIE = "MSIE"; - /** Firefox瀛楃涓 */ + /** + * Firefox瀛楃涓 + */ public static final String FIREFOX = "Firefox"; - /** Chrome瀛楃涓 */ + /** + * Chrome瀛楃涓 + */ public static final String CHROME = "Chrome"; - /** json瀛楃涓 */ + /** + * json瀛楃涓 + */ public static final String ACCEPT_JSON = "application/json"; - /** XMLHttpRequest瀛楃涓 */ + /** + * XMLHttpRequest瀛楃涓 + */ public static final String XML_HTTP = "XMLHttpRequest"; - /** json瀛楃涓 */ + /** + * json瀛楃涓 + */ public static final String JSON = "json"; - /** xml瀛楃涓 */ + /** + * xml瀛楃涓 + */ public static final String XML = "xml"; - /** 涓嬪垝绾 */ + /** + * 涓嬪垝绾 + */ public static final char SEPARATOR = '_'; /** * 鑾峰彇鍙傛暟涓嶄负绌哄 - * + * * @param value defaultValue 瑕佸垽鏂殑value * @return value 杩斿洖鍊 */ - public static T nvl(T value, T defaultValue) - { + public static T nvl(T value, T defaultValue) { return value != null ? value : defaultValue; } /** * * 鍒ゆ柇涓涓狢ollection鏄惁涓虹┖锛 鍖呭惈List锛孲et锛孮ueue - * + * * @param coll 瑕佸垽鏂殑Collection * @return true锛氫负绌 false锛氶潪绌 */ - public static boolean isEmpty(Collection coll) - { + public static boolean isEmpty(Collection coll) { return isNull(coll) || coll.isEmpty(); } /** * * 鍒ゆ柇涓涓狢ollection鏄惁闈炵┖锛屽寘鍚獿ist锛孲et锛孮ueue - * + * * @param coll 瑕佸垽鏂殑Collection * @return true锛氶潪绌 false锛氱┖ */ - public static boolean isNotEmpty(Collection coll) - { + public static boolean isNotEmpty(Collection coll) { return !isEmpty(coll); } /** * * 鍒ゆ柇涓涓璞℃暟缁勬槸鍚︿负绌 - * + * * @param objects 瑕佸垽鏂殑瀵硅薄鏁扮粍 - ** @return true锛氫负绌 false锛氶潪绌 + * * @return true锛氫负绌 false锛氶潪绌 */ - public static boolean isEmpty(Object[] objects) - { + public static boolean isEmpty(Object[] objects) { return isNull(objects) || (objects.length == 0); } /** * * 鍒ゆ柇涓涓璞℃暟缁勬槸鍚﹂潪绌 - * + * * @param objects 瑕佸垽鏂殑瀵硅薄鏁扮粍 * @return true锛氶潪绌 false锛氱┖ */ - public static boolean isNotEmpty(Object[] objects) - { + public static boolean isNotEmpty(Object[] objects) { return !isEmpty(objects); } /** * * 鍒ゆ柇涓涓狹ap鏄惁涓虹┖ - * + * * @param map 瑕佸垽鏂殑Map * @return true锛氫负绌 false锛氶潪绌 */ - public static boolean isEmpty(Map map) - { + public static boolean isEmpty(Map map) { return isNull(map) || map.isEmpty(); } /** * * 鍒ゆ柇涓涓狹ap鏄惁涓虹┖ - * + * * @param map 瑕佸垽鏂殑Map * @return true锛氶潪绌 false锛氱┖ */ - public static boolean isNotEmpty(Map map) - { + public static boolean isNotEmpty(Map map) { return !isEmpty(map); } /** * * 鍒ゆ柇涓涓瓧绗︿覆鏄惁涓虹┖涓 - * + * * @param str String * @return true锛氫负绌 false锛氶潪绌 */ - public static boolean isEmpty(String str) - { + public static boolean isEmpty(String str) { return isNull(str) || NULLSTR.equals(str.trim()); } /** * * 鍒ゆ柇涓涓瓧绗︿覆鏄惁涓洪潪绌轰覆 - * + * * @param str String * @return true锛氶潪绌轰覆 false锛氱┖涓 */ - public static boolean isNotEmpty(String str) - { + public static boolean isNotEmpty(String str) { return !isEmpty(str); } /** * * 鍒ゆ柇涓涓璞℃槸鍚︿负绌 - * + * * @param object Object * @return true锛氫负绌 false锛氶潪绌 */ - public static boolean isNull(Object object) - { + public static boolean isNull(Object object) { return object == null; } /** * * 鍒ゆ柇涓涓璞℃槸鍚﹂潪绌 - * + * * @param object Object * @return true锛氶潪绌 false锛氱┖ */ - public static boolean isNotNull(Object object) - { + public static boolean isNotNull(Object object) { return !isNull(object); } /** * * 鍒ゆ柇涓涓璞℃槸鍚︽槸鏁扮粍绫诲瀷锛圝ava鍩烘湰鍨嬪埆鐨勬暟缁勶級 - * + * * @param object 瀵硅薄 * @return true锛氭槸鏁扮粍 false锛氫笉鏄暟缁 */ - public static boolean isArray(Object object) - { + public static boolean isArray(Object object) { return isNotNull(object) && object.getClass().isArray(); } /** * 鍘荤┖鏍 */ - public static String trim(String str) - { + public static String trim(String str) { return (str == null ? "" : str.trim()); } /** * 鎴彇瀛楃涓 - * - * @param str 瀛楃涓 + * + * @param str 瀛楃涓 * @param start 寮濮 * @return 缁撴灉 */ - public static String substring(final String str, int start) - { - if (str == null) - { + public static String substring(final String str, int start) { + if (str == null) { return NULLSTR; } - if (start < 0) - { + if (start < 0) { start = str.length() + start; } - if (start < 0) - { + if (start < 0) { start = 0; } - if (start > str.length()) - { + if (start > str.length()) { return NULLSTR; } @@ -244,44 +279,36 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils /** * 鎴彇瀛楃涓 - * - * @param str 瀛楃涓 + * + * @param str 瀛楃涓 * @param start 寮濮 - * @param end 缁撴潫 + * @param end 缁撴潫 * @return 缁撴灉 */ - public static String substring(final String str, int start, int end) - { - if (str == null) - { + public static String substring(final String str, int start, int end) { + if (str == null) { return NULLSTR; } - if (end < 0) - { + if (end < 0) { end = str.length() + end; } - if (start < 0) - { + if (start < 0) { start = str.length() + start; } - if (end > str.length()) - { + if (end > str.length()) { end = str.length(); } - if (start > end) - { + if (start > end) { return NULLSTR; } - if (start < 0) - { + if (start < 0) { start = 0; } - if (end < 0) - { + if (end < 0) { end = 0; } @@ -290,22 +317,18 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils /** * 鍒ゆ柇鏄惁涓虹┖锛屽苟涓斾笉鏄┖鐧藉瓧绗 - * + * * @param str 瑕佸垽鏂殑value * @return 缁撴灉 */ - public static boolean hasText(String str) - { + public static boolean hasText(String str) { return (str != null && !str.isEmpty() && containsText(str)); } - private static boolean containsText(CharSequence str) - { + private static boolean containsText(CharSequence str) { int strLen = str.length(); - for (int i = 0; i < strLen; i++) - { - if (!Character.isWhitespace(str.charAt(i))) - { + for (int i = 0; i < strLen; i++) { + if (!Character.isWhitespace(str.charAt(i))) { return true; } } @@ -320,15 +343,13 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils * 閫氬父浣跨敤锛歠ormat("this is {} for {}", "a", "b") -> this is a for b
* 杞箟{}锛 format("this is \\{} for {}", "a", "b") -> this is \{} for a
* 杞箟\锛 format("this is \\\\{} for {}", "a", "b") -> this is \a for b
- * + * * @param template 鏂囨湰妯℃澘锛岃鏇挎崲鐨勯儴鍒嗙敤 {} 琛ㄧず - * @param params 鍙傛暟鍊 + * @param params 鍙傛暟鍊 * @return 鏍煎紡鍖栧悗鐨勬枃鏈 */ - public static String format(String template, Object... params) - { - if (isEmpty(params) || isEmpty(template)) - { + public static String format(String template, Object... params) { + if (isEmpty(params) || isEmpty(template)) { return template; } return StrFormatter.format(template, params); @@ -336,22 +357,19 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils /** * 鏄惁涓篽ttp(s)://寮澶 - * + * * @param link 閾炬帴 * @return 缁撴灉 */ - public static boolean ishttp(String link) - { + public static boolean ishttp(String link) { return StringUtils.startsWithAny(link, Constants.HTTP, Constants.HTTPS); } /** * 椹煎嘲杞笅鍒掔嚎鍛藉悕 */ - public static String toUnderScoreCase(String str) - { - if (str == null) - { + public static String toUnderScoreCase(String str) { + if (str == null) { return null; } StringBuilder sb = new StringBuilder(); @@ -361,27 +379,21 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils boolean curreCharIsUpperCase = true; // 涓嬩竴瀛楃鏄惁澶у啓 boolean nexteCharIsUpperCase = true; - for (int i = 0; i < str.length(); i++) - { + for (int i = 0; i < str.length(); i++) { char c = str.charAt(i); - if (i > 0) - { + if (i > 0) { preCharIsUpperCase = Character.isUpperCase(str.charAt(i - 1)); - } - else - { + } else { preCharIsUpperCase = false; } curreCharIsUpperCase = Character.isUpperCase(c); - if (i < (str.length() - 1)) - { + if (i < (str.length() - 1)) { nexteCharIsUpperCase = Character.isUpperCase(str.charAt(i + 1)); } - if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase) - { + if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase) { sb.append(SEPARATOR); } else if (i != 0 && !preCharIsUpperCase && curreCharIsUpperCase) { sb.append(SEPARATOR); @@ -394,19 +406,15 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils /** * 鏄惁鍖呭惈瀛楃涓 - * - * @param str 楠岃瘉瀛楃涓 + * + * @param str 楠岃瘉瀛楃涓 * @param strs 瀛楃涓茬粍 * @return 鍖呭惈杩斿洖true */ - public static boolean inStringIgnoreCase(String str, String... strs) - { - if (str != null && strs != null) - { - for (String s : strs) - { - if (str.equalsIgnoreCase(trim(s))) - { + public static boolean inStringIgnoreCase(String str, String... strs) { + if (str != null && strs != null) { + for (String s : strs) { + if (str.equalsIgnoreCase(trim(s))) { return true; } } @@ -416,12 +424,11 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils /** * 灏嗕笅鍒掔嚎澶у啓鏂瑰紡鍛藉悕鐨勫瓧绗︿覆杞崲涓洪┘宄板紡銆傚鏋滆浆鎹㈠墠鐨勪笅鍒掔嚎澶у啓鏂瑰紡鍛藉悕鐨勫瓧绗︿覆涓虹┖锛屽垯杩斿洖绌哄瓧绗︿覆銆 渚嬪锛欻ELLO_WORLD->HelloWorld - * + * * @param name 杞崲鍓嶇殑涓嬪垝绾垮ぇ鍐欐柟寮忓懡鍚嶇殑瀛楃涓 * @return 杞崲鍚庣殑椹煎嘲寮忓懡鍚嶇殑瀛楃涓 */ - public static String convertToCamelCase(String name) - { + public static String convertToCamelCase(String name) { StringBuilder result = new StringBuilder(); String underline = "_"; // 蹇熸鏌 @@ -434,11 +441,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils } // 鐢ㄤ笅鍒掔嚎灏嗗師濮嬪瓧绗︿覆鍒嗗壊 String[] camels = name.split(underline); - for (String camel : camels) - { + for (String camel : camels) { // 璺宠繃鍘熷瀛楃涓蹭腑寮澶淬佺粨灏剧殑涓嬫崲绾挎垨鍙岄噸涓嬪垝绾 - if (camel.isEmpty()) - { + if (camel.isEmpty()) { continue; } // 棣栧瓧姣嶅ぇ鍐 @@ -451,30 +456,22 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils /** * 椹煎嘲寮忓懡鍚嶆硶 渚嬪锛歶ser_name->userName */ - public static String toCamelCase(String s) - { - if (s == null) - { + public static String toCamelCase(String s) { + if (s == null) { return null; } s = s.toLowerCase(); StringBuilder sb = new StringBuilder(s.length()); boolean upperCase = false; - for (int i = 0; i < s.length(); i++) - { + for (int i = 0; i < s.length(); i++) { char c = s.charAt(i); - if (c == SEPARATOR) - { + if (c == SEPARATOR) { upperCase = true; - } - else if (upperCase) - { + } else if (upperCase) { sb.append(Character.toUpperCase(c)); upperCase = false; - } - else - { + } else { sb.append(c); } } @@ -483,21 +480,17 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils /** * 鏌ユ壘鎸囧畾瀛楃涓叉槸鍚﹀尮閰嶆寚瀹氬瓧绗︿覆鍒楄〃涓殑浠绘剰涓涓瓧绗︿覆 - * - * @param str 鎸囧畾瀛楃涓 + * + * @param str 鎸囧畾瀛楃涓 * @param strs 闇瑕佹鏌ョ殑瀛楃涓叉暟缁 * @return 鏄惁鍖归厤 */ - public static boolean matches(String str, List strs) - { - if (isEmpty(str) || isEmpty(strs)) - { + public static boolean matches(String str, List strs) { + if (isEmpty(str) || isEmpty(strs)) { return false; } - for (String pattern : strs) - { - if (isMatch(pattern, str)) - { + for (String pattern : strs) { + if (isMatch(pattern, str)) { return true; } } @@ -505,70 +498,58 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils } /** - * 鍒ゆ柇url鏄惁涓庤鍒欓厤缃: - * ? 琛ㄧず鍗曚釜瀛楃; - * * 琛ㄧず涓灞傝矾寰勫唴鐨勪换鎰忓瓧绗︿覆锛屼笉鍙法灞傜骇; + * 鍒ゆ柇url鏄惁涓庤鍒欓厤缃: + * ? 琛ㄧず鍗曚釜瀛楃; + * * 琛ㄧず涓灞傝矾寰勫唴鐨勪换鎰忓瓧绗︿覆锛屼笉鍙法灞傜骇; * ** 琛ㄧず浠绘剰灞傝矾寰; - * + * * @param pattern 鍖归厤瑙勫垯 - * @param url 闇瑕佸尮閰嶇殑url + * @param url 闇瑕佸尮閰嶇殑url * @return */ - public static boolean isMatch(String pattern, String url) - { + public static boolean isMatch(String pattern, String url) { AntPathMatcher matcher = new AntPathMatcher(); return matcher.match(pattern, url); } @SuppressWarnings("unchecked") - public static T cast(Object obj) - { + public static T cast(Object obj) { return (T) obj; } /** * 鏁板瓧宸﹁竟琛ラ綈0锛屼娇涔嬭揪鍒版寚瀹氶暱搴︺傛敞鎰忥紝濡傛灉鏁板瓧杞崲涓哄瓧绗︿覆鍚庯紝闀垮害澶т簬size锛屽垯鍙繚鐣 鏈鍚巗ize涓瓧绗︺ - * - * @param num 鏁板瓧瀵硅薄 + * + * @param num 鏁板瓧瀵硅薄 * @param size 瀛楃涓叉寚瀹氶暱搴 * @return 杩斿洖鏁板瓧鐨勫瓧绗︿覆鏍煎紡锛岃瀛楃涓蹭负鎸囧畾闀垮害銆 */ - public static final String padl(final Number num, final int size) - { + public static final String padl(final Number num, final int size) { return padl(num.toString(), size, '0'); } /** * 瀛楃涓插乏琛ラ綈銆傚鏋滃師濮嬪瓧绗︿覆s闀垮害澶т簬size锛屽垯鍙繚鐣欐渶鍚巗ize涓瓧绗︺ - * - * @param s 鍘熷瀛楃涓 + * + * @param s 鍘熷瀛楃涓 * @param size 瀛楃涓叉寚瀹氶暱搴 - * @param c 鐢ㄤ簬琛ラ綈鐨勫瓧绗 + * @param c 鐢ㄤ簬琛ラ綈鐨勫瓧绗 * @return 杩斿洖鎸囧畾闀垮害鐨勫瓧绗︿覆锛岀敱鍘熷瓧绗︿覆宸﹁ˉ榻愭垨鎴彇寰楀埌銆 */ - public static final String padl(final String s, final int size, final char c) - { + public static final String padl(final String s, final int size, final char c) { final StringBuilder sb = new StringBuilder(size); - if (s != null) - { + if (s != null) { final int len = s.length(); - if (s.length() <= size) - { - for (int i = size - len; i > 0; i--) - { + if (s.length() <= size) { + for (int i = size - len; i > 0; i--) { sb.append(c); } sb.append(s); - } - else - { + } else { return s.substring(len - size, len); } - } - else - { - for (int i = size; i > 0; i--) - { + } else { + for (int i = size; i > 0; i--) { sb.append(c); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java index d027ceff..85ff99fe 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java @@ -8,46 +8,46 @@ import java.util.regex.Pattern; /** * Bean 宸ュ叿绫 - * + * * @author ruoyi */ -public class BeanUtils extends org.springframework.beans.BeanUtils -{ - /** Bean鏂规硶鍚嶄腑灞炴у悕寮濮嬬殑涓嬫爣 */ +public class BeanUtils extends org.springframework.beans.BeanUtils { + /** + * Bean鏂规硶鍚嶄腑灞炴у悕寮濮嬬殑涓嬫爣 + */ private static final int BEAN_METHOD_PROP_INDEX = 3; - /** * 鍖归厤getter鏂规硶鐨勬鍒欒〃杈惧紡 */ + /** + * 鍖归厤getter鏂规硶鐨勬鍒欒〃杈惧紡 + */ private static final Pattern GET_PATTERN = Pattern.compile("get(\\p{javaUpperCase}\\w*)"); - /** * 鍖归厤setter鏂规硶鐨勬鍒欒〃杈惧紡 */ + /** + * 鍖归厤setter鏂规硶鐨勬鍒欒〃杈惧紡 + */ private static final Pattern SET_PATTERN = Pattern.compile("set(\\p{javaUpperCase}\\w*)"); /** * Bean灞炴у鍒跺伐鍏锋柟娉曘 - * + * * @param dest 鐩爣瀵硅薄 - * @param src 婧愬璞 + * @param src 婧愬璞 */ - public static void copyBeanProp(Object dest, Object src) - { - try - { + public static void copyBeanProp(Object dest, Object src) { + try { copyProperties(src, dest); - } - catch (Exception e) - { + } catch (Exception e) { e.printStackTrace(); } } /** * 鑾峰彇瀵硅薄鐨剆etter鏂规硶銆 - * + * * @param obj 瀵硅薄 * @return 瀵硅薄鐨剆etter鏂规硶鍒楄〃 */ - public static List getSetterMethods(Object obj) - { + public static List getSetterMethods(Object obj) { // setter鏂规硶鍒楄〃 List setterMethods = new ArrayList(); @@ -56,11 +56,9 @@ public class BeanUtils extends org.springframework.beans.BeanUtils // 鏌ユ壘setter鏂规硶 - for (Method method : methods) - { + for (Method method : methods) { Matcher m = SET_PATTERN.matcher(method.getName()); - if (m.matches() && (method.getParameterTypes().length == 1)) - { + if (m.matches() && (method.getParameterTypes().length == 1)) { setterMethods.add(method); } } @@ -70,23 +68,20 @@ public class BeanUtils extends org.springframework.beans.BeanUtils /** * 鑾峰彇瀵硅薄鐨刧etter鏂规硶銆 - * + * * @param obj 瀵硅薄 * @return 瀵硅薄鐨刧etter鏂规硶鍒楄〃 */ - public static List getGetterMethods(Object obj) - { + public static List getGetterMethods(Object obj) { // getter鏂规硶鍒楄〃 List getterMethods = new ArrayList(); // 鑾峰彇鎵鏈夋柟娉 Method[] methods = obj.getClass().getMethods(); // 鏌ユ壘getter鏂规硶 - for (Method method : methods) - { + for (Method method : methods) { Matcher m = GET_PATTERN.matcher(method.getName()); - if (m.matches() && (method.getParameterTypes().length == 0)) - { + if (m.matches() && (method.getParameterTypes().length == 0)) { getterMethods.add(method); } } @@ -97,14 +92,13 @@ public class BeanUtils extends org.springframework.beans.BeanUtils /** * 妫鏌ean鏂规硶鍚嶄腑鐨勫睘鎬у悕鏄惁鐩哥瓑銆
* 濡俫etName()鍜宻etName()灞炴у悕涓鏍凤紝getName()鍜宻etAge()灞炴у悕涓嶄竴鏍枫 - * + * * @param m1 鏂规硶鍚1 * @param m2 鏂规硶鍚2 * @return 灞炴у悕涓鏍疯繑鍥瀟rue锛屽惁鍒欒繑鍥瀎alse */ - public static boolean isMethodPropEquals(String m1, String m2) - { + public static boolean isMethodPropEquals(String m1, String m2) { return m1.substring(BEAN_METHOD_PROP_INDEX).equals(m2.substring(BEAN_METHOD_PROP_INDEX)); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java index 322e6876..98d30487 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java @@ -7,17 +7,14 @@ import java.util.Set; /** * bean瀵硅薄灞炴ч獙璇 - * + * * @author ruoyi */ -public class BeanValidators -{ +public class BeanValidators { public static void validateWithException(Validator validator, Object object, Class... groups) - throws ConstraintViolationException - { + throws ConstraintViolationException { Set> constraintViolations = validator.validate(object, groups); - if (!constraintViolations.isEmpty()) - { + if (!constraintViolations.isEmpty()) { throw new ConstraintViolationException(constraintViolations); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java index 2fd6183e..4e11b4d3 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java @@ -9,20 +9,17 @@ import java.io.File; * * @author ruoyi */ -public class FileTypeUtils -{ +public class FileTypeUtils { /** * 鑾峰彇鏂囦欢绫诲瀷 *

* 渚嬪: ruoyi.txt, 杩斿洖: txt - * + * * @param file 鏂囦欢鍚 * @return 鍚庣紑锛堜笉鍚".") */ - public static String getFileType(File file) - { - if (null == file) - { + public static String getFileType(File file) { + if (null == file) { return StringUtils.EMPTY; } return getFileType(file.getName()); @@ -36,11 +33,9 @@ public class FileTypeUtils * @param fileName 鏂囦欢鍚 * @return 鍚庣紑锛堜笉鍚".") */ - public static String getFileType(String fileName) - { + public static String getFileType(String fileName) { int separatorIndex = fileName.lastIndexOf("."); - if (separatorIndex < 0) - { + if (separatorIndex < 0) { return ""; } return fileName.substring(separatorIndex + 1).toLowerCase(); @@ -48,12 +43,11 @@ public class FileTypeUtils /** * 鑾峰彇鏂囦欢绫诲瀷 - * + * * @param photoByte 鏂囦欢瀛楄妭鐮 * @return 鍚庣紑锛堜笉鍚".") */ - public static String getFileExtendName(byte[] photoByte) - { + public static String getFileExtendName(byte[] photoByte) { String strFileExtendName = "JPG"; int i71 = 71; int i73 = 73; @@ -79,17 +73,11 @@ public class FileTypeUtils if ((photoByte[i4] == i55) || (photoByte[i4] == i57)) { strFileExtendName = "GIF"; } - } - else if ((photoByte[i6] == i74) && (photoByte[i7] == i70) && (photoByte[i8] == i73) && (photoByte[i9] == i70)) - { + } else if ((photoByte[i6] == i74) && (photoByte[i7] == i70) && (photoByte[i8] == i73) && (photoByte[i9] == i70)) { strFileExtendName = "JPG"; - } - else if ((photoByte[0] == i66) && (photoByte[1] == i77)) - { + } else if ((photoByte[0] == i66) && (photoByte[1] == i77)) { strFileExtendName = "BMP"; - } - else if ((photoByte[1] == i80) && (photoByte[i2] == i78) && (photoByte[i3] == i71)) - { + } else if ((photoByte[1] == i80) && (photoByte[i2] == i78) && (photoByte[i3] == i71)) { strFileExtendName = "PNG"; } return strFileExtendName; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java index cd8de02b..26bc3e61 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java @@ -15,38 +15,27 @@ import java.util.Arrays; * * @author ruoyi */ -public class ImageUtils -{ +public class ImageUtils { private static final Logger log = LoggerFactory.getLogger(ImageUtils.class); - public static byte[] getImage(String imagePath) - { + public static byte[] getImage(String imagePath) { InputStream is = getFile(imagePath); - try - { + try { return IOUtils.toByteArray(is); - } - catch (Exception e) - { + } catch (Exception e) { log.error("鍥剧墖鍔犺浇寮傚父 {}", e); return null; - } - finally - { + } finally { IOUtils.closeQuietly(is); } } - public static InputStream getFile(String imagePath) - { - try - { + public static InputStream getFile(String imagePath) { + try { byte[] result = readFile(imagePath); result = Arrays.copyOf(result, result.length); return new ByteArrayInputStream(result); - } - catch (Exception e) - { + } catch (Exception e) { log.error("鑾峰彇鍥剧墖寮傚父 {}", e); } return null; @@ -54,15 +43,13 @@ public class ImageUtils /** * 璇诲彇鏂囦欢涓哄瓧鑺傛暟鎹 - * + * * @param url 鍦板潃 * @return 瀛楄妭鏁版嵁 */ - public static byte[] readFile(String url) - { + public static byte[] readFile(String url) { InputStream in = null; - try - { + try { // 缃戠粶鍦板潃 URL urlObj = new URL(url); URLConnection urlConnection = urlObj.openConnection(); @@ -71,14 +58,10 @@ public class ImageUtils urlConnection.setDoInput(true); in = urlConnection.getInputStream(); return IOUtils.toByteArray(in); - } - catch (Exception e) - { + } catch (Exception e) { log.error("璁块棶鏂囦欢寮傚父 {}", e); return null; - } - finally - { + } finally { IOUtils.closeQuietly(in); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java index b8a3bc39..d3466cda 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java @@ -2,11 +2,10 @@ package com.ruoyi.common.core.utils.file; /** * 濯掍綋绫诲瀷宸ュ叿绫 - * + * * @author ruoyi */ -public class MimeTypeUtils -{ +public class MimeTypeUtils { public static final String IMAGE_PNG = "image/png"; public static final String IMAGE_JPG = "image/jpg"; @@ -17,14 +16,14 @@ public class MimeTypeUtils public static final String IMAGE_GIF = "image/gif"; - public static final String[] IMAGE_EXTENSION = { "bmp", "gif", "jpg", "jpeg", "png" }; + public static final String[] IMAGE_EXTENSION = {"bmp", "gif", "jpg", "jpeg", "png"}; - public static final String[] FLASH_EXTENSION = { "swf", "flv" }; + public static final String[] FLASH_EXTENSION = {"swf", "flv"}; - public static final String[] MEDIA_EXTENSION = { "swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg", - "asf", "rm", "rmvb" }; + public static final String[] MEDIA_EXTENSION = {"swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg", + "asf", "rm", "rmvb"}; - public static final String[] VIDEO_EXTENSION = { "mp4", "avi", "rmvb" }; + public static final String[] VIDEO_EXTENSION = {"mp4", "avi", "rmvb"}; public static final String[] DEFAULT_ALLOWED_EXTENSION = { // 鍥剧墖 @@ -36,12 +35,10 @@ public class MimeTypeUtils // 瑙嗛鏍煎紡 "mp4", "avi", "rmvb", // pdf - "pdf" }; + "pdf"}; - public static String getExtension(String prefix) - { - switch (prefix) - { + public static String getExtension(String prefix) { + switch (prefix) { case IMAGE_PNG: return "png"; case IMAGE_JPG: diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java index 8e8f3145..bd246446 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java @@ -4,11 +4,10 @@ import com.ruoyi.common.core.utils.StringUtils; /** * 杞箟鍜屽弽杞箟宸ュ叿绫 - * + * * @author ruoyi */ -public class EscapeUtil -{ +public class EscapeUtil { public static final String RE_HTML_MARK = "(<[^<]*?>)|(<[\\s]*?/[^<]*?>)|(<[^<]*?/[\\s]*?>)"; private static final char[][] TEXT = new char[64][]; @@ -16,7 +15,7 @@ public class EscapeUtil static { int baseSize = 64; for (int i = 0; i < baseSize; i++) { - TEXT[i] = new char[] { (char) i }; + TEXT[i] = new char[]{(char) i}; } // special HTML characters @@ -29,69 +28,58 @@ public class EscapeUtil /** * 杞箟鏂囨湰涓殑HTML瀛楃涓哄畨鍏ㄧ殑瀛楃 - * + * * @param text 琚浆涔夌殑鏂囨湰 * @return 杞箟鍚庣殑鏂囨湰 */ - public static String escape(String text) - { + public static String escape(String text) { return encode(text); } /** * 杩樺師琚浆涔夌殑HTML鐗规畩瀛楃 - * + * * @param content 鍖呭惈杞箟绗︾殑HTML鍐呭 * @return 杞崲鍚庣殑瀛楃涓 */ - public static String unescape(String content) - { + public static String unescape(String content) { return decode(content); } /** * 娓呴櫎鎵鏈塇TML鏍囩锛屼絾鏄笉鍒犻櫎鏍囩鍐呯殑鍐呭 - * + * * @param content 鏂囨湰 * @return 娓呴櫎鏍囩鍚庣殑鏂囨湰 */ - public static String clean(String content) - { + public static String clean(String content) { return new HtmlFilter().filter(content); } /** * Escape缂栫爜 - * + * * @param text 琚紪鐮佺殑鏂囨湰 * @return 缂栫爜鍚庣殑瀛楃 */ - private static String encode(String text) - { - if (StringUtils.isEmpty(text)) - { + private static String encode(String text) { + if (StringUtils.isEmpty(text)) { return StringUtils.EMPTY; } final StringBuilder tmp = new StringBuilder(text.length() * 6); char c; - for (int i = 0; i < text.length(); i++) - { + for (int i = 0; i < text.length(); i++) { c = text.charAt(i); - if (c < 256) - { + if (c < 256) { tmp.append("%"); - if (c < 16) - { + if (c < 16) { tmp.append("0"); } tmp.append(Integer.toString(c, 16)); - } - else - { + } else { tmp.append("%u"); - if (c <= 0xfff) - { + if (c <= 0xfff) { // issue#I49JU8@Gitee tmp.append("0"); } @@ -103,47 +91,35 @@ public class EscapeUtil /** * Escape瑙ｇ爜 - * + * * @param content 琚浆涔夌殑鍐呭 * @return 瑙ｇ爜鍚庣殑瀛楃涓 */ - public static String decode(String content) - { - if (StringUtils.isEmpty(content)) - { + public static String decode(String content) { + if (StringUtils.isEmpty(content)) { return content; } StringBuilder tmp = new StringBuilder(content.length()); int lastPos = 0, pos = 0; char ch; - while (lastPos < content.length()) - { + while (lastPos < content.length()) { pos = content.indexOf("%", lastPos); - if (pos == lastPos) - { - if (content.charAt(pos + 1) == 'u') - { + if (pos == lastPos) { + if (content.charAt(pos + 1) == 'u') { ch = (char) Integer.parseInt(content.substring(pos + 2, pos + 6), 16); tmp.append(ch); lastPos = pos + 6; - } - else - { + } else { ch = (char) Integer.parseInt(content.substring(pos + 1, pos + 3), 16); tmp.append(ch); lastPos = pos + 3; } - } - else - { - if (pos == -1) - { + } else { + if (pos == -1) { tmp.append(content.substring(lastPos)); lastPos = content.length(); - } - else - { + } else { tmp.append(content.substring(lastPos, pos)); lastPos = pos; } @@ -152,8 +128,7 @@ public class EscapeUtil return tmp.toString(); } - public static void main(String[] args) - { + public static void main(String[] args) { String html = ""; String escape = EscapeUtil.escape(html); // String html = "ipt>alert(\"XSS\")ipt>"; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HtmlFilter.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HtmlFilter.java index 82ba91b0..a9ec547d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HtmlFilter.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HtmlFilter.java @@ -162,12 +162,6 @@ public final class HtmlFilter { alwaysMakeTags = conf.containsKey("alwaysMakeTags") ? (Boolean) conf.get("alwaysMakeTags") : true; } - private void reset() { - vTagCounts.clear(); - } - - // --------------------------------------------------------------- - /** * my versions of some PHP library functions * @@ -178,6 +172,8 @@ public final class HtmlFilter { return String.valueOf((char) decimal); } + // --------------------------------------------------------------- + public static String htmlSpecialChars(final String s) { String result = s; result = regexReplace(P_AMP, "&", result); @@ -187,8 +183,26 @@ public final class HtmlFilter { return result; } + private static String regexReplace(final Pattern regexPattern, final String replacement, final String s) { + Matcher m = regexPattern.matcher(s); + return m.replaceAll(replacement); + } + // --------------------------------------------------------------- + private static boolean inArray(final String s, final String[] array) { + for (String item : array) { + if (item != null && item.equals(s)) { + return true; + } + } + return false; + } + + private void reset() { + vTagCounts.clear(); + } + /** * given a user submitted input String, filter out any invalid or restricted html. * @@ -300,11 +314,6 @@ public final class HtmlFilter { return result; } - private static String regexReplace(final Pattern regexPattern, final String replacement, final String s) { - Matcher m = regexPattern.matcher(s); - return m.replaceAll(replacement); - } - private String processTag(final String s) { Matcher m = P_END_TAG.matcher(s); if (m.find()) { @@ -473,15 +482,6 @@ public final class HtmlFilter { return inArray(entity, vAllowedEntities); } - private static boolean inArray(final String s, final String[] array) { - for (String item : array) { - if (item != null && item.equals(s)) { - return true; - } - } - return false; - } - private boolean allowed(final String name) { return (vAllowed.isEmpty() || vAllowed.containsKey(name)) && !inArray(name, vDisallowed); } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java index aa15afdd..c7a9c650 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java @@ -89,7 +89,7 @@ public class IpUtils { case section6: { return true; } - default:{ + default: { break; } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java index 15bb8d26..eef3b014 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java @@ -2,17 +2,15 @@ package com.ruoyi.common.core.utils.poi; /** * Excel鏁版嵁鏍煎紡澶勭悊閫傞厤鍣 - * + * * @author ruoyi */ -public interface ExcelHandlerAdapter -{ +public interface ExcelHandlerAdapter { /** * 鏍煎紡鍖 - * - * @param value 鍗曞厓鏍兼暟鎹 - * @param args excel娉ㄨВargs鍙傛暟缁 * + * @param value 鍗曞厓鏍兼暟鎹 + * @param args excel娉ㄨВargs鍙傛暟缁 * @return 澶勭悊鍚庣殑鍊 */ Object format(Object value, String[] args); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java index a461fecf..617c3e3e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java @@ -39,84 +39,136 @@ import java.util.stream.Collectors; * @author ruoyi */ public class ExcelUtil { - private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class); - public static final String FORMULA_REGEX_STR = "=|-|\\+|@"; - public static final String[] FORMULA_STR = {"=", "-", "+", "@"}; - /** * Excel sheet鏈澶ц鏁帮紝榛樿65536 */ public static final int SHEET_SIZE = 65536; - + private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class); + /** + * 鏁板瓧鏍煎紡 + */ + private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00"); + /** + * 瀹炰綋瀵硅薄 + */ + public Class clazz; /** * 宸ヤ綔琛ㄥ悕绉 */ private String sheetName; - /** * 瀵煎嚭绫诲瀷锛圗XPORT:瀵煎嚭鏁版嵁锛汭MPORT锛氬鍏ユā鏉匡級 */ private Type type; - /** * 宸ヤ綔钖勫璞 */ private Workbook wb; - /** * 宸ヤ綔琛ㄥ璞 */ private Sheet sheet; - /** * 鏍峰紡鍒楄〃 */ private Map styles; - /** * 瀵煎叆瀵煎嚭鏁版嵁鍒楄〃 */ private List list; - /** * 娉ㄨВ鍒楄〃 */ private List fields; - /** * 褰撳墠琛屽彿 */ private int rownum; - /** * 鏍囬 */ private String title; - /** * 鏈澶ч珮搴 */ private short maxHeight; - /** * 缁熻鍒楄〃 */ private Map statistics = new HashMap(); + public ExcelUtil(Class clazz) { + this.clazz = clazz; + } + /** - * 鏁板瓧鏍煎紡 + * 鑾峰彇鐢诲竷 */ - private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00"); + public static Drawing getDrawingPatriarch(Sheet sheet) { + if (sheet.getDrawingPatriarch() == null) { + sheet.createDrawingPatriarch(); + } + return sheet.getDrawingPatriarch(); + } /** - * 瀹炰綋瀵硅薄 + * 瑙ｆ瀽瀵煎嚭鍊 0=鐢,1=濂,2=鏈煡 + * + * @param propertyValue 鍙傛暟鍊 + * @param converterExp 缈昏瘧娉ㄨВ + * @param separator 鍒嗛殧绗 + * @return 瑙ｆ瀽鍚庡 */ - public Class clazz; + public static String convertByExp(String propertyValue, String converterExp, String separator) { + StringBuilder propertyString = new StringBuilder(); + String[] convertSource = converterExp.split(","); + for (String item : convertSource) { + String[] itemArray = item.split("="); + if (StringUtils.containsAny(separator, propertyValue)) { + for (String value : propertyValue.split(separator)) { + if (itemArray[0].equals(value)) { + propertyString.append(itemArray[1] + separator); + break; + } + } + } else { + if (itemArray[0].equals(propertyValue)) { + return itemArray[1]; + } + } + } + return StringUtils.stripEnd(propertyString.toString(), separator); + } - public ExcelUtil(Class clazz) { - this.clazz = clazz; + /** + * 鍙嶅悜瑙ｆ瀽鍊 鐢=0,濂=1,鏈煡=2 + * + * @param propertyValue 鍙傛暟鍊 + * @param converterExp 缈昏瘧娉ㄨВ + * @param separator 鍒嗛殧绗 + * @return 瑙ｆ瀽鍚庡 + */ + public static String reverseByExp(String propertyValue, String converterExp, String separator) { + StringBuilder propertyString = new StringBuilder(); + String[] convertSource = converterExp.split(","); + for (String item : convertSource) { + String[] itemArray = item.split("="); + if (StringUtils.containsAny(separator, propertyValue)) { + for (String value : propertyValue.split(separator)) { + if (itemArray[1].equals(value)) { + propertyString.append(itemArray[0] + separator); + break; + } + } + } else { + if (itemArray[1].equals(propertyValue)) { + return itemArray[0]; + } + } + } + return StringUtils.stripEnd(propertyString.toString(), separator); } public void init(List list, String sheetName, String title, Type type) { @@ -226,6 +278,13 @@ public class ExcelUtil { return list; } + /** + * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟 + * + * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О + * @return 缁撴灉 + */ + /** * importExcel鏂规硶鎷撳睍 鍗曟柟娉曚笉瓒呰繃80琛屼唬鐮 * @@ -328,12 +387,6 @@ public class ExcelUtil { exportExcel(response); } - /** - * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟 - * - * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О - * @return 缁撴灉 - */ /** * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟 * @@ -540,16 +593,6 @@ public class ExcelUtil { } } - /** - * 鑾峰彇鐢诲竷 - */ - public static Drawing getDrawingPatriarch(Sheet sheet) { - if (sheet.getDrawingPatriarch() == null) { - sheet.createDrawingPatriarch(); - } - return sheet.getDrawingPatriarch(); - } - /** * 鑾峰彇鍥剧墖绫诲瀷,璁剧疆鍥剧墖鎻掑叆绫诲瀷 */ @@ -651,64 +694,6 @@ public class ExcelUtil { sheet.addValidationData(dataValidation); } - /** - * 瑙ｆ瀽瀵煎嚭鍊 0=鐢,1=濂,2=鏈煡 - * - * @param propertyValue 鍙傛暟鍊 - * @param converterExp 缈昏瘧娉ㄨВ - * @param separator 鍒嗛殧绗 - * @return 瑙ｆ瀽鍚庡 - */ - public static String convertByExp(String propertyValue, String converterExp, String separator) { - StringBuilder propertyString = new StringBuilder(); - String[] convertSource = converterExp.split(","); - for (String item : convertSource) { - String[] itemArray = item.split("="); - if (StringUtils.containsAny(separator, propertyValue)) { - for (String value : propertyValue.split(separator)) { - if (itemArray[0].equals(value)) { - propertyString.append(itemArray[1] + separator); - break; - } - } - } else { - if (itemArray[0].equals(propertyValue)) { - return itemArray[1]; - } - } - } - return StringUtils.stripEnd(propertyString.toString(), separator); - } - - /** - * 鍙嶅悜瑙ｆ瀽鍊 鐢=0,濂=1,鏈煡=2 - * - * @param propertyValue 鍙傛暟鍊 - * @param converterExp 缈昏瘧娉ㄨВ - * @param separator 鍒嗛殧绗 - * @return 瑙ｆ瀽鍚庡 - */ - public static String reverseByExp(String propertyValue, String converterExp, String separator) { - StringBuilder propertyString = new StringBuilder(); - String[] convertSource = converterExp.split(","); - for (String item : convertSource) { - String[] itemArray = item.split("="); - if (StringUtils.containsAny(separator, propertyValue)) { - for (String value : propertyValue.split(separator)) { - if (itemArray[1].equals(value)) { - propertyString.append(itemArray[0] + separator); - break; - } - } - } else { - if (itemArray[1].equals(propertyValue)) { - return itemArray[0]; - } - } - } - return StringUtils.stripEnd(propertyString.toString(), separator); - } - /** * 鏁版嵁澶勭悊鍣 * diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java index 5e4b3949..f5b27632 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java @@ -13,12 +13,11 @@ import java.util.Date; /** * 鍙嶅皠宸ュ叿绫. 鎻愪緵璋冪敤getter/setter鏂规硶, 璁块棶绉佹湁鍙橀噺, 璋冪敤绉佹湁鏂规硶, 鑾峰彇娉涘瀷绫诲瀷Class, 琚獳OP杩囩殑鐪熷疄绫荤瓑宸ュ叿鍑芥暟. - * + * * @author ruoyi */ @SuppressWarnings("rawtypes") -public class ReflectUtils -{ +public class ReflectUtils { private static final String SETTER_PREFIX = "set"; private static final String GETTER_PREFIX = "get"; @@ -32,14 +31,12 @@ public class ReflectUtils * 鏀寔澶氱骇锛屽锛氬璞″悕.瀵硅薄鍚.鏂规硶 */ @SuppressWarnings("unchecked") - public static E invokeGetter(Object obj, String propertyName) - { + public static E invokeGetter(Object obj, String propertyName) { Object object = obj; String point = "."; - for (String name : StringUtils.split(propertyName, point)) - { + for (String name : StringUtils.split(propertyName, point)) { String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name); - object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {}); + object = invokeMethod(object, getterMethodName, new Class[]{}, new Object[]{}); } return (E) object; } @@ -48,21 +45,16 @@ public class ReflectUtils * 璋冪敤Setter鏂规硶, 浠呭尮閰嶆柟娉曞悕銆 * 鏀寔澶氱骇锛屽锛氬璞″悕.瀵硅薄鍚.鏂规硶 */ - public static void invokeSetter(Object obj, String propertyName, E value) - { + public static void invokeSetter(Object obj, String propertyName, E value) { Object object = obj; String[] names = StringUtils.split(propertyName, "."); - for (int i = 0; i < names.length; i++) - { - if (i < names.length - 1) - { + for (int i = 0; i < names.length; i++) { + if (i < names.length - 1) { String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(names[i]); - object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {}); - } - else - { + object = invokeMethod(object, getterMethodName, new Class[]{}, new Object[]{}); + } else { String setterMethodName = SETTER_PREFIX + StringUtils.capitalize(names[i]); - invokeMethodByName(object, setterMethodName, new Object[] { value }); + invokeMethodByName(object, setterMethodName, new Object[]{value}); } } } @@ -71,21 +63,16 @@ public class ReflectUtils * 鐩存帴璇诲彇瀵硅薄灞炴у, 鏃犺private/protected淇グ绗, 涓嶇粡杩噂etter鍑芥暟. */ @SuppressWarnings("unchecked") - public static E getFieldValue(final Object obj, final String fieldName) - { + public static E getFieldValue(final Object obj, final String fieldName) { Field field = getAccessibleField(obj, fieldName); - if (field == null) - { + if (field == null) { logger.debug("鍦 [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + fieldName + "] 瀛楁 "); return null; } E result = null; - try - { + try { result = (E) field.get(obj); - } - catch (IllegalAccessException e) - { + } catch (IllegalAccessException e) { logger.error("涓嶅彲鑳芥姏鍑虹殑寮傚父{}", e.getMessage()); } return result; @@ -94,20 +81,15 @@ public class ReflectUtils /** * 鐩存帴璁剧疆瀵硅薄灞炴у, 鏃犺private/protected淇グ绗, 涓嶇粡杩噑etter鍑芥暟. */ - public static void setFieldValue(final Object obj, final String fieldName, final E value) - { + public static void setFieldValue(final Object obj, final String fieldName, final E value) { Field field = getAccessibleField(obj, fieldName); - if (field == null) - { + if (field == null) { logger.debug("鍦 [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + fieldName + "] 瀛楁 "); return; } - try - { + try { field.set(obj, value); - } - catch (IllegalAccessException e) - { + } catch (IllegalAccessException e) { logger.error("涓嶅彲鑳芥姏鍑虹殑寮傚父: {}", e.getMessage()); } } @@ -119,24 +101,18 @@ public class ReflectUtils */ @SuppressWarnings("unchecked") public static E invokeMethod(final Object obj, final String methodName, final Class[] parameterTypes, - final Object[] args) - { - if (obj == null || methodName == null) - { + final Object[] args) { + if (obj == null || methodName == null) { return null; } Method method = getAccessibleMethod(obj, methodName, parameterTypes); - if (method == null) - { + if (method == null) { logger.debug("鍦 [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + methodName + "] 鏂规硶 "); return null; } - try - { + try { return (E) method.invoke(obj, args); - } - catch (Exception e) - { + } catch (Exception e) { String msg = "method: " + method + ", obj: " + obj + ", args: " + args + ""; throw convertReflectionExceptionToUnchecked(msg, e); } @@ -148,68 +124,44 @@ public class ReflectUtils * 鍙尮閰嶅嚱鏁板悕锛屽鏋滄湁澶氫釜鍚屽悕鍑芥暟璋冪敤绗竴涓 */ @SuppressWarnings("unchecked") - public static E invokeMethodByName(final Object obj, final String methodName, final Object[] args) - { + public static E invokeMethodByName(final Object obj, final String methodName, final Object[] args) { Method method = getAccessibleMethodByName(obj, methodName, args.length); - if (method == null) - { + if (method == null) { // 濡傛灉涓虹┖涓嶆姤閿欙紝鐩存帴杩斿洖绌恒 logger.debug("鍦 [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + methodName + "] 鏂规硶 "); return null; } - try - { + try { // 绫诲瀷杞崲锛堝皢鍙傛暟鏁版嵁绫诲瀷杞崲涓虹洰鏍囨柟娉曞弬鏁扮被鍨嬶級 Class[] cs = method.getParameterTypes(); - for (int i = 0; i < cs.length; i++) - { - if (args[i] != null && !args[i].getClass().equals(cs[i])) - { - if (cs[i] == String.class) - { + for (int i = 0; i < cs.length; i++) { + if (args[i] != null && !args[i].getClass().equals(cs[i])) { + if (cs[i] == String.class) { args[i] = Convert.toStr(args[i]); - if (StringUtils.endsWith((String) args[i], ".0")) - { + if (StringUtils.endsWith((String) args[i], ".0")) { args[i] = StringUtils.substringBefore((String) args[i], ".0"); } - } - else if (cs[i] == Integer.class) - { + } else if (cs[i] == Integer.class) { args[i] = Convert.toInt(args[i]); - } - else if (cs[i] == Long.class) - { + } else if (cs[i] == Long.class) { args[i] = Convert.toLong(args[i]); - } - else if (cs[i] == Double.class) - { + } else if (cs[i] == Double.class) { args[i] = Convert.toDouble(args[i]); - } - else if (cs[i] == Float.class) - { + } else if (cs[i] == Float.class) { args[i] = Convert.toFloat(args[i]); - } - else if (cs[i] == Date.class) - { - if (args[i] instanceof String) - { + } else if (cs[i] == Date.class) { + if (args[i] instanceof String) { args[i] = DateUtils.parseDate(args[i]); - } - else - { + } else { args[i] = DateUtil.getJavaDate((Double) args[i]); } - } - else if (cs[i] == boolean.class || cs[i] == Boolean.class) - { + } else if (cs[i] == boolean.class || cs[i] == Boolean.class) { args[i] = Convert.toBool(args[i]); } } } return (E) method.invoke(obj, args); - } - catch (Exception e) - { + } catch (Exception e) { String msg = "method: " + method + ", obj: " + obj + ", args: " + args + ""; throw convertReflectionExceptionToUnchecked(msg, e); } @@ -219,24 +171,18 @@ public class ReflectUtils * 寰幆鍚戜笂杞瀷, 鑾峰彇瀵硅薄鐨凞eclaredField, 骞跺己鍒惰缃负鍙闂. * 濡傚悜涓婅浆鍨嬪埌Object浠嶆棤娉曟壘鍒, 杩斿洖null. */ - public static Field getAccessibleField(final Object obj, final String fieldName) - { + public static Field getAccessibleField(final Object obj, final String fieldName) { // 涓虹┖涓嶆姤閿欍傜洿鎺ヨ繑鍥 null - if (obj == null) - { + if (obj == null) { return null; } Validate.notBlank(fieldName, "fieldName can't be blank"); - for (Class superClass = obj.getClass(); superClass != Object.class; superClass = superClass.getSuperclass()) - { - try - { + for (Class superClass = obj.getClass(); superClass != Object.class; superClass = superClass.getSuperclass()) { + try { Field field = superClass.getDeclaredField(fieldName); makeAccessible(field); return field; - } - catch (NoSuchFieldException e) - { + } catch (NoSuchFieldException e) { continue; } } @@ -250,24 +196,18 @@ public class ReflectUtils * 鐢ㄤ簬鏂规硶闇瑕佽澶氭璋冪敤鐨勬儏鍐. 鍏堜娇鐢ㄦ湰鍑芥暟鍏堝彇寰桵ethod,鐒跺悗璋冪敤Method.invoke(Object obj, Object... args) */ public static Method getAccessibleMethod(final Object obj, final String methodName, - final Class... parameterTypes) - { + final Class... parameterTypes) { // 涓虹┖涓嶆姤閿欍傜洿鎺ヨ繑鍥 null - if (obj == null) - { + if (obj == null) { return null; } Validate.notBlank(methodName, "methodName can't be blank"); - for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass()) - { - try - { + for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass()) { + try { Method method = searchType.getDeclaredMethod(methodName, parameterTypes); makeAccessible(method); return method; - } - catch (NoSuchMethodException e) - { + } catch (NoSuchMethodException e) { continue; } } @@ -280,21 +220,16 @@ public class ReflectUtils * 鍙尮閰嶅嚱鏁板悕銆 * 鐢ㄤ簬鏂规硶闇瑕佽澶氭璋冪敤鐨勬儏鍐. 鍏堜娇鐢ㄦ湰鍑芥暟鍏堝彇寰桵ethod,鐒跺悗璋冪敤Method.invoke(Object obj, Object... args) */ - public static Method getAccessibleMethodByName(final Object obj, final String methodName, int argsNum) - { + public static Method getAccessibleMethodByName(final Object obj, final String methodName, int argsNum) { // 涓虹┖涓嶆姤閿欍傜洿鎺ヨ繑鍥 null - if (obj == null) - { + if (obj == null) { return null; } Validate.notBlank(methodName, "methodName can't be blank"); - for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass()) - { + for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass()) { Method[] methods = searchType.getDeclaredMethods(); - for (Method method : methods) - { - if (method.getName().equals(methodName) && method.getParameterTypes().length == argsNum) - { + for (Method method : methods) { + if (method.getName().equals(methodName) && method.getParameterTypes().length == argsNum) { makeAccessible(method); return method; } @@ -306,8 +241,7 @@ public class ReflectUtils /** * 鏀瑰彉private/protected鐨勬柟娉曚负public锛屽敖閲忎笉璋冪敤瀹為檯鏀瑰姩鐨勮鍙ワ紝閬垮厤JDK鐨凷ecurityManager鎶辨ㄣ */ - public static void makeAccessible(Method method) - { + public static void makeAccessible(Method method) { if (!method.isAccessible()) { if (!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers())) { method.setAccessible(true); @@ -318,8 +252,7 @@ public class ReflectUtils /** * 鏀瑰彉private/protected鐨勬垚鍛樺彉閲忎负public锛屽敖閲忎笉璋冪敤瀹為檯鏀瑰姩鐨勮鍙ワ紝閬垮厤JDK鐨凷ecurityManager鎶辨ㄣ */ - public static void makeAccessible(Field field) - { + public static void makeAccessible(Field field) { if (!field.isAccessible()) { if (!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers()) || Modifier.isFinal(field.getModifiers())) { @@ -333,8 +266,7 @@ public class ReflectUtils * 濡傛棤娉曟壘鍒, 杩斿洖Object.class. */ @SuppressWarnings("unchecked") - public static Class getClassGenricType(final Class clazz) - { + public static Class getClassGenricType(final Class clazz) { return getClassGenricType(clazz, 0); } @@ -342,26 +274,22 @@ public class ReflectUtils * 閫氳繃鍙嶅皠, 鑾峰緱Class瀹氫箟涓０鏄庣殑鐖剁被鐨勬硾鍨嬪弬鏁扮殑绫诲瀷. * 濡傛棤娉曟壘鍒, 杩斿洖Object.class. */ - public static Class getClassGenricType(final Class clazz, final int index) - { + public static Class getClassGenricType(final Class clazz, final int index) { Type genType = clazz.getGenericSuperclass(); - if (!(genType instanceof ParameterizedType)) - { + if (!(genType instanceof ParameterizedType)) { logger.debug(clazz.getSimpleName() + "'s superclass not ParameterizedType"); return Object.class; } Type[] params = ((ParameterizedType) genType).getActualTypeArguments(); - if (index >= params.length || index < 0) - { + if (index >= params.length || index < 0) { logger.debug("Index: " + index + ", Size of " + clazz.getSimpleName() + "'s Parameterized Type: " + params.length); return Object.class; } - if (!(params[index] instanceof Class)) - { + if (!(params[index] instanceof Class)) { logger.debug(clazz.getSimpleName() + " not set the actual class on superclass generic parameter"); return Object.class; } @@ -369,18 +297,14 @@ public class ReflectUtils return (Class) params[index]; } - public static Class getUserClass(Object instance) - { - if (instance == null) - { + public static Class getUserClass(Object instance) { + if (instance == null) { throw new RuntimeException("Instance must not be null"); } Class clazz = instance.getClass(); - if (clazz != null && clazz.getName().contains(CGLIB_CLASS_SEPARATOR)) - { + if (clazz != null && clazz.getName().contains(CGLIB_CLASS_SEPARATOR)) { Class superClass = clazz.getSuperclass(); - if (superClass != null && !Object.class.equals(superClass)) - { + if (superClass != null && !Object.class.equals(superClass)) { return superClass; } } @@ -391,15 +315,11 @@ public class ReflectUtils /** * 灏嗗弽灏勬椂鐨刢hecked exception杞崲涓簎nchecked exception. */ - public static RuntimeException convertReflectionExceptionToUnchecked(String msg, Exception e) - { + public static RuntimeException convertReflectionExceptionToUnchecked(String msg, Exception e) { if (e instanceof IllegalAccessException || e instanceof IllegalArgumentException - || e instanceof NoSuchMethodException) - { + || e instanceof NoSuchMethodException) { return new IllegalArgumentException(msg, e); - } - else if (e instanceof InvocationTargetException) - { + } else if (e instanceof InvocationTargetException) { return new RuntimeException(msg, ((InvocationTargetException) e).getTargetException()); } return new RuntimeException(msg, e); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java index 7e095d91..53bbfc67 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java @@ -5,11 +5,10 @@ import com.ruoyi.common.core.utils.StringUtils; /** * sql鎿嶄綔宸ュ叿绫 - * + * * @author ruoyi */ -public class SqlUtil -{ +public class SqlUtil { /** * 瀹氫箟甯哥敤鐨 sql鍏抽敭瀛 */ @@ -23,10 +22,8 @@ public class SqlUtil /** * 妫鏌ュ瓧绗︼紝闃叉娉ㄥ叆缁曡繃 */ - public static String escapeOrderBySql(String value) - { - if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value)) - { + public static String escapeOrderBySql(String value) { + if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value)) { throw new UtilException("鍙傛暟涓嶇鍚堣鑼冿紝涓嶈兘杩涜鏌ヨ"); } return value; @@ -35,25 +32,20 @@ public class SqlUtil /** * 楠岃瘉 order by 璇硶鏄惁绗﹀悎瑙勮寖 */ - public static boolean isValidOrderBySql(String value) - { + public static boolean isValidOrderBySql(String value) { return value.matches(SQL_PATTERN); } /** * SQL鍏抽敭瀛楁鏌 */ - public static void filterKeyword(String value) - { - if (StringUtils.isEmpty(value)) - { + public static void filterKeyword(String value) { + if (StringUtils.isEmpty(value)) { return; } String[] sqlKeywords = StringUtils.split(SQL_REGEX, "\\|"); - for (String sqlKeyword : sqlKeywords) - { - if (StringUtils.indexOfIgnoreCase(value, sqlKeyword) > -1) - { + for (String sqlKeyword : sqlKeywords) { + if (StringUtils.indexOfIgnoreCase(value, sqlKeyword) > -1) { throw new UtilException("鍙傛暟瀛樺湪SQL娉ㄥ叆椋庨櫓"); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java index 81137027..d666925d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java @@ -2,48 +2,43 @@ package com.ruoyi.common.core.utils.uuid; /** * ID鐢熸垚鍣ㄥ伐鍏风被 - * + * * @author ruoyi */ -public class IdUtils -{ +public class IdUtils { /** * 鑾峰彇闅忔満UUID - * + * * @return 闅忔満UUID */ - public static String randomuuid() - { + public static String randomuuid() { return UUID.randomuuid().toString(); } /** * 绠鍖栫殑UUID锛屽幓鎺変簡妯嚎 - * + * * @return 绠鍖栫殑UUID锛屽幓鎺変簡妯嚎 */ - public static String simpleuuid() - { + public static String simpleuuid() { return UUID.randomuuid().toString(true); } /** * 鑾峰彇闅忔満UUID锛屼娇鐢ㄦц兘鏇村ソ鐨凾hreadLocalRandom鐢熸垚UUID - * + * * @return 闅忔満UUID */ - public static String fastuuid() - { + public static String fastuuid() { return UUID.fastuuid().toString(); } /** * 绠鍖栫殑UUID锛屽幓鎺変簡妯嚎锛屼娇鐢ㄦц兘鏇村ソ鐨凾hreadLocalRandom鐢熸垚UUID - * + * * @return 绠鍖栫殑UUID锛屽幓鎺変簡妯嚎 */ - public static String fastsimpleuuid() - { + public static String fastsimpleuuid() { return UUID.fastuuid().toString(true); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java index 389ea650..e84c388a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java @@ -8,8 +8,7 @@ import java.util.concurrent.atomic.AtomicInteger; /** * @author ruoyi 搴忓垪鐢熸垚绫 */ -public class Seq -{ +public class Seq { /** * 閫氱敤搴忓垪绫诲瀷 */ @@ -37,24 +36,21 @@ public class Seq /** * 鑾峰彇閫氱敤搴忓垪鍙 - * + * * @return 搴忓垪鍊 */ - public static String getId() - { + public static String getId() { return getId(COMM_SEQ_TYPE); } - + /** * 榛樿16浣嶅簭鍒楀彿 yyMMddHHmmss + 涓浣嶆満鍣ㄦ爣璇 + 3闀垮害寰幆閫掑瀛楃涓 - * + * * @return 搴忓垪鍊 */ - public static String getId(String type) - { + public static String getId(String type) { AtomicInteger atomicInt = commSeq; - if (UPLOAD_SEQ_TYPE.equals(type)) - { + if (UPLOAD_SEQ_TYPE.equals(type)) { atomicInt = uploadSeq; } return getId(atomicInt, 3); @@ -62,13 +58,12 @@ public class Seq /** * 閫氱敤鎺ュ彛搴忓垪鍙 yyMMddHHmmss + 涓浣嶆満鍣ㄦ爣璇 + length闀垮害寰幆閫掑瀛楃涓 - * + * * @param atomicInt 搴忓垪鏁 - * @param length 鏁板奸暱搴 + * @param length 鏁板奸暱搴 * @return 搴忓垪鍊 */ - public static String getId(AtomicInteger atomicInt, int length) - { + public static String getId(AtomicInteger atomicInt, int length) { String result = DateUtils.dateTimeNow(); result += machineCode; result += getSeq(atomicInt, length); @@ -77,18 +72,16 @@ public class Seq /** * 搴忓垪寰幆閫掑瀛楃涓瞇1, 10 鐨 (length)骞傛鏂), 鐢0宸﹁ˉ榻恖ength浣嶆暟 - * + * * @return 搴忓垪鍊 */ - private synchronized static String getSeq(AtomicInteger atomicInt, int length) - { + private synchronized static String getSeq(AtomicInteger atomicInt, int length) { // 鍏堝彇鍊煎啀+1 int value = atomicInt.getAndIncrement(); // 濡傛灉鏇存柊鍚庡>=10 鐨 (length)骞傛鏂瑰垯閲嶇疆涓1 int maxSeq = (int) Math.pow(10, length); - if (atomicInt.get() >= maxSeq) - { + if (atomicInt.get() >= maxSeq) { atomicInt.set(1); } // 杞瓧绗︿覆锛岀敤0宸﹁ˉ榻 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java index b77d3dfc..31894af5 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java @@ -15,19 +15,10 @@ import java.util.concurrent.ThreadLocalRandom; */ public final class UUID implements java.io.Serializable, Comparable { private static final long serialVersionUID = -1185015143654744140L; - - /** - * SecureRandom 鐨勫崟渚 - */ - private static class Holder { - static final SecureRandom NUMBER_GENERATOR = getSecureRandom(); - } - /** * 姝UID鐨勬渶楂64鏈夋晥浣 */ private final long mostSigBits; - /** * 姝UID鐨勬渶浣64鏈夋晥浣 */ @@ -155,6 +146,41 @@ public final class UUID implements java.io.Serializable, Comparable { return new UUID(mostSigBits, leastSigBits); } + /** + * 杩斿洖鎸囧畾鏁板瓧瀵瑰簲鐨刪ex鍊 + * + * @param val 鍊 + * @param digits 浣 + * @return 鍊 + */ + private static String digits(long val, int digits) { + long hi = 1L << (digits * 4); + return Long.toHexString(hi | (val & (hi - 1))).substring(1); + } + + /** + * 鑾峰彇{@link SecureRandom}锛岀被鎻愪緵鍔犲瘑鐨勫己闅忔満鏁扮敓鎴愬櫒 (RNG) + * + * @return {@link SecureRandom} + */ + public static SecureRandom getSecureRandom() { + try { + return SecureRandom.getInstance("SHA1PRNG"); + } catch (NoSuchAlgorithmException e) { + throw new UtilException(e); + } + } + + /** + * 鑾峰彇闅忔満鏁扮敓鎴愬櫒瀵硅薄
+ * ThreadLocalRandom鏄疛DK 7涔嬪悗鎻愪緵骞跺彂浜х敓闅忔満鏁帮紝鑳藉瑙ｅ喅澶氫釜绾跨▼鍙戠敓鐨勭珵浜変簤澶恒 + * + * @return {@link ThreadLocalRandom} + */ + public static ThreadLocalRandom getRandom() { + return ThreadLocalRandom.current(); + } + /** * 杩斿洖姝 UUID 鐨 128 浣嶅间腑鐨勬渶浣庢湁鏁 64 浣嶃 * @@ -348,6 +374,8 @@ public final class UUID implements java.io.Serializable, Comparable { return builder.toString(); } + // Comparison Operations + /** * 杩斿洖姝 UUID 鐨勫搱甯岀爜銆 * @@ -359,6 +387,9 @@ public final class UUID implements java.io.Serializable, Comparable { return ((int) (hilo >> 32)) ^ (int) hilo; } + // ------------------------------------------------------------------------------------------------------------------- + // Private method start + /** * 灏嗘瀵硅薄涓庢寚瀹氬璞℃瘮杈冦 *

@@ -376,8 +407,6 @@ public final class UUID implements java.io.Serializable, Comparable { return (mostSigBits == id.mostSigBits && leastSigBits == id.leastSigBits); } - // Comparison Operations - /** * 灏嗘 UUID 涓庢寚瀹氱殑 UUID 姣旇緝銆 * @@ -398,21 +427,6 @@ public final class UUID implements java.io.Serializable, Comparable { 0)))); } - // ------------------------------------------------------------------------------------------------------------------- - // Private method start - - /** - * 杩斿洖鎸囧畾鏁板瓧瀵瑰簲鐨刪ex鍊 - * - * @param val 鍊 - * @param digits 浣 - * @return 鍊 - */ - private static String digits(long val, int digits) { - long hi = 1L << (digits * 4); - return Long.toHexString(hi | (val & (hi - 1))).substring(1); - } - /** * 妫鏌ユ槸鍚︿负time-based鐗堟湰UUID */ @@ -423,25 +437,9 @@ public final class UUID implements java.io.Serializable, Comparable { } /** - * 鑾峰彇{@link SecureRandom}锛岀被鎻愪緵鍔犲瘑鐨勫己闅忔満鏁扮敓鎴愬櫒 (RNG) - * - * @return {@link SecureRandom} - */ - public static SecureRandom getSecureRandom() { - try { - return SecureRandom.getInstance("SHA1PRNG"); - } catch (NoSuchAlgorithmException e) { - throw new UtilException(e); - } - } - - /** - * 鑾峰彇闅忔満鏁扮敓鎴愬櫒瀵硅薄
- * ThreadLocalRandom鏄疛DK 7涔嬪悗鎻愪緵骞跺彂浜х敓闅忔満鏁帮紝鑳藉瑙ｅ喅澶氫釜绾跨▼鍙戠敓鐨勭珵浜変簤澶恒 - * - * @return {@link ThreadLocalRandom} + * SecureRandom 鐨勫崟渚 */ - public static ThreadLocalRandom getRandom() { - return ThreadLocalRandom.current(); + private static class Holder { + static final SecureRandom NUMBER_GENERATOR = getSecureRandom(); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java index 06c16449..3b1da310 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java @@ -17,25 +17,21 @@ import java.util.List; /** * web灞傞氱敤鏁版嵁澶勭悊 - * + * * @author ruoyi */ -public class BaseController -{ +public class BaseController { protected final Logger logger = LoggerFactory.getLogger(this.getClass()); /** * 灏嗗墠鍙颁紶閫掕繃鏉ョ殑鏃ユ湡鏍煎紡鐨勫瓧绗︿覆锛岃嚜鍔ㄨ浆鍖栦负Date绫诲瀷 */ @InitBinder - public void initBinder(WebDataBinder binder) - { + public void initBinder(WebDataBinder binder) { // Date 绫诲瀷杞崲 - binder.registerCustomEditor(Date.class, new PropertyEditorSupport() - { + binder.registerCustomEditor(Date.class, new PropertyEditorSupport() { @Override - public void setAsText(String text) - { + public void setAsText(String text) { setValue(DateUtils.parseDate(text)); } }); @@ -44,25 +40,22 @@ public class BaseController /** * 璁剧疆璇锋眰鍒嗛〉鏁版嵁 */ - protected void startPage() - { + protected void startPage() { PageUtils.startPage(); } /** * 娓呯悊鍒嗛〉鐨勭嚎绋嬪彉閲 */ - protected void clearPage() - { + protected void clearPage() { PageUtils.clearPage(); } /** * 鍝嶅簲璇锋眰鍒嗛〉鏁版嵁 */ - @SuppressWarnings({ "rawtypes", "unchecked" }) - protected TableDataInfo getDataTable(List list) - { + @SuppressWarnings({"rawtypes", "unchecked"}) + protected TableDataInfo getDataTable(List list) { TableDataInfo rspData = new TableDataInfo(); rspData.setCode(HttpStatus.SUCCESS); rspData.setRows(list); @@ -73,55 +66,49 @@ public class BaseController /** * 鍝嶅簲杩斿洖缁撴灉 - * + * * @param rows 褰卞搷琛屾暟 * @return 鎿嶄綔缁撴灉 */ - protected AjaxResult toAjax(int rows) - { + protected AjaxResult toAjax(int rows) { return rows > 0 ? AjaxResult.success() : AjaxResult.error(); } /** * 鍝嶅簲杩斿洖缁撴灉 - * + * * @param result 缁撴灉 * @return 鎿嶄綔缁撴灉 */ - protected AjaxResult toAjax(boolean result) - { + protected AjaxResult toAjax(boolean result) { return result ? success() : error(); } /** * 杩斿洖鎴愬姛 */ - public AjaxResult success() - { + public AjaxResult success() { return AjaxResult.success(); } /** * 杩斿洖澶辫触娑堟伅 */ - public AjaxResult error() - { + public AjaxResult error() { return AjaxResult.error(); } /** * 杩斿洖鎴愬姛娑堟伅 */ - public AjaxResult success(String message) - { + public AjaxResult success(String message) { return AjaxResult.success(message); } /** * 杩斿洖澶辫触娑堟伅 */ - public AjaxResult error(String message) - { + public AjaxResult error(String message) { return AjaxResult.error(message); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java index 2c4993b9..759c61b5 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java @@ -7,157 +7,146 @@ import java.util.HashMap; /** * 鎿嶄綔娑堟伅鎻愰啋 - * + * * @author ruoyi */ -public class AjaxResult extends HashMap -{ - private static final long serialVersionUID = 1L; - - /** 鐘舵佺爜 */ +public class AjaxResult extends HashMap { + /** + * 鐘舵佺爜 + */ public static final String CODE_TAG = "code"; - - /** 杩斿洖鍐呭 */ + /** + * 杩斿洖鍐呭 + */ public static final String MSG_TAG = "msg"; - - /** 鏁版嵁瀵硅薄 */ + /** + * 鏁版嵁瀵硅薄 + */ public static final String DATA_TAG = "data"; + private static final long serialVersionUID = 1L; /** * 鍒濆鍖栦竴涓柊鍒涘缓鐨 AjaxResult 瀵硅薄锛屼娇鍏惰〃绀轰竴涓┖娑堟伅銆 */ - public AjaxResult() - { + public AjaxResult() { } /** * 鍒濆鍖栦竴涓柊鍒涘缓鐨 AjaxResult 瀵硅薄 - * + * * @param code 鐘舵佺爜 - * @param msg 杩斿洖鍐呭 + * @param msg 杩斿洖鍐呭 */ - public AjaxResult(int code, String msg) - { + public AjaxResult(int code, String msg) { super.put(CODE_TAG, code); super.put(MSG_TAG, msg); } /** * 鍒濆鍖栦竴涓柊鍒涘缓鐨 AjaxResult 瀵硅薄 - * + * * @param code 鐘舵佺爜 - * @param msg 杩斿洖鍐呭 + * @param msg 杩斿洖鍐呭 * @param data 鏁版嵁瀵硅薄 */ - public AjaxResult(int code, String msg, Object data) - { + public AjaxResult(int code, String msg, Object data) { super.put(CODE_TAG, code); super.put(MSG_TAG, msg); - if (StringUtils.isNotNull(data)) - { + if (StringUtils.isNotNull(data)) { super.put(DATA_TAG, data); } } - - /** - * 鏂逛究閾惧紡璋冪敤 - * - * @param key - * @param value - * @return - */ - @Override - public AjaxResult put(String key, Object value) - { - super.put(key, value); - return this; - } /** * 杩斿洖鎴愬姛娑堟伅 - * + * * @return 鎴愬姛娑堟伅 */ - public static AjaxResult success() - { + public static AjaxResult success() { return AjaxResult.success("鎿嶄綔鎴愬姛"); } /** * 杩斿洖鎴愬姛鏁版嵁 - * + * * @return 鎴愬姛娑堟伅 */ - public static AjaxResult success(Object data) - { + public static AjaxResult success(Object data) { return AjaxResult.success("鎿嶄綔鎴愬姛", data); } /** * 杩斿洖鎴愬姛娑堟伅 - * + * * @param msg 杩斿洖鍐呭 * @return 鎴愬姛娑堟伅 */ - public static AjaxResult success(String msg) - { + public static AjaxResult success(String msg) { return AjaxResult.success(msg, null); } /** * 杩斿洖鎴愬姛娑堟伅 - * - * @param msg 杩斿洖鍐呭 + * + * @param msg 杩斿洖鍐呭 * @param data 鏁版嵁瀵硅薄 * @return 鎴愬姛娑堟伅 */ - public static AjaxResult success(String msg, Object data) - { + public static AjaxResult success(String msg, Object data) { return new AjaxResult(HttpStatus.SUCCESS, msg, data); } /** * 杩斿洖閿欒娑堟伅 - * + * * @return */ - public static AjaxResult error() - { + public static AjaxResult error() { return AjaxResult.error("鎿嶄綔澶辫触"); } /** * 杩斿洖閿欒娑堟伅 - * + * * @param msg 杩斿洖鍐呭 * @return 璀﹀憡娑堟伅 */ - public static AjaxResult error(String msg) - { + public static AjaxResult error(String msg) { return AjaxResult.error(msg, null); } /** * 杩斿洖閿欒娑堟伅 - * - * @param msg 杩斿洖鍐呭 + * + * @param msg 杩斿洖鍐呭 * @param data 鏁版嵁瀵硅薄 * @return 璀﹀憡娑堟伅 */ - public static AjaxResult error(String msg, Object data) - { + public static AjaxResult error(String msg, Object data) { return new AjaxResult(HttpStatus.ERROR, msg, data); } /** * 杩斿洖閿欒娑堟伅 - * + * * @param code 鐘舵佺爜 - * @param msg 杩斿洖鍐呭 + * @param msg 杩斿洖鍐呭 * @return 璀﹀憡娑堟伅 */ - public static AjaxResult error(int code, String msg) - { + public static AjaxResult error(int code, String msg) { return new AjaxResult(code, msg, null); } + + /** + * 鏂逛究閾惧紡璋冪敤 + * + * @param key + * @param value + * @return + */ + @Override + public AjaxResult put(String key, Object value) { + super.put(key, value); + return this; + } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java index 4d4af1bd..6d7f2733 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java @@ -9,107 +9,105 @@ import java.util.Map; /** * Entity鍩虹被 - * + * * @author ruoyi */ -public class BaseEntity implements Serializable -{ +public class BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - /** 鎼滅储鍊 */ + /** + * 鎼滅储鍊 + */ private String searchValue; - /** 鍒涘缓鑰 */ + /** + * 鍒涘缓鑰 + */ private String createBy; - /** 鍒涘缓鏃堕棿 */ + /** + * 鍒涘缓鏃堕棿 + */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; - /** 鏇存柊鑰 */ + /** + * 鏇存柊鑰 + */ private String updateBy; - /** 鏇存柊鏃堕棿 */ + /** + * 鏇存柊鏃堕棿 + */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; - /** 澶囨敞 */ + /** + * 澶囨敞 + */ private String remark; - /** 璇锋眰鍙傛暟 */ + /** + * 璇锋眰鍙傛暟 + */ private Map params; - public String getSearchValue() - { + public String getSearchValue() { return searchValue; } - public void setSearchValue(String searchValue) - { + public void setSearchValue(String searchValue) { this.searchValue = searchValue; } - public String getCreateBy() - { + public String getCreateBy() { return createBy; } - public void setCreateBy(String createBy) - { + public void setCreateBy(String createBy) { this.createBy = createBy; } - public Date getCreateTime() - { + public Date getCreateTime() { return createTime; } - public void setCreateTime(Date createTime) - { + public void setCreateTime(Date createTime) { this.createTime = createTime; } - public String getUpdateBy() - { + public String getUpdateBy() { return updateBy; } - public void setUpdateBy(String updateBy) - { + public void setUpdateBy(String updateBy) { this.updateBy = updateBy; } - public Date getUpdateTime() - { + public Date getUpdateTime() { return updateTime; } - public void setUpdateTime(Date updateTime) - { + public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; } - public String getRemark() - { + public String getRemark() { return remark; } - public void setRemark(String remark) - { + public void setRemark(String remark) { this.remark = remark; } - public Map getParams() - { - if (params == null) - { + public Map getParams() { + if (params == null) { params = new HashMap<>(2); } return params; } - public void setParams(Map params) - { + public void setParams(Map params) { this.params = params; } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java index 909d1e62..54db97f2 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java @@ -5,75 +5,74 @@ import java.util.List; /** * Tree鍩虹被 - * + * * @author ruoyi */ -public class TreeEntity extends BaseEntity -{ +public class TreeEntity extends BaseEntity { private static final long serialVersionUID = 1L; - /** 鐖惰彍鍗曞悕绉 */ + /** + * 鐖惰彍鍗曞悕绉 + */ private String parentName; - /** 鐖惰彍鍗旾D */ + /** + * 鐖惰彍鍗旾D + */ private Long parentId; - /** 鏄剧ず椤哄簭 */ + /** + * 鏄剧ず椤哄簭 + */ private Integer orderNum; - /** 绁栫骇鍒楄〃 */ + /** + * 绁栫骇鍒楄〃 + */ private String ancestors; - /** 瀛愰儴闂 */ + /** + * 瀛愰儴闂 + */ private List children = new ArrayList<>(); - public String getParentName() - { + public String getParentName() { return parentName; } - public void setParentName(String parentName) - { + public void setParentName(String parentName) { this.parentName = parentName; } - public Long getParentId() - { + public Long getParentId() { return parentId; } - public void setParentId(Long parentId) - { + public void setParentId(Long parentId) { this.parentId = parentId; } - public Integer getOrderNum() - { + public Integer getOrderNum() { return orderNum; } - public void setOrderNum(Integer orderNum) - { + public void setOrderNum(Integer orderNum) { this.orderNum = orderNum; } - public String getAncestors() - { + public String getAncestors() { return ancestors; } - public void setAncestors(String ancestors) - { + public void setAncestors(String ancestors) { this.ancestors = ancestors; } - public List getChildren() - { + public List getChildren() { return children; } - public void setChildren(List children) - { + public void setChildren(List children) { this.children = children; } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java index 1fc5910e..16a7aa2e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java @@ -4,97 +4,90 @@ import com.ruoyi.common.core.utils.StringUtils; /** * 鍒嗛〉鏁版嵁 - * + * * @author ruoyi */ -public class PageDomain -{ - /** 褰撳墠璁板綍璧峰绱㈠紩 */ +public class PageDomain { + /** + * 褰撳墠璁板綍璧峰绱㈠紩 + */ private Integer pageNum; - /** 姣忛〉鏄剧ず璁板綍鏁 */ + /** + * 姣忛〉鏄剧ず璁板綍鏁 + */ private Integer pageSize; - /** 鎺掑簭鍒 */ + /** + * 鎺掑簭鍒 + */ private String orderByColumn; - /** 鎺掑簭鐨勬柟鍚慸esc鎴栬卆sc */ + /** + * 鎺掑簭鐨勬柟鍚慸esc鎴栬卆sc + */ private String isAsc = "asc"; - /** 鍒嗛〉鍙傛暟鍚堢悊鍖 */ + /** + * 鍒嗛〉鍙傛暟鍚堢悊鍖 + */ private Boolean reasonable = true; - public String getOrderBy() - { - if (StringUtils.isEmpty(orderByColumn)) - { + public String getOrderBy() { + if (StringUtils.isEmpty(orderByColumn)) { return ""; } return StringUtils.toUnderScoreCase(orderByColumn) + " " + isAsc; } - public Integer getPageNum() - { + public Integer getPageNum() { return pageNum; } - public void setPageNum(Integer pageNum) - { + public void setPageNum(Integer pageNum) { this.pageNum = pageNum; } - public Integer getPageSize() - { + public Integer getPageSize() { return pageSize; } - public void setPageSize(Integer pageSize) - { + public void setPageSize(Integer pageSize) { this.pageSize = pageSize; } - public String getOrderByColumn() - { + public String getOrderByColumn() { return orderByColumn; } - public void setOrderByColumn(String orderByColumn) - { + public void setOrderByColumn(String orderByColumn) { this.orderByColumn = orderByColumn; } - public String getIsAsc() - { + public String getIsAsc() { return isAsc; } - public void setIsAsc(String isAsc) - { + public void setIsAsc(String isAsc) { if (StringUtils.isNotEmpty(isAsc)) { // 鍏煎鍓嶇鎺掑簭绫诲瀷 - if (StringUtils.ASC_ENDING.equals(isAsc)) - { + if (StringUtils.ASC_ENDING.equals(isAsc)) { isAsc = "asc"; - } - else if (StringUtils.DESC_ENDING.equals(isAsc)) - { + } else if (StringUtils.DESC_ENDING.equals(isAsc)) { isAsc = "desc"; } this.isAsc = isAsc; } } - public Boolean getReasonable() - { - if (StringUtils.isNull(reasonable)) - { + public Boolean getReasonable() { + if (StringUtils.isNull(reasonable)) { return Boolean.TRUE; } return reasonable; } - public void setReasonable(Boolean reasonable) - { + public void setReasonable(Boolean reasonable) { this.reasonable = reasonable; } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java index 41dc0fe7..e30890ba 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java @@ -5,81 +5,78 @@ import java.util.List; /** * 琛ㄦ牸鍒嗛〉鏁版嵁瀵硅薄 - * + * * @author ruoyi */ -public class TableDataInfo implements Serializable -{ +public class TableDataInfo implements Serializable { private static final long serialVersionUID = 1L; - /** 鎬昏褰曟暟 */ + /** + * 鎬昏褰曟暟 + */ private long total; - /** 鍒楄〃鏁版嵁 */ + /** + * 鍒楄〃鏁版嵁 + */ private List rows; - /** 娑堟伅鐘舵佺爜 */ + /** + * 娑堟伅鐘舵佺爜 + */ private int code; - /** 娑堟伅鍐呭 */ + /** + * 娑堟伅鍐呭 + */ private String msg; /** * 琛ㄦ牸鏁版嵁瀵硅薄 */ - public TableDataInfo() - { + public TableDataInfo() { } /** * 鍒嗛〉 - * - * @param list 鍒楄〃鏁版嵁 + * + * @param list 鍒楄〃鏁版嵁 * @param total 鎬昏褰曟暟 */ - public TableDataInfo(List list, int total) - { + public TableDataInfo(List list, int total) { this.rows = list; this.total = total; } - public long getTotal() - { + public long getTotal() { return total; } - public void setTotal(long total) - { + public void setTotal(long total) { this.total = total; } - public List getRows() - { + public List getRows() { return rows; } - public void setRows(List rows) - { + public void setRows(List rows) { this.rows = rows; } - public int getCode() - { + public int getCode() { return code; } - public void setCode(int code) - { + public void setCode(int code) { this.code = code; } - public String getMsg() - { + public String getMsg() { return msg; } - public void setMsg(String msg) - { + public void setMsg(String msg) { this.msg = msg; } } \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java index 0f4abaaf..7e9dccbd 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java @@ -5,11 +5,10 @@ import com.ruoyi.common.core.utils.ServletUtils; /** * 琛ㄦ牸鏁版嵁澶勭悊 - * + * * @author ruoyi */ -public class TableSupport -{ +public class TableSupport { /** * 褰撳墠璁板綍璧峰绱㈠紩 */ @@ -38,8 +37,7 @@ public class TableSupport /** * 灏佽鍒嗛〉瀵硅薄 */ - public static PageDomain getPageDomain() - { + public static PageDomain getPageDomain() { PageDomain pageDomain = new PageDomain(); pageDomain.setPageNum(Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1)); pageDomain.setPageSize(Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10)); @@ -49,8 +47,7 @@ public class TableSupport return pageDomain; } - public static PageDomain buildPageRequest() - { + public static PageDomain buildPageRequest() { return getPageDomain(); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java index 0a94d6b4..d54dbc56 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java @@ -9,17 +9,16 @@ import java.lang.annotation.Target; /** * 鑷畾涔墄ss鏍￠獙娉ㄨВ - * + * * @author ruoyi */ @Retention(RetentionPolicy.RUNTIME) -@Target(value = { ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER }) -@Constraint(validatedBy = { XssValidator.class }) -public @interface Xss -{ +@Target(value = {ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER}) +@Constraint(validatedBy = {XssValidator.class}) +public @interface Xss { String message() - default "涓嶅厑璁镐换浣曡剼鏈繍琛"; + default "涓嶅厑璁镐换浣曡剼鏈繍琛"; Class[] groups() default {}; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java index c4de8def..18a5a02f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java @@ -9,27 +9,23 @@ import java.util.regex.Pattern; /** * 鑷畾涔墄ss鏍￠獙娉ㄨВ瀹炵幇 - * + * * @author ruoyi */ -public class XssValidator implements ConstraintValidator -{ +public class XssValidator implements ConstraintValidator { private static final String HTML_PATTERN = "<(\\S*?)[^>]*>.*?|<.*? />"; + public static boolean containsHtml(String value) { + Pattern pattern = Pattern.compile(HTML_PATTERN); + Matcher matcher = pattern.matcher(value); + return matcher.matches(); + } + @Override - public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) - { - if (StringUtils.isBlank(value)) - { + public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) { + if (StringUtils.isBlank(value)) { return true; } return !containsHtml(value); } - - public static boolean containsHtml(String value) - { - Pattern pattern = Pattern.compile(HTML_PATTERN); - Matcher matcher = pattern.matcher(value); - return matcher.matches(); - } } \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java index 3ba0d376..43206b95 100644 --- a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java +++ b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java @@ -4,14 +4,13 @@ import java.lang.annotation.*; /** * 鏁版嵁鏉冮檺杩囨护娉ㄨВ - * + * * @author ruoyi */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) @Documented -public @interface DataScope -{ +public @interface DataScope { /** * 閮ㄩ棬琛ㄧ殑鍒悕 */ diff --git a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java index abf3bab2..4dd341e5 100644 --- a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java +++ b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java @@ -14,13 +14,12 @@ import org.springframework.stereotype.Component; /** * 鏁版嵁杩囨护澶勭悊 - * + * * @author ruoyi */ @Aspect @Component -public class DataScopeAspect -{ +public class DataScopeAspect { /** * 鍏ㄩ儴鏁版嵁鏉冮檺 */ @@ -51,98 +50,76 @@ public class DataScopeAspect */ public static final String DATA_SCOPE = "dataScope"; - @Before("@annotation(controllerDataScope)") - public void doBefore(JoinPoint point, DataScope controllerDataScope) throws Throwable - { - clearDataScope(point); - handleDataScope(point, controllerDataScope); - } - - protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope) - { - // 鑾峰彇褰撳墠鐨勭敤鎴 - LoginUser loginUser = SecurityUtils.getLoginUser(); - if (StringUtils.isNotNull(loginUser)) - { - SysUser currentUser = loginUser.getSysUser(); - // 濡傛灉鏄秴绾х鐞嗗憳锛屽垯涓嶈繃婊ゆ暟鎹 - if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin()) - { - dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(), - controllerDataScope.userAlias()); - } - } - } - /** * 鏁版嵁鑼冨洿杩囨护 - * + * * @param joinPoint 鍒囩偣 - * @param user 鐢ㄦ埛 + * @param user 鐢ㄦ埛 * @param deptAlias 閮ㄩ棬鍒悕 * @param userAlias 鐢ㄦ埛鍒悕 */ - public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias) - { + public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias) { StringBuilder sqlString = new StringBuilder(); - for (SysRole role : user.getRoles()) - { + for (SysRole role : user.getRoles()) { String dataScope = role.getDataScope(); - if (DATA_SCOPE_ALL.equals(dataScope)) - { + if (DATA_SCOPE_ALL.equals(dataScope)) { sqlString = new StringBuilder(); break; - } - else if (DATA_SCOPE_CUSTOM.equals(dataScope)) - { + } else if (DATA_SCOPE_CUSTOM.equals(dataScope)) { sqlString.append(StringUtils.format( " OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, role.getRoleId())); - } - else if (DATA_SCOPE_DEPT.equals(dataScope)) - { + } else if (DATA_SCOPE_DEPT.equals(dataScope)) { sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId())); - } - else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) - { + } else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) { sqlString.append(StringUtils.format( " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )", deptAlias, user.getDeptId(), user.getDeptId())); - } - else if (DATA_SCOPE_SELF.equals(dataScope)) - { - if (StringUtils.isNotBlank(userAlias)) - { + } else if (DATA_SCOPE_SELF.equals(dataScope)) { + if (StringUtils.isNotBlank(userAlias)) { sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId())); - } - else - { + } else { // 鏁版嵁鏉冮檺涓轰粎鏈汉涓旀病鏈塽serAlias鍒悕涓嶆煡璇换浣曟暟鎹 sqlString.append(" OR 1=0 "); } } } - if (StringUtils.isNotBlank(sqlString.toString())) - { + if (StringUtils.isNotBlank(sqlString.toString())) { Object params = joinPoint.getArgs()[0]; - if (StringUtils.isNotNull(params) && params instanceof BaseEntity) - { + if (StringUtils.isNotNull(params) && params instanceof BaseEntity) { BaseEntity baseEntity = (BaseEntity) params; baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")"); } } } + @Before("@annotation(controllerDataScope)") + public void doBefore(JoinPoint point, DataScope controllerDataScope) throws Throwable { + clearDataScope(point); + handleDataScope(point, controllerDataScope); + } + + protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope) { + // 鑾峰彇褰撳墠鐨勭敤鎴 + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (StringUtils.isNotNull(loginUser)) { + SysUser currentUser = loginUser.getSysUser(); + // 濡傛灉鏄秴绾х鐞嗗憳锛屽垯涓嶈繃婊ゆ暟鎹 + if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin()) { + dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(), + controllerDataScope.userAlias()); + } + } + } + /** * 鎷兼帴鏉冮檺sql鍓嶅厛娓呯┖params.dataScope鍙傛暟闃叉娉ㄥ叆 */ - private void clearDataScope(final JoinPoint joinPoint) - { + private void clearDataScope(final JoinPoint joinPoint) { Object params = joinPoint.getArgs()[0]; - if (StringUtils.isNotNull(params) && params instanceof BaseEntity) - { + if (StringUtils.isNotNull(params) && params instanceof BaseEntity) { BaseEntity baseEntity = (BaseEntity) params; baseEntity.getParams().put(DATA_SCOPE, ""); } diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java b/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java index 711ff580..97edc04c 100644 --- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java +++ b/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java @@ -6,14 +6,13 @@ import java.lang.annotation.*; /** * 涓诲簱鏁版嵁婧 - * + * * @author ruoyi */ -@Target({ ElementType.TYPE, ElementType.METHOD }) +@Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) @Documented @DS("master") -public @interface Master -{ +public @interface Master { } \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java b/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java index 86391d9f..8b07b9ee 100644 --- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java +++ b/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java @@ -6,14 +6,13 @@ import java.lang.annotation.*; /** * 浠庡簱鏁版嵁婧 - * + * * @author ruoyi */ -@Target({ ElementType.TYPE, ElementType.METHOD }) +@Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) @Documented @DS("slave") -public @interface Slave -{ +public @interface Slave { } \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/env/ApplicationSeataInitializer.java b/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/env/ApplicationSeataInitializer.java index 28394ead..8343194b 100644 --- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/env/ApplicationSeataInitializer.java +++ b/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/env/ApplicationSeataInitializer.java @@ -10,17 +10,14 @@ import org.springframework.core.env.ConfigurableEnvironment; * * @author ruoyi */ -public class ApplicationSeataInitializer implements EnvironmentPostProcessor, Ordered -{ +public class ApplicationSeataInitializer implements EnvironmentPostProcessor, Ordered { @Override - public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) - { + public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) { System.setProperty("spring.main.allow-circular-references", "true"); } @Override - public int getOrder() - { + public int getOrder() { return Ordered.LOWEST_PRECEDENCE; } } diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java index 6fdc6719..ad5a0146 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java @@ -7,15 +7,13 @@ import java.lang.annotation.*; /** * 鑷畾涔夋搷浣滄棩蹇楄褰曟敞瑙 - * - * @author ruoyi * + * @author ruoyi */ -@Target({ ElementType.PARAMETER, ElementType.METHOD }) +@Target({ElementType.PARAMETER, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) @Documented -public @interface Log -{ +public @interface Log { /** * 妯″潡 */ diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java index 363b52ee..78927c38 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java @@ -28,15 +28,14 @@ import java.util.Map; /** * 鎿嶄綔鏃ュ織璁板綍澶勭悊 - * + * * @author ruoyi */ @Aspect @Component -public class LogAspect -{ +public class LogAspect { private static final Logger log = LoggerFactory.getLogger(LogAspect.class); - + @Autowired private AsyncLogService asyncLogService; @@ -46,27 +45,23 @@ public class LogAspect * @param joinPoint 鍒囩偣 */ @AfterReturning(pointcut = "@annotation(controllerLog)", returning = "jsonResult") - public void doAfterReturning(JoinPoint joinPoint, Log controllerLog, Object jsonResult) - { + public void doAfterReturning(JoinPoint joinPoint, Log controllerLog, Object jsonResult) { handleLog(joinPoint, controllerLog, null, jsonResult); } /** * 鎷︽埅寮傚父鎿嶄綔 - * + * * @param joinPoint 鍒囩偣 - * @param e 寮傚父 + * @param e 寮傚父 */ @AfterThrowing(value = "@annotation(controllerLog)", throwing = "e") - public void doAfterThrowing(JoinPoint joinPoint, Log controllerLog, Exception e) - { + public void doAfterThrowing(JoinPoint joinPoint, Log controllerLog, Exception e) { handleLog(joinPoint, controllerLog, e, null); } - protected void handleLog(final JoinPoint joinPoint, Log controllerLog, final Exception e, Object jsonResult) - { - try - { + protected void handleLog(final JoinPoint joinPoint, Log controllerLog, final Exception e, Object jsonResult) { + try { // *========鏁版嵁搴撴棩蹇=========*// SysOperLog operLog = new SysOperLog(); operLog.setStatus(BusinessStatus.SUCCESS.ordinal()); @@ -75,13 +70,11 @@ public class LogAspect operLog.setOperIp(ip); operLog.setOperUrl(ServletUtils.getRequest().getRequestURI()); String username = SecurityUtils.getUsername(); - if (StringUtils.isNotBlank(username)) - { + if (StringUtils.isNotBlank(username)) { operLog.setOperName(username); } - if (e != null) - { + if (e != null) { operLog.setStatus(BusinessStatus.FAIL.ordinal()); operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000)); } @@ -95,9 +88,7 @@ public class LogAspect getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult); // 淇濆瓨鏁版嵁搴 asyncLogService.saveSysLog(operLog); - } - catch (Exception exp) - { + } catch (Exception exp) { // 璁板綍鏈湴寮傚父鏃ュ織 log.error("==鍓嶇疆閫氱煡寮傚父=="); log.error("寮傚父淇℃伅:{}", exp.getMessage()); @@ -107,13 +98,12 @@ public class LogAspect /** * 鑾峰彇娉ㄨВ涓鏂规硶鐨勬弿杩颁俊鎭 鐢ㄤ簬Controller灞傛敞瑙 - * - * @param log 鏃ュ織 + * + * @param log 鏃ュ織 * @param operLog 鎿嶄綔鏃ュ織 * @throws Exception */ - public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog, Object jsonResult) throws Exception - { + public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog, Object jsonResult) throws Exception { // 璁剧疆action鍔ㄤ綔 operLog.setBusinessType(log.businessType().ordinal()); // 璁剧疆鏍囬 @@ -121,29 +111,25 @@ public class LogAspect // 璁剧疆鎿嶄綔浜虹被鍒 operLog.setOperatorType(log.operatorType().ordinal()); // 鏄惁闇瑕佷繚瀛榬equest锛屽弬鏁板拰鍊 - if (log.isSaveRequestData()) - { + if (log.isSaveRequestData()) { // 鑾峰彇鍙傛暟鐨勪俊鎭紝浼犲叆鍒版暟鎹簱涓 setRequestValue(joinPoint, operLog); } // 鏄惁闇瑕佷繚瀛榬esponse锛屽弬鏁板拰鍊 - if (log.isSaveResponseData() && StringUtils.isNotNull(jsonResult)) - { + if (log.isSaveResponseData() && StringUtils.isNotNull(jsonResult)) { operLog.setJsonResult(StringUtils.substring(JSON.toJSONString(jsonResult), 0, 2000)); } } /** * 鑾峰彇璇锋眰鐨勫弬鏁帮紝鏀惧埌log涓 - * + * * @param operLog 鎿嶄綔鏃ュ織 * @throws Exception 寮傚父 */ - private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog) throws Exception - { + private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog) throws Exception { String requestMethod = operLog.getRequestMethod(); - if (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod)) - { + if (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod)) { String params = argsArrayToString(joinPoint.getArgs()); operLog.setOperParam(StringUtils.substring(params, 0, 2000)); } @@ -152,22 +138,15 @@ public class LogAspect /** * 鍙傛暟鎷艰 */ - private String argsArrayToString(Object[] paramsArray) - { + private String argsArrayToString(Object[] paramsArray) { String params = ""; - if (paramsArray != null && paramsArray.length > 0) - { - for (Object o : paramsArray) - { - if (StringUtils.isNotNull(o) && !isFilterObject(o)) - { - try - { + if (paramsArray != null && paramsArray.length > 0) { + for (Object o : paramsArray) { + if (StringUtils.isNotNull(o) && !isFilterObject(o)) { + try { Object jsonObj = JSON.toJSON(o); params += jsonObj.toString() + " "; - } - catch (Exception e) - { + } catch (Exception e) { } } } @@ -177,31 +156,23 @@ public class LogAspect /** * 鍒ゆ柇鏄惁闇瑕佽繃婊ょ殑瀵硅薄銆 - * + * * @param o 瀵硅薄淇℃伅銆 * @return 濡傛灉鏄渶瑕佽繃婊ょ殑瀵硅薄锛屽垯杩斿洖true锛涘惁鍒欒繑鍥瀎alse銆 */ @SuppressWarnings("rawtypes") - public boolean isFilterObject(final Object o) - { + public boolean isFilterObject(final Object o) { Class clazz = o.getClass(); - if (clazz.isArray()) - { + if (clazz.isArray()) { return clazz.getComponentType().isAssignableFrom(MultipartFile.class); - } - else if (Collection.class.isAssignableFrom(clazz)) - { + } else if (Collection.class.isAssignableFrom(clazz)) { Collection collection = (Collection) o; - for (Object value : collection) - { + for (Object value : collection) { return value instanceof MultipartFile; } - } - else if (Map.class.isAssignableFrom(clazz)) - { + } else if (Map.class.isAssignableFrom(clazz)) { Map map = (Map) o; - for (Object value : map.entrySet()) - { + for (Object value : map.entrySet()) { Map.Entry entry = (Map.Entry) value; return entry.getValue() instanceof MultipartFile; } diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java index cd644ba6..5ac3ff48 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java @@ -2,12 +2,10 @@ package com.ruoyi.common.log.enums; /** * 鎿嶄綔鐘舵 - * - * @author ruoyi * + * @author ruoyi */ -public enum BusinessStatus -{ +public enum BusinessStatus { /** * 鎴愬姛 */ diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java index 3a9a71c9..6bf65ed4 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java @@ -2,11 +2,10 @@ package com.ruoyi.common.log.enums; /** * 涓氬姟鎿嶄綔绫诲瀷 - * + * * @author ruoyi */ -public enum BusinessType -{ +public enum BusinessType { /** * 鍏跺畠 */ diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/OperatorType.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/OperatorType.java index b122f25f..ceb8e510 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/OperatorType.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/OperatorType.java @@ -2,11 +2,10 @@ package com.ruoyi.common.log.enums; /** * 鎿嶄綔浜虹被鍒 - * + * * @author ruoyi */ -public enum OperatorType -{ +public enum OperatorType { /** * 鍏跺畠 */ diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java index 6ce39912..e67fb837 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java @@ -9,12 +9,11 @@ import org.springframework.stereotype.Service; /** * 寮傛璋冪敤鏃ュ織鏈嶅姟 - * + * * @author ruoyi */ @Service -public class AsyncLogService -{ +public class AsyncLogService { @Autowired private RemoteLogService remoteLogService; @@ -22,8 +21,7 @@ public class AsyncLogService * 淇濆瓨绯荤粺鏃ュ織璁板綍 */ @Async - public void saveSysLog(SysOperLog sysOperLog) - { + public void saveSysLog(SysOperLog sysOperLog) { remoteLogService.saveLog(sysOperLog, SecurityConstants.INNER); } } diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java index c9781099..345e8bca 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java @@ -14,44 +14,36 @@ import java.nio.charset.Charset; /** * Redis浣跨敤FastJson搴忓垪鍖 - * + * * @author ruoyi */ -public class FastJson2JsonRedisSerializer implements RedisSerializer -{ - @SuppressWarnings("unused") - private ObjectMapper objectMapper = new ObjectMapper(); - +public class FastJson2JsonRedisSerializer implements RedisSerializer { public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8"); - private Class clazz; - - static - { + static { ParserConfig.getGlobalInstance().setAutoTypeSupport(true); } - public FastJson2JsonRedisSerializer(Class clazz) - { + @SuppressWarnings("unused") + private ObjectMapper objectMapper = new ObjectMapper(); + private Class clazz; + + public FastJson2JsonRedisSerializer(Class clazz) { super(); this.clazz = clazz; } @Override - public byte[] serialize(T t) throws SerializationException - { - if (t == null) - { + public byte[] serialize(T t) throws SerializationException { + if (t == null) { return new byte[0]; } return JSON.toJSONString(t, SerializerFeature.WriteClassName).getBytes(DEFAULT_CHARSET); } @Override - public T deserialize(byte[] bytes) throws SerializationException - { - if (bytes == null || bytes.length <= 0) - { + public T deserialize(byte[] bytes) throws SerializationException { + if (bytes == null || bytes.length <= 0) { return null; } String str = new String(bytes, DEFAULT_CHARSET); @@ -59,14 +51,12 @@ public class FastJson2JsonRedisSerializer implements RedisSerializer return JSON.parseObject(str, clazz); } - public void setObjectMapper(ObjectMapper objectMapper) - { + public void setObjectMapper(ObjectMapper objectMapper) { Assert.notNull(objectMapper, "'objectMapper' must not be null"); this.objectMapper = objectMapper; } - protected JavaType getJavaType(Class clazz) - { + protected JavaType getJavaType(Class clazz) { return TypeFactory.defaultInstance().constructType(clazz); } } diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java index 58afede4..62d6f690 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java @@ -15,17 +15,15 @@ import org.springframework.data.redis.serializer.StringRedisSerializer; /** * redis閰嶇疆 - * + * * @author ruoyi */ @Configuration @EnableCaching -public class RedisConfig extends CachingConfigurerSupport -{ +public class RedisConfig extends CachingConfigurerSupport { @Bean - @SuppressWarnings(value = { "unchecked", "rawtypes" }) - public RedisTemplate redisTemplate(RedisConnectionFactory connectionFactory) - { + @SuppressWarnings(value = {"unchecked", "rawtypes"}) + public RedisTemplate redisTemplate(RedisConnectionFactory connectionFactory) { RedisTemplate template = new RedisTemplate<>(); template.setConnectionFactory(connectionFactory); diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java index 9797ea65..d1f61e22 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java @@ -12,62 +12,57 @@ import java.util.concurrent.TimeUnit; /** * spring redis 宸ュ叿绫 - * + * * @author ruoyi **/ -@SuppressWarnings(value = { "unchecked", "rawtypes" }) +@SuppressWarnings(value = {"unchecked", "rawtypes"}) @Component -public class RedisService -{ +public class RedisService { @Autowired public RedisTemplate redisTemplate; /** * 缂撳瓨鍩烘湰鐨勫璞★紝Integer銆丼tring銆佸疄浣撶被绛 * - * @param key 缂撳瓨鐨勯敭鍊 + * @param key 缂撳瓨鐨勯敭鍊 * @param value 缂撳瓨鐨勫 */ - public void setCacheObject(final String key, final T value) - { + public void setCacheObject(final String key, final T value) { redisTemplate.opsForValue().set(key, value); } /** * 缂撳瓨鍩烘湰鐨勫璞★紝Integer銆丼tring銆佸疄浣撶被绛 * - * @param key 缂撳瓨鐨勯敭鍊 - * @param value 缂撳瓨鐨勫 - * @param timeout 鏃堕棿 + * @param key 缂撳瓨鐨勯敭鍊 + * @param value 缂撳瓨鐨勫 + * @param timeout 鏃堕棿 * @param timeUnit 鏃堕棿棰楃矑搴 */ - public void setCacheObject(final String key, final T value, final Long timeout, final TimeUnit timeUnit) - { + public void setCacheObject(final String key, final T value, final Long timeout, final TimeUnit timeUnit) { redisTemplate.opsForValue().set(key, value, timeout, timeUnit); } /** * 璁剧疆鏈夋晥鏃堕棿 * - * @param key Redis閿 + * @param key Redis閿 * @param timeout 瓒呮椂鏃堕棿 * @return true=璁剧疆鎴愬姛锛沠alse=璁剧疆澶辫触 */ - public boolean expire(final String key, final long timeout) - { + public boolean expire(final String key, final long timeout) { return expire(key, timeout, TimeUnit.SECONDS); } /** * 璁剧疆鏈夋晥鏃堕棿 * - * @param key Redis閿 + * @param key Redis閿 * @param timeout 瓒呮椂鏃堕棿 - * @param unit 鏃堕棿鍗曚綅 + * @param unit 鏃堕棿鍗曚綅 * @return true=璁剧疆鎴愬姛锛沠alse=璁剧疆澶辫触 */ - public boolean expire(final String key, final long timeout, final TimeUnit unit) - { + public boolean expire(final String key, final long timeout, final TimeUnit unit) { return redisTemplate.expire(key, timeout, unit); } @@ -77,8 +72,7 @@ public class RedisService * @param key Redis閿 * @return 鏈夋晥鏃堕棿 */ - public long getExpire(final String key) - { + public long getExpire(final String key) { return redisTemplate.getExpire(key); } @@ -88,8 +82,7 @@ public class RedisService * @param key 閿 * @return true 瀛樺湪 false涓嶅瓨鍦 */ - public Boolean hasKey(String key) - { + public Boolean hasKey(String key) { return redisTemplate.hasKey(key); } @@ -99,8 +92,7 @@ public class RedisService * @param key 缂撳瓨閿 * @return 缂撳瓨閿煎搴旂殑鏁版嵁 */ - public T getCacheObject(final String key) - { + public T getCacheObject(final String key) { ValueOperations operation = redisTemplate.opsForValue(); return operation.get(key); } @@ -110,8 +102,7 @@ public class RedisService * * @param key */ - public boolean deleteObject(final String key) - { + public boolean deleteObject(final String key) { return redisTemplate.delete(key); } @@ -121,20 +112,18 @@ public class RedisService * @param collection 澶氫釜瀵硅薄 * @return */ - public long deleteObject(final Collection collection) - { + public long deleteObject(final Collection collection) { return redisTemplate.delete(collection); } /** * 缂撳瓨List鏁版嵁 * - * @param key 缂撳瓨鐨勯敭鍊 + * @param key 缂撳瓨鐨勯敭鍊 * @param dataList 寰呯紦瀛樼殑List鏁版嵁 * @return 缂撳瓨鐨勫璞 */ - public long setCacheList(final String key, final List dataList) - { + public long setCacheList(final String key, final List dataList) { Long count = redisTemplate.opsForList().rightPushAll(key, dataList); return count == null ? 0 : count; } @@ -145,24 +134,21 @@ public class RedisService * @param key 缂撳瓨鐨勯敭鍊 * @return 缂撳瓨閿煎搴旂殑鏁版嵁 */ - public List getCacheList(final String key) - { + public List getCacheList(final String key) { return redisTemplate.opsForList().range(key, 0, -1); } /** * 缂撳瓨Set * - * @param key 缂撳瓨閿 + * @param key 缂撳瓨閿 * @param dataSet 缂撳瓨鐨勬暟鎹 * @return 缂撳瓨鏁版嵁鐨勫璞 */ - public BoundSetOperations setCacheSet(final String key, final Set dataSet) - { + public BoundSetOperations setCacheSet(final String key, final Set dataSet) { BoundSetOperations setOperation = redisTemplate.boundSetOps(key); Iterator it = dataSet.iterator(); - while (it.hasNext()) - { + while (it.hasNext()) { setOperation.add(it.next()); } return setOperation; @@ -174,8 +160,7 @@ public class RedisService * @param key * @return */ - public Set getCacheSet(final String key) - { + public Set getCacheSet(final String key) { return redisTemplate.opsForSet().members(key); } @@ -185,8 +170,7 @@ public class RedisService * @param key * @param dataMap */ - public void setCacheMap(final String key, final Map dataMap) - { + public void setCacheMap(final String key, final Map dataMap) { if (dataMap != null) { redisTemplate.opsForHash().putAll(key, dataMap); } @@ -198,32 +182,29 @@ public class RedisService * @param key * @return */ - public Map getCacheMap(final String key) - { + public Map getCacheMap(final String key) { return redisTemplate.opsForHash().entries(key); } /** * 寰Hash涓瓨鍏ユ暟鎹 * - * @param key Redis閿 - * @param hKey Hash閿 + * @param key Redis閿 + * @param hKey Hash閿 * @param value 鍊 */ - public void setCacheMapValue(final String key, final String hKey, final T value) - { + public void setCacheMapValue(final String key, final String hKey, final T value) { redisTemplate.opsForHash().put(key, hKey, value); } /** * 鑾峰彇Hash涓殑鏁版嵁 * - * @param key Redis閿 + * @param key Redis閿 * @param hKey Hash閿 * @return Hash涓殑瀵硅薄 */ - public T getCacheMapValue(final String key, final String hKey) - { + public T getCacheMapValue(final String key, final String hKey) { HashOperations opsForHash = redisTemplate.opsForHash(); return opsForHash.get(key, hKey); } @@ -231,23 +212,21 @@ public class RedisService /** * 鑾峰彇澶氫釜Hash涓殑鏁版嵁 * - * @param key Redis閿 + * @param key Redis閿 * @param hKeys Hash閿泦鍚 * @return Hash瀵硅薄闆嗗悎 */ - public List getMultiCacheMapValue(final String key, final Collection hKeys) - { + public List getMultiCacheMapValue(final String key, final Collection hKeys) { return redisTemplate.opsForHash().multiGet(key, hKeys); } /** * 鑾峰緱缂撳瓨鐨勫熀鏈璞″垪琛 - * + * * @param pattern 瀛楃涓插墠缂 * @return 瀵硅薄鍒楄〃 */ - public Collection keys(final String pattern) - { + public Collection keys(final String pattern) { return redisTemplate.keys(pattern); } } diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java index 4f1399c9..003c83bc 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java @@ -23,8 +23,7 @@ import java.lang.annotation.*; // 寮鍚嚎绋嬪紓姝ユ墽琛 @EnableAsync // 鑷姩鍔犺浇绫 -@Import({ ApplicationConfig.class, FeignAutoConfiguration.class }) -public @interface EnableCustomConfig -{ +@Import({ApplicationConfig.class, FeignAutoConfiguration.class}) +public @interface EnableCustomConfig { } diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java index a15ccb00..f7580d0e 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java @@ -7,18 +7,17 @@ import java.lang.annotation.*; /** * 鑷畾涔塮eign娉ㄨВ * 娣诲姞basePackages璺緞 - * + * * @author ruoyi */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Documented @EnableFeignClients -public @interface EnableRyFeignClients -{ +public @interface EnableRyFeignClients { String[] value() default {}; - String[] basePackages() default { "com.ruoyi" }; + String[] basePackages() default {"com.ruoyi"}; Class[] basePackageClasses() default {}; diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/InnerAuth.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/InnerAuth.java index 80fa59e7..a6f26d80 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/InnerAuth.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/InnerAuth.java @@ -4,14 +4,13 @@ import java.lang.annotation.*; /** * 鍐呴儴璁よ瘉娉ㄨВ - * + * * @author ruoyi */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) @Documented -public @interface InnerAuth -{ +public @interface InnerAuth { /** * 鏄惁鏍￠獙鐢ㄦ埛淇℃伅 */ diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java index e88f56cb..1d633674 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java @@ -2,12 +2,10 @@ package com.ruoyi.common.security.annotation; /** * 鏉冮檺娉ㄨВ鐨勯獙璇佹ā寮 - * - * @author ruoyi * + * @author ruoyi */ -public enum Logical -{ +public enum Logical { /** * 蹇呴』鍏锋湁鎵鏈夌殑鍏冪礌 */ diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java index 0910b129..e7cf713f 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java @@ -7,12 +7,10 @@ import java.lang.annotation.Target; /** * 鐧诲綍璁よ瘉锛氬彧鏈夌櫥褰曚箣鍚庢墠鑳借繘鍏ヨ鏂规硶 - * - * @author ruoyi * + * @author ruoyi */ @Retention(RetentionPolicy.RUNTIME) -@Target({ ElementType.METHOD, ElementType.TYPE }) -public @interface RequiresLogin -{ +@Target({ElementType.METHOD, ElementType.TYPE}) +public @interface RequiresLogin { } diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java index 4adf4df8..5ff5ed3e 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java @@ -7,14 +7,12 @@ import java.lang.annotation.Target; /** * 鏉冮檺璁よ瘉锛氬繀椤诲叿鏈夋寚瀹氭潈闄愭墠鑳借繘鍏ヨ鏂规硶 - * - * @author ruoyi * + * @author ruoyi */ @Retention(RetentionPolicy.RUNTIME) -@Target({ ElementType.METHOD, ElementType.TYPE }) -public @interface RequiresPermissions -{ +@Target({ElementType.METHOD, ElementType.TYPE}) +public @interface RequiresPermissions { /** * 闇瑕佹牎楠岀殑鏉冮檺鐮 */ diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java index 546620d2..d703069a 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java @@ -7,13 +7,12 @@ import java.lang.annotation.Target; /** * 瑙掕壊璁よ瘉锛氬繀椤诲叿鏈夋寚瀹氳鑹叉爣璇嗘墠鑳借繘鍏ヨ鏂规硶 - * + * * @author ruoyi */ @Retention(RetentionPolicy.RUNTIME) -@Target({ ElementType.METHOD, ElementType.TYPE }) -public @interface RequiresRoles -{ +@Target({ElementType.METHOD, ElementType.TYPE}) +public @interface RequiresRoles { /** * 闇瑕佹牎楠岀殑瑙掕壊鏍囪瘑 */ diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java index e9fa384d..d0b23d3d 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java @@ -13,20 +13,17 @@ import org.springframework.stereotype.Component; /** * 鍐呴儴鏈嶅姟璋冪敤楠岃瘉澶勭悊 - * + * * @author ruoyi */ @Aspect @Component -public class InnerAuthAspect implements Ordered -{ +public class InnerAuthAspect implements Ordered { @Around("@annotation(innerAuth)") - public Object innerAround(ProceedingJoinPoint point, InnerAuth innerAuth) throws Throwable - { + public Object innerAround(ProceedingJoinPoint point, InnerAuth innerAuth) throws Throwable { String source = ServletUtils.getRequest().getHeader(SecurityConstants.FROM_SOURCE); // 鍐呴儴璇锋眰楠岃瘉 - if (!StringUtils.equals(SecurityConstants.INNER, source)) - { + if (!StringUtils.equals(SecurityConstants.INNER, source)) { throw new InnerAuthException("娌℃湁鍐呴儴璁块棶鏉冮檺锛屼笉鍏佽璁块棶"); } @@ -45,8 +42,7 @@ public class InnerAuthAspect implements Ordered * 纭繚鍦ㄦ潈闄愯璇乤op鎵ц鍓嶆墽琛 */ @Override - public int getOrder() - { + public int getOrder() { return Ordered.HIGHEST_PRECEDENCE + 1; } } diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java index e9b15a4e..cd02ca98 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java @@ -15,20 +15,12 @@ import java.lang.reflect.Method; /** * 鍩轰簬 Spring Aop 鐨勬敞瑙ｉ壌鏉 - * + * * @author kong */ @Aspect @Component -public class PreAuthorizeAspect -{ - /** - * 鏋勫缓 - */ - public PreAuthorizeAspect() - { - } - +public class PreAuthorizeAspect { /** * 瀹氫箟AOP绛惧悕 (鍒囧叆鎵鏈変娇鐢ㄩ壌鏉冩敞瑙ｇ殑鏂规硶) */ @@ -36,35 +28,36 @@ public class PreAuthorizeAspect + "@annotation(com.ruoyi.common.security.annotation.RequiresPermissions) || " + "@annotation(com.ruoyi.common.security.annotation.RequiresRoles)"; + /** + * 鏋勫缓 + */ + public PreAuthorizeAspect() { + } + /** * 澹版槑AOP绛惧悕 */ @Pointcut(POINTCUT_SIGN) - public void pointcut() - { + public void pointcut() { } /** * 鐜粫鍒囧叆 - * + * * @param joinPoint 鍒囬潰瀵硅薄 * @return 搴曞眰鏂规硶鎵ц鍚庣殑杩斿洖鍊 * @throws Throwable 搴曞眰鏂规硶鎶涘嚭鐨勫紓甯 */ @Around("pointcut()") - public Object around(ProceedingJoinPoint joinPoint) throws Throwable - { + public Object around(ProceedingJoinPoint joinPoint) throws Throwable { // 娉ㄨВ閴存潈 MethodSignature signature = (MethodSignature) joinPoint.getSignature(); checkMethodAnnotation(signature.getMethod()); - try - { + try { // 鎵ц鍘熸湁閫昏緫 Object obj = joinPoint.proceed(); return obj; - } - catch (Throwable e) - { + } catch (Throwable e) { throw e; } } @@ -72,26 +65,22 @@ public class PreAuthorizeAspect /** * 瀵逛竴涓狹ethod瀵硅薄杩涜娉ㄨВ妫鏌 */ - public void checkMethodAnnotation(Method method) - { + public void checkMethodAnnotation(Method method) { // 鏍￠獙 @RequiresLogin 娉ㄨВ RequiresLogin requiresLogin = method.getAnnotation(RequiresLogin.class); - if (requiresLogin != null) - { + if (requiresLogin != null) { AuthUtil.checkLogin(); } // 鏍￠獙 @RequiresRoles 娉ㄨВ RequiresRoles requiresRoles = method.getAnnotation(RequiresRoles.class); - if (requiresRoles != null) - { + if (requiresRoles != null) { AuthUtil.checkRole(requiresRoles); } // 鏍￠獙 @RequiresPermissions 娉ㄨВ RequiresPermissions requiresPermissions = method.getAnnotation(RequiresPermissions.class); - if (requiresPermissions != null) - { + if (requiresPermissions != null) { AuthUtil.checkPermi(requiresPermissions); } } diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java index fe92dca0..f3cecc51 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java @@ -20,15 +20,18 @@ import java.util.Set; /** * Token 鏉冮檺楠岃瘉锛岄昏緫瀹炵幇绫 - * + * * @author ruoyi */ -public class AuthLogic -{ - /** 鎵鏈夋潈闄愭爣璇 */ +public class AuthLogic { + /** + * 鎵鏈夋潈闄愭爣璇 + */ private static final String ALL_PERMISSION = "*:*:*"; - /** 绠＄悊鍛樿鑹叉潈闄愭爣璇 */ + /** + * 绠＄悊鍛樿鑹叉潈闄愭爣璇 + */ private static final String SUPER_ADMIN = "admin"; public TokenService tokenService = SpringUtils.getBean(TokenService.class); @@ -36,11 +39,9 @@ public class AuthLogic /** * 浼氳瘽娉ㄩ攢 */ - public void logout() - { + public void logout() { String token = SecurityUtils.getToken(); - if (token == null) - { + if (token == null) { return; } logoutByToken(token); @@ -49,34 +50,29 @@ public class AuthLogic /** * 浼氳瘽娉ㄩ攢锛屾牴鎹寚瀹歍oken */ - public void logoutByToken(String token) - { + public void logoutByToken(String token) { tokenService.delLoginUser(token); } /** * 妫楠岀敤鎴锋槸鍚﹀凡缁忕櫥褰曪紝濡傛湭鐧诲綍锛屽垯鎶涘嚭寮傚父 */ - public void checkLogin() - { + public void checkLogin() { getLoginUser(); } /** * 鑾峰彇褰撳墠鐢ㄦ埛缂撳瓨淇℃伅, 濡傛灉鏈櫥褰曪紝鍒欐姏鍑哄紓甯 - * + * * @return 鐢ㄦ埛缂撳瓨淇℃伅 */ - public LoginUser getLoginUser() - { + public LoginUser getLoginUser() { String token = SecurityUtils.getToken(); - if (token == null) - { + if (token == null) { throw new NotLoginException("鏈彁渚泃oken"); } LoginUser loginUser = SecurityUtils.getLoginUser(); - if (loginUser == null) - { + if (loginUser == null) { throw new NotLoginException("鏃犳晥鐨則oken"); } return loginUser; @@ -84,63 +80,54 @@ public class AuthLogic /** * 鑾峰彇褰撳墠鐢ㄦ埛缂撳瓨淇℃伅, 濡傛灉鏈櫥褰曪紝鍒欐姏鍑哄紓甯 - * + * * @param token 鍓嶇浼犻掔殑璁よ瘉淇℃伅 * @return 鐢ㄦ埛缂撳瓨淇℃伅 */ - public LoginUser getLoginUser(String token) - { + public LoginUser getLoginUser(String token) { return tokenService.getLoginUser(token); } /** * 楠岃瘉褰撳墠鐢ㄦ埛鏈夋晥鏈, 濡傛灉鐩稿樊涓嶈冻120鍒嗛挓锛岃嚜鍔ㄥ埛鏂扮紦瀛 - * + * * @param loginUser 褰撳墠鐢ㄦ埛淇℃伅 */ - public void verifyLoginUserExpire(LoginUser loginUser) - { + public void verifyLoginUserExpire(LoginUser loginUser) { tokenService.verifyToken(loginUser); } /** * 楠岃瘉鐢ㄦ埛鏄惁鍏峰鏌愭潈闄 - * + * * @param permission 鏉冮檺瀛楃涓 * @return 鐢ㄦ埛鏄惁鍏峰鏌愭潈闄 */ - public boolean hasPermi(String permission) - { + public boolean hasPermi(String permission) { return hasPermi(getPermiList(), permission); } /** * 楠岃瘉鐢ㄦ埛鏄惁鍏峰鏌愭潈闄, 濡傛灉楠岃瘉鏈氳繃锛屽垯鎶涘嚭寮傚父: NotPermissionException - * + * * @param permission 鏉冮檺瀛楃涓 * @return 鐢ㄦ埛鏄惁鍏峰鏌愭潈闄 */ - public void checkPermi(String permission) - { - if (!hasPermi(getPermiList(), permission)) - { + public void checkPermi(String permission) { + if (!hasPermi(getPermiList(), permission)) { throw new NotPermissionException(permission); } } /** * 鏍规嵁娉ㄨВ(@RequiresPermissions)閴存潈, 濡傛灉楠岃瘉鏈氳繃锛屽垯鎶涘嚭寮傚父: NotPermissionException - * + * * @param requiresPermissions 娉ㄨВ瀵硅薄 */ - public void checkPermi(RequiresPermissions requiresPermissions) - { - if (requiresPermissions.logical() == Logical.AND) - { + public void checkPermi(RequiresPermissions requiresPermissions) { + if (requiresPermissions.logical() == Logical.AND) { checkPermiAnd(requiresPermissions.value()); - } - else - { + } else { checkPermiOr(requiresPermissions.value()); } } @@ -150,13 +137,10 @@ public class AuthLogic * * @param permissions 鏉冮檺鍒楄〃 */ - public void checkPermiAnd(String... permissions) - { + public void checkPermiAnd(String... permissions) { Set permissionList = getPermiList(); - for (String permission : permissions) - { - if (!hasPermi(permissionList, permission)) - { + for (String permission : permissions) { + if (!hasPermi(permissionList, permission)) { throw new NotPermissionException(permission); } } @@ -164,78 +148,64 @@ public class AuthLogic /** * 楠岃瘉鐢ㄦ埛鏄惁鍚湁鎸囧畾鏉冮檺锛屽彧闇鍖呭惈鍏朵腑涓涓 - * + * * @param permissions 鏉冮檺鐮佹暟缁 */ - public void checkPermiOr(String... permissions) - { + public void checkPermiOr(String... permissions) { Set permissionList = getPermiList(); - for (String permission : permissions) - { - if (hasPermi(permissionList, permission)) - { + for (String permission : permissions) { + if (hasPermi(permissionList, permission)) { return; } } - if (permissions.length > 0) - { + if (permissions.length > 0) { throw new NotPermissionException(permissions); } } /** * 鍒ゆ柇鐢ㄦ埛鏄惁鎷ユ湁鏌愪釜瑙掕壊 - * + * * @param role 瑙掕壊鏍囪瘑 * @return 鐢ㄦ埛鏄惁鍏峰鏌愯鑹 */ - public boolean hasRole(String role) - { + public boolean hasRole(String role) { return hasRole(getRoleList(), role); } /** * 鍒ゆ柇鐢ㄦ埛鏄惁鎷ユ湁鏌愪釜瑙掕壊, 濡傛灉楠岃瘉鏈氳繃锛屽垯鎶涘嚭寮傚父: NotRoleException - * + * * @param role 瑙掕壊鏍囪瘑 */ - public void checkRole(String role) - { - if (!hasRole(role)) - { + public void checkRole(String role) { + if (!hasRole(role)) { throw new NotRoleException(role); } } /** * 鏍规嵁娉ㄨВ(@RequiresRoles)閴存潈 - * + * * @param requiresRoles 娉ㄨВ瀵硅薄 */ - public void checkRole(RequiresRoles requiresRoles) - { - if (requiresRoles.logical() == Logical.AND) - { + public void checkRole(RequiresRoles requiresRoles) { + if (requiresRoles.logical() == Logical.AND) { checkRoleAnd(requiresRoles.value()); - } - else - { + } else { checkRoleOr(requiresRoles.value()); } } /** * 楠岃瘉鐢ㄦ埛鏄惁鍚湁鎸囧畾瑙掕壊锛屽繀椤诲叏閮ㄦ嫢鏈 - * + * * @param roles 瑙掕壊鏍囪瘑鏁扮粍 */ - public void checkRoleAnd(String... roles) - { + public void checkRoleAnd(String... roles) { Set roleList = getRoleList(); - for (String role : roles) - { - if (!hasRole(roleList, role)) - { + for (String role : roles) { + if (!hasRole(roleList, role)) { throw new NotRoleException(role); } } @@ -243,129 +213,106 @@ public class AuthLogic /** * 楠岃瘉鐢ㄦ埛鏄惁鍚湁鎸囧畾瑙掕壊锛屽彧闇鍖呭惈鍏朵腑涓涓 - * + * * @param roles 瑙掕壊鏍囪瘑鏁扮粍 */ - public void checkRoleOr(String... roles) - { + public void checkRoleOr(String... roles) { Set roleList = getRoleList(); - for (String role : roles) - { - if (hasRole(roleList, role)) - { + for (String role : roles) { + if (hasRole(roleList, role)) { return; } } - if (roles.length > 0) - { + if (roles.length > 0) { throw new NotRoleException(roles); } } /** * 鏍规嵁娉ㄨВ(@RequiresLogin)閴存潈 - * + * * @param at 娉ㄨВ瀵硅薄 */ - public void checkByAnnotation(RequiresLogin at) - { + public void checkByAnnotation(RequiresLogin at) { this.checkLogin(); } /** * 鏍规嵁娉ㄨВ(@RequiresRoles)閴存潈 - * + * * @param at 娉ㄨВ瀵硅薄 */ - public void checkByAnnotation(RequiresRoles at) - { + public void checkByAnnotation(RequiresRoles at) { String[] roleArray = at.value(); - if (at.logical() == Logical.AND) - { + if (at.logical() == Logical.AND) { this.checkRoleAnd(roleArray); - } - else - { + } else { this.checkRoleOr(roleArray); } } /** * 鏍规嵁娉ㄨВ(@RequiresPermissions)閴存潈 - * + * * @param at 娉ㄨВ瀵硅薄 */ - public void checkByAnnotation(RequiresPermissions at) - { + public void checkByAnnotation(RequiresPermissions at) { String[] permissionArray = at.value(); - if (at.logical() == Logical.AND) - { + if (at.logical() == Logical.AND) { this.checkPermiAnd(permissionArray); - } - else - { + } else { this.checkPermiOr(permissionArray); } } /** * 鑾峰彇褰撳墠璐﹀彿鐨勮鑹插垪琛 - * + * * @return 瑙掕壊鍒楄〃 */ - public Set getRoleList() - { - try - { + public Set getRoleList() { + try { LoginUser loginUser = getLoginUser(); return loginUser.getRoles(); - } - catch (Exception e) - { + } catch (Exception e) { return new HashSet<>(); } } /** * 鑾峰彇褰撳墠璐﹀彿鐨勬潈闄愬垪琛 - * + * * @return 鏉冮檺鍒楄〃 */ - public Set getPermiList() - { - try - { + public Set getPermiList() { + try { LoginUser loginUser = getLoginUser(); return loginUser.getPermissions(); - } - catch (Exception e) - { + } catch (Exception e) { return new HashSet<>(); } } /** * 鍒ゆ柇鏄惁鍖呭惈鏉冮檺 - * + * * @param authorities 鏉冮檺鍒楄〃 - * @param permission 鏉冮檺瀛楃涓 + * @param permission 鏉冮檺瀛楃涓 * @return 鐢ㄦ埛鏄惁鍏峰鏌愭潈闄 */ - public boolean hasPermi(Collection authorities, String permission) - { + public boolean hasPermi(Collection authorities, String permission) { return authorities.stream().filter(StringUtils::hasText) .anyMatch(x -> ALL_PERMISSION.contains(x) || PatternMatchUtils.simpleMatch(x, permission)); } /** * 鍒ゆ柇鏄惁鍖呭惈瑙掕壊 - * + * * @param roles 瑙掕壊鍒楄〃 - * @param role 瑙掕壊 + * @param role 瑙掕壊 * @return 鐢ㄦ埛鏄惁鍏峰鏌愯鑹叉潈闄 */ - public boolean hasRole(Collection roles, String role) - { + public boolean hasRole(Collection roles, String role) { return roles.stream().filter(StringUtils::hasText) .anyMatch(x -> SUPER_ADMIN.contains(x) || PatternMatchUtils.simpleMatch(x, role)); } diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java index f0738dfc..0a2aa4aa 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java @@ -6,11 +6,10 @@ import com.ruoyi.system.api.model.LoginUser; /** * Token 鏉冮檺楠岃瘉宸ュ叿绫 - * + * * @author ruoyi */ -public class AuthUtil -{ +public class AuthUtil { /** * 搴曞眰鐨 AuthLogic 瀵硅薄 */ @@ -19,144 +18,129 @@ public class AuthUtil /** * 浼氳瘽娉ㄩ攢 */ - public static void logout() - { + public static void logout() { authLogic.logout(); } /** * 浼氳瘽娉ㄩ攢锛屾牴鎹寚瀹歍oken - * + * * @param tokenValue 鎸囧畾token */ - public static void logoutByToken(String token) - { + public static void logoutByToken(String token) { authLogic.logoutByToken(token); } /** * 妫楠屽綋鍓嶄細璇濇槸鍚﹀凡缁忕櫥褰曪紝濡傛湭鐧诲綍锛屽垯鎶涘嚭寮傚父 */ - public static void checkLogin() - { + public static void checkLogin() { authLogic.checkLogin(); } /** * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛淇℃伅 */ - public static LoginUser getLoginUser(String token) - { + public static LoginUser getLoginUser(String token) { return authLogic.getLoginUser(token); } /** * 楠岃瘉褰撳墠鐢ㄦ埛鏈夋晥鏈 */ - public static void verifyLoginUserExpire(LoginUser loginUser) - { + public static void verifyLoginUserExpire(LoginUser loginUser) { authLogic.verifyLoginUserExpire(loginUser); } /** * 褰撳墠璐﹀彿鏄惁鍚湁鎸囧畾瑙掕壊鏍囪瘑, 杩斿洖true鎴杅alse - * + * * @param role 瑙掕壊鏍囪瘑 * @return 鏄惁鍚湁鎸囧畾瑙掕壊鏍囪瘑 */ - public static boolean hasRole(String role) - { + public static boolean hasRole(String role) { return authLogic.hasRole(role); } /** * 褰撳墠璐﹀彿鏄惁鍚湁鎸囧畾瑙掕壊鏍囪瘑, 濡傛灉楠岃瘉鏈氳繃锛屽垯鎶涘嚭寮傚父: NotRoleException - * + * * @param role 瑙掕壊鏍囪瘑 */ - public static void checkRole(String role) - { + public static void checkRole(String role) { authLogic.checkRole(role); } /** * 鏍规嵁娉ㄨВ浼犲叆鍙傛暟閴存潈, 濡傛灉楠岃瘉鏈氳繃锛屽垯鎶涘嚭寮傚父: NotRoleException - * + * * @param requiresRoles 瑙掕壊鏉冮檺娉ㄨВ */ - public static void checkRole(RequiresRoles requiresRoles) - { + public static void checkRole(RequiresRoles requiresRoles) { authLogic.checkRole(requiresRoles); } /** * 褰撳墠璐﹀彿鏄惁鍚湁鎸囧畾瑙掕壊鏍囪瘑 [鎸囧畾澶氫釜锛屽繀椤诲叏閮ㄩ獙璇侀氳繃] - * + * * @param roles 瑙掕壊鏍囪瘑鏁扮粍 */ - public static void checkRoleAnd(String... roles) - { + public static void checkRoleAnd(String... roles) { authLogic.checkRoleAnd(roles); } /** * 褰撳墠璐﹀彿鏄惁鍚湁鎸囧畾瑙掕壊鏍囪瘑 [鎸囧畾澶氫釜锛屽彧瑕佸叾涓楠岃瘉閫氳繃鍗冲彲] - * + * * @param roles 瑙掕壊鏍囪瘑鏁扮粍 */ - public static void checkRoleOr(String... roles) - { + public static void checkRoleOr(String... roles) { authLogic.checkRoleOr(roles); } /** * 褰撳墠璐﹀彿鏄惁鍚湁鎸囧畾鏉冮檺, 杩斿洖true鎴杅alse - * + * * @param permission 鏉冮檺鐮 * @return 鏄惁鍚湁鎸囧畾鏉冮檺 */ - public static boolean hasPermi(String permission) - { + public static boolean hasPermi(String permission) { return authLogic.hasPermi(permission); } /** * 褰撳墠璐﹀彿鏄惁鍚湁鎸囧畾鏉冮檺, 濡傛灉楠岃瘉鏈氳繃锛屽垯鎶涘嚭寮傚父: NotPermissionException - * + * * @param permission 鏉冮檺鐮 */ - public static void checkPermi(String permission) - { + public static void checkPermi(String permission) { authLogic.checkPermi(permission); } /** * 鏍规嵁娉ㄨВ浼犲叆鍙傛暟閴存潈, 濡傛灉楠岃瘉鏈氳繃锛屽垯鎶涘嚭寮傚父: NotPermissionException - * + * * @param requiresPermissions 鏉冮檺娉ㄨВ */ - public static void checkPermi(RequiresPermissions requiresPermissions) - { + public static void checkPermi(RequiresPermissions requiresPermissions) { authLogic.checkPermi(requiresPermissions); } /** * 褰撳墠璐﹀彿鏄惁鍚湁鎸囧畾鏉冮檺 [鎸囧畾澶氫釜锛屽繀椤诲叏閮ㄩ獙璇侀氳繃] - * + * * @param permissions 鏉冮檺鐮佹暟缁 */ - public static void checkPermiAnd(String... permissions) - { + public static void checkPermiAnd(String... permissions) { authLogic.checkPermiAnd(permissions); } /** * 褰撳墠璐﹀彿鏄惁鍚湁鎸囧畾鏉冮檺 [鎸囧畾澶氫釜锛屽彧瑕佸叾涓楠岃瘉閫氳繃鍗冲彲] - * + * * @param permissions 鏉冮檺鐮佹暟缁 */ - public static void checkPermiOr(String... permissions) - { + public static void checkPermiOr(String... permissions) { authLogic.checkPermiOr(permissions); } } diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java index 990ebb5b..baffebfb 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java @@ -10,14 +10,12 @@ import java.util.TimeZone; * * @author ruoyi */ -public class ApplicationConfig -{ +public class ApplicationConfig { /** * 鏃跺尯閰嶇疆 */ @Bean - public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization() - { + public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization() { return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(TimeZone.getDefault()); } } diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java index 8f5d6411..ea46b18e 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java @@ -9,14 +9,14 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * * @author ruoyi */ -public class WebMvcConfig implements WebMvcConfigurer -{ - /** 涓嶉渶瑕佹嫤鎴湴鍧 */ - public static final String[] EXCLUDE_URLS = { "/login", "/logout", "/refresh" }; +public class WebMvcConfig implements WebMvcConfigurer { + /** + * 涓嶉渶瑕佹嫤鎴湴鍧 + */ + public static final String[] EXCLUDE_URLS = {"/login", "/logout", "/refresh"}; @Override - public void addInterceptors(InterceptorRegistry registry) - { + public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(getHeaderInterceptor()) .addPathPatterns("/**") .excludePathPatterns(EXCLUDE_URLS) @@ -26,8 +26,7 @@ public class WebMvcConfig implements WebMvcConfigurer /** * 鑷畾涔夎姹傚ご鎷︽埅鍣 */ - public HeaderInterceptor getHeaderInterceptor() - { + public HeaderInterceptor getHeaderInterceptor() { return new HeaderInterceptor(); } } diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java index a3462a82..a81918c8 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java @@ -10,11 +10,9 @@ import org.springframework.context.annotation.Configuration; * @author ruoyi **/ @Configuration -public class FeignAutoConfiguration -{ +public class FeignAutoConfiguration { @Bean - public RequestInterceptor requestInterceptor() - { + public RequestInterceptor requestInterceptor() { return new FeignRequestInterceptor(); } } diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java index 4cd5b471..87e76f35 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java @@ -13,33 +13,27 @@ import java.util.Map; /** * feign 璇锋眰鎷︽埅鍣 - * + * * @author ruoyi */ @Component -public class FeignRequestInterceptor implements RequestInterceptor -{ +public class FeignRequestInterceptor implements RequestInterceptor { @Override - public void apply(RequestTemplate requestTemplate) - { + public void apply(RequestTemplate requestTemplate) { HttpServletRequest httpServletRequest = ServletUtils.getRequest(); - if (StringUtils.isNotNull(httpServletRequest)) - { + if (StringUtils.isNotNull(httpServletRequest)) { Map headers = ServletUtils.getHeaders(httpServletRequest); // 浼犻掔敤鎴蜂俊鎭姹傚ご锛岄槻姝涪澶 String userId = headers.get(SecurityConstants.DETAILS_USER_ID); - if (StringUtils.isNotEmpty(userId)) - { + if (StringUtils.isNotEmpty(userId)) { requestTemplate.header(SecurityConstants.DETAILS_USER_ID, userId); } String userName = headers.get(SecurityConstants.DETAILS_USERNAME); - if (StringUtils.isNotEmpty(userName)) - { + if (StringUtils.isNotEmpty(userName)) { requestTemplate.header(SecurityConstants.DETAILS_USERNAME, userName); } String authentication = headers.get(SecurityConstants.AUTHORIZATION_HEADER); - if (StringUtils.isNotEmpty(authentication)) - { + if (StringUtils.isNotEmpty(authentication)) { requestTemplate.header(SecurityConstants.AUTHORIZATION_HEADER, authentication); } diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java index c39de53f..d8c791ca 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java @@ -20,20 +20,18 @@ import javax.servlet.http.HttpServletRequest; /** * 鍏ㄥ眬寮傚父澶勭悊鍣 - * + * * @author ruoyi */ @RestControllerAdvice -public class GlobalExceptionHandler -{ +public class GlobalExceptionHandler { private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class); /** * 鏉冮檺鐮佸紓甯 */ @ExceptionHandler(NotPermissionException.class) - public AjaxResult handleNotPermissionException(NotPermissionException e, HttpServletRequest request) - { + public AjaxResult handleNotPermissionException(NotPermissionException e, HttpServletRequest request) { String requestUri = request.getRequestURI(); log.error("璇锋眰鍦板潃'{}',鏉冮檺鐮佹牎楠屽け璐'{}'", requestUri, e.getMessage()); return AjaxResult.error(HttpStatus.FORBIDDEN, "娌℃湁璁块棶鏉冮檺锛岃鑱旂郴绠＄悊鍛樻巿鏉"); @@ -43,8 +41,7 @@ public class GlobalExceptionHandler * 瑙掕壊鏉冮檺寮傚父 */ @ExceptionHandler(NotRoleException.class) - public AjaxResult handleNotRoleException(NotRoleException e, HttpServletRequest request) - { + public AjaxResult handleNotRoleException(NotRoleException e, HttpServletRequest request) { String requestUri = request.getRequestURI(); log.error("璇锋眰鍦板潃'{}',瑙掕壊鏉冮檺鏍￠獙澶辫触'{}'", requestUri, e.getMessage()); return AjaxResult.error(HttpStatus.FORBIDDEN, "娌℃湁璁块棶鏉冮檺锛岃鑱旂郴绠＄悊鍛樻巿鏉"); @@ -55,8 +52,7 @@ public class GlobalExceptionHandler */ @ExceptionHandler(HttpRequestMethodNotSupportedException.class) public AjaxResult handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException e, - HttpServletRequest request) - { + HttpServletRequest request) { String requestUri = request.getRequestURI(); log.error("璇锋眰鍦板潃'{}',涓嶆敮鎸'{}'璇锋眰", requestUri, e.getMethod()); return AjaxResult.error(e.getMessage()); @@ -66,8 +62,7 @@ public class GlobalExceptionHandler * 涓氬姟寮傚父 */ @ExceptionHandler(ServiceException.class) - public AjaxResult handleServiceException(ServiceException e, HttpServletRequest request) - { + public AjaxResult handleServiceException(ServiceException e, HttpServletRequest request) { log.error(e.getMessage(), e); Integer code = e.getCode(); return StringUtils.isNotNull(code) ? AjaxResult.error(code, e.getMessage()) : AjaxResult.error(e.getMessage()); @@ -77,8 +72,7 @@ public class GlobalExceptionHandler * 鎷︽埅鏈煡鐨勮繍琛屾椂寮傚父 */ @ExceptionHandler(RuntimeException.class) - public AjaxResult handleRuntimeException(RuntimeException e, HttpServletRequest request) - { + public AjaxResult handleRuntimeException(RuntimeException e, HttpServletRequest request) { String requestUri = request.getRequestURI(); log.error("璇锋眰鍦板潃'{}',鍙戠敓鏈煡寮傚父.", requestUri, e); return AjaxResult.error(e.getMessage()); @@ -88,8 +82,7 @@ public class GlobalExceptionHandler * 绯荤粺寮傚父 */ @ExceptionHandler(Exception.class) - public AjaxResult handleException(Exception e, HttpServletRequest request) - { + public AjaxResult handleException(Exception e, HttpServletRequest request) { String requestUri = request.getRequestURI(); log.error("璇锋眰鍦板潃'{}',鍙戠敓绯荤粺寮傚父.", requestUri, e); return AjaxResult.error(e.getMessage()); @@ -99,8 +92,7 @@ public class GlobalExceptionHandler * 鑷畾涔夐獙璇佸紓甯 */ @ExceptionHandler(BindException.class) - public AjaxResult handleBindException(BindException e) - { + public AjaxResult handleBindException(BindException e) { log.error(e.getMessage(), e); String message = e.getAllErrors().get(0).getDefaultMessage(); return AjaxResult.error(message); @@ -110,8 +102,7 @@ public class GlobalExceptionHandler * 鑷畾涔夐獙璇佸紓甯 */ @ExceptionHandler(MethodArgumentNotValidException.class) - public Object handleMethodArgumentNotValidException(MethodArgumentNotValidException e) - { + public Object handleMethodArgumentNotValidException(MethodArgumentNotValidException e) { log.error(e.getMessage(), e); String message = e.getBindingResult().getFieldError().getDefaultMessage(); return AjaxResult.error(message); @@ -121,8 +112,7 @@ public class GlobalExceptionHandler * 鍐呴儴璁よ瘉寮傚父 */ @ExceptionHandler(InnerAuthException.class) - public AjaxResult handleInnerAuthException(InnerAuthException e) - { + public AjaxResult handleInnerAuthException(InnerAuthException e) { return AjaxResult.error(e.getMessage()); } @@ -130,8 +120,7 @@ public class GlobalExceptionHandler * 婕旂ず妯″紡寮傚父 */ @ExceptionHandler(DemoModeException.class) - public AjaxResult handleDemoModeException(DemoModeException e) - { + public AjaxResult handleDemoModeException(DemoModeException e) { return AjaxResult.error("婕旂ず妯″紡锛屼笉鍏佽鎿嶄綔"); } } diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java index bfc58ffe..608b4bfa 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java @@ -19,13 +19,10 @@ import javax.servlet.http.HttpServletResponse; * * @author ruoyi */ -public class HeaderInterceptor implements AsyncHandlerInterceptor -{ +public class HeaderInterceptor implements AsyncHandlerInterceptor { @Override - public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception - { - if (!(handler instanceof HandlerMethod)) - { + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { + if (!(handler instanceof HandlerMethod)) { return true; } @@ -34,11 +31,9 @@ public class HeaderInterceptor implements AsyncHandlerInterceptor SecurityContextHolder.setUserKey(ServletUtils.getHeader(request, SecurityConstants.USER_KEY)); String token = SecurityUtils.getToken(); - if (StringUtils.isNotEmpty(token)) - { + if (StringUtils.isNotEmpty(token)) { LoginUser loginUser = AuthUtil.getLoginUser(token); - if (StringUtils.isNotNull(loginUser)) - { + if (StringUtils.isNotNull(loginUser)) { AuthUtil.verifyLoginUserExpire(loginUser); SecurityContextHolder.set(SecurityConstants.LOGIN_USER, loginUser); } @@ -48,8 +43,7 @@ public class HeaderInterceptor implements AsyncHandlerInterceptor @Override public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) - throws Exception - { + throws Exception { SecurityContextHolder.remove(); } } diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java index 0359a3dd..7f5ef121 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java @@ -20,30 +20,24 @@ import java.util.concurrent.TimeUnit; /** * token楠岃瘉澶勭悊 - * + * * @author ruoyi */ @Component -public class TokenService -{ - @Autowired - private RedisService redisService; - +public class TokenService { protected static final long MILLIS_SECOND = 1000; - protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND; - + private final static Long MILLIS_MINUTE_TEN = CacheConstants.REFRESH_TIME * MILLIS_MINUTE; private final static long EXPIRE_TIME = CacheConstants.EXPIRATION; private final static String ACCESS_TOKEN = CacheConstants.LOGIN_TOKEN_KEY; - - private final static Long MILLIS_MINUTE_TEN = CacheConstants.REFRESH_TIME * MILLIS_MINUTE; + @Autowired + private RedisService redisService; /** * 鍒涘缓浠ょ墝 */ - public Map createToken(LoginUser loginUser) - { + public Map createToken(LoginUser loginUser) { String token = IdUtils.fastuuid(); Long userId = loginUser.getSysUser().getUserId(); String userName = loginUser.getSysUser().getUserName(); @@ -71,18 +65,25 @@ public class TokenService * * @return 鐢ㄦ埛淇℃伅 */ - public LoginUser getLoginUser() - { + public LoginUser getLoginUser() { return getLoginUser(ServletUtils.getRequest()); } + /** + * 璁剧疆鐢ㄦ埛韬唤淇℃伅 + */ + public void setLoginUser(LoginUser loginUser) { + if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken())) { + refreshToken(loginUser); + } + } + /** * 鑾峰彇鐢ㄦ埛韬唤淇℃伅 * * @return 鐢ㄦ埛淇℃伅 */ - public LoginUser getLoginUser(HttpServletRequest request) - { + public LoginUser getLoginUser(HttpServletRequest request) { // 鑾峰彇璇锋眰鎼哄甫鐨勪护鐗 String token = SecurityUtils.getToken(request); return getLoginUser(token); @@ -93,42 +94,24 @@ public class TokenService * * @return 鐢ㄦ埛淇℃伅 */ - public LoginUser getLoginUser(String token) - { + public LoginUser getLoginUser(String token) { LoginUser user = null; - try - { - if (StringUtils.isNotEmpty(token)) - { + try { + if (StringUtils.isNotEmpty(token)) { String userkey = JwtUtils.getUserKey(token); user = redisService.getCacheObject(getTokenKey(userkey)); return user; } - } - catch (Exception e) - { + } catch (Exception e) { } return user; } - /** - * 璁剧疆鐢ㄦ埛韬唤淇℃伅 - */ - public void setLoginUser(LoginUser loginUser) - { - if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken())) - { - refreshToken(loginUser); - } - } - /** * 鍒犻櫎鐢ㄦ埛缂撳瓨淇℃伅 */ - public void delLoginUser(String token) - { - if (StringUtils.isNotEmpty(token)) - { + public void delLoginUser(String token) { + if (StringUtils.isNotEmpty(token)) { String userkey = JwtUtils.getUserKey(token); redisService.deleteObject(getTokenKey(userkey)); } @@ -139,12 +122,10 @@ public class TokenService * * @param loginUser */ - public void verifyToken(LoginUser loginUser) - { + public void verifyToken(LoginUser loginUser) { long expireTime = loginUser.getExpireTime(); long currentTime = System.currentTimeMillis(); - if (expireTime - currentTime <= MILLIS_MINUTE_TEN) - { + if (expireTime - currentTime <= MILLIS_MINUTE_TEN) { refreshToken(loginUser); } } @@ -154,8 +135,7 @@ public class TokenService * * @param loginUser 鐧诲綍淇℃伅 */ - public void refreshToken(LoginUser loginUser) - { + public void refreshToken(LoginUser loginUser) { loginUser.setLoginTime(System.currentTimeMillis()); loginUser.setExpireTime(loginUser.getLoginTime() + EXPIRE_TIME * MILLIS_MINUTE); // 鏍规嵁uuid灏唋oginUser缂撳瓨 @@ -163,8 +143,7 @@ public class TokenService redisService.setCacheObject(userKey, loginUser, EXPIRE_TIME, TimeUnit.MINUTES); } - private String getTokenKey(String token) - { + private String getTokenKey(String token) { return ACCESS_TOKEN + token; } } diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java index 4fdd4eb2..de8ed1a4 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java @@ -11,33 +11,29 @@ import java.util.List; /** * 瀛楀吀宸ュ叿绫 - * + * * @author ruoyi */ -public class DictUtils -{ +public class DictUtils { /** * 璁剧疆瀛楀吀缂撳瓨 - * - * @param key 鍙傛暟閿 + * + * @param key 鍙傛暟閿 * @param dictDatas 瀛楀吀鏁版嵁鍒楄〃 */ - public static void setDictCache(String key, List dictDatas) - { + public static void setDictCache(String key, List dictDatas) { SpringUtils.getBean(RedisService.class).setCacheObject(getCacheKey(key), dictDatas); } /** * 鑾峰彇瀛楀吀缂撳瓨 - * + * * @param key 鍙傛暟閿 * @return dictDatas 瀛楀吀鏁版嵁鍒楄〃 */ - public static List getDictCache(String key) - { + public static List getDictCache(String key) { Object cacheObj = SpringUtils.getBean(RedisService.class).getCacheObject(getCacheKey(key)); - if (StringUtils.isNotNull(cacheObj)) - { + if (StringUtils.isNotNull(cacheObj)) { return StringUtils.cast(cacheObj); } return null; @@ -45,31 +41,28 @@ public class DictUtils /** * 鍒犻櫎鎸囧畾瀛楀吀缂撳瓨 - * + * * @param key 瀛楀吀閿 */ - public static void removeDictCache(String key) - { + public static void removeDictCache(String key) { SpringUtils.getBean(RedisService.class).deleteObject(getCacheKey(key)); } /** * 娓呯┖瀛楀吀缂撳瓨 */ - public static void clearDictCache() - { + public static void clearDictCache() { Collection keys = SpringUtils.getBean(RedisService.class).keys(Constants.SYS_DICT_KEY + "*"); SpringUtils.getBean(RedisService.class).deleteObject(keys); } /** * 璁剧疆cache key - * + * * @param configKey 鍙傛暟閿 * @return 缂撳瓨閿甼ey */ - public static String getCacheKey(String configKey) - { + public static String getCacheKey(String configKey) { return Constants.SYS_DICT_KEY + configKey; } } diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java index 90a7807d..34c406bc 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java @@ -12,56 +12,49 @@ import javax.servlet.http.HttpServletRequest; /** * 鏉冮檺鑾峰彇宸ュ叿绫 - * + * * @author ruoyi */ -public class SecurityUtils -{ +public class SecurityUtils { /** * 鑾峰彇鐢ㄦ埛ID */ - public static Long getUserId() - { + public static Long getUserId() { return SecurityContextHolder.getUserId(); } /** * 鑾峰彇鐢ㄦ埛鍚嶇О */ - public static String getUsername() - { + public static String getUsername() { return SecurityContextHolder.getUserName(); } /** * 鑾峰彇鐢ㄦ埛key */ - public static String getUserKey() - { + public static String getUserKey() { return SecurityContextHolder.getUserKey(); } /** * 鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅 */ - public static LoginUser getLoginUser() - { + public static LoginUser getLoginUser() { return SecurityContextHolder.get(SecurityConstants.LOGIN_USER, LoginUser.class); } /** * 鑾峰彇璇锋眰token */ - public static String getToken() - { + public static String getToken() { return getToken(ServletUtils.getRequest()); } /** * 鏍规嵁request鑾峰彇璇锋眰token */ - public static String getToken(HttpServletRequest request) - { + public static String getToken(HttpServletRequest request) { // 浠巋eader鑾峰彇token鏍囪瘑 String token = request.getHeader(TokenConstants.AUTHENTICATION); return replaceTokenPrefix(token); @@ -70,11 +63,9 @@ public class SecurityUtils /** * 瑁佸壀token鍓嶇紑 */ - public static String replaceTokenPrefix(String token) - { + public static String replaceTokenPrefix(String token) { // 濡傛灉鍓嶇璁剧疆浜嗕护鐗屽墠缂锛屽垯瑁佸壀鎺夊墠缂 - if (StringUtils.isNotEmpty(token) && token.startsWith(TokenConstants.PREFIX)) - { + if (StringUtils.isNotEmpty(token) && token.startsWith(TokenConstants.PREFIX)) { token = token.replaceFirst(TokenConstants.PREFIX, ""); } return token; @@ -82,12 +73,11 @@ public class SecurityUtils /** * 鏄惁涓虹鐞嗗憳 - * + * * @param userId 鐢ㄦ埛ID * @return 缁撴灉 */ - public static boolean isAdmin(Long userId) - { + public static boolean isAdmin(Long userId) { return userId != null && 1L == userId; } @@ -97,8 +87,7 @@ public class SecurityUtils * @param password 瀵嗙爜 * @return 鍔犲瘑瀛楃涓 */ - public static String encryptPassword(String password) - { + public static String encryptPassword(String password) { BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); return passwordEncoder.encode(password); } @@ -106,12 +95,11 @@ public class SecurityUtils /** * 鍒ゆ柇瀵嗙爜鏄惁鐩稿悓 * - * @param rawPassword 鐪熷疄瀵嗙爜 + * @param rawPassword 鐪熷疄瀵嗙爜 * @param encodedPassword 鍔犲瘑鍚庡瓧绗 * @return 缁撴灉 */ - public static boolean matchesPassword(String rawPassword, String encodedPassword) - { + public static boolean matchesPassword(String rawPassword, String encodedPassword) { BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); return passwordEncoder.matches(rawPassword, encodedPassword); } diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/annotation/EnableCustomSwagger2.java b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/annotation/EnableCustomSwagger2.java index 1e7d276e..1b2e2d3e 100644 --- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/annotation/EnableCustomSwagger2.java +++ b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/annotation/EnableCustomSwagger2.java @@ -8,12 +8,11 @@ import java.lang.annotation.*; /** * @author pan */ -@Target({ ElementType.TYPE }) +@Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) @Documented @Inherited -@Import({ SwaggerAutoConfiguration.class }) -public @interface EnableCustomSwagger2 -{ +@Import({SwaggerAutoConfiguration.class}) +public @interface EnableCustomSwagger2 { } diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java index df273e6e..d8121b2f 100644 --- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java +++ b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java @@ -27,7 +27,7 @@ import java.util.function.Predicate; @EnableSwagger2 @EnableAutoConfiguration @ConditionalOnProperty(name = "swagger.enabled", matchIfMissing = true) -public class SwaggerAutoConfiguration{ +public class SwaggerAutoConfiguration { /** * 榛樿鐨勬帓闄よ矾寰勶紝鎺掗櫎Spring Boot榛樿鐨勯敊璇鐞嗚矾寰勫拰绔偣 */ @@ -37,17 +37,14 @@ public class SwaggerAutoConfiguration{ @Bean @ConditionalOnMissingBean - public SwaggerProperties swaggerProperties() - { + public SwaggerProperties swaggerProperties() { return new SwaggerProperties(); } @Bean - public Docket api(SwaggerProperties swaggerProperties) - { + public Docket api(SwaggerProperties swaggerProperties) { // base-path澶勭悊 - if (swaggerProperties.getBasePath().isEmpty()) - { + if (swaggerProperties.getBasePath().isEmpty()) { swaggerProperties.getBasePath().add(BASE_PATH); } // noinspection unchecked @@ -55,8 +52,7 @@ public class SwaggerAutoConfiguration{ swaggerProperties.getBasePath().forEach(path -> basePath.add(PathSelectors.ant(path))); // exclude-path澶勭悊 - if (swaggerProperties.getExcludePath().isEmpty()) - { + if (swaggerProperties.getExcludePath().isEmpty()) { swaggerProperties.getExcludePath().addAll(DEFAULT_EXCLUDE_PATH); } @@ -76,8 +72,7 @@ public class SwaggerAutoConfiguration{ /** * 瀹夊叏妯″紡锛岃繖閲屾寚瀹歵oken閫氳繃Authorization澶磋姹傚ご浼犻 */ - private List securitySchemes() - { + private List securitySchemes() { List apiKeyList = new ArrayList(); apiKeyList.add(new ApiKey("Authorization", "Authorization", "header")); return apiKeyList; @@ -86,8 +81,7 @@ public class SwaggerAutoConfiguration{ /** * 瀹夊叏涓婁笅鏂 */ - private List securityContexts() - { + private List securityContexts() { List securityContexts = new ArrayList<>(); securityContexts.add( SecurityContext.builder() @@ -102,8 +96,7 @@ public class SwaggerAutoConfiguration{ * * @return */ - private List defaultAuth() - { + private List defaultAuth() { AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything"); AuthorizationScope[] authorizationScopes = new AuthorizationScope[1]; authorizationScopes[0] = authorizationScope; @@ -112,16 +105,15 @@ public class SwaggerAutoConfiguration{ return securityReferences; } - private ApiInfo apiInfo(SwaggerProperties swaggerProperties) - { - return new ApiInfoBuilder() - .title(swaggerProperties.getTitle()) - .description(swaggerProperties.getDescription()) - .license(swaggerProperties.getLicense()) - .licenseUrl(swaggerProperties.getLicenseUrl()) - .termsOfServiceUrl(swaggerProperties.getTermsOfServiceUrl()) - .contact(new Contact(swaggerProperties.getContact().getName(), swaggerProperties.getContact().getUrl(), swaggerProperties.getContact().getEmail())) - .version(swaggerProperties.getVersion()) - .build(); + private ApiInfo apiInfo(SwaggerProperties swaggerProperties) { + return new ApiInfoBuilder() + .title(swaggerProperties.getTitle()) + .description(swaggerProperties.getDescription()) + .license(swaggerProperties.getLicense()) + .licenseUrl(swaggerProperties.getLicenseUrl()) + .termsOfServiceUrl(swaggerProperties.getTermsOfServiceUrl()) + .contact(new Contact(swaggerProperties.getContact().getName(), swaggerProperties.getContact().getUrl(), swaggerProperties.getContact().getEmail())) + .version(swaggerProperties.getVersion()) + .build(); } } diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerBeanPostProcessor.java b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerBeanPostProcessor.java index 8929adfb..e41e1ce7 100644 --- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerBeanPostProcessor.java +++ b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerBeanPostProcessor.java @@ -18,20 +18,16 @@ import java.util.stream.Collectors; * @author ruoyi */ @Component -public class SwaggerBeanPostProcessor implements BeanPostProcessor -{ +public class SwaggerBeanPostProcessor implements BeanPostProcessor { @Override - public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException - { - if (bean instanceof WebMvcRequestHandlerProvider || bean instanceof WebFluxRequestHandlerProvider) - { + public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { + if (bean instanceof WebMvcRequestHandlerProvider || bean instanceof WebFluxRequestHandlerProvider) { customizeSpringfoxHandlerMappings(getHandlerMappings(bean)); } return bean; } - private void customizeSpringfoxHandlerMappings(List mappings) - { + private void customizeSpringfoxHandlerMappings(List mappings) { List copy = mappings.stream().filter(mapping -> mapping.getPatternParser() == null) .collect(Collectors.toList()); mappings.clear(); @@ -39,16 +35,12 @@ public class SwaggerBeanPostProcessor implements BeanPostProcessor } @SuppressWarnings("unchecked") - private List getHandlerMappings(Object bean) - { - try - { + private List getHandlerMappings(Object bean) { + try { Field field = ReflectionUtils.findField(bean.getClass(), "handlerMappings"); field.setAccessible(true); return (List) field.get(bean); - } - catch (IllegalArgumentException | IllegalAccessException e) - { + } catch (IllegalArgumentException | IllegalAccessException e) { throw new IllegalStateException(e); } } diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerProperties.java b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerProperties.java index 81619ba4..cb3e14f5 100644 --- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerProperties.java +++ b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerProperties.java @@ -11,8 +11,7 @@ import java.util.List; */ @Component @ConfigurationProperties("swagger") -public class SwaggerProperties -{ +public class SwaggerProperties { /** * 鏄惁寮鍚痵wagger */ @@ -78,138 +77,111 @@ public class SwaggerProperties **/ private Authorization authorization = new Authorization(); - public Boolean getEnabled() - { + public Boolean getEnabled() { return enabled; } - public void setEnabled(Boolean enabled) - { + public void setEnabled(Boolean enabled) { this.enabled = enabled; } - public String getBasePackage() - { + public String getBasePackage() { return basePackage; } - public void setBasePackage(String basePackage) - { + public void setBasePackage(String basePackage) { this.basePackage = basePackage; } - public List getBasePath() - { + public List getBasePath() { return basePath; } - public void setBasePath(List basePath) - { + public void setBasePath(List basePath) { this.basePath = basePath; } - public List getExcludePath() - { + public List getExcludePath() { return excludePath; } - public void setExcludePath(List excludePath) - { + public void setExcludePath(List excludePath) { this.excludePath = excludePath; } - public String getTitle() - { + public String getTitle() { return title; } - public void setTitle(String title) - { + public void setTitle(String title) { this.title = title; } - public String getDescription() - { + public String getDescription() { return description; } - public void setDescription(String description) - { + public void setDescription(String description) { this.description = description; } - public String getVersion() - { + public String getVersion() { return version; } - public void setVersion(String version) - { + public void setVersion(String version) { this.version = version; } - public String getLicense() - { + public String getLicense() { return license; } - public void setLicense(String license) - { + public void setLicense(String license) { this.license = license; } - public String getLicenseUrl() - { + public String getLicenseUrl() { return licenseUrl; } - public void setLicenseUrl(String licenseUrl) - { + public void setLicenseUrl(String licenseUrl) { this.licenseUrl = licenseUrl; } - public String getTermsOfServiceUrl() - { + public String getTermsOfServiceUrl() { return termsOfServiceUrl; } - public void setTermsOfServiceUrl(String termsOfServiceUrl) - { + public void setTermsOfServiceUrl(String termsOfServiceUrl) { this.termsOfServiceUrl = termsOfServiceUrl; } - public String getHost() - { + public String getHost() { return host; } - public void setHost(String host) - { + public void setHost(String host) { this.host = host; } - public Contact getContact() - { + public Contact getContact() { return contact; } - public void setContact(Contact contact) - { + public void setContact(Contact contact) { this.contact = contact; } - public Authorization getAuthorization() - { + public Authorization getAuthorization() { return authorization; } - public void setAuthorization(Authorization authorization) - { + public void setAuthorization(Authorization authorization) { this.authorization = authorization; } - public static class Contact - { + public static class Contact { /** * 鑱旂郴浜 **/ @@ -223,39 +195,32 @@ public class SwaggerProperties **/ private String email = ""; - public String getName() - { + public String getName() { return name; } - public void setName(String name) - { + public void setName(String name) { this.name = name; } - public String getUrl() - { + public String getUrl() { return url; } - public void setUrl(String url) - { + public void setUrl(String url) { this.url = url; } - public String getEmail() - { + public String getEmail() { return email; } - public void setEmail(String email) - { + public void setEmail(String email) { this.email = email; } } - public static class Authorization - { + public static class Authorization { /** * 閴存潈绛栫暐ID锛岄渶瑕佸拰SecurityReferences ID淇濇寔涓鑷 */ @@ -273,49 +238,40 @@ public class SwaggerProperties private List tokenUrlList = new ArrayList<>(); - public String getName() - { + public String getName() { return name; } - public void setName(String name) - { + public void setName(String name) { this.name = name; } - public String getAuthRegex() - { + public String getAuthRegex() { return authRegex; } - public void setAuthRegex(String authRegex) - { + public void setAuthRegex(String authRegex) { this.authRegex = authRegex; } - public List getAuthorizationScopeList() - { + public List getAuthorizationScopeList() { return authorizationScopeList; } - public void setAuthorizationScopeList(List authorizationScopeList) - { + public void setAuthorizationScopeList(List authorizationScopeList) { this.authorizationScopeList = authorizationScopeList; } - public List getTokenUrlList() - { + public List getTokenUrlList() { return tokenUrlList; } - public void setTokenUrlList(List tokenUrlList) - { + public void setTokenUrlList(List tokenUrlList) { this.tokenUrlList = tokenUrlList; } } - public static class AuthorizationScope - { + public static class AuthorizationScope { /** * 浣滅敤鍩熷悕绉 */ @@ -326,23 +282,19 @@ public class SwaggerProperties */ private String description = ""; - public String getScope() - { + public String getScope() { return scope; } - public void setScope(String scope) - { + public void setScope(String scope) { this.scope = scope; } - public String getDescription() - { + public String getDescription() { return description; } - public void setDescription(String description) - { + public void setDescription(String description) { this.description = description; } } diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java index 424e8c3c..5adf409f 100644 --- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java +++ b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java @@ -6,15 +6,13 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; /** * swagger 璧勬簮鏄犲皠璺緞 - * + * * @author ruoyi */ @Configuration -public class SwaggerWebConfiguration implements WebMvcConfigurer -{ +public class SwaggerWebConfiguration implements WebMvcConfigurer { @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) - { + public void addResourceHandlers(ResourceHandlerRegistry registry) { /** swagger-ui 鍦板潃 */ registry.addResourceHandler("/swagger-ui/**") .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/"); diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java index c6f7db68..bc090cee 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java @@ -6,14 +6,12 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; /** * 缃戝叧鍚姩绋嬪簭 - * + * * @author ruoyi */ -@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) -public class RuoYiGatewayApplication -{ - public static void main(String[] args) - { +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) +public class RuoYiGatewayApplication { + public static void main(String[] args) { SpringApplication.run(RuoYiGatewayApplication.class, args); System.out.println("(鈾モ棤鈥库棤)锞夛緸 鑻ヤ緷缃戝叧鍚姩鎴愬姛 醿(麓凇`醿)锞 \n" + " .-------. ____ __ \n" + diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java index 0679f991..7267e824 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java @@ -11,15 +11,13 @@ import static com.google.code.kaptcha.Constants.*; /** * 楠岃瘉鐮侀厤缃 - * + * * @author ruoyi */ @Configuration -public class CaptchaConfig -{ +public class CaptchaConfig { @Bean(name = "captchaProducer") - public DefaultKaptcha getKaptchaBean() - { + public DefaultKaptcha getKaptchaBean() { DefaultKaptcha defaultKaptcha = new DefaultKaptcha(); Properties properties = new Properties(); // 鏄惁鏈夎竟妗 榛樿涓簍rue 鎴戜滑鍙互鑷繁璁剧疆yes锛宯o @@ -44,10 +42,9 @@ public class CaptchaConfig defaultKaptcha.setConfig(config); return defaultKaptcha; } - + @Bean(name = "captchaProducerMath") - public DefaultKaptcha getKaptchaBeanMath() - { + public DefaultKaptcha getKaptchaBeanMath() { DefaultKaptcha defaultKaptcha = new DefaultKaptcha(); Properties properties = new Properties(); // 鏄惁鏈夎竟妗 榛樿涓簍rue 鎴戜滑鍙互鑷繁璁剧疆yes锛宯o diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java index b133a7d8..7a42013e 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java @@ -8,16 +8,14 @@ import org.springframework.core.annotation.Order; /** * 缃戝叧闄愭祦閰嶇疆 - * + * * @author ruoyi */ @Configuration -public class GatewayConfig -{ +public class GatewayConfig { @Bean @Order(Ordered.HIGHEST_PRECEDENCE) - public SentinelFallbackHandler sentinelGatewayExceptionHandler() - { + public SentinelFallbackHandler sentinelGatewayExceptionHandler() { return new SentinelFallbackHandler(); } } \ No newline at end of file diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java index ac6bb815..284ce8d4 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java @@ -6,16 +6,14 @@ import java.util.Random; /** * 楠岃瘉鐮佹枃鏈敓鎴愬櫒 - * + * * @author ruoyi */ -public class KaptchaTextCreator extends DefaultTextCreator -{ +public class KaptchaTextCreator extends DefaultTextCreator { private static final String[] CNUMBERS = "0,1,2,3,4,5,6,7,8,9,10".split(","); @Override - public String getText() - { + public String getText() { Integer result = 0; Random random = new Random(); int x = random.nextInt(10); @@ -28,8 +26,7 @@ public class KaptchaTextCreator extends DefaultTextCreator suChinese.append(CNUMBERS[x]); suChinese.append("*"); suChinese.append(CNUMBERS[y]); - } - else if (randomoperands == 1) { + } else if (randomoperands == 1) { if ((x != 0) && y % x == 0) { result = y / x; suChinese.append(CNUMBERS[y]); @@ -42,23 +39,18 @@ public class KaptchaTextCreator extends DefaultTextCreator suChinese.append(CNUMBERS[y]); } } else if (randomoperands == randomoperandsInt) { - if (x >= y) - { + if (x >= y) { result = x - y; suChinese.append(CNUMBERS[x]); suChinese.append("-"); suChinese.append(CNUMBERS[y]); - } - else - { + } else { result = y - x; suChinese.append(CNUMBERS[y]); suChinese.append("-"); suChinese.append(CNUMBERS[x]); } - } - else - { + } else { result = x + y; suChinese.append(CNUMBERS[x]); suChinese.append("+"); diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java index 8643b8af..62064710 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java @@ -11,19 +11,17 @@ import org.springframework.web.reactive.function.server.RouterFunctions; /** * 璺敱閰嶇疆淇℃伅 - * + * * @author ruoyi */ @Configuration -public class RouterFunctionConfiguration -{ +public class RouterFunctionConfiguration { @Autowired private ValidateCodeHandler validateCodeHandler; @SuppressWarnings("rawtypes") @Bean - public RouterFunction routerFunction() - { + public RouterFunction routerFunction() { return RouterFunctions.route( RequestPredicates.GET("/code").and(RequestPredicates.accept(MediaType.TEXT_PLAIN)), validateCodeHandler); diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java index 256f2d79..b74e9a95 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java @@ -15,12 +15,11 @@ import java.util.List; /** * 鑱氬悎绯荤粺鎺ュ彛 - * + * * @author ruoyi */ @Component -public class SwaggerProvider implements SwaggerResourcesProvider, WebFluxConfigurer -{ +public class SwaggerProvider implements SwaggerResourcesProvider, WebFluxConfigurer { /** * Swagger2榛樿鐨剈rl鍚庣紑 */ @@ -36,12 +35,11 @@ public class SwaggerProvider implements SwaggerResourcesProvider, WebFluxConfigu /** * 鑱氬悎鍏朵粬鏈嶅姟鎺ュ彛 - * + * * @return */ @Override - public List get() - { + public List get() { List resourceList = new ArrayList<>(); List routes = new ArrayList<>(); // 鑾峰彇缃戝叧涓厤缃殑route @@ -58,8 +56,7 @@ public class SwaggerProvider implements SwaggerResourcesProvider, WebFluxConfigu return resourceList; } - private SwaggerResource swaggerResource(String name, String location) - { + private SwaggerResource swaggerResource(String name, String location) { SwaggerResource swaggerResource = new SwaggerResource(); swaggerResource.setName(name); swaggerResource.setLocation(location); @@ -68,8 +65,7 @@ public class SwaggerProvider implements SwaggerResourcesProvider, WebFluxConfigu } @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) - { + public void addResourceHandlers(ResourceHandlerRegistry registry) { /** swagger-ui 鍦板潃 */ registry.addResourceHandler("/swagger-ui/**") .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/"); diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java index dea2e168..4333720f 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java @@ -6,14 +6,13 @@ import org.springframework.context.annotation.Configuration; /** * 楠岃瘉鐮侀厤缃 - * + * * @author ruoyi */ @Configuration @RefreshScope @ConfigurationProperties(prefix = "security.captcha") -public class CaptchaProperties -{ +public class CaptchaProperties { /** * 楠岃瘉鐮佸紑鍏 */ @@ -24,23 +23,19 @@ public class CaptchaProperties */ private String type; - public Boolean getEnabled() - { + public Boolean getEnabled() { return enabled; } - public void setEnabled(Boolean enabled) - { + public void setEnabled(Boolean enabled) { this.enabled = enabled; } - public String getType() - { + public String getType() { return type; } - public void setType(String type) - { + public void setType(String type) { this.type = type; } } diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java index 6a44df18..5627fca4 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java @@ -9,26 +9,23 @@ import java.util.List; /** * 鏀捐鐧藉悕鍗曢厤缃 - * + * * @author ruoyi */ @Configuration @RefreshScope @ConfigurationProperties(prefix = "security.ignore") -public class IgnoreWhiteProperties -{ +public class IgnoreWhiteProperties { /** * 鏀捐鐧藉悕鍗曢厤缃紝缃戝叧涓嶆牎楠屾澶勭殑鐧藉悕鍗 */ private List whites = new ArrayList<>(); - public List getWhites() - { + public List getWhites() { return whites; } - public void setWhites(List whites) - { + public void setWhites(List whites) { this.whites = whites; } } diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java index 09ca80bc..c84a5cf2 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java @@ -9,14 +9,13 @@ import java.util.List; /** * XSS璺ㄧ珯鑴氭湰閰嶇疆 - * + * * @author ruoyi */ @Configuration @RefreshScope @ConfigurationProperties(prefix = "security.xss") -public class XssProperties -{ +public class XssProperties { /** * Xss寮鍏 */ @@ -27,23 +26,19 @@ public class XssProperties */ private List excludeUrls = new ArrayList<>(); - public Boolean getEnabled() - { + public Boolean getEnabled() { return enabled; } - public void setEnabled(Boolean enabled) - { + public void setEnabled(Boolean enabled) { this.enabled = enabled; } - public List getExcludeUrls() - { + public List getExcludeUrls() { return excludeUrls; } - public void setExcludeUrls(List excludeUrls) - { + public void setExcludeUrls(List excludeUrls) { this.excludeUrls = excludeUrls; } } diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java index b08f9915..d9cbc3c3 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java @@ -23,12 +23,11 @@ import reactor.core.publisher.Mono; /** * 缃戝叧閴存潈 - * + * * @author ruoyi */ @Component -public class AuthFilter implements GlobalFilter, Ordered -{ +public class AuthFilter implements GlobalFilter, Ordered { private static final Logger log = LoggerFactory.getLogger(AuthFilter.class); /** @@ -42,37 +41,31 @@ public class AuthFilter implements GlobalFilter, Ordered @Override - public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) - { + public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { ServerHttpRequest request = exchange.getRequest(); ServerHttpRequest.Builder mutate = request.mutate(); String url = request.getURI().getPath(); // 璺宠繃涓嶉渶瑕侀獙璇佺殑璺緞 - if (StringUtils.matches(url, ignoreWhite.getWhites())) - { + if (StringUtils.matches(url, ignoreWhite.getWhites())) { return chain.filter(exchange); } String token = getToken(request); - if (StringUtils.isEmpty(token)) - { + if (StringUtils.isEmpty(token)) { return unauthorizedResponse(exchange, "浠ょ墝涓嶈兘涓虹┖"); } Claims claims = JwtUtils.parseToken(token); - if (claims == null) - { + if (claims == null) { return unauthorizedResponse(exchange, "浠ょ墝宸茶繃鏈熸垨楠岃瘉涓嶆纭紒"); } String userkey = JwtUtils.getUserKey(claims); boolean islogin = redisService.hasKey(getTokenKey(userkey)); - if (!islogin) - { + if (!islogin) { return unauthorizedResponse(exchange, "鐧诲綍鐘舵佸凡杩囨湡"); } String userid = JwtUtils.getUserId(claims); String username = JwtUtils.getUserName(claims); - if (StringUtils.isEmpty(userid) || StringUtils.isEmpty(username)) - { + if (StringUtils.isEmpty(userid) || StringUtils.isEmpty(username)) { return unauthorizedResponse(exchange, "浠ょ墝楠岃瘉澶辫触"); } @@ -85,10 +78,8 @@ public class AuthFilter implements GlobalFilter, Ordered return chain.filter(exchange.mutate().request(mutate.build()).build()); } - private void addHeader(ServerHttpRequest.Builder mutate, String name, Object value) - { - if (value == null) - { + private void addHeader(ServerHttpRequest.Builder mutate, String name, Object value) { + if (value == null) { return; } String valueStr = value.toString(); @@ -96,13 +87,11 @@ public class AuthFilter implements GlobalFilter, Ordered mutate.header(name, valueEncode); } - private void removeHeader(ServerHttpRequest.Builder mutate, String name) - { + private void removeHeader(ServerHttpRequest.Builder mutate, String name) { mutate.headers(httpHeaders -> httpHeaders.remove(name)).build(); } - private Mono unauthorizedResponse(ServerWebExchange exchange, String msg) - { + private Mono unauthorizedResponse(ServerWebExchange exchange, String msg) { log.error("[閴存潈寮傚父澶勭悊]璇锋眰璺緞:{}", exchange.getRequest().getPath()); return ServletUtils.webFluxResponseWriter(exchange.getResponse(), msg, HttpStatus.UNAUTHORIZED); } @@ -110,28 +99,24 @@ public class AuthFilter implements GlobalFilter, Ordered /** * 鑾峰彇缂撳瓨key */ - private String getTokenKey(String token) - { + private String getTokenKey(String token) { return CacheConstants.LOGIN_TOKEN_KEY + token; } /** * 鑾峰彇璇锋眰token */ - private String getToken(ServerHttpRequest request) - { + private String getToken(ServerHttpRequest request) { String token = request.getHeaders().getFirst(TokenConstants.AUTHENTICATION); // 濡傛灉鍓嶇璁剧疆浜嗕护鐗屽墠缂锛屽垯瑁佸壀鎺夊墠缂 - if (StringUtils.isNotEmpty(token) && token.startsWith(TokenConstants.PREFIX)) - { + if (StringUtils.isNotEmpty(token) && token.startsWith(TokenConstants.PREFIX)) { token = token.replaceFirst(TokenConstants.PREFIX, StringUtils.EMPTY); } return token; } @Override - public int getOrder() - { + public int getOrder() { return -200; } } diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java index a17a8a1a..9ac88bb2 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java @@ -11,20 +11,21 @@ import java.util.regex.Pattern; /** * 榛戝悕鍗曡繃婊ゅ櫒 - * + * * @author ruoyi */ @Component -public class BlackListUrlFilter extends AbstractGatewayFilterFactory -{ +public class BlackListUrlFilter extends AbstractGatewayFilterFactory { + public BlackListUrlFilter() { + super(Config.class); + } + @Override - public GatewayFilter apply(Config config) - { + public GatewayFilter apply(Config config) { return (exchange, chain) -> { String url = exchange.getRequest().getURI().getPath(); - if (config.matchBlacklist(url)) - { + if (config.matchBlacklist(url)) { return ServletUtils.webFluxResponseWriter(exchange.getResponse(), "璇锋眰鍦板潃涓嶅厑璁歌闂"); } @@ -32,29 +33,20 @@ public class BlackListUrlFilter extends AbstractGatewayFilterFactory blacklistUrl; private List blacklistUrlPattern = new ArrayList<>(); - public boolean matchBlacklist(String url) - { + public boolean matchBlacklist(String url) { return !blacklistUrlPattern.isEmpty() && blacklistUrlPattern.stream().anyMatch(p -> p.matcher(url).find()); } - public List getBlacklistUrl() - { + public List getBlacklistUrl() { return blacklistUrl; } - public void setBlacklistUrl(List blacklistUrl) - { + public void setBlacklistUrl(List blacklistUrl) { this.blacklistUrl = blacklistUrl; this.blacklistUrlPattern.clear(); this.blacklistUrl.forEach(url -> { diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java index 87cb8db4..8fec75e0 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java @@ -20,44 +20,41 @@ import java.util.List; /** * 鑾峰彇body璇锋眰鏁版嵁锛堣В鍐虫祦涓嶈兘閲嶅璇诲彇闂锛 - * + * * @author ruoyi */ @Component -public class CacheRequestFilter extends AbstractGatewayFilterFactory -{ - public CacheRequestFilter() - { +public class CacheRequestFilter extends AbstractGatewayFilterFactory { + public CacheRequestFilter() { super(Config.class); } @Override - public String name() - { + public String name() { return "CacheRequestFilter"; } @Override - public GatewayFilter apply(Config config) - { + public GatewayFilter apply(Config config) { CacheRequestGatewayFilter cacheRequestGatewayFilter = new CacheRequestGatewayFilter(); Integer order = config.getOrder(); - if (order == null) - { + if (order == null) { return cacheRequestGatewayFilter; } return new OrderedGatewayFilter(cacheRequestGatewayFilter, order); } - public static class CacheRequestGatewayFilter implements GatewayFilter - { + @Override + public List shortcutFieldOrder() { + return Collections.singletonList("order"); + } + + public static class CacheRequestGatewayFilter implements GatewayFilter { @Override - public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) - { + public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { // GET DELETE 涓嶈繃婊 HttpMethod method = exchange.getRequest().getMethod(); - if (method == null || method.matches(StringUtils.GET) || method.matches(StringUtils.DELETE)) - { + if (method == null || method.matches(StringUtils.GET) || method.matches(StringUtils.DELETE)) { return chain.filter(exchange); } return DataBufferUtils.join(exchange.getRequest().getBody()).map(dataBuffer -> { @@ -67,13 +64,10 @@ public class CacheRequestFilter extends AbstractGatewayFilterFactory { DataBufferFactory dataBufferFactory = exchange.getResponse().bufferFactory(); - ServerHttpRequestDecorator decorator = new ServerHttpRequestDecorator(exchange.getRequest()) - { + ServerHttpRequestDecorator decorator = new ServerHttpRequestDecorator(exchange.getRequest()) { @Override - public Flux getBody() - { - if (bytes.length > 0) - { + public Flux getBody() { + if (bytes.length > 0) { return Flux.just(dataBufferFactory.wrap(bytes)); } return Flux.empty(); @@ -84,23 +78,14 @@ public class CacheRequestFilter extends AbstractGatewayFilterFactory shortcutFieldOrder() - { - return Collections.singletonList("order"); - } - - static class Config - { + static class Config { private Integer order; - public Integer getOrder() - { + public Integer getOrder() { return order; } - public void setOrder(Integer order) - { + public void setOrder(Integer order) { this.order = order; } } diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java index 69cf1450..021fa2d2 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java @@ -24,48 +24,37 @@ import java.util.concurrent.atomic.AtomicReference; * @author ruoyi */ @Component -public class ValidateCodeFilter extends AbstractGatewayFilterFactory -{ - private final static String[] VALIDATE_URL = new String[] { "/auth/login", "/auth/register" }; - +public class ValidateCodeFilter extends AbstractGatewayFilterFactory { + private final static String[] VALIDATE_URL = new String[]{"/auth/login", "/auth/register"}; + private static final String CODE = "code"; + private static final String UUID = "uuid"; @Autowired private ValidateCodeService validateCodeService; - @Autowired private CaptchaProperties captchaProperties; - private static final String CODE = "code"; - - private static final String UUID = "uuid"; - @Override - public GatewayFilter apply(Object config) - { + public GatewayFilter apply(Object config) { return (exchange, chain) -> { ServerHttpRequest request = exchange.getRequest(); // 闈炵櫥褰/娉ㄥ唽璇锋眰鎴栭獙璇佺爜鍏抽棴锛屼笉澶勭悊 - if (!StringUtils.containsAnyIgnoreCase(request.getURI().getPath(), VALIDATE_URL) || !captchaProperties.getEnabled()) - { + if (!StringUtils.containsAnyIgnoreCase(request.getURI().getPath(), VALIDATE_URL) || !captchaProperties.getEnabled()) { return chain.filter(exchange); } - try - { + try { String rspStr = resolveBodyFromRequest(request); JSONObject obj = JSONObject.parseObject(rspStr); validateCodeService.checkCaptcha(obj.getString(CODE), obj.getString(UUID)); - } - catch (Exception e) - { + } catch (Exception e) { return ServletUtils.webFluxResponseWriter(exchange.getResponse(), e.getMessage()); } return chain.filter(exchange); }; } - private String resolveBodyFromRequest(ServerHttpRequest serverHttpRequest) - { + private String resolveBodyFromRequest(ServerHttpRequest serverHttpRequest) { // 鑾峰彇璇锋眰浣 Flux body = serverHttpRequest.getBody(); AtomicReference bodyRef = new AtomicReference<>(); diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java index 07d828fe..1e327683 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java @@ -29,8 +29,7 @@ import java.nio.charset.StandardCharsets; */ @Component @ConditionalOnProperty(value = "security.xss.enabled", havingValue = "true") -public class XssFilter implements GlobalFilter, Ordered -{ +public class XssFilter implements GlobalFilter, Ordered { /** * 璺ㄧ珯鑴氭湰鐨 xss 閰嶇疆锛宯acos鑷娣诲姞 */ @@ -38,24 +37,20 @@ public class XssFilter implements GlobalFilter, Ordered private XssProperties xss; @Override - public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) - { + public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { ServerHttpRequest request = exchange.getRequest(); // GET DELETE 涓嶈繃婊 HttpMethod method = request.getMethod(); - if (method == null || method.matches(StringUtils.GET) || method.matches(StringUtils.DELETE)) - { + if (method == null || method.matches(StringUtils.GET) || method.matches(StringUtils.DELETE)) { return chain.filter(exchange); } // 闈瀓son绫诲瀷锛屼笉杩囨护 - if (!isJsonRequest(exchange)) - { + if (!isJsonRequest(exchange)) { return chain.filter(exchange); } // excludeUrls 涓嶈繃婊 String url = request.getURI().getPath(); - if (StringUtils.matches(url, xss.getExcludeUrls())) - { + if (StringUtils.matches(url, xss.getExcludeUrls())) { return chain.filter(exchange); } ServerHttpRequestDecorator httpRequestDecorator = requestDecorator(exchange); @@ -63,13 +58,10 @@ public class XssFilter implements GlobalFilter, Ordered } - private ServerHttpRequestDecorator requestDecorator(ServerWebExchange exchange) - { - ServerHttpRequestDecorator serverHttpRequestDecorator = new ServerHttpRequestDecorator(exchange.getRequest()) - { + private ServerHttpRequestDecorator requestDecorator(ServerWebExchange exchange) { + ServerHttpRequestDecorator serverHttpRequestDecorator = new ServerHttpRequestDecorator(exchange.getRequest()) { @Override - public Flux getBody() - { + public Flux getBody() { Flux body = super.getBody(); return body.buffer().map(dataBuffers -> { DataBufferFactory dataBufferFactory = new DefaultDataBufferFactory(); @@ -90,8 +82,7 @@ public class XssFilter implements GlobalFilter, Ordered } @Override - public HttpHeaders getHeaders() - { + public HttpHeaders getHeaders() { HttpHeaders httpHeaders = new HttpHeaders(); httpHeaders.putAll(super.getHeaders()); // 鐢变簬淇敼浜嗚姹備綋鐨刡ody锛屽鑷碿ontent-length闀垮害涓嶇‘瀹氾紝鍥犳闇瑕佸垹闄ゅ師鍏堢殑content-length @@ -106,18 +97,16 @@ public class XssFilter implements GlobalFilter, Ordered /** * 鏄惁鏄疛son璇锋眰 - * + * * @param exchange HTTP璇锋眰 */ - public boolean isJsonRequest(ServerWebExchange exchange) - { + public boolean isJsonRequest(ServerWebExchange exchange) { String header = exchange.getRequest().getHeaders().getFirst(HttpHeaders.CONTENT_TYPE); return StringUtils.startsWithIgnoreCase(header, MediaType.APPLICATION_JSON_VALUE); } @Override - public int getOrder() - { + public int getOrder() { return -100; } } diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java index 81deac6c..6a7033fc 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java @@ -19,33 +19,25 @@ import reactor.core.publisher.Mono; */ @Order(-1) @Configuration -public class GatewayExceptionHandler implements ErrorWebExceptionHandler -{ +public class GatewayExceptionHandler implements ErrorWebExceptionHandler { private static final Logger log = LoggerFactory.getLogger(GatewayExceptionHandler.class); @Override - public Mono handle(ServerWebExchange exchange, Throwable ex) - { + public Mono handle(ServerWebExchange exchange, Throwable ex) { ServerHttpResponse response = exchange.getResponse(); - if (exchange.getResponse().isCommitted()) - { + if (exchange.getResponse().isCommitted()) { return Mono.error(ex); } String msg; - if (ex instanceof NotFoundException) - { + if (ex instanceof NotFoundException) { msg = "鏈嶅姟鏈壘鍒"; - } - else if (ex instanceof ResponseStatusException) - { + } else if (ex instanceof ResponseStatusException) { ResponseStatusException responseStatusException = (ResponseStatusException) ex; msg = responseStatusException.getMessage(); - } - else - { + } else { msg = "鍐呴儴鏈嶅姟鍣ㄩ敊璇"; } diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SentinelFallbackHandler.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SentinelFallbackHandler.java index 1b496e29..acf5ca9e 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SentinelFallbackHandler.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SentinelFallbackHandler.java @@ -13,29 +13,23 @@ import reactor.core.publisher.Mono; * * @author ruoyi */ -public class SentinelFallbackHandler implements WebExceptionHandler -{ - private Mono writeResponse(ServerResponse response, ServerWebExchange exchange) - { +public class SentinelFallbackHandler implements WebExceptionHandler { + private Mono writeResponse(ServerResponse response, ServerWebExchange exchange) { return ServletUtils.webFluxResponseWriter(exchange.getResponse(), "璇锋眰瓒呰繃鏈澶ф暟锛岃绋嶅欏啀璇"); } @Override - public Mono handle(ServerWebExchange exchange, Throwable ex) - { - if (exchange.getResponse().isCommitted()) - { + public Mono handle(ServerWebExchange exchange, Throwable ex) { + if (exchange.getResponse().isCommitted()) { return Mono.error(ex); } - if (!BlockException.isBlockException(ex)) - { + if (!BlockException.isBlockException(ex)) { return Mono.error(ex); } return handleBlockedRequest(exchange, ex).flatMap(response -> writeResponse(response, exchange)); } - private Mono handleBlockedRequest(ServerWebExchange exchange, Throwable throwable) - { + private Mono handleBlockedRequest(ServerWebExchange exchange, Throwable throwable) { return GatewayCallbackManager.getBlockHandler().handleRequest(exchange, throwable); } } diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SwaggerHandler.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SwaggerHandler.java index 726f4310..0d6bed09 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SwaggerHandler.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SwaggerHandler.java @@ -17,39 +17,33 @@ import java.util.Optional; @RestController @RequestMapping("/swagger-resources") public class SwaggerHandler { + private final SwaggerResourcesProvider swaggerResources; @Autowired(required = false) private SecurityConfiguration securityConfiguration; - @Autowired(required = false) private UiConfiguration uiConfiguration; - private final SwaggerResourcesProvider swaggerResources; - @Autowired - public SwaggerHandler(SwaggerResourcesProvider swaggerResources) - { + public SwaggerHandler(SwaggerResourcesProvider swaggerResources) { this.swaggerResources = swaggerResources; } @GetMapping("/configuration/security") - public Mono> securityConfiguration() - { + public Mono> securityConfiguration() { return Mono.just(new ResponseEntity<>( Optional.ofNullable(securityConfiguration).orElse(SecurityConfigurationBuilder.builder().build()), HttpStatus.OK)); } @GetMapping("/configuration/ui") - public Mono> uiConfiguration() - { + public Mono> uiConfiguration() { return Mono.just(new ResponseEntity<>( Optional.ofNullable(uiConfiguration).orElse(UiConfigurationBuilder.builder().build()), HttpStatus.OK)); } @SuppressWarnings("rawtypes") @GetMapping("") - public Mono swaggerResources() - { + public Mono swaggerResources() { return Mono.just((new ResponseEntity<>(swaggerResources.get(), HttpStatus.OK))); } } diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java index 2e26eca3..547b7145 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java @@ -20,21 +20,16 @@ import java.io.IOException; * @author ruoyi */ @Component -public class ValidateCodeHandler implements HandlerFunction -{ +public class ValidateCodeHandler implements HandlerFunction { @Autowired private ValidateCodeService validateCodeService; @Override - public Mono handle(ServerRequest serverRequest) - { + public Mono handle(ServerRequest serverRequest) { AjaxResult ajax; - try - { + try { ajax = validateCodeService.createCaptcha(); - } - catch (CaptchaException | IOException e) - { + } catch (CaptchaException | IOException e) { return Mono.error(e); } return ServerResponse.status(HttpStatus.OK).body(BodyInserters.fromValue(ajax)); diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java index 3a7bd981..39afdda8 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java @@ -10,19 +10,20 @@ import java.io.IOException; * * @author ruoyi */ -public interface ValidateCodeService -{ +public interface ValidateCodeService { /** * 鐢熸垚楠岃瘉鐮 + * * @return AjaxResult - * @throws IOException / + * @throws IOException / * @throws CaptchaException / */ public AjaxResult createCaptcha() throws IOException, CaptchaException; /** * 鏍￠獙楠岃瘉鐮 - * @param key 閿 + * + * @param key 閿 * @param value 鍊 * @throws CaptchaException / */ diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java index e078eff1..c6cdd359 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java @@ -26,8 +26,7 @@ import java.util.concurrent.TimeUnit; * @author ruoyi */ @Service -public class ValidateCodeServiceImpl implements ValidateCodeService -{ +public class ValidateCodeServiceImpl implements ValidateCodeService { @Resource(name = "captchaProducer") private Producer captchaProducer; @@ -44,13 +43,11 @@ public class ValidateCodeServiceImpl implements ValidateCodeService * 鐢熸垚楠岃瘉鐮 */ @Override - public AjaxResult createCaptcha() throws IOException, CaptchaException - { + public AjaxResult createCaptcha() throws IOException, CaptchaException { AjaxResult ajax = AjaxResult.success(); boolean captchaOnOff = captchaProperties.getEnabled(); ajax.put("captchaOnOff", captchaOnOff); - if (!captchaOnOff) - { + if (!captchaOnOff) { return ajax; } @@ -63,15 +60,12 @@ public class ValidateCodeServiceImpl implements ValidateCodeService String captchaType = captchaProperties.getType(); // 鐢熸垚楠岃瘉鐮 - if (StringUtils.MATH.equals(captchaType)) - { + if (StringUtils.MATH.equals(captchaType)) { String capText = captchaProducerMath.createText(); capStr = capText.substring(0, capText.lastIndexOf("@")); code = capText.substring(capText.lastIndexOf("@") + 1); image = captchaProducerMath.createImage(capStr); - } - else if (StringUtils.CHAR.equals(captchaType)) - { + } else if (StringUtils.CHAR.equals(captchaType)) { capStr = code = captchaProducer.createText(); image = captchaProducer.createImage(capStr); } @@ -79,12 +73,9 @@ public class ValidateCodeServiceImpl implements ValidateCodeService redisService.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES); // 杞崲娴佷俊鎭啓鍑 FastByteArrayOutputStream os = new FastByteArrayOutputStream(); - try - { + try { ImageIO.write(image, "jpg", os); - } - catch (IOException e) - { + } catch (IOException e) { return AjaxResult.error(e.getMessage()); } @@ -97,22 +88,18 @@ public class ValidateCodeServiceImpl implements ValidateCodeService * 鏍￠獙楠岃瘉鐮 */ @Override - public void checkCaptcha(String code, String uuid) throws CaptchaException - { - if (StringUtils.isEmpty(code)) - { + public void checkCaptcha(String code, String uuid) throws CaptchaException { + if (StringUtils.isEmpty(code)) { throw new CaptchaException("楠岃瘉鐮佷笉鑳戒负绌"); } - if (StringUtils.isEmpty(uuid)) - { + if (StringUtils.isEmpty(uuid)) { throw new CaptchaException("楠岃瘉鐮佸凡澶辨晥"); } String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid; String captcha = redisService.getCacheObject(verifyKey); redisService.deleteObject(verifyKey); - if (!code.equalsIgnoreCase(captcha)) - { + if (!code.equalsIgnoreCase(captcha)) { throw new CaptchaException("楠岃瘉鐮侀敊璇"); } } diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java index dcd3e600..0dca9d6d 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java @@ -7,15 +7,13 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; /** * 鏂囦欢鏈嶅姟 - * + * * @author ruoyi */ @EnableCustomSwagger2 -@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) -public class RuoYiFileApplication -{ - public static void main(String[] args) - { +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) +public class RuoYiFileApplication { + public static void main(String[] args) { SpringApplication.run(RuoYiFileApplication.class, args); System.out.println("(鈾モ棤鈥库棤)锞夛緸 鏂囦欢鏈嶅姟妯″潡鍚姩鎴愬姛 醿(麓凇`醿)锞 \n" + " .-------. ____ __ \n" + diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java index 89ab2742..06227ee5 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java @@ -12,8 +12,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConfigurationProperties(prefix = "minio") -public class MinioConfig -{ +public class MinioConfig { /** * 鏈嶅姟鍦板潃 */ @@ -34,49 +33,40 @@ public class MinioConfig */ private String bucketName; - public String getUrl() - { + public String getUrl() { return url; } - public void setUrl(String url) - { + public void setUrl(String url) { this.url = url; } - public String getAccessKey() - { + public String getAccessKey() { return accessKey; } - public void setAccessKey(String accessKey) - { + public void setAccessKey(String accessKey) { this.accessKey = accessKey; } - public String getSecretKey() - { + public String getSecretKey() { return secretKey; } - public void setSecretKey(String secretKey) - { + public void setSecretKey(String secretKey) { this.secretKey = secretKey; } - public String getBucketName() - { + public String getBucketName() { return bucketName; } - public void setBucketName(String bucketName) - { + public void setBucketName(String bucketName) { this.bucketName = bucketName; } @Bean - public MinioClient getMinioClient() - { + public MinioClient getMinioClient() { return MinioClient.builder().endpoint(url).credentials(accessKey, secretKey).build(); } } diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java index f70c8a92..375be5d6 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java @@ -10,39 +10,36 @@ import java.io.File; /** * 閫氱敤鏄犲皠閰嶇疆 - * + * * @author ruoyi */ @Configuration -public class ResourcesConfig implements WebMvcConfigurer -{ - /** - * 涓婁紶鏂囦欢瀛樺偍鍦ㄦ湰鍦扮殑鏍硅矾寰 - */ - @Value("${file.path}") - private String localFilePath; - +public class ResourcesConfig implements WebMvcConfigurer { /** * 璧勬簮鏄犲皠璺緞 鍓嶇紑 */ @Value("${file.prefix}") public String localFilePrefix; + /** + * 涓婁紶鏂囦欢瀛樺偍鍦ㄦ湰鍦扮殑鏍硅矾寰 + */ + @Value("${file.path}") + private String localFilePath; @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) - { + public void addResourceHandlers(ResourceHandlerRegistry registry) { /** 鏈湴鏂囦欢涓婁紶璺緞 */ registry.addResourceHandler(localFilePrefix + "/**") .addResourceLocations("file:" + localFilePath + File.separator); } - + /** * 寮鍚法鍩 */ @Override public void addCorsMappings(CorsRegistry registry) { // 璁剧疆鍏佽璺ㄥ煙鐨勮矾鐢 - registry.addMapping(localFilePrefix + "/**") + registry.addMapping(localFilePrefix + "/**") // 璁剧疆鍏佽璺ㄥ煙璇锋眰鐨勫煙鍚 .allowedOrigins("*") // 璁剧疆鍏佽鐨勬柟娉 diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java index 98908316..fbbcf39b 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java @@ -13,12 +13,11 @@ import org.springframework.web.multipart.MultipartFile; /** * 鏂囦欢璇锋眰澶勭悊 - * + * * @author ruoyi */ @RestController -public class SysFileController -{ +public class SysFileController { private static final Logger log = LoggerFactory.getLogger(SysFileController.class); @Autowired @@ -28,19 +27,15 @@ public class SysFileController * 鏂囦欢涓婁紶璇锋眰 */ @PostMapping("upload") - public Rust upload(MultipartFile file) - { - try - { + public Rust upload(MultipartFile file) { + try { // 涓婁紶骞惰繑鍥炶闂湴鍧 String url = sysFileService.uploadFile(file); SysFile sysFile = new SysFile(); sysFile.setName(FileUtils.getName(url)); sysFile.setUrl(url); return Rust.ok(sysFile); - } - catch (Exception e) - { + } catch (Exception e) { log.error("涓婁紶鏂囦欢澶辫触", e); return Rust.fail(e.getMessage()); } diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java index cd8c354d..9e274b66 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java @@ -10,12 +10,11 @@ import org.springframework.web.multipart.MultipartFile; /** * FastDFS 鏂囦欢瀛樺偍 - * + * * @author ruoyi */ @Service -public class FastDfsSysFileServiceImpl implements ISysFileService -{ +public class FastDfsSysFileServiceImpl implements ISysFileService { /** * 鍩熷悕鎴栨湰鏈鸿闂湴鍧 */ @@ -27,14 +26,13 @@ public class FastDfsSysFileServiceImpl implements ISysFileService /** * FastDfs鏂囦欢涓婁紶鎺ュ彛 - * + * * @param file 涓婁紶鐨勬枃浠 * @return 璁块棶鍦板潃 * @throws Exception */ @Override - public String uploadFile(MultipartFile file) throws Exception - { + public String uploadFile(MultipartFile file) throws Exception { StorePath storePath = storageClient.uploadFile(file.getInputStream(), file.getSize(), FilenameUtils.getExtension(file.getOriginalFilename()), null); return domain + "/" + storePath.getFullPath(); diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java index 5a353489..674622be 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java @@ -4,14 +4,13 @@ import org.springframework.web.multipart.MultipartFile; /** * 鏂囦欢涓婁紶鎺ュ彛 - * + * * @author ruoyi */ -public interface ISysFileService -{ +public interface ISysFileService { /** * 鏂囦欢涓婁紶鎺ュ彛 - * + * * @param file 涓婁紶鐨勬枃浠 * @return 璁块棶鍦板潃 * @throws Exception diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java index 1b26bf41..d4f5d41d 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java @@ -8,13 +8,12 @@ import org.springframework.web.multipart.MultipartFile; /** * 鏈湴鏂囦欢瀛樺偍 - * + * * @author ruoyi */ @Primary @Service -public class LocalSysFileServiceImpl implements ISysFileService -{ +public class LocalSysFileServiceImpl implements ISysFileService { /** * 璧勬簮鏄犲皠璺緞 鍓嶇紑 */ @@ -26,7 +25,7 @@ public class LocalSysFileServiceImpl implements ISysFileService */ @Value("${file.domain}") public String domain; - + /** * 涓婁紶鏂囦欢瀛樺偍鍦ㄦ湰鍦扮殑鏍硅矾寰 */ @@ -35,14 +34,13 @@ public class LocalSysFileServiceImpl implements ISysFileService /** * 鏈湴鏂囦欢涓婁紶鎺ュ彛 - * + * * @param file 涓婁紶鐨勬枃浠 * @return 璁块棶鍦板潃 * @throws Exception */ @Override - public String uploadFile(MultipartFile file) throws Exception - { + public String uploadFile(MultipartFile file) throws Exception { String name = FileUploadUtils.upload(localFilePath, file); String url = domain + localFilePrefix + name; return url; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java index 49b15faf..7c66abd6 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java @@ -10,12 +10,11 @@ import org.springframework.web.multipart.MultipartFile; /** * Minio 鏂囦欢瀛樺偍 - * + * * @author ruoyi */ @Service -public class MinioSysFileServiceImpl implements ISysFileService -{ +public class MinioSysFileServiceImpl implements ISysFileService { @Autowired private MinioConfig minioConfig; @@ -24,14 +23,13 @@ public class MinioSysFileServiceImpl implements ISysFileService /** * 鏈湴鏂囦欢涓婁紶鎺ュ彛 - * + * * @param file 涓婁紶鐨勬枃浠 * @return 璁块棶鍦板潃 * @throws Exception */ @Override - public String uploadFile(MultipartFile file) throws Exception - { + public String uploadFile(MultipartFile file) throws Exception { String fileName = FileUploadUtils.extractFilename(file); PutObjectArgs args = PutObjectArgs.builder() .bucket(minioConfig.getBucketName()) diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java index 22954c5f..74d7c59f 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java @@ -17,11 +17,10 @@ import java.util.Objects; /** * 鏂囦欢涓婁紶宸ュ叿绫 - * + * * @author ruoyi */ -public class FileUploadUtils -{ +public class FileUploadUtils { /** * 榛樿澶у皬 50M */ @@ -36,18 +35,14 @@ public class FileUploadUtils * 鏍规嵁鏂囦欢璺緞涓婁紶 * * @param baseDir 鐩稿搴旂敤鐨勫熀鐩綍 - * @param file 涓婁紶鐨勬枃浠 + * @param file 涓婁紶鐨勬枃浠 * @return 鏂囦欢鍚嶇О * @throws IOException */ - public static final String upload(String baseDir, MultipartFile file) throws IOException - { - try - { + public static final String upload(String baseDir, MultipartFile file) throws IOException { + try { return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION); - } - catch (Exception e) - { + } catch (Exception e) { throw new IOException(e.getMessage(), e); } } @@ -55,22 +50,20 @@ public class FileUploadUtils /** * 鏂囦欢涓婁紶 * - * @param baseDir 鐩稿搴旂敤鐨勫熀鐩綍 - * @param file 涓婁紶鐨勬枃浠 + * @param baseDir 鐩稿搴旂敤鐨勫熀鐩綍 + * @param file 涓婁紶鐨勬枃浠 * @param allowedExtension 涓婁紶鏂囦欢绫诲瀷 * @return 杩斿洖涓婁紶鎴愬姛鐨勬枃浠跺悕 - * @throws FileSizeLimitExceededException 濡傛灉瓒呭嚭鏈澶уぇ灏 + * @throws FileSizeLimitExceededException 濡傛灉瓒呭嚭鏈澶уぇ灏 * @throws FileNameLengthLimitExceededException 鏂囦欢鍚嶅お闀 - * @throws IOException 姣斿璇诲啓鏂囦欢鍑洪敊鏃 - * @throws InvalidExtensionException 鏂囦欢鏍￠獙寮傚父 + * @throws IOException 姣斿璇诲啓鏂囦欢鍑洪敊鏃 + * @throws InvalidExtensionException 鏂囦欢鏍￠獙寮傚父 */ public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension) throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException, - InvalidExtensionException - { + InvalidExtensionException { int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length(); - if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH) - { + if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH) { throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH); } @@ -86,28 +79,23 @@ public class FileUploadUtils /** * 缂栫爜鏂囦欢鍚 */ - public static final String extractFilename(MultipartFile file) - { + public static final String extractFilename(MultipartFile file) { return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(), FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.UPLOAD_SEQ_TYPE), getExtension(file)); } - private static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException - { + 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()) - { + 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 - { + private static final String getPathFileName(String fileName) throws IOException { String pathFileName = "/" + fileName; return pathFileName; } @@ -117,43 +105,31 @@ public class FileUploadUtils * * @param file 涓婁紶鐨勬枃浠 * @throws FileSizeLimitExceededException 濡傛灉瓒呭嚭鏈澶уぇ灏 - * @throws InvalidExtensionException 鏂囦欢鏍￠獙寮傚父 + * @throws InvalidExtensionException 鏂囦欢鏍￠獙寮傚父 */ public static final void assertAllowed(MultipartFile file, String[] allowedExtension) - throws FileSizeLimitExceededException, InvalidExtensionException - { + throws FileSizeLimitExceededException, InvalidExtensionException { long size = file.getSize(); - if (size > DEFAULT_MAX_SIZE) - { + if (size > DEFAULT_MAX_SIZE) { throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024); } String fileName = file.getOriginalFilename(); String extension = getExtension(file); - if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension)) - { - if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION) - { + if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension)) { + if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION) { throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension, fileName); - } - else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION) - { + } else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION) { throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension, fileName); - } - else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION) - { + } else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION) { throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension, fileName); - } - else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION) - { + } else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION) { throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension, fileName); - } - else - { + } else { throw new InvalidExtensionException(allowedExtension, extension, fileName); } } @@ -162,16 +138,13 @@ public class FileUploadUtils /** * 鍒ゆ柇MIME绫诲瀷鏄惁鏄厑璁哥殑MIME绫诲瀷 * - * @param extension 涓婁紶鏂囦欢绫诲瀷 + * @param extension 涓婁紶鏂囦欢绫诲瀷 * @param allowedExtension 鍏佽涓婁紶鏂囦欢绫诲瀷 * @return true/false */ - public static final boolean isAllowedExtension(String extension, String[] allowedExtension) - { - for (String str : allowedExtension) - { - if (str.equalsIgnoreCase(extension)) - { + public static final boolean isAllowedExtension(String extension, String[] allowedExtension) { + for (String str : allowedExtension) { + if (str.equalsIgnoreCase(extension)) { return true; } } @@ -180,15 +153,13 @@ public class FileUploadUtils /** * 鑾峰彇鏂囦欢鍚嶇殑鍚庣紑 - * + * * @param file 琛ㄥ崟鏂囦欢 * @return 鍚庣紑鍚 */ - public static final String getExtension(MultipartFile file) - { + public static final String getExtension(MultipartFile file) { String extension = FilenameUtils.getExtension(file.getOriginalFilename()); - if (StringUtils.isEmpty(extension)) - { + if (StringUtils.isEmpty(extension)) { extension = MimeTypeUtils.getExtension(Objects.requireNonNull(file.getContentType())); } return extension; diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java index b5c60f24..6fc65a32 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java @@ -8,17 +8,15 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; /** * 浠ｇ爜鐢熸垚 - * + * * @author ruoyi */ @EnableCustomConfig -@EnableCustomSwagger2 +@EnableCustomSwagger2 @EnableRyFeignClients @SpringBootApplication -public class RuoYiGenApplication -{ - public static void main(String[] args) - { +public class RuoYiGenApplication { + public static void main(String[] args) { SpringApplication.run(RuoYiGenApplication.class, args); System.out.println("(鈾モ棤鈥库棤)锞夛緸 浠ｇ爜鐢熸垚妯″潡鍚姩鎴愬姛 醿(麓凇`醿)锞 \n" + " .-------. ____ __ \n" + diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/config/GenConfig.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/config/GenConfig.java index 7bfdfe20..b0d546ef 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/config/GenConfig.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/config/GenConfig.java @@ -5,62 +5,61 @@ import org.springframework.stereotype.Component; /** * 浠ｇ爜鐢熸垚鐩稿叧閰嶇疆 - * + * * @author ruoyi */ @Component @ConfigurationProperties(prefix = "gen") -public class GenConfig -{ - /** 浣滆 */ +public class GenConfig { + /** + * 浣滆 + */ public static String author; - /** 鐢熸垚鍖呰矾寰 */ + /** + * 鐢熸垚鍖呰矾寰 + */ public static String packageName; - /** 鑷姩鍘婚櫎琛ㄥ墠缂锛岄粯璁ゆ槸false */ + /** + * 鑷姩鍘婚櫎琛ㄥ墠缂锛岄粯璁ゆ槸false + */ public static boolean autoRemovePre; - /** 琛ㄥ墠缂(绫诲悕涓嶄細鍖呭惈琛ㄥ墠缂) */ + /** + * 琛ㄥ墠缂(绫诲悕涓嶄細鍖呭惈琛ㄥ墠缂) + */ public static String tablePrefix; - public static String getAuthor() - { + public static String getAuthor() { return author; } - public void setAuthor(String author) - { + public void setAuthor(String author) { GenConfig.author = author; } - public static String getPackageName() - { + public static String getPackageName() { return packageName; } - public void setPackageName(String packageName) - { + public void setPackageName(String packageName) { GenConfig.packageName = packageName; } - public static boolean getAutoRemovePre() - { + public static boolean getAutoRemovePre() { return autoRemovePre; } - public void setAutoRemovePre(boolean autoRemovePre) - { + public void setAutoRemovePre(boolean autoRemovePre) { GenConfig.autoRemovePre = autoRemovePre; } - public static String getTablePrefix() - { + public static String getTablePrefix() { return tablePrefix; } - public void setTablePrefix(String tablePrefix) - { + public void setTablePrefix(String tablePrefix) { GenConfig.tablePrefix = tablePrefix; } } diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java index d4275c8b..efd9ce28 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java @@ -24,13 +24,12 @@ import java.util.Map; /** * 浠ｇ爜鐢熸垚 鎿嶄綔澶勭悊 - * + * * @author ruoyi */ @RequestMapping("/gen") @RestController -public class GenController extends BaseController -{ +public class GenController extends BaseController { @Autowired private IGenTableService genTableService; @@ -42,8 +41,7 @@ public class GenController extends BaseController */ @RequiresPermissions("tool:gen:list") @GetMapping("/list") - public TableDataInfo genList(GenTable genTable) - { + public TableDataInfo genList(GenTable genTable) { startPage(); List list = genTableService.selectGenTableList(genTable); return getDataTable(list); @@ -54,8 +52,7 @@ public class GenController extends BaseController */ @RequiresPermissions("tool:gen:query") @GetMapping(value = "/{tableId}") - public AjaxResult getInfo(@PathVariable Long tableId) - { + public AjaxResult getInfo(@PathVariable Long tableId) { GenTable table = genTableService.selectGenTableById(tableId); List tables = genTableService.selectGenTableAll(); List list = genTableColumnService.selectGenTableColumnListByTableId(tableId); @@ -71,8 +68,7 @@ public class GenController extends BaseController */ @RequiresPermissions("tool:gen:list") @GetMapping("/db/list") - public TableDataInfo dataList(GenTable genTable) - { + public TableDataInfo dataList(GenTable genTable) { startPage(); List list = genTableService.selectDbTableList(genTable); return getDataTable(list); @@ -82,8 +78,7 @@ public class GenController extends BaseController * 鏌ヨ鏁版嵁琛ㄥ瓧娈靛垪琛 */ @GetMapping(value = "/column/{tableId}") - public TableDataInfo columnList(Long tableId) - { + public TableDataInfo columnList(Long tableId) { TableDataInfo dataInfo = new TableDataInfo(); List list = genTableColumnService.selectGenTableColumnListByTableId(tableId); dataInfo.setRows(list); @@ -97,8 +92,7 @@ public class GenController extends BaseController @RequiresPermissions("tool:gen:import") @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.IMPORT) @PostMapping("/importTable") - public AjaxResult importTableSave(String tables) - { + public AjaxResult importTableSave(String tables) { String[] tableNames = Convert.toStrArray(tables); // 鏌ヨ琛ㄤ俊鎭 List tableList = genTableService.selectDbTableListByNames(tableNames); @@ -112,8 +106,7 @@ public class GenController extends BaseController @RequiresPermissions("tool:gen:edit") @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult editSave(@Validated @RequestBody GenTable genTable) - { + public AjaxResult editSave(@Validated @RequestBody GenTable genTable) { genTableService.validateEdit(genTable); genTableService.updateGenTable(genTable); return AjaxResult.success(); @@ -125,8 +118,7 @@ public class GenController extends BaseController @RequiresPermissions("tool:gen:remove") @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.DELETE) @DeleteMapping("/{tableIds}") - public AjaxResult remove(@PathVariable Long[] tableIds) - { + public AjaxResult remove(@PathVariable Long[] tableIds) { genTableService.deleteGenTableByIds(tableIds); return AjaxResult.success(); } @@ -136,8 +128,7 @@ public class GenController extends BaseController */ @RequiresPermissions("tool:gen:preview") @GetMapping("/preview/{tableId}") - public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException - { + public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException { Map dataMap = genTableService.previewCode(tableId); return AjaxResult.success(dataMap); } @@ -148,8 +139,7 @@ public class GenController extends BaseController @RequiresPermissions("tool:gen:code") @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE) @GetMapping("/download/{tableName}") - public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException - { + public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException { byte[] data = genTableService.downloadCode(tableName); genCode(response, data); } @@ -160,8 +150,7 @@ public class GenController extends BaseController @RequiresPermissions("tool:gen:code") @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE) @GetMapping("/genCode/{tableName}") - public AjaxResult genCode(@PathVariable("tableName") String tableName) - { + public AjaxResult genCode(@PathVariable("tableName") String tableName) { genTableService.generatorCode(tableName); return AjaxResult.success(); } @@ -172,8 +161,7 @@ public class GenController extends BaseController @RequiresPermissions("tool:gen:edit") @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE) @GetMapping("/synchDb/{tableName}") - public AjaxResult synchDb(@PathVariable("tableName") String tableName) - { + public AjaxResult synchDb(@PathVariable("tableName") String tableName) { genTableService.synchDb(tableName); return AjaxResult.success(); } @@ -184,8 +172,7 @@ public class GenController extends BaseController @RequiresPermissions("tool:gen:code") @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE) @GetMapping("/batchGenCode") - public void batchGenCode(HttpServletResponse response, String tables) throws IOException - { + public void batchGenCode(HttpServletResponse response, String tables) throws IOException { String[] tableNames = Convert.toStrArray(tables); byte[] data = genTableService.downloadCode(tableNames); genCode(response, data); @@ -194,8 +181,7 @@ public class GenController extends BaseController /** * 鐢熸垚zip鏂囦欢 */ - private void genCode(HttpServletResponse response, byte[] data) throws IOException - { + private void genCode(HttpServletResponse response, byte[] data) throws IOException { response.reset(); response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); response.addHeader("Content-Length", "" + data.length); diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java index 619f9aaf..8196068f 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java @@ -11,361 +11,353 @@ import java.util.List; /** * 涓氬姟琛 gen_table - * + * * @author ruoyi */ -public class GenTable extends BaseEntity -{ +public class GenTable extends BaseEntity { private static final long serialVersionUID = 1L; - /** 缂栧彿 */ + /** + * 缂栧彿 + */ private Long tableId; - /** 琛ㄥ悕绉 */ + /** + * 琛ㄥ悕绉 + */ @NotBlank(message = "琛ㄥ悕绉颁笉鑳戒负绌") private String tableName; - /** 琛ㄦ弿杩 */ + /** + * 琛ㄦ弿杩 + */ @NotBlank(message = "琛ㄦ弿杩颁笉鑳戒负绌") private String tableComment; - /** 鍏宠仈鐖惰〃鐨勮〃鍚 */ + /** + * 鍏宠仈鐖惰〃鐨勮〃鍚 + */ private String subTableName; - /** 鏈〃鍏宠仈鐖惰〃鐨勫閿悕 */ + /** + * 鏈〃鍏宠仈鐖惰〃鐨勫閿悕 + */ private String subTableFkName; - /** 瀹炰綋绫诲悕绉(棣栧瓧姣嶅ぇ鍐) */ + /** + * 瀹炰綋绫诲悕绉(棣栧瓧姣嶅ぇ鍐) + */ @NotBlank(message = "瀹炰綋绫诲悕绉颁笉鑳戒负绌") private String className; - /** 浣跨敤鐨勬ā鏉匡紙crud鍗曡〃鎿嶄綔 tree鏍戣〃鎿嶄綔 sub涓诲瓙琛ㄦ搷浣滐級 */ + /** + * 浣跨敤鐨勬ā鏉匡紙crud鍗曡〃鎿嶄綔 tree鏍戣〃鎿嶄綔 sub涓诲瓙琛ㄦ搷浣滐級 + */ private String tplCategory; - /** 鐢熸垚鍖呰矾寰 */ + /** + * 鐢熸垚鍖呰矾寰 + */ @NotBlank(message = "鐢熸垚鍖呰矾寰勪笉鑳戒负绌") private String packageName; - /** 鐢熸垚妯″潡鍚 */ + /** + * 鐢熸垚妯″潡鍚 + */ @NotBlank(message = "鐢熸垚妯″潡鍚嶄笉鑳戒负绌") private String moduleName; - /** 鐢熸垚涓氬姟鍚 */ + /** + * 鐢熸垚涓氬姟鍚 + */ @NotBlank(message = "鐢熸垚涓氬姟鍚嶄笉鑳戒负绌") private String businessName; - /** 鐢熸垚鍔熻兘鍚 */ + /** + * 鐢熸垚鍔熻兘鍚 + */ @NotBlank(message = "鐢熸垚鍔熻兘鍚嶄笉鑳戒负绌") private String functionName; - /** 鐢熸垚浣滆 */ + /** + * 鐢熸垚浣滆 + */ @NotBlank(message = "浣滆呬笉鑳戒负绌") private String functionAuthor; - /** 鐢熸垚浠ｇ爜鏂瑰紡锛0zip鍘嬬缉鍖 1鑷畾涔夎矾寰勶級 */ + /** + * 鐢熸垚浠ｇ爜鏂瑰紡锛0zip鍘嬬缉鍖 1鑷畾涔夎矾寰勶級 + */ private String genType; - /** 鐢熸垚璺緞锛堜笉濉粯璁ら」鐩矾寰勶級 */ + /** + * 鐢熸垚璺緞锛堜笉濉粯璁ら」鐩矾寰勶級 + */ private String genPath; - /** 涓婚敭淇℃伅 */ + /** + * 涓婚敭淇℃伅 + */ private GenTableColumn pkColumn; - /** 瀛愯〃淇℃伅 */ + /** + * 瀛愯〃淇℃伅 + */ private GenTable subTable; - /** 琛ㄥ垪淇℃伅 */ + /** + * 琛ㄥ垪淇℃伅 + */ @Valid private List columns; - /** 鍏跺畠鐢熸垚閫夐」 */ + /** + * 鍏跺畠鐢熸垚閫夐」 + */ private String options; - /** 鏍戠紪鐮佸瓧娈 */ + /** + * 鏍戠紪鐮佸瓧娈 + */ private String treeCode; - /** 鏍戠埗缂栫爜瀛楁 */ + /** + * 鏍戠埗缂栫爜瀛楁 + */ private String treeParentCode; - /** 鏍戝悕绉板瓧娈 */ + /** + * 鏍戝悕绉板瓧娈 + */ private String treeName; - /** 涓婄骇鑿滃崟ID瀛楁 */ + /** + * 涓婄骇鑿滃崟ID瀛楁 + */ private String parentMenuId; - /** 涓婄骇鑿滃崟鍚嶇О瀛楁 */ + /** + * 涓婄骇鑿滃崟鍚嶇О瀛楁 + */ private String parentMenuName; - public Long getTableId() - { + public static boolean isSub(String tplCategory) { + return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory); + } + + public static boolean isTree(String tplCategory) { + return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory); + } + + public static boolean isCrud(String tplCategory) { + return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory); + } + + public static boolean isSuperColumn(String tplCategory, String javaField) { + if (isTree(tplCategory)) { + return StringUtils.equalsAnyIgnoreCase(javaField, + ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY)); + } + return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY); + } + + public Long getTableId() { return tableId; } - public void setTableId(Long tableId) - { + public void setTableId(Long tableId) { this.tableId = tableId; } - public String getTableName() - { + public String getTableName() { return tableName; } - public void setTableName(String tableName) - { + public void setTableName(String tableName) { this.tableName = tableName; } - public String getTableComment() - { + public String getTableComment() { return tableComment; } - public void setTableComment(String tableComment) - { + public void setTableComment(String tableComment) { this.tableComment = tableComment; } - public String getSubTableName() - { + public String getSubTableName() { return subTableName; } - public void setSubTableName(String subTableName) - { + public void setSubTableName(String subTableName) { this.subTableName = subTableName; } - public String getSubTableFkName() - { + public String getSubTableFkName() { return subTableFkName; } - public void setSubTableFkName(String subTableFkName) - { + public void setSubTableFkName(String subTableFkName) { this.subTableFkName = subTableFkName; } - public String getClassName() - { + public String getClassName() { return className; } - public void setClassName(String className) - { + public void setClassName(String className) { this.className = className; } - public String getTplCategory() - { + public String getTplCategory() { return tplCategory; } - public void setTplCategory(String tplCategory) - { + public void setTplCategory(String tplCategory) { this.tplCategory = tplCategory; } - public String getPackageName() - { + public String getPackageName() { return packageName; } - public void setPackageName(String packageName) - { + public void setPackageName(String packageName) { this.packageName = packageName; } - public String getModuleName() - { + public String getModuleName() { return moduleName; } - public void setModuleName(String moduleName) - { + public void setModuleName(String moduleName) { this.moduleName = moduleName; } - public String getBusinessName() - { + public String getBusinessName() { return businessName; } - public void setBusinessName(String businessName) - { + public void setBusinessName(String businessName) { this.businessName = businessName; } - public String getFunctionName() - { + public String getFunctionName() { return functionName; } - public void setFunctionName(String functionName) - { + public void setFunctionName(String functionName) { this.functionName = functionName; } - public String getFunctionAuthor() - { + public String getFunctionAuthor() { return functionAuthor; } - public void setFunctionAuthor(String functionAuthor) - { + public void setFunctionAuthor(String functionAuthor) { this.functionAuthor = functionAuthor; } - public String getGenType() - { + public String getGenType() { return genType; } - public void setGenType(String genType) - { + public void setGenType(String genType) { this.genType = genType; } - public String getGenPath() - { + public String getGenPath() { return genPath; } - public void setGenPath(String genPath) - { + public void setGenPath(String genPath) { this.genPath = genPath; } - public GenTableColumn getPkColumn() - { + public GenTableColumn getPkColumn() { return pkColumn; } - public void setPkColumn(GenTableColumn pkColumn) - { + public void setPkColumn(GenTableColumn pkColumn) { this.pkColumn = pkColumn; } - public GenTable getSubTable() - { + public GenTable getSubTable() { return subTable; } - public void setSubTable(GenTable subTable) - { + public void setSubTable(GenTable subTable) { this.subTable = subTable; } - public List getColumns() - { + + public List getColumns() { return columns; } - public void setColumns(List columns) - { + public void setColumns(List columns) { this.columns = columns; } - public String getOptions() - { + public String getOptions() { return options; } - public void setOptions(String options) - { + public void setOptions(String options) { this.options = options; } - public String getTreeCode() - { + public String getTreeCode() { return treeCode; } - public void setTreeCode(String treeCode) - { + public void setTreeCode(String treeCode) { this.treeCode = treeCode; } - public String getTreeParentCode() - { + public String getTreeParentCode() { return treeParentCode; } - public void setTreeParentCode(String treeParentCode) - { + public void setTreeParentCode(String treeParentCode) { this.treeParentCode = treeParentCode; } - public String getTreeName() - { + public String getTreeName() { return treeName; } - public void setTreeName(String treeName) - { + public void setTreeName(String treeName) { this.treeName = treeName; } - public String getParentMenuId() - { + public String getParentMenuId() { return parentMenuId; } - public void setParentMenuId(String parentMenuId) - { + public void setParentMenuId(String parentMenuId) { this.parentMenuId = parentMenuId; } - public String getParentMenuName() - { + public String getParentMenuName() { return parentMenuName; } - public void setParentMenuName(String parentMenuName) - { + public void setParentMenuName(String parentMenuName) { this.parentMenuName = parentMenuName; } - public boolean isSub() - { + public boolean isSub() { return isSub(this.tplCategory); } - public static boolean isSub(String tplCategory) - { - return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory); - } - public boolean isTree() - { + public boolean isTree() { return isTree(this.tplCategory); } - public static boolean isTree(String tplCategory) - { - return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory); - } - - public boolean isCrud() - { + public boolean isCrud() { return isCrud(this.tplCategory); } - public static boolean isCrud(String tplCategory) - { - return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory); - } - - public boolean isSuperColumn(String javaField) - { + public boolean isSuperColumn(String javaField) { return isSuperColumn(this.tplCategory, javaField); } - - public static boolean isSuperColumn(String tplCategory, String javaField) - { - if (isTree(tplCategory)) - { - return StringUtils.equalsAnyIgnoreCase(javaField, - ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY)); - } - return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY); - } } diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java index cdb5a68c..af53dc2b 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java @@ -7,350 +7,329 @@ import javax.validation.constraints.NotBlank; /** * 浠ｇ爜鐢熸垚涓氬姟瀛楁琛 gen_table_column - * + * * @author ruoyi */ -public class GenTableColumn extends BaseEntity -{ +public class GenTableColumn extends BaseEntity { private static final long serialVersionUID = 1L; - /** 缂栧彿 */ + /** + * 缂栧彿 + */ private Long columnId; - /** 褰掑睘琛ㄧ紪鍙 */ + /** + * 褰掑睘琛ㄧ紪鍙 + */ private Long tableId; - /** 鍒楀悕绉 */ + /** + * 鍒楀悕绉 + */ private String columnName; - /** 鍒楁弿杩 */ + /** + * 鍒楁弿杩 + */ private String columnComment; - /** 鍒楃被鍨 */ + /** + * 鍒楃被鍨 + */ private String columnType; - /** JAVA绫诲瀷 */ + /** + * JAVA绫诲瀷 + */ private String javaType; - /** JAVA瀛楁鍚 */ + /** + * JAVA瀛楁鍚 + */ @NotBlank(message = "Java灞炴т笉鑳戒负绌") private String javaField; - /** 鏄惁涓婚敭锛1鏄級 */ + /** + * 鏄惁涓婚敭锛1鏄級 + */ private String isPk; - /** 鏄惁鑷锛1鏄級 */ + /** + * 鏄惁鑷锛1鏄級 + */ private String isIncrement; - /** 鏄惁蹇呭～锛1鏄級 */ + /** + * 鏄惁蹇呭～锛1鏄級 + */ private String isRequired; - /** 鏄惁涓烘彃鍏ュ瓧娈碉紙1鏄級 */ + /** + * 鏄惁涓烘彃鍏ュ瓧娈碉紙1鏄級 + */ private String isInsert; - /** 鏄惁缂栬緫瀛楁锛1鏄級 */ + /** + * 鏄惁缂栬緫瀛楁锛1鏄級 + */ private String isEdit; - /** 鏄惁鍒楄〃瀛楁锛1鏄級 */ + /** + * 鏄惁鍒楄〃瀛楁锛1鏄級 + */ private String isList; - /** 鏄惁鏌ヨ瀛楁锛1鏄級 */ + /** + * 鏄惁鏌ヨ瀛楁锛1鏄級 + */ private String isQuery; - /** 鏌ヨ鏂瑰紡锛圗Q绛変簬銆丯E涓嶇瓑浜庛丟T澶т簬銆丩T灏忎簬銆丩IKE妯＄硦銆丅ETWEEN鑼冨洿锛 */ + /** + * 鏌ヨ鏂瑰紡锛圗Q绛変簬銆丯E涓嶇瓑浜庛丟T澶т簬銆丩T灏忎簬銆丩IKE妯＄硦銆丅ETWEEN鑼冨洿锛 + */ private String queryType; - /** 鏄剧ず绫诲瀷锛坕nput鏂囨湰妗嗐乼extarea鏂囨湰鍩熴乻elect涓嬫媺妗嗐乧heckbox澶嶉夋銆乺adio鍗曢夋銆乨atetime鏃ユ湡鎺т欢銆乮mage鍥剧墖涓婁紶鎺т欢銆乽pload鏂囦欢涓婁紶鎺т欢銆乪ditor瀵屾枃鏈帶浠讹級 */ + /** + * 鏄剧ず绫诲瀷锛坕nput鏂囨湰妗嗐乼extarea鏂囨湰鍩熴乻elect涓嬫媺妗嗐乧heckbox澶嶉夋銆乺adio鍗曢夋銆乨atetime鏃ユ湡鎺т欢銆乮mage鍥剧墖涓婁紶鎺т欢銆乽pload鏂囦欢涓婁紶鎺т欢銆乪ditor瀵屾枃鏈帶浠讹級 + */ private String htmlType; - /** 瀛楀吀绫诲瀷 */ + /** + * 瀛楀吀绫诲瀷 + */ private String dictType; - /** 鎺掑簭 */ + /** + * 鎺掑簭 + */ private Integer sort; - public void setColumnId(Long columnId) - { - this.columnId = columnId; + public static boolean isSuperColumn(String javaField) { + return StringUtils.equalsAnyIgnoreCase(javaField, + // BaseEntity + "createBy", "createTime", "updateBy", "updateTime", "remark", + // TreeEntity + "parentName", "parentId", "orderNum", "ancestors"); + } + + public static boolean isUsableColumn(String javaField) { + // isSuperColumn()涓殑鍚嶅崟鐢ㄤ簬閬垮厤鐢熸垚澶氫綑Domain灞炴э紝鑻ユ煇浜涘睘鎬у湪鐢熸垚椤甸潰鏃堕渶瑕佺敤鍒颁笉鑳藉拷鐣ワ紝鍒欐斁鍦ㄦ澶勭櫧鍚嶅崟 + return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark"); } - public Long getColumnId() - { + public Long getColumnId() { return columnId; } - public void setTableId(Long tableId) - { - this.tableId = tableId; + public void setColumnId(Long columnId) { + this.columnId = columnId; } - public Long getTableId() - { + public Long getTableId() { return tableId; } - public void setColumnName(String columnName) - { - this.columnName = columnName; + public void setTableId(Long tableId) { + this.tableId = tableId; } - public String getColumnName() - { + public String getColumnName() { return columnName; } - public void setColumnComment(String columnComment) - { - this.columnComment = columnComment; + public void setColumnName(String columnName) { + this.columnName = columnName; } - public String getColumnComment() - { + public String getColumnComment() { return columnComment; } - public void setColumnType(String columnType) - { - this.columnType = columnType; + public void setColumnComment(String columnComment) { + this.columnComment = columnComment; } - public String getColumnType() - { + public String getColumnType() { return columnType; } - public void setJavaType(String javaType) - { - this.javaType = javaType; + public void setColumnType(String columnType) { + this.columnType = columnType; } - public String getJavaType() - { + public String getJavaType() { return javaType; } - public void setJavaField(String javaField) - { - this.javaField = javaField; + public void setJavaType(String javaType) { + this.javaType = javaType; } - public String getJavaField() - { + public String getJavaField() { return javaField; } - public String getCapJavaField() - { - return StringUtils.capitalize(javaField); + public void setJavaField(String javaField) { + this.javaField = javaField; } - public void setIsPk(String isPk) - { - this.isPk = isPk; + public String getCapJavaField() { + return StringUtils.capitalize(javaField); } - public String getIsPk() - { + public String getIsPk() { return isPk; } - public boolean isPk() - { + public void setIsPk(String isPk) { + this.isPk = isPk; + } + + public boolean isPk() { return isPk(this.isPk); } - public boolean isPk(String isPk) - { + public boolean isPk(String isPk) { return isPk != null && StringUtils.equals("1", isPk); } - public String getIsIncrement() - { + public String getIsIncrement() { return isIncrement; } - public void setIsIncrement(String isIncrement) - { + public void setIsIncrement(String isIncrement) { this.isIncrement = isIncrement; } - public boolean isIncrement() - { + public boolean isIncrement() { return isIncrement(this.isIncrement); } - public boolean isIncrement(String isIncrement) - { + public boolean isIncrement(String isIncrement) { return isIncrement != null && StringUtils.equals("1", isIncrement); } - public void setIsRequired(String isRequired) - { - this.isRequired = isRequired; + public String getIsRequired() { + return isRequired; } - public String getIsRequired() - { - return isRequired; + public void setIsRequired(String isRequired) { + this.isRequired = isRequired; } - public boolean isRequired() - { + public boolean isRequired() { return isRequired(this.isRequired); } - public boolean isRequired(String isRequired) - { + public boolean isRequired(String isRequired) { return isRequired != null && StringUtils.equals("1", isRequired); } - public void setIsInsert(String isInsert) - { - this.isInsert = isInsert; + public String getIsInsert() { + return isInsert; } - public String getIsInsert() - { - return isInsert; + public void setIsInsert(String isInsert) { + this.isInsert = isInsert; } - public boolean isInsert() - { + public boolean isInsert() { return isInsert(this.isInsert); } - public boolean isInsert(String isInsert) - { + public boolean isInsert(String isInsert) { return isInsert != null && StringUtils.equals("1", isInsert); } - public void setIsEdit(String isEdit) - { - this.isEdit = isEdit; + public String getIsEdit() { + return isEdit; } - public String getIsEdit() - { - return isEdit; + public void setIsEdit(String isEdit) { + this.isEdit = isEdit; } - public boolean isEdit() - { + public boolean isEdit() { return isInsert(this.isEdit); } - public boolean isEdit(String isEdit) - { + public boolean isEdit(String isEdit) { return isEdit != null && StringUtils.equals("1", isEdit); } - public void setIsList(String isList) - { - this.isList = isList; + public String getIsList() { + return isList; } - public String getIsList() - { - return isList; + public void setIsList(String isList) { + this.isList = isList; } - public boolean isList() - { + public boolean isList() { return isList(this.isList); } - public boolean isList(String isList) - { + public boolean isList(String isList) { return isList != null && StringUtils.equals("1", isList); } - public void setIsQuery(String isQuery) - { - this.isQuery = isQuery; + public String getIsQuery() { + return isQuery; } - public String getIsQuery() - { - return isQuery; + public void setIsQuery(String isQuery) { + this.isQuery = isQuery; } - public boolean isQuery() - { + public boolean isQuery() { return isQuery(this.isQuery); } - public boolean isQuery(String isQuery) - { + public boolean isQuery(String isQuery) { return isQuery != null && StringUtils.equals("1", isQuery); } - public void setQueryType(String queryType) - { - this.queryType = queryType; + public String getQueryType() { + return queryType; } - public String getQueryType() - { - return queryType; + public void setQueryType(String queryType) { + this.queryType = queryType; } - public String getHtmlType() - { + public String getHtmlType() { return htmlType; } - public void setHtmlType(String htmlType) - { + public void setHtmlType(String htmlType) { this.htmlType = htmlType; } - public void setDictType(String dictType) - { - this.dictType = dictType; - } - - public String getDictType() - { + public String getDictType() { return dictType; } - public void setSort(Integer sort) - { - this.sort = sort; + public void setDictType(String dictType) { + this.dictType = dictType; } - public Integer getSort() - { + public Integer getSort() { return sort; } - public boolean isSuperColumn() - { - return isSuperColumn(this.javaField); + public void setSort(Integer sort) { + this.sort = sort; } - public static boolean isSuperColumn(String javaField) - { - return StringUtils.equalsAnyIgnoreCase(javaField, - // BaseEntity - "createBy", "createTime", "updateBy", "updateTime", "remark", - // TreeEntity - "parentName", "parentId", "orderNum", "ancestors"); + public boolean isSuperColumn() { + return isSuperColumn(this.javaField); } - public boolean isUsableColumn() - { + public boolean isUsableColumn() { return isUsableColumn(javaField); } - public static boolean isUsableColumn(String javaField) - { - // isSuperColumn()涓殑鍚嶅崟鐢ㄤ簬閬垮厤鐢熸垚澶氫綑Domain灞炴э紝鑻ユ煇浜涘睘鎬у湪鐢熸垚椤甸潰鏃堕渶瑕佺敤鍒颁笉鑳藉拷鐣ワ紝鍒欐斁鍦ㄦ澶勭櫧鍚嶅崟 - return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark"); - } - - public String readConverterExp() - { + public String readConverterExp() { String remarks = StringUtils.substringBetween(this.columnComment, "锛", "锛"); StringBuffer sb = new StringBuffer(); if (StringUtils.isNotEmpty(remarks)) { @@ -362,9 +341,7 @@ public class GenTableColumn extends BaseEntity } } return sb.deleteCharAt(sb.length() - 1).toString(); - } - else - { + } else { return this.columnComment; } } diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java index 71ba93a3..407139a7 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java @@ -6,14 +6,13 @@ import java.util.List; /** * 涓氬姟瀛楁 鏁版嵁灞 - * + * * @author ruoyi */ -public interface GenTableColumnMapper -{ +public interface GenTableColumnMapper { /** * 鏍规嵁琛ㄥ悕绉版煡璇㈠垪淇℃伅 - * + * * @param tableName 琛ㄥ悕绉 * @return 鍒椾俊鎭 */ @@ -21,7 +20,7 @@ public interface GenTableColumnMapper /** * 鏌ヨ涓氬姟瀛楁鍒楄〃 - * + * * @param tableId 涓氬姟瀛楁缂栧彿 * @return 涓氬姟瀛楁闆嗗悎 */ @@ -29,7 +28,7 @@ public interface GenTableColumnMapper /** * 鏂板涓氬姟瀛楁 - * + * * @param genTableColumn 涓氬姟瀛楁淇℃伅 * @return 缁撴灉 */ @@ -37,7 +36,7 @@ public interface GenTableColumnMapper /** * 淇敼涓氬姟瀛楁 - * + * * @param genTableColumn 涓氬姟瀛楁淇℃伅 * @return 缁撴灉 */ @@ -45,7 +44,7 @@ public interface GenTableColumnMapper /** * 鍒犻櫎涓氬姟瀛楁 - * + * * @param genTableColumns 鍒楁暟鎹 * @return 缁撴灉 */ @@ -53,7 +52,7 @@ public interface GenTableColumnMapper /** * 鎵归噺鍒犻櫎涓氬姟瀛楁 - * + * * @param ids 闇瑕佸垹闄ょ殑鏁版嵁ID * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java index a8f56692..521971ff 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java @@ -6,14 +6,13 @@ import java.util.List; /** * 涓氬姟 鏁版嵁灞 - * + * * @author ruoyi */ -public interface GenTableMapper -{ +public interface GenTableMapper { /** * 鏌ヨ涓氬姟鍒楄〃 - * + * * @param genTable 涓氬姟淇℃伅 * @return 涓氬姟闆嗗悎 */ @@ -21,7 +20,7 @@ public interface GenTableMapper /** * 鏌ヨ鎹簱鍒楄〃 - * + * * @param genTable 涓氬姟淇℃伅 * @return 鏁版嵁搴撹〃闆嗗悎 */ @@ -29,7 +28,7 @@ public interface GenTableMapper /** * 鏌ヨ鎹簱鍒楄〃 - * + * * @param tableNames 琛ㄥ悕绉扮粍 * @return 鏁版嵁搴撹〃闆嗗悎 */ @@ -37,14 +36,14 @@ public interface GenTableMapper /** * 鏌ヨ鎵鏈夎〃淇℃伅 - * + * * @return 琛ㄤ俊鎭泦鍚 */ public List selectGenTableAll(); /** * 鏌ヨ琛↖D涓氬姟淇℃伅 - * + * * @param id 涓氬姟ID * @return 涓氬姟淇℃伅 */ @@ -52,7 +51,7 @@ public interface GenTableMapper /** * 鏌ヨ琛ㄥ悕绉颁笟鍔′俊鎭 - * + * * @param tableName 琛ㄥ悕绉 * @return 涓氬姟淇℃伅 */ @@ -60,7 +59,7 @@ public interface GenTableMapper /** * 鏂板涓氬姟 - * + * * @param genTable 涓氬姟淇℃伅 * @return 缁撴灉 */ @@ -68,7 +67,7 @@ public interface GenTableMapper /** * 淇敼涓氬姟 - * + * * @param genTable 涓氬姟淇℃伅 * @return 缁撴灉 */ @@ -76,7 +75,7 @@ public interface GenTableMapper /** * 鎵归噺鍒犻櫎涓氬姟 - * + * * @param ids 闇瑕佸垹闄ょ殑鏁版嵁ID * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java index 0084755b..ad96f7c9 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java @@ -10,60 +10,55 @@ import java.util.List; /** * 涓氬姟瀛楁 鏈嶅姟灞傚疄鐜 - * + * * @author ruoyi */ @Service -public class GenTableColumnServiceImpl implements IGenTableColumnService -{ - @Autowired - private GenTableColumnMapper genTableColumnMapper; +public class GenTableColumnServiceImpl implements IGenTableColumnService { + @Autowired + private GenTableColumnMapper genTableColumnMapper; - /** + /** * 鏌ヨ涓氬姟瀛楁鍒楄〃 - * + * * @param tableId 涓氬姟瀛楁缂栧彿 * @return 涓氬姟瀛楁闆嗗悎 */ - @Override - public List selectGenTableColumnListByTableId(Long tableId) - { - return genTableColumnMapper.selectGenTableColumnListByTableId(tableId); - } - + @Override + public List selectGenTableColumnListByTableId(Long tableId) { + return genTableColumnMapper.selectGenTableColumnListByTableId(tableId); + } + /** * 鏂板涓氬姟瀛楁 - * + * * @param genTableColumn 涓氬姟瀛楁淇℃伅 * @return 缁撴灉 */ - @Override - public int insertGenTableColumn(GenTableColumn genTableColumn) - { - return genTableColumnMapper.insertGenTableColumn(genTableColumn); - } - - /** + @Override + public int insertGenTableColumn(GenTableColumn genTableColumn) { + return genTableColumnMapper.insertGenTableColumn(genTableColumn); + } + + /** * 淇敼涓氬姟瀛楁 - * + * * @param genTableColumn 涓氬姟瀛楁淇℃伅 * @return 缁撴灉 */ - @Override - public int updateGenTableColumn(GenTableColumn genTableColumn) - { - return genTableColumnMapper.updateGenTableColumn(genTableColumn); - } + @Override + public int updateGenTableColumn(GenTableColumn genTableColumn) { + return genTableColumnMapper.updateGenTableColumn(genTableColumn); + } - /** + /** * 鍒犻櫎涓氬姟瀛楁瀵硅薄 - * + * * @param ids 闇瑕佸垹闄ょ殑鏁版嵁ID * @return 缁撴灉 */ - @Override - public int deleteGenTableColumnByIds(String ids) - { - return genTableColumnMapper.deleteGenTableColumnByIds(Convert.toLongArray(ids)); - } + @Override + public int deleteGenTableColumnByIds(String ids) { + return genTableColumnMapper.deleteGenTableColumnByIds(Convert.toLongArray(ids)); + } } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java index f19ae9c8..ae2cb7f5 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java @@ -40,12 +40,11 @@ import java.util.zip.ZipOutputStream; /** * 涓氬姟 鏈嶅姟灞傚疄鐜 - * + * * @author ruoyi */ @Service -public class GenTableServiceImpl implements IGenTableService -{ +public class GenTableServiceImpl implements IGenTableService { private static final Logger log = LoggerFactory.getLogger(GenTableServiceImpl.class); @Autowired @@ -54,15 +53,29 @@ public class GenTableServiceImpl implements IGenTableService @Autowired private GenTableColumnMapper genTableColumnMapper; + /** + * 鑾峰彇浠ｇ爜鐢熸垚鍦板潃 + * + * @param table 涓氬姟琛ㄤ俊鎭 + * @param template 妯℃澘鏂囦欢璺緞 + * @return 鐢熸垚鍦板潃 + */ + public static String getGenPath(GenTable table, String template) { + String genPath = table.getGenPath(); + if (StringUtils.equals(genPath, StringUtils.SLASH)) { + return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table); + } + return genPath + File.separator + VelocityUtils.getFileName(template, table); + } + /** * 鏌ヨ涓氬姟淇℃伅 - * + * * @param id 涓氬姟ID * @return 涓氬姟淇℃伅 */ @Override - public GenTable selectGenTableById(Long id) - { + public GenTable selectGenTableById(Long id) { GenTable genTable = genTableMapper.selectGenTableById(id); setTableFromOptions(genTable); return genTable; @@ -70,68 +83,61 @@ public class GenTableServiceImpl implements IGenTableService /** * 鏌ヨ涓氬姟鍒楄〃 - * + * * @param genTable 涓氬姟淇℃伅 * @return 涓氬姟闆嗗悎 */ @Override - public List selectGenTableList(GenTable genTable) - { + public List selectGenTableList(GenTable genTable) { return genTableMapper.selectGenTableList(genTable); } /** * 鏌ヨ鎹簱鍒楄〃 - * + * * @param genTable 涓氬姟淇℃伅 * @return 鏁版嵁搴撹〃闆嗗悎 */ @Override - public List selectDbTableList(GenTable genTable) - { + public List selectDbTableList(GenTable genTable) { return genTableMapper.selectDbTableList(genTable); } /** * 鏌ヨ鎹簱鍒楄〃 - * + * * @param tableNames 琛ㄥ悕绉扮粍 * @return 鏁版嵁搴撹〃闆嗗悎 */ @Override - public List selectDbTableListByNames(String[] tableNames) - { + public List selectDbTableListByNames(String[] tableNames) { return genTableMapper.selectDbTableListByNames(tableNames); } /** * 鏌ヨ鎵鏈夎〃淇℃伅 - * + * * @return 琛ㄤ俊鎭泦鍚 */ @Override - public List selectGenTableAll() - { + public List selectGenTableAll() { return genTableMapper.selectGenTableAll(); } /** * 淇敼涓氬姟 - * + * * @param genTable 涓氬姟淇℃伅 * @return 缁撴灉 */ @Override @Transactional(rollbackFor = Exception.class) - public void updateGenTable(GenTable genTable) - { + public void updateGenTable(GenTable genTable) { String options = JSON.toJSONString(genTable.getParams()); genTable.setOptions(options); int row = genTableMapper.updateGenTable(genTable); - if (row > 0) - { - for (GenTableColumn cenTableColumn : genTable.getColumns()) - { + if (row > 0) { + for (GenTableColumn cenTableColumn : genTable.getColumns()) { genTableColumnMapper.updateGenTableColumn(cenTableColumn); } } @@ -139,62 +145,53 @@ public class GenTableServiceImpl implements IGenTableService /** * 鍒犻櫎涓氬姟瀵硅薄 - * + * * @param tableIds 闇瑕佸垹闄ょ殑鏁版嵁ID * @return 缁撴灉 */ @Override @Transactional(rollbackFor = Exception.class) - public void deleteGenTableByIds(Long[] tableIds) - { + public void deleteGenTableByIds(Long[] tableIds) { genTableMapper.deleteGenTableByIds(tableIds); genTableColumnMapper.deleteGenTableColumnByIds(tableIds); } /** * 瀵煎叆琛ㄧ粨鏋 - * + * * @param tableList 瀵煎叆琛ㄥ垪琛 */ @Override @Transactional(rollbackFor = Exception.class) - public void importGenTable(List tableList) - { + public void importGenTable(List tableList) { String operName = SecurityUtils.getUsername(); - try - { - for (GenTable table : tableList) - { + try { + for (GenTable table : tableList) { String tableName = table.getTableName(); GenUtils.initTable(table, operName); int row = genTableMapper.insertGenTable(table); - if (row > 0) - { + if (row > 0) { // 淇濆瓨鍒椾俊鎭 List genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName); - for (GenTableColumn column : genTableColumns) - { + for (GenTableColumn column : genTableColumns) { GenUtils.initColumnField(column, table); genTableColumnMapper.insertGenTableColumn(column); } } } - } - catch (Exception e) - { + } catch (Exception e) { throw new ServiceException("瀵煎叆澶辫触锛" + e.getMessage()); } } /** * 棰勮浠ｇ爜 - * + * * @param tableId 琛ㄧ紪鍙 * @return 棰勮鏁版嵁鍒楄〃 */ @Override - public Map previewCode(Long tableId) - { + public Map previewCode(Long tableId) { Map dataMap = new LinkedHashMap<>(); // 鏌ヨ琛ㄤ俊鎭 GenTable table = genTableMapper.selectGenTableById(tableId); @@ -208,8 +205,7 @@ public class GenTableServiceImpl implements IGenTableService // 鑾峰彇妯℃澘鍒楄〃 List templates = VelocityUtils.getTemplateList(table.getTplCategory()); - for (String template : templates) - { + for (String template : templates) { // 娓叉煋妯℃澘 StringWriter sw = new StringWriter(); Template tpl = Velocity.getTemplate(template, Constants.UTF8); @@ -221,13 +217,12 @@ public class GenTableServiceImpl implements IGenTableService /** * 鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級 - * + * * @param tableName 琛ㄥ悕绉 * @return 鏁版嵁 */ @Override - public byte[] downloadCode(String tableName) - { + public byte[] downloadCode(String tableName) { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); ZipOutputStream zip = new ZipOutputStream(outputStream); generatorCode(tableName, zip); @@ -237,12 +232,11 @@ public class GenTableServiceImpl implements IGenTableService /** * 鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛 - * + * * @param tableName 琛ㄥ悕绉 */ @Override - public void generatorCode(String tableName) - { + public void generatorCode(String tableName) { // 鏌ヨ琛ㄤ俊鎭 GenTable table = genTableMapper.selectGenTableByName(tableName); // 璁剧疆涓诲瓙琛ㄤ俊鎭 @@ -256,21 +250,16 @@ public class GenTableServiceImpl implements IGenTableService // 鑾峰彇妯℃澘鍒楄〃 List templates = VelocityUtils.getTemplateList(table.getTplCategory()); - for (String template : templates) - { - if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm")) - { + for (String template : templates) { + if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm")) { // 娓叉煋妯℃澘 StringWriter sw = new StringWriter(); Template tpl = Velocity.getTemplate(template, Constants.UTF8); tpl.merge(context, sw); - try - { + try { String path = getGenPath(table, template); FileUtils.writeStringToFile(new File(path), sw.toString(), CharsetKit.UTF_8); - } - catch (IOException e) - { + } catch (IOException e) { throw new ServiceException("娓叉煋妯℃澘澶辫触锛岃〃鍚嶏細" + table.getTableName()); } } @@ -279,32 +268,28 @@ public class GenTableServiceImpl implements IGenTableService /** * 鍚屾鏁版嵁搴 - * + * * @param tableName 琛ㄥ悕绉 */ @Override @Transactional(rollbackFor = Exception.class) - public void synchDb(String tableName) - { + public void synchDb(String tableName) { GenTable table = genTableMapper.selectGenTableByName(tableName); List tableColumns = table.getColumns(); Map tableColumnMap = tableColumns.stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity())); List dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName); - if (StringUtils.isEmpty(dbTableColumns)) - { + if (StringUtils.isEmpty(dbTableColumns)) { throw new ServiceException("鍚屾鏁版嵁澶辫触锛屽師琛ㄧ粨鏋勪笉瀛樺湪"); } List dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList()); dbTableColumns.forEach(column -> { GenUtils.initColumnField(column, table); - if (tableColumnMap.containsKey(column.getColumnName())) - { + if (tableColumnMap.containsKey(column.getColumnName())) { GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName()); column.setColumnId(prevColumn.getColumnId()); - if (column.isList()) - { + if (column.isList()) { // 濡傛灉鏄垪琛紝缁х画淇濈暀鏌ヨ鏂瑰紡/瀛楀吀绫诲瀷閫夐」 column.setDictType(prevColumn.getDictType()); column.setQueryType(prevColumn.getQueryType()); @@ -319,33 +304,28 @@ public class GenTableServiceImpl implements IGenTableService } } genTableColumnMapper.updateGenTableColumn(column); - } - else - { + } else { genTableColumnMapper.insertGenTableColumn(column); } }); List delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList()); - if (StringUtils.isNotEmpty(delColumns)) - { + if (StringUtils.isNotEmpty(delColumns)) { genTableColumnMapper.deleteGenTableColumns(delColumns); } } /** * 鎵归噺鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級 - * + * * @param tableNames 琛ㄦ暟缁 * @return 鏁版嵁 */ @Override - public byte[] downloadCode(String[] tableNames) - { + public byte[] downloadCode(String[] tableNames) { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); ZipOutputStream zip = new ZipOutputStream(outputStream); - for (String tableName : tableNames) - { + for (String tableName : tableNames) { generatorCode(tableName, zip); } IOUtils.closeQuietly(zip); @@ -355,8 +335,7 @@ public class GenTableServiceImpl implements IGenTableService /** * 鏌ヨ琛ㄤ俊鎭苟鐢熸垚浠ｇ爜 */ - private void generatorCode(String tableName, ZipOutputStream zip) - { + private void generatorCode(String tableName, ZipOutputStream zip) { // 鏌ヨ琛ㄤ俊鎭 GenTable table = genTableMapper.selectGenTableByName(tableName); // 璁剧疆涓诲瓙琛ㄤ俊鎭 @@ -370,23 +349,19 @@ public class GenTableServiceImpl implements IGenTableService // 鑾峰彇妯℃澘鍒楄〃 List templates = VelocityUtils.getTemplateList(table.getTplCategory()); - for (String template : templates) - { + for (String template : templates) { // 娓叉煋妯℃澘 StringWriter sw = new StringWriter(); Template tpl = Velocity.getTemplate(template, Constants.UTF8); tpl.merge(context, sw); - try - { + try { // 娣诲姞鍒皕ip zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table))); IOUtils.write(sw.toString(), zip, Constants.UTF8); IOUtils.closeQuietly(sw); zip.flush(); zip.closeEntry(); - } - catch (IOException e) - { + } catch (IOException e) { log.error("娓叉煋妯℃澘澶辫触锛岃〃鍚嶏細" + table.getTableName(), e); } } @@ -394,36 +369,24 @@ public class GenTableServiceImpl implements IGenTableService /** * 淇敼淇濆瓨鍙傛暟鏍￠獙 - * + * * @param genTable 涓氬姟淇℃伅 */ @Override - public void validateEdit(GenTable genTable) - { - if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) - { + public void validateEdit(GenTable genTable) { + if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) { String options = JSON.toJSONString(genTable.getParams()); JSONObject paramsObj = JSONObject.parseObject(options); - if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_CODE))) - { + if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_CODE))) { throw new ServiceException("鏍戠紪鐮佸瓧娈典笉鑳戒负绌"); - } - else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_PARENT_CODE))) - { + } else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_PARENT_CODE))) { throw new ServiceException("鏍戠埗缂栫爜瀛楁涓嶈兘涓虹┖"); - } - else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_NAME))) - { + } else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_NAME))) { throw new ServiceException("鏍戝悕绉板瓧娈典笉鑳戒负绌"); - } - else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory())) - { - if (StringUtils.isEmpty(genTable.getSubTableName())) - { + } else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory())) { + if (StringUtils.isEmpty(genTable.getSubTableName())) { throw new ServiceException("鍏宠仈瀛愯〃鐨勮〃鍚嶄笉鑳戒负绌"); - } - else if (StringUtils.isEmpty(genTable.getSubTableFkName())) - { + } else if (StringUtils.isEmpty(genTable.getSubTableFkName())) { throw new ServiceException("瀛愯〃鍏宠仈鐨勫閿悕涓嶈兘涓虹┖"); } } @@ -432,35 +395,27 @@ public class GenTableServiceImpl implements IGenTableService /** * 璁剧疆涓婚敭鍒椾俊鎭 - * + * * @param table 涓氬姟琛ㄤ俊鎭 */ - public void setPkColumn(GenTable table) - { - for (GenTableColumn column : table.getColumns()) - { - if (column.isPk()) - { + public void setPkColumn(GenTable table) { + for (GenTableColumn column : table.getColumns()) { + if (column.isPk()) { table.setPkColumn(column); break; } } - if (StringUtils.isNull(table.getPkColumn())) - { + if (StringUtils.isNull(table.getPkColumn())) { table.setPkColumn(table.getColumns().get(0)); } - if (GenConstants.TPL_SUB.equals(table.getTplCategory())) - { - for (GenTableColumn column : table.getSubTable().getColumns()) - { - if (column.isPk()) - { + if (GenConstants.TPL_SUB.equals(table.getTplCategory())) { + for (GenTableColumn column : table.getSubTable().getColumns()) { + if (column.isPk()) { table.getSubTable().setPkColumn(column); break; } } - if (StringUtils.isNull(table.getSubTable().getPkColumn())) - { + if (StringUtils.isNull(table.getSubTable().getPkColumn())) { table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0)); } } @@ -468,28 +423,24 @@ public class GenTableServiceImpl implements IGenTableService /** * 璁剧疆涓诲瓙琛ㄤ俊鎭 - * + * * @param table 涓氬姟琛ㄤ俊鎭 */ - public void setSubTable(GenTable table) - { + public void setSubTable(GenTable table) { String subTableName = table.getSubTableName(); - if (StringUtils.isNotEmpty(subTableName)) - { + if (StringUtils.isNotEmpty(subTableName)) { table.setSubTable(genTableMapper.selectGenTableByName(subTableName)); } } /** * 璁剧疆浠ｇ爜鐢熸垚鍏朵粬閫夐」鍊 - * + * * @param genTable 璁剧疆鍚庣殑鐢熸垚瀵硅薄 */ - public void setTableFromOptions(GenTable genTable) - { + public void setTableFromOptions(GenTable genTable) { JSONObject paramsObj = JSONObject.parseObject(genTable.getOptions()); - if (StringUtils.isNotNull(paramsObj)) - { + if (StringUtils.isNotNull(paramsObj)) { String treeCode = paramsObj.getString(GenConstants.TREE_CODE); String treeParentCode = paramsObj.getString(GenConstants.TREE_PARENT_CODE); String treeName = paramsObj.getString(GenConstants.TREE_NAME); @@ -503,21 +454,4 @@ public class GenTableServiceImpl implements IGenTableService genTable.setParentMenuName(parentMenuName); } } - - /** - * 鑾峰彇浠ｇ爜鐢熸垚鍦板潃 - * - * @param table 涓氬姟琛ㄤ俊鎭 - * @param template 妯℃澘鏂囦欢璺緞 - * @return 鐢熸垚鍦板潃 - */ - public static String getGenPath(GenTable table, String template) - { - String genPath = table.getGenPath(); - if (StringUtils.equals(genPath, StringUtils.SLASH)) - { - return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table); - } - return genPath + File.separator + VelocityUtils.getFileName(template, table); - } } diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java index 74cb289c..db3159c5 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java @@ -6,14 +6,13 @@ import java.util.List; /** * 涓氬姟瀛楁 鏈嶅姟灞 - * + * * @author ruoyi */ -public interface IGenTableColumnService -{ +public interface IGenTableColumnService { /** * 鏌ヨ涓氬姟瀛楁鍒楄〃 - * + * * @param tableId 涓氬姟瀛楁缂栧彿 * @return 涓氬姟瀛楁闆嗗悎 */ @@ -21,7 +20,7 @@ public interface IGenTableColumnService /** * 鏂板涓氬姟瀛楁 - * + * * @param genTableColumn 涓氬姟瀛楁淇℃伅 * @return 缁撴灉 */ @@ -29,7 +28,7 @@ public interface IGenTableColumnService /** * 淇敼涓氬姟瀛楁 - * + * * @param genTableColumn 涓氬姟瀛楁淇℃伅 * @return 缁撴灉 */ @@ -37,7 +36,7 @@ public interface IGenTableColumnService /** * 鍒犻櫎涓氬姟瀛楁淇℃伅 - * + * * @param ids 闇瑕佸垹闄ょ殑鏁版嵁ID * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java index 69bfc2ba..32417d8e 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java @@ -7,14 +7,13 @@ import java.util.Map; /** * 涓氬姟 鏈嶅姟灞 - * + * * @author ruoyi */ -public interface IGenTableService -{ +public interface IGenTableService { /** * 鏌ヨ涓氬姟鍒楄〃 - * + * * @param genTable 涓氬姟淇℃伅 * @return 涓氬姟闆嗗悎 */ @@ -22,7 +21,7 @@ public interface IGenTableService /** * 鏌ヨ鎹簱鍒楄〃 - * + * * @param genTable 涓氬姟淇℃伅 * @return 鏁版嵁搴撹〃闆嗗悎 */ @@ -30,7 +29,7 @@ public interface IGenTableService /** * 鏌ヨ鎹簱鍒楄〃 - * + * * @param tableNames 琛ㄥ悕绉扮粍 * @return 鏁版嵁搴撹〃闆嗗悎 */ @@ -38,14 +37,14 @@ public interface IGenTableService /** * 鏌ヨ鎵鏈夎〃淇℃伅 - * + * * @return 琛ㄤ俊鎭泦鍚 */ public List selectGenTableAll(); /** * 鏌ヨ涓氬姟淇℃伅 - * + * * @param id 涓氬姟ID * @return 涓氬姟淇℃伅 */ @@ -53,7 +52,7 @@ public interface IGenTableService /** * 淇敼涓氬姟 - * + * * @param genTable 涓氬姟淇℃伅 * @return 缁撴灉 */ @@ -61,7 +60,7 @@ public interface IGenTableService /** * 鍒犻櫎涓氬姟淇℃伅 - * + * * @param tableIds 闇瑕佸垹闄ょ殑琛ㄦ暟鎹甀D * @return 缁撴灉 */ @@ -69,14 +68,14 @@ public interface IGenTableService /** * 瀵煎叆琛ㄧ粨鏋 - * + * * @param tableList 瀵煎叆琛ㄥ垪琛 */ public void importGenTable(List tableList); /** * 棰勮浠ｇ爜 - * + * * @param tableId 琛ㄧ紪鍙 * @return 棰勮鏁版嵁鍒楄〃 */ @@ -84,7 +83,7 @@ public interface IGenTableService /** * 鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級 - * + * * @param tableName 琛ㄥ悕绉 * @return 鏁版嵁 */ @@ -92,7 +91,7 @@ public interface IGenTableService /** * 鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛 - * + * * @param tableName 琛ㄥ悕绉 * @return 鏁版嵁 */ @@ -100,14 +99,14 @@ public interface IGenTableService /** * 鍚屾鏁版嵁搴 - * + * * @param tableName 琛ㄥ悕绉 */ public void synchDb(String tableName); /** * 鎵归噺鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級 - * + * * @param tableNames 琛ㄦ暟缁 * @return 鏁版嵁 */ @@ -115,7 +114,7 @@ public interface IGenTableService /** * 淇敼淇濆瓨鍙傛暟鏍￠獙 - * + * * @param genTable 涓氬姟淇℃伅 */ public void validateEdit(GenTable genTable); diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java index aba0fd44..076814fd 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java @@ -7,28 +7,23 @@ import java.util.Properties; /** * VelocityEngine宸ュ巶 - * + * * @author ruoyi */ -public class VelocityInitializer -{ +public class VelocityInitializer { /** * 鍒濆鍖杤m鏂规硶 */ - public static void initVelocity() - { + public static void initVelocity() { Properties p = new Properties(); - try - { + try { // 鍔犺浇classpath鐩綍涓嬬殑vm鏂囦欢 p.setProperty("resource.loader.file.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader"); // 瀹氫箟瀛楃闆 p.setProperty(Velocity.INPUT_ENCODING, Constants.UTF8); // 鍒濆鍖朧elocity寮曟搸锛屾寚瀹氶厤缃甈roperties Velocity.init(p); - } - catch (Exception e) - { + } catch (Exception e) { throw new RuntimeException(e); } } diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java index eab7e4c7..8d53621e 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java @@ -8,17 +8,15 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; /** * 瀹氭椂浠诲姟 - * + * * @author ruoyi */ @EnableCustomConfig -@EnableCustomSwagger2 +@EnableCustomSwagger2 @EnableRyFeignClients @SpringBootApplication -public class RuoYiJobApplication -{ - public static void main(String[] args) - { +public class RuoYiJobApplication { + public static void main(String[] args) { SpringApplication.run(RuoYiJobApplication.class, args); System.out.println("(鈾モ棤鈥库棤)锞夛緸 瀹氭椂浠诲姟妯″潡鍚姩鎴愬姛 醿(麓凇`醿)锞 \n" + " .-------. ____ __ \n" + diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java index 827ab792..32273d0f 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java @@ -9,15 +9,13 @@ import java.util.Properties; /** * 瀹氭椂浠诲姟閰嶇疆锛堝崟鏈洪儴缃插缓璁垹闄ゆ绫诲拰qrtz鏁版嵁搴撹〃锛岄粯璁よ蛋鍐呭瓨浼氭渶楂樻晥锛 - * + * * @author ruoyi */ @Configuration -public class ScheduleConfig -{ +public class ScheduleConfig { @Bean - public SchedulerFactoryBean schedulerFactoryBean(DataSource dataSource) - { + public SchedulerFactoryBean schedulerFactoryBean(DataSource dataSource) { SchedulerFactoryBean factory = new SchedulerFactoryBean(); factory.setDataSource(dataSource); diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java index ab41d14c..9f17c634 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java @@ -24,13 +24,12 @@ import java.util.List; /** * 璋冨害浠诲姟淇℃伅鎿嶄綔澶勭悊 - * + * * @author ruoyi */ @RestController @RequestMapping("/job") -public class SysJobController extends BaseController -{ +public class SysJobController extends BaseController { @Autowired private ISysJobService jobService; @@ -39,8 +38,7 @@ public class SysJobController extends BaseController */ @RequiresPermissions("monitor:job:list") @GetMapping("/list") - public TableDataInfo list(SysJob sysJob) - { + public TableDataInfo list(SysJob sysJob) { startPage(); List list = jobService.selectJobList(sysJob); return getDataTable(list); @@ -52,8 +50,7 @@ public class SysJobController extends BaseController @RequiresPermissions("monitor:job:export") @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, SysJob sysJob) - { + public void export(HttpServletResponse response, SysJob sysJob) { List list = jobService.selectJobList(sysJob); ExcelUtil util = new ExcelUtil(SysJob.class); util.exportExcel(response, list, "瀹氭椂浠诲姟"); @@ -64,8 +61,7 @@ public class SysJobController extends BaseController */ @RequiresPermissions("monitor:job:query") @GetMapping(value = "/{jobId}") - public AjaxResult getInfo(@PathVariable("jobId") Long jobId) - { + public AjaxResult getInfo(@PathVariable("jobId") Long jobId) { return AjaxResult.success(jobService.selectJobById(jobId)); } @@ -75,30 +71,18 @@ public class SysJobController extends BaseController @RequiresPermissions("monitor:job:add") @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException - { - if (!CronUtils.isValid(job.getCronExpression())) - { + public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException { + if (!CronUtils.isValid(job.getCronExpression())) { return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛孋ron琛ㄨ揪寮忎笉姝ｇ‘"); - } - else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI)) - { + } else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI)) { return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁'rmi'璋冪敤"); - } - else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS })) - { + } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS})) { return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁'ldap(s)'璋冪敤"); - } - else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS })) - { + } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.HTTP, Constants.HTTPS})) { return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁'http(s)'璋冪敤"); - } - else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR)) - { + } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR)) { return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆瀛樺湪杩濊"); - } - else if (!ScheduleUtils.whiteList(job.getInvokeTarget())) - { + } else if (!ScheduleUtils.whiteList(job.getInvokeTarget())) { return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅湪鐧藉悕鍗曞唴"); } job.setCreateBy(SecurityUtils.getUsername()); @@ -111,30 +95,18 @@ public class SysJobController extends BaseController @RequiresPermissions("monitor:job:edit") @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException - { - if (!CronUtils.isValid(job.getCronExpression())) - { + public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException { + if (!CronUtils.isValid(job.getCronExpression())) { return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛孋ron琛ㄨ揪寮忎笉姝ｇ‘"); - } - else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI)) - { + } else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI)) { return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁'rmi'璋冪敤"); - } - else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS })) - { + } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS})) { return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁'ldap(s)'璋冪敤"); - } - else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS })) - { + } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.HTTP, Constants.HTTPS})) { return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁'http(s)'璋冪敤"); - } - else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR)) - { + } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR)) { return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆瀛樺湪杩濊"); - } - else if (!ScheduleUtils.whiteList(job.getInvokeTarget())) - { + } else if (!ScheduleUtils.whiteList(job.getInvokeTarget())) { return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅湪鐧藉悕鍗曞唴"); } job.setUpdateBy(SecurityUtils.getUsername()); @@ -147,8 +119,7 @@ public class SysJobController extends BaseController @RequiresPermissions("monitor:job:changeStatus") @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException - { + public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException { SysJob newJob = jobService.selectJobById(job.getJobId()); newJob.setStatus(job.getStatus()); return toAjax(jobService.changeStatus(newJob)); @@ -160,8 +131,7 @@ public class SysJobController extends BaseController @RequiresPermissions("monitor:job:changeStatus") @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE) @PutMapping("/run") - public AjaxResult run(@RequestBody SysJob job) throws SchedulerException - { + public AjaxResult run(@RequestBody SysJob job) throws SchedulerException { jobService.run(job); return AjaxResult.success(); } @@ -172,8 +142,7 @@ public class SysJobController extends BaseController @RequiresPermissions("monitor:job:remove") @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.DELETE) @DeleteMapping("/{jobIds}") - public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException - { + public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException { jobService.deleteJobByIds(jobIds); return AjaxResult.success(); } diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java index 4107d897..d04c229d 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java @@ -17,13 +17,12 @@ import java.util.List; /** * 璋冨害鏃ュ織鎿嶄綔澶勭悊 - * + * * @author ruoyi */ @RestController @RequestMapping("/job/log") -public class SysJobLogController extends BaseController -{ +public class SysJobLogController extends BaseController { @Autowired private ISysJobLogService jobLogService; @@ -32,8 +31,7 @@ public class SysJobLogController extends BaseController */ @RequiresPermissions("monitor:job:list") @GetMapping("/list") - public TableDataInfo list(SysJobLog sysJobLog) - { + public TableDataInfo list(SysJobLog sysJobLog) { startPage(); List list = jobLogService.selectJobLogList(sysJobLog); return getDataTable(list); @@ -45,8 +43,7 @@ public class SysJobLogController extends BaseController @RequiresPermissions("monitor:job:export") @Log(title = "浠诲姟璋冨害鏃ュ織", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, SysJobLog sysJobLog) - { + public void export(HttpServletResponse response, SysJobLog sysJobLog) { List list = jobLogService.selectJobLogList(sysJobLog); ExcelUtil util = new ExcelUtil(SysJobLog.class); util.exportExcel(response, list, "璋冨害鏃ュ織"); @@ -57,8 +54,7 @@ public class SysJobLogController extends BaseController */ @RequiresPermissions("monitor:job:query") @GetMapping(value = "/{configId}") - public AjaxResult getInfo(@PathVariable Long jobLogId) - { + public AjaxResult getInfo(@PathVariable Long jobLogId) { return AjaxResult.success(jobLogService.selectJobLogById(jobLogId)); } @@ -68,8 +64,7 @@ public class SysJobLogController extends BaseController @RequiresPermissions("monitor:job:remove") @Log(title = "瀹氭椂浠诲姟璋冨害鏃ュ織", businessType = BusinessType.DELETE) @DeleteMapping("/{jobLogIds}") - public AjaxResult remove(@PathVariable Long[] jobLogIds) - { + public AjaxResult remove(@PathVariable Long[] jobLogIds) { return toAjax(jobLogService.deleteJobLogByIds(jobLogIds)); } @@ -79,8 +74,7 @@ public class SysJobLogController extends BaseController @RequiresPermissions("monitor:job:remove") @Log(title = "璋冨害鏃ュ織", businessType = BusinessType.CLEAN) @DeleteMapping("/clean") - public AjaxResult clean() - { + public AjaxResult clean() { jobLogService.cleanJobLog(); return AjaxResult.success(); } diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java index b1fb2cc9..ecf88ec5 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java @@ -16,157 +16,154 @@ import java.util.Date; /** * 瀹氭椂浠诲姟璋冨害琛 sys_job - * + * * @author ruoyi */ -public class SysJob extends BaseEntity -{ +public class SysJob extends BaseEntity { private static final long serialVersionUID = 1L; - /** 浠诲姟ID */ + /** + * 浠诲姟ID + */ @Excel(name = "浠诲姟搴忓彿", cellType = ColumnType.NUMERIC) private Long jobId; - /** 浠诲姟鍚嶇О */ + /** + * 浠诲姟鍚嶇О + */ @Excel(name = "浠诲姟鍚嶇О") private String jobName; - /** 浠诲姟缁勫悕 */ + /** + * 浠诲姟缁勫悕 + */ @Excel(name = "浠诲姟缁勫悕") private String jobGroup; - /** 璋冪敤鐩爣瀛楃涓 */ + /** + * 璋冪敤鐩爣瀛楃涓 + */ @Excel(name = "璋冪敤鐩爣瀛楃涓") private String invokeTarget; - /** cron鎵ц琛ㄨ揪寮 */ + /** + * cron鎵ц琛ㄨ揪寮 + */ @Excel(name = "鎵ц琛ㄨ揪寮 ") private String cronExpression; - /** cron璁″垝绛栫暐 */ + /** + * cron璁″垝绛栫暐 + */ @Excel(name = "璁″垝绛栫暐 ", readConverterExp = "0=榛樿,1=绔嬪嵆瑙﹀彂鎵ц,2=瑙﹀彂涓娆℃墽琛,3=涓嶈Е鍙戠珛鍗虫墽琛") private String misfirePolicy = ScheduleConstants.MISFIRE_DEFAULT; - /** 鏄惁骞跺彂鎵ц锛0鍏佽 1绂佹锛 */ + /** + * 鏄惁骞跺彂鎵ц锛0鍏佽 1绂佹锛 + */ @Excel(name = "骞跺彂鎵ц", readConverterExp = "0=鍏佽,1=绂佹") private String concurrent; - /** 浠诲姟鐘舵侊紙0姝ｅ父 1鏆傚仠锛 */ + /** + * 浠诲姟鐘舵侊紙0姝ｅ父 1鏆傚仠锛 + */ @Excel(name = "浠诲姟鐘舵", readConverterExp = "0=姝ｅ父,1=鏆傚仠") private String status; - public Long getJobId() - { + public Long getJobId() { return jobId; } - public void setJobId(Long jobId) - { + public void setJobId(Long jobId) { this.jobId = jobId; } @NotBlank(message = "浠诲姟鍚嶇О涓嶈兘涓虹┖") @Size(min = 0, max = 64, message = "浠诲姟鍚嶇О涓嶈兘瓒呰繃64涓瓧绗") - public String getJobName() - { + public String getJobName() { return jobName; } - public void setJobName(String jobName) - { + public void setJobName(String jobName) { this.jobName = jobName; } - public String getJobGroup() - { + public String getJobGroup() { return jobGroup; } - public void setJobGroup(String jobGroup) - { + public void setJobGroup(String jobGroup) { this.jobGroup = jobGroup; } @NotBlank(message = "璋冪敤鐩爣瀛楃涓蹭笉鑳戒负绌") @Size(min = 0, max = 500, message = "璋冪敤鐩爣瀛楃涓查暱搴︿笉鑳借秴杩500涓瓧绗") - public String getInvokeTarget() - { + public String getInvokeTarget() { return invokeTarget; } - public void setInvokeTarget(String invokeTarget) - { + public void setInvokeTarget(String invokeTarget) { this.invokeTarget = invokeTarget; } @NotBlank(message = "Cron鎵ц琛ㄨ揪寮忎笉鑳戒负绌") @Size(min = 0, max = 255, message = "Cron鎵ц琛ㄨ揪寮忎笉鑳借秴杩255涓瓧绗") - public String getCronExpression() - { + public String getCronExpression() { return cronExpression; } - public void setCronExpression(String cronExpression) - { + public void setCronExpression(String cronExpression) { this.cronExpression = cronExpression; } @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - public Date getNextValidTime() - { - if (StringUtils.isNotEmpty(cronExpression)) - { + public Date getNextValidTime() { + if (StringUtils.isNotEmpty(cronExpression)) { return CronUtils.getNextExecution(cronExpression); } return null; } - public String getMisfirePolicy() - { + public String getMisfirePolicy() { return misfirePolicy; } - public void setMisfirePolicy(String misfirePolicy) - { + public void setMisfirePolicy(String misfirePolicy) { this.misfirePolicy = misfirePolicy; } - public String getConcurrent() - { + public String getConcurrent() { return concurrent; } - public void setConcurrent(String concurrent) - { + public void setConcurrent(String concurrent) { this.concurrent = concurrent; } - public String getStatus() - { + public String getStatus() { return status; } - public void setStatus(String status) - { + public void setStatus(String status) { this.status = status; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("jobId", getJobId()) - .append("jobName", getJobName()) - .append("jobGroup", getJobGroup()) - .append("cronExpression", getCronExpression()) - .append("nextValidTime", getNextValidTime()) - .append("misfirePolicy", getMisfirePolicy()) - .append("concurrent", getConcurrent()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("jobId", getJobId()) + .append("jobName", getJobName()) + .append("jobGroup", getJobGroup()) + .append("cronExpression", getCronExpression()) + .append("nextValidTime", getNextValidTime()) + .append("misfirePolicy", getMisfirePolicy()) + .append("concurrent", getConcurrent()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); } } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java index 662c93fe..46f3e0ce 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java @@ -9,148 +9,147 @@ import java.util.Date; /** * 瀹氭椂浠诲姟璋冨害鏃ュ織琛 sys_job_log - * + * * @author ruoyi */ -public class SysJobLog extends BaseEntity -{ +public class SysJobLog extends BaseEntity { private static final long serialVersionUID = 1L; - /** ID */ + /** + * ID + */ @Excel(name = "鏃ュ織搴忓彿") private Long jobLogId; - /** 浠诲姟鍚嶇О */ + /** + * 浠诲姟鍚嶇О + */ @Excel(name = "浠诲姟鍚嶇О") private String jobName; - /** 浠诲姟缁勫悕 */ + /** + * 浠诲姟缁勫悕 + */ @Excel(name = "浠诲姟缁勫悕") private String jobGroup; - /** 璋冪敤鐩爣瀛楃涓 */ + /** + * 璋冪敤鐩爣瀛楃涓 + */ @Excel(name = "璋冪敤鐩爣瀛楃涓") private String invokeTarget; - /** 鏃ュ織淇℃伅 */ + /** + * 鏃ュ織淇℃伅 + */ @Excel(name = "鏃ュ織淇℃伅") private String jobMessage; - /** 鎵ц鐘舵侊紙0姝ｅ父 1澶辫触锛 */ + /** + * 鎵ц鐘舵侊紙0姝ｅ父 1澶辫触锛 + */ @Excel(name = "鎵ц鐘舵", readConverterExp = "0=姝ｅ父,1=澶辫触") private String status; - /** 寮傚父淇℃伅 */ + /** + * 寮傚父淇℃伅 + */ @Excel(name = "寮傚父淇℃伅") private String exceptionInfo; - /** 寮濮嬫椂闂 */ + /** + * 寮濮嬫椂闂 + */ private Date startTime; - /** 鍋滄鏃堕棿 */ + /** + * 鍋滄鏃堕棿 + */ private Date stopTime; - public Long getJobLogId() - { + public Long getJobLogId() { return jobLogId; } - public void setJobLogId(Long jobLogId) - { + public void setJobLogId(Long jobLogId) { this.jobLogId = jobLogId; } - public String getJobName() - { + public String getJobName() { return jobName; } - public void setJobName(String jobName) - { + public void setJobName(String jobName) { this.jobName = jobName; } - public String getJobGroup() - { + public String getJobGroup() { return jobGroup; } - public void setJobGroup(String jobGroup) - { + public void setJobGroup(String jobGroup) { this.jobGroup = jobGroup; } - public String getInvokeTarget() - { + public String getInvokeTarget() { return invokeTarget; } - public void setInvokeTarget(String invokeTarget) - { + public void setInvokeTarget(String invokeTarget) { this.invokeTarget = invokeTarget; } - public String getJobMessage() - { + public String getJobMessage() { return jobMessage; } - public void setJobMessage(String jobMessage) - { + public void setJobMessage(String jobMessage) { this.jobMessage = jobMessage; } - public String getStatus() - { + public String getStatus() { return status; } - public void setStatus(String status) - { + public void setStatus(String status) { this.status = status; } - public String getExceptionInfo() - { + public String getExceptionInfo() { return exceptionInfo; } - public void setExceptionInfo(String exceptionInfo) - { + public void setExceptionInfo(String exceptionInfo) { this.exceptionInfo = exceptionInfo; } - public Date getStartTime() - { + public Date getStartTime() { return startTime; } - public void setStartTime(Date startTime) - { + public void setStartTime(Date startTime) { this.startTime = startTime; } - - public Date getStopTime() - { + + public Date getStopTime() { return stopTime; } - public void setStopTime(Date stopTime) - { + public void setStopTime(Date stopTime) { this.stopTime = stopTime; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("jobLogId", getJobLogId()) - .append("jobName", getJobName()) - .append("jobGroup", getJobGroup()) - .append("jobMessage", getJobMessage()) - .append("status", getStatus()) - .append("exceptionInfo", getExceptionInfo()) - .append("startTime", getStartTime()) - .append("stopTime", getStopTime()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("jobLogId", getJobLogId()) + .append("jobName", getJobName()) + .append("jobGroup", getJobGroup()) + .append("jobMessage", getJobMessage()) + .append("status", getStatus()) + .append("exceptionInfo", getExceptionInfo()) + .append("startTime", getStartTime()) + .append("stopTime", getStopTime()) + .toString(); } } diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java index 170c5ef3..f4d981da 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java @@ -6,14 +6,13 @@ import java.util.List; /** * 璋冨害浠诲姟鏃ュ織淇℃伅 鏁版嵁灞 - * + * * @author ruoyi */ -public interface SysJobLogMapper -{ +public interface SysJobLogMapper { /** * 鑾峰彇quartz璋冨害鍣ㄦ棩蹇楃殑璁″垝浠诲姟 - * + * * @param jobLog 璋冨害鏃ュ織淇℃伅 * @return 璋冨害浠诲姟鏃ュ織闆嗗悎 */ @@ -28,7 +27,7 @@ public interface SysJobLogMapper /** * 閫氳繃璋冨害浠诲姟鏃ュ織ID鏌ヨ璋冨害淇℃伅 - * + * * @param jobLogId 璋冨害浠诲姟鏃ュ織ID * @return 璋冨害浠诲姟鏃ュ織瀵硅薄淇℃伅 */ @@ -36,7 +35,7 @@ public interface SysJobLogMapper /** * 鏂板浠诲姟鏃ュ織 - * + * * @param jobLog 璋冨害鏃ュ織淇℃伅 * @return 缁撴灉 */ @@ -44,7 +43,7 @@ public interface SysJobLogMapper /** * 鎵归噺鍒犻櫎璋冨害鏃ュ織淇℃伅 - * + * * @param logIds 闇瑕佸垹闄ょ殑鏁版嵁ID * @return 缁撴灉 */ @@ -52,7 +51,7 @@ public interface SysJobLogMapper /** * 鍒犻櫎浠诲姟鏃ュ織 - * + * * @param jobId 璋冨害鏃ュ織ID * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java index dead5a7f..81c7ec7a 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java @@ -6,14 +6,13 @@ import java.util.List; /** * 璋冨害浠诲姟淇℃伅 鏁版嵁灞 - * + * * @author ruoyi */ -public interface SysJobMapper -{ +public interface SysJobMapper { /** * 鏌ヨ璋冨害浠诲姟鏃ュ織闆嗗悎 - * + * * @param job 璋冨害淇℃伅 * @return 鎿嶄綔鏃ュ織闆嗗悎 */ @@ -21,14 +20,14 @@ public interface SysJobMapper /** * 鏌ヨ鎵鏈夎皟搴︿换鍔 - * + * * @return 璋冨害浠诲姟鍒楄〃 */ public List selectJobAll(); /** * 閫氳繃璋冨害ID鏌ヨ璋冨害浠诲姟淇℃伅 - * + * * @param jobId 璋冨害ID * @return 瑙掕壊瀵硅薄淇℃伅 */ @@ -36,7 +35,7 @@ public interface SysJobMapper /** * 閫氳繃璋冨害ID鍒犻櫎璋冨害浠诲姟淇℃伅 - * + * * @param jobId 璋冨害ID * @return 缁撴灉 */ @@ -44,7 +43,7 @@ public interface SysJobMapper /** * 鎵归噺鍒犻櫎璋冨害浠诲姟淇℃伅 - * + * * @param ids 闇瑕佸垹闄ょ殑鏁版嵁ID * @return 缁撴灉 */ @@ -52,7 +51,7 @@ public interface SysJobMapper /** * 淇敼璋冨害浠诲姟淇℃伅 - * + * * @param job 璋冨害浠诲姟淇℃伅 * @return 缁撴灉 */ @@ -60,7 +59,7 @@ public interface SysJobMapper /** * 鏂板璋冨害浠诲姟淇℃伅 - * + * * @param job 璋冨害浠诲姟淇℃伅 * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java index 9b788b31..5af0eeb2 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java @@ -6,14 +6,13 @@ import java.util.List; /** * 瀹氭椂浠诲姟璋冨害鏃ュ織淇℃伅淇℃伅 鏈嶅姟灞 - * + * * @author ruoyi */ -public interface ISysJobLogService -{ +public interface ISysJobLogService { /** * 鑾峰彇quartz璋冨害鍣ㄦ棩蹇楃殑璁″垝浠诲姟 - * + * * @param jobLog 璋冨害鏃ュ織淇℃伅 * @return 璋冨害浠诲姟鏃ュ織闆嗗悎 */ @@ -21,7 +20,7 @@ public interface ISysJobLogService /** * 閫氳繃璋冨害浠诲姟鏃ュ織ID鏌ヨ璋冨害淇℃伅 - * + * * @param jobLogId 璋冨害浠诲姟鏃ュ織ID * @return 璋冨害浠诲姟鏃ュ織瀵硅薄淇℃伅 */ @@ -29,14 +28,14 @@ public interface ISysJobLogService /** * 鏂板浠诲姟鏃ュ織 - * + * * @param jobLog 璋冨害鏃ュ織淇℃伅 */ public void addJobLog(SysJobLog jobLog); /** * 鎵归噺鍒犻櫎璋冨害鏃ュ織淇℃伅 - * + * * @param logIds 闇瑕佸垹闄ょ殑鏃ュ織ID * @return 缁撴灉 */ @@ -44,7 +43,7 @@ public interface ISysJobLogService /** * 鍒犻櫎浠诲姟鏃ュ織 - * + * * @param jobId 璋冨害鏃ュ織ID * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java index ea7bbbb1..70cfb660 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java @@ -8,14 +8,13 @@ import java.util.List; /** * 瀹氭椂浠诲姟璋冨害淇℃伅淇℃伅 鏈嶅姟灞 - * + * * @author ruoyi */ -public interface ISysJobService -{ +public interface ISysJobService { /** * 鑾峰彇quartz璋冨害鍣ㄧ殑璁″垝浠诲姟 - * + * * @param job 璋冨害淇℃伅 * @return 璋冨害浠诲姟闆嗗悎 */ @@ -23,7 +22,7 @@ public interface ISysJobService /** * 閫氳繃璋冨害浠诲姟ID鏌ヨ璋冨害淇℃伅 - * + * * @param jobId 璋冨害浠诲姟ID * @return 璋冨害浠诲姟瀵硅薄淇℃伅 */ @@ -31,6 +30,7 @@ public interface ISysJobService /** * 鏆傚仠浠诲姟 + * * @param job 璋冨害淇℃伅 * @return 缁撴灉 * @throws SchedulerException @@ -39,7 +39,7 @@ public interface ISysJobService /** * 鎭㈠浠诲姟 - * + * * @param job 璋冨害淇℃伅 * @return 缁撴灉 * @throws SchedulerException 寮傚父 @@ -48,7 +48,7 @@ public interface ISysJobService /** * 鍒犻櫎浠诲姟鍚庯紝鎵瀵瑰簲鐨則rigger涔熷皢琚垹闄 - * + * * @param job 璋冨害淇℃伅 * @return 缁撴灉 * @throws SchedulerException 寮傚父 @@ -56,7 +56,6 @@ public interface ISysJobService public int deleteJob(SysJob job) throws SchedulerException; /** - * * 鎵归噺鍒犻櫎璋冨害淇℃伅 * * @param jobIds 闇瑕佸垹闄ょ殑浠诲姟ID @@ -67,6 +66,7 @@ public interface ISysJobService /** * 浠诲姟璋冨害鐘舵佷慨鏀 + * * @param job 璋冨害淇℃伅 * @return 缁撴灉 * @throws SchedulerException / @@ -75,6 +75,7 @@ public interface ISysJobService /** * 绔嬪嵆杩愯浠诲姟 + * * @param job 璋冨害淇℃伅 * @return 缁撴灉 * @throws SchedulerException / @@ -83,25 +84,27 @@ public interface ISysJobService /** * 鏂板浠诲姟 + * * @param job 璋冨害淇℃伅 * @return 缁撴灉 * @throws SchedulerException / - * @throws TaskException / + * @throws TaskException / */ public int insertJob(SysJob job) throws SchedulerException, TaskException; /** * 鏇存柊浠诲姟 + * * @param job 璋冨害淇℃伅 * @return 缁撴灉 * @throws SchedulerException / - * @throws TaskException / + * @throws TaskException / */ public int updateJob(SysJob job) throws SchedulerException, TaskException; /** * 鏍￠獙cron琛ㄨ揪寮忔槸鍚︽湁鏁 - * + * * @param cronExpression 琛ㄨ揪寮 * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java index e982c8e1..0b0b53bd 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java @@ -9,70 +9,64 @@ import java.util.List; /** * 瀹氭椂浠诲姟璋冨害鏃ュ織淇℃伅 鏈嶅姟灞 - * + * * @author ruoyi */ @Service -public class SysJobLogServiceImpl implements ISysJobLogService -{ +public class SysJobLogServiceImpl implements ISysJobLogService { @Autowired private SysJobLogMapper jobLogMapper; /** * 鑾峰彇quartz璋冨害鍣ㄦ棩蹇楃殑璁″垝浠诲姟 - * + * * @param jobLog 璋冨害鏃ュ織淇℃伅 * @return 璋冨害浠诲姟鏃ュ織闆嗗悎 */ @Override - public List selectJobLogList(SysJobLog jobLog) - { + public List selectJobLogList(SysJobLog jobLog) { return jobLogMapper.selectJobLogList(jobLog); } /** * 閫氳繃璋冨害浠诲姟鏃ュ織ID鏌ヨ璋冨害淇℃伅 - * + * * @param jobLogId 璋冨害浠诲姟鏃ュ織ID * @return 璋冨害浠诲姟鏃ュ織瀵硅薄淇℃伅 */ @Override - public SysJobLog selectJobLogById(Long jobLogId) - { + public SysJobLog selectJobLogById(Long jobLogId) { return jobLogMapper.selectJobLogById(jobLogId); } /** * 鏂板浠诲姟鏃ュ織 - * + * * @param jobLog 璋冨害鏃ュ織淇℃伅 */ @Override - public void addJobLog(SysJobLog jobLog) - { + public void addJobLog(SysJobLog jobLog) { jobLogMapper.insertJobLog(jobLog); } /** * 鎵归噺鍒犻櫎璋冨害鏃ュ織淇℃伅 - * + * * @param logIds 闇瑕佸垹闄ょ殑鏁版嵁ID * @return 缁撴灉 */ @Override - public int deleteJobLogByIds(Long[] logIds) - { + public int deleteJobLogByIds(Long[] logIds) { return jobLogMapper.deleteJobLogByIds(logIds); } /** * 鍒犻櫎浠诲姟鏃ュ織 - * + * * @param jobId 璋冨害鏃ュ織ID */ @Override - public int deleteJobLogById(Long jobId) - { + public int deleteJobLogById(Long jobId) { return jobLogMapper.deleteJobLogById(jobId); } @@ -80,8 +74,7 @@ public class SysJobLogServiceImpl implements ISysJobLogService * 娓呯┖浠诲姟鏃ュ織 */ @Override - public void cleanJobLog() - { + public void cleanJobLog() { jobLogMapper.cleanJobLog(); } } diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java index a28a931c..656a0f61 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java @@ -19,12 +19,11 @@ import java.util.List; /** * 瀹氭椂浠诲姟璋冨害淇℃伅 鏈嶅姟灞 - * + * * @author ruoyi */ @Service -public class SysJobServiceImpl implements ISysJobService -{ +public class SysJobServiceImpl implements ISysJobService { @Autowired private Scheduler scheduler; @@ -35,55 +34,49 @@ public class SysJobServiceImpl implements ISysJobService * 椤圭洰鍚姩鏃讹紝鍒濆鍖栧畾鏃跺櫒 涓昏鏄槻姝㈡墜鍔ㄤ慨鏀规暟鎹簱瀵艰嚧鏈悓姝ュ埌瀹氭椂浠诲姟澶勭悊锛堟敞锛氫笉鑳芥墜鍔ㄤ慨鏀规暟鎹簱ID鍜屼换鍔＄粍鍚嶏紝鍚﹀垯浼氬鑷磋剰鏁版嵁锛 */ @PostConstruct - public void init() throws SchedulerException, TaskException - { + public void init() throws SchedulerException, TaskException { scheduler.clear(); List jobList = jobMapper.selectJobAll(); - for (SysJob job : jobList) - { + for (SysJob job : jobList) { ScheduleUtils.createScheduleJob(scheduler, job); } } /** * 鑾峰彇quartz璋冨害鍣ㄧ殑璁″垝浠诲姟鍒楄〃 - * + * * @param job 璋冨害淇℃伅 * @return */ @Override - public List selectJobList(SysJob job) - { + public List selectJobList(SysJob job) { return jobMapper.selectJobList(job); } /** * 閫氳繃璋冨害浠诲姟ID鏌ヨ璋冨害淇℃伅 - * + * * @param jobId 璋冨害浠诲姟ID * @return 璋冨害浠诲姟瀵硅薄淇℃伅 */ @Override - public SysJob selectJobById(Long jobId) - { + public SysJob selectJobById(Long jobId) { return jobMapper.selectJobById(jobId); } /** * 鏆傚仠浠诲姟 - * + * * @param job 璋冨害淇℃伅 */ @Override @Transactional(rollbackFor = Exception.class) - public int pauseJob(SysJob job) throws SchedulerException - { + public int pauseJob(SysJob job) throws SchedulerException { Long jobId = job.getJobId(); String jobGroup = job.getJobGroup(); job.setStatus(ScheduleConstants.Status.PAUSE.getValue()); int rows = jobMapper.updateJob(job); - if (rows > 0) - { + if (rows > 0) { scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup)); } return rows; @@ -91,19 +84,17 @@ public class SysJobServiceImpl implements ISysJobService /** * 鎭㈠浠诲姟 - * + * * @param job 璋冨害淇℃伅 */ @Override @Transactional(rollbackFor = Exception.class) - public int resumeJob(SysJob job) throws SchedulerException - { + public int resumeJob(SysJob job) throws SchedulerException { Long jobId = job.getJobId(); String jobGroup = job.getJobGroup(); job.setStatus(ScheduleConstants.Status.NORMAL.getValue()); int rows = jobMapper.updateJob(job); - if (rows > 0) - { + if (rows > 0) { scheduler.resumeJob(ScheduleUtils.getJobKey(jobId, jobGroup)); } return rows; @@ -111,18 +102,16 @@ public class SysJobServiceImpl implements ISysJobService /** * 鍒犻櫎浠诲姟鍚庯紝鎵瀵瑰簲鐨則rigger涔熷皢琚垹闄 - * + * * @param job 璋冨害淇℃伅 */ @Override @Transactional(rollbackFor = Exception.class) - public int deleteJob(SysJob job) throws SchedulerException - { + public int deleteJob(SysJob job) throws SchedulerException { Long jobId = job.getJobId(); String jobGroup = job.getJobGroup(); int rows = jobMapper.deleteJobById(jobId); - if (rows > 0) - { + if (rows > 0) { scheduler.deleteJob(ScheduleUtils.getJobKey(jobId, jobGroup)); } return rows; @@ -130,16 +119,14 @@ public class SysJobServiceImpl implements ISysJobService /** * 鎵归噺鍒犻櫎璋冨害淇℃伅 - * + * * @param jobIds 闇瑕佸垹闄ょ殑浠诲姟ID * @return 缁撴灉 */ @Override @Transactional(rollbackFor = Exception.class) - public void deleteJobByIds(Long[] jobIds) throws SchedulerException - { - for (Long jobId : jobIds) - { + public void deleteJobByIds(Long[] jobIds) throws SchedulerException { + for (Long jobId : jobIds) { SysJob job = jobMapper.selectJobById(jobId); deleteJob(job); } @@ -147,21 +134,17 @@ public class SysJobServiceImpl implements ISysJobService /** * 浠诲姟璋冨害鐘舵佷慨鏀 - * + * * @param job 璋冨害淇℃伅 */ @Override @Transactional(rollbackFor = Exception.class) - public int changeStatus(SysJob job) throws SchedulerException - { + public int changeStatus(SysJob job) throws SchedulerException { int rows = 0; String status = job.getStatus(); - if (ScheduleConstants.Status.NORMAL.getValue().equals(status)) - { + if (ScheduleConstants.Status.NORMAL.getValue().equals(status)) { rows = resumeJob(job); - } - else if (ScheduleConstants.Status.PAUSE.getValue().equals(status)) - { + } else if (ScheduleConstants.Status.PAUSE.getValue().equals(status)) { rows = pauseJob(job); } return rows; @@ -169,13 +152,12 @@ public class SysJobServiceImpl implements ISysJobService /** * 绔嬪嵆杩愯浠诲姟 - * + * * @param job 璋冨害淇℃伅 */ @Override @Transactional(rollbackFor = Exception.class) - public void run(SysJob job) throws SchedulerException - { + public void run(SysJob job) throws SchedulerException { Long jobId = job.getJobId(); String jobGroup = job.getJobGroup(); SysJob properties = selectJobById(job.getJobId()); @@ -187,17 +169,15 @@ public class SysJobServiceImpl implements ISysJobService /** * 鏂板浠诲姟 - * + * * @param job 璋冨害淇℃伅 璋冨害淇℃伅 */ @Override @Transactional(rollbackFor = Exception.class) - public int insertJob(SysJob job) throws SchedulerException, TaskException - { + public int insertJob(SysJob job) throws SchedulerException, TaskException { job.setStatus(ScheduleConstants.Status.PAUSE.getValue()); int rows = jobMapper.insertJob(job); - if (rows > 0) - { + if (rows > 0) { ScheduleUtils.createScheduleJob(scheduler, job); } return rows; @@ -205,17 +185,15 @@ public class SysJobServiceImpl implements ISysJobService /** * 鏇存柊浠诲姟鐨勬椂闂磋〃杈惧紡 - * + * * @param job 璋冨害淇℃伅 */ @Override @Transactional(rollbackFor = Exception.class) - public int updateJob(SysJob job) throws SchedulerException, TaskException - { + public int updateJob(SysJob job) throws SchedulerException, TaskException { SysJob properties = selectJobById(job.getJobId()); int rows = jobMapper.updateJob(job); - if (rows > 0) - { + if (rows > 0) { updateSchedulerJob(job, properties.getJobGroup()); } return rows; @@ -223,17 +201,15 @@ public class SysJobServiceImpl implements ISysJobService /** * 鏇存柊浠诲姟 - * - * @param job 浠诲姟瀵硅薄 + * + * @param job 浠诲姟瀵硅薄 * @param jobGroup 浠诲姟缁勫悕 */ - public void updateSchedulerJob(SysJob job, String jobGroup) throws SchedulerException, TaskException - { + public void updateSchedulerJob(SysJob job, String jobGroup) throws SchedulerException, TaskException { Long jobId = job.getJobId(); // 鍒ゆ柇鏄惁瀛樺湪 JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup); - if (scheduler.checkExists(jobKey)) - { + if (scheduler.checkExists(jobKey)) { // 闃叉鍒涘缓鏃跺瓨鍦ㄦ暟鎹棶棰 鍏堢Щ闄わ紝鐒跺悗鍦ㄦ墽琛屽垱寤烘搷浣 scheduler.deleteJob(jobKey); } @@ -242,13 +218,12 @@ public class SysJobServiceImpl implements ISysJobService /** * 鏍￠獙cron琛ㄨ揪寮忔槸鍚︽湁鏁 - * + * * @param cronExpression 琛ㄨ揪寮 * @return 缁撴灉 */ @Override - public boolean checkCronExpressionIsValid(String cronExpression) - { + public boolean checkCronExpressionIsValid(String cronExpression) { return CronUtils.isValid(cronExpression); } } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java index d63e0cc3..a9589328 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java @@ -5,24 +5,20 @@ import org.springframework.stereotype.Component; /** * 瀹氭椂浠诲姟璋冨害娴嬭瘯 - * + * * @author ruoyi */ @Component("ryTask") -public class RyTask -{ - public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) - { +public class RyTask { + public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) { System.out.println(StringUtils.format("鎵ц澶氬弬鏂规硶锛 瀛楃涓茬被鍨媨}锛屽竷灏旂被鍨媨}锛岄暱鏁村瀷{}锛屾诞鐐瑰瀷{}锛屾暣褰}", s, b, l, d, i)); } - public void ryParams(String params) - { + public void ryParams(String params) { System.out.println("鎵ц鏈夊弬鏂规硶锛" + params); } - public void ryNoParams() - { + public void ryNoParams() { System.out.println("鎵ц鏃犲弬鏂规硶"); } } diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java index 36b698de..3cc32580 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java @@ -21,8 +21,7 @@ import java.util.Date; * * @author ruoyi */ -public abstract class AbstractQuartzJob implements Job -{ +public abstract class AbstractQuartzJob implements Job { private static final Logger log = LoggerFactory.getLogger(AbstractQuartzJob.class); /** @@ -31,21 +30,16 @@ public abstract class AbstractQuartzJob implements Job private static ThreadLocal threadLocal = new ThreadLocal<>(); @Override - public void execute(JobExecutionContext context) throws JobExecutionException - { + public void execute(JobExecutionContext context) throws JobExecutionException { SysJob sysJob = new SysJob(); BeanUtils.copyBeanProp(sysJob, context.getMergedJobDataMap().get(ScheduleConstants.TASK_PROPERTIES)); - try - { + try { before(context, sysJob); - if (sysJob != null) - { + if (sysJob != null) { doExecute(context, sysJob); } after(context, sysJob, null); - } - catch (Exception e) - { + } catch (Exception e) { log.error("浠诲姟鎵ц寮傚父 - 锛", e); after(context, sysJob, e); } @@ -55,10 +49,9 @@ public abstract class AbstractQuartzJob implements Job * 鎵ц鍓 * * @param context 宸ヤ綔鎵ц涓婁笅鏂囧璞 - * @param sysJob 绯荤粺璁″垝浠诲姟 + * @param sysJob 绯荤粺璁″垝浠诲姟 */ - protected void before(JobExecutionContext context, SysJob sysJob) - { + protected void before(JobExecutionContext context, SysJob sysJob) { threadLocal.set(new Date()); } @@ -66,10 +59,9 @@ public abstract class AbstractQuartzJob implements Job * 鎵ц鍚 * * @param context 宸ヤ綔鎵ц涓婁笅鏂囧璞 - * @param sysJob 绯荤粺璁″垝浠诲姟 + * @param sysJob 绯荤粺璁″垝浠诲姟 */ - protected void after(JobExecutionContext context, SysJob sysJob, Exception e) - { + protected void after(JobExecutionContext context, SysJob sysJob, Exception e) { Date startTime = threadLocal.get(); threadLocal.remove(); @@ -81,14 +73,11 @@ public abstract class AbstractQuartzJob implements Job sysJobLog.setStopTime(new Date()); long runMs = sysJobLog.getStopTime().getTime() - sysJobLog.getStartTime().getTime(); sysJobLog.setJobMessage(sysJobLog.getJobName() + " 鎬诲叡鑰楁椂锛" + runMs + "姣"); - if (e != null) - { + if (e != null) { sysJobLog.setStatus("1"); String errorMsg = StringUtils.substring(ExceptionUtil.getExceptionMessage(e), 0, 2000); sysJobLog.setExceptionInfo(errorMsg); - } - else - { + } else { sysJobLog.setStatus("0"); } @@ -100,7 +89,7 @@ public abstract class AbstractQuartzJob implements Job * 鎵ц鏂规硶锛岀敱瀛愮被閲嶈浇 * * @param context 宸ヤ綔鎵ц涓婁笅鏂囧璞 - * @param sysJob 绯荤粺璁″垝浠诲姟 + * @param sysJob 绯荤粺璁″垝浠诲姟 * @throws Exception 鎵ц杩囩▼涓殑寮傚父 */ protected abstract void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java index 66b3a625..a0669fec 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java @@ -7,20 +7,17 @@ import java.util.Date; /** * cron琛ㄨ揪寮忓伐鍏风被 - * - * @author ruoyi * + * @author ruoyi */ -public class CronUtils -{ +public class CronUtils { /** * 杩斿洖涓涓竷灏斿间唬琛ㄤ竴涓粰瀹氱殑Cron琛ㄨ揪寮忕殑鏈夋晥鎬 * * @param cronExpression Cron琛ㄨ揪寮 * @return boolean 琛ㄨ揪寮忔槸鍚︽湁鏁 */ - public static boolean isValid(String cronExpression) - { + public static boolean isValid(String cronExpression) { return CronExpression.isValidExpression(cronExpression); } @@ -30,15 +27,11 @@ public class CronUtils * @param cronExpression Cron琛ㄨ揪寮 * @return String 鏃犳晥鏃惰繑鍥炶〃杈惧紡閿欒鎻忚堪,濡傛灉鏈夋晥杩斿洖null */ - public static String getInvalidMessage(String cronExpression) - { - try - { + public static String getInvalidMessage(String cronExpression) { + try { new CronExpression(cronExpression); return null; - } - catch (ParseException pe) - { + } catch (ParseException pe) { return pe.getMessage(); } } @@ -49,15 +42,11 @@ public class CronUtils * @param cronExpression Cron琛ㄨ揪寮 * @return Date 涓嬫Cron琛ㄨ揪寮忔墽琛屾椂闂 */ - public static Date getNextExecution(String cronExpression) - { - try - { + public static Date getNextExecution(String cronExpression) { + try { CronExpression cron = new CronExpression(cronExpression); return cron.getNextValidTimeAfter(new Date(System.currentTimeMillis())); - } - catch (ParseException e) - { + } catch (ParseException e) { throw new IllegalArgumentException(e.getMessage()); } } diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java index c718fdeb..92a333bd 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java @@ -14,27 +14,22 @@ import java.util.List; * * @author ruoyi */ -public class JobInvokeUtil -{ +public class JobInvokeUtil { /** * 鎵ц鏂规硶 * * @param sysJob 绯荤粺浠诲姟 */ - public static void invokeMethod(SysJob sysJob) throws Exception - { + public static void invokeMethod(SysJob sysJob) throws Exception { String invokeTarget = sysJob.getInvokeTarget(); String beanName = getBeanName(invokeTarget); String methodName = getMethodName(invokeTarget); List methodParams = getMethodParams(invokeTarget); - if (!isValidClassName(beanName)) - { + if (!isValidClassName(beanName)) { Object bean = SpringUtils.getBean(beanName); invokeMethod(bean, methodName, methodParams); - } - else - { + } else { Object bean = Class.forName(beanName).newInstance(); invokeMethod(bean, methodName, methodParams); } @@ -43,21 +38,17 @@ public class JobInvokeUtil /** * 璋冪敤浠诲姟鏂规硶 * - * @param bean 鐩爣瀵硅薄 - * @param methodName 鏂规硶鍚嶇О + * @param bean 鐩爣瀵硅薄 + * @param methodName 鏂规硶鍚嶇О * @param methodParams 鏂规硶鍙傛暟 */ private static void invokeMethod(Object bean, String methodName, List methodParams) throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, - InvocationTargetException - { - if (StringUtils.isNotNull(methodParams) && methodParams.size() > 0) - { + InvocationTargetException { + if (StringUtils.isNotNull(methodParams) && methodParams.size() > 0) { Method method = bean.getClass().getDeclaredMethod(methodName, getMethodParamsType(methodParams)); method.invoke(bean, getMethodParamsValue(methodParams)); - } - else - { + } else { Method method = bean.getClass().getDeclaredMethod(methodName); method.invoke(bean); } @@ -65,81 +56,70 @@ public class JobInvokeUtil /** * 鏍￠獙鏄惁涓轰负class鍖呭悕 - * + * * @param invokeTarget 鍚嶇О * @return true鏄 false鍚 */ - public static boolean isValidClassName(String invokeTarget) - { + public static boolean isValidClassName(String invokeTarget) { return StringUtils.countMatches(invokeTarget, ".") > 1; } /** * 鑾峰彇bean鍚嶇О - * + * * @param invokeTarget 鐩爣瀛楃涓 * @return bean鍚嶇О */ - public static String getBeanName(String invokeTarget) - { + public static String getBeanName(String invokeTarget) { String beanName = StringUtils.substringBefore(invokeTarget, "("); return StringUtils.substringBeforeLast(beanName, "."); } /** * 鑾峰彇bean鏂规硶 - * + * * @param invokeTarget 鐩爣瀛楃涓 * @return method鏂规硶 */ - public static String getMethodName(String invokeTarget) - { + public static String getMethodName(String invokeTarget) { String methodName = StringUtils.substringBefore(invokeTarget, "("); return StringUtils.substringAfterLast(methodName, "."); } /** * 鑾峰彇method鏂规硶鍙傛暟鐩稿叧鍒楄〃 - * + * * @param invokeTarget 鐩爣瀛楃涓 * @return method鏂规硶鐩稿叧鍙傛暟鍒楄〃 */ - public static List getMethodParams(String invokeTarget) - { + public static List getMethodParams(String invokeTarget) { String methodStr = StringUtils.substringBetween(invokeTarget, "(", ")"); - if (StringUtils.isEmpty(methodStr)) - { + if (StringUtils.isEmpty(methodStr)) { return null; } String[] methodParams = methodStr.split(",(?=([^\"']*[\"'][^\"']*[\"'])*[^\"']*$)"); List classs = new LinkedList<>(); - for (int i = 0; i < methodParams.length; i++) - { + for (int i = 0; i < methodParams.length; i++) { String str = StringUtils.trimToEmpty(methodParams[i]); // String瀛楃涓茬被鍨嬶紝浠'鎴"寮澶 - if (StringUtils.startsWithAny(str, "'", "\"")) - { - classs.add(new Object[] { StringUtils.substring(str, 1, str.length() - 1), String.class }); + if (StringUtils.startsWithAny(str, "'", "\"")) { + classs.add(new Object[]{StringUtils.substring(str, 1, str.length() - 1), String.class}); } // boolean甯冨皵绫诲瀷锛岀瓑浜巘rue鎴栬協alse - else if ("true".equalsIgnoreCase(str) || "false".equalsIgnoreCase(str)) - { - classs.add(new Object[] { Boolean.valueOf(str), Boolean.class }); + else if ("true".equalsIgnoreCase(str) || "false".equalsIgnoreCase(str)) { + classs.add(new Object[]{Boolean.valueOf(str), Boolean.class}); } // long闀挎暣褰紝浠缁撳熬 - else if (StringUtils.endsWith(str, "L")) - { - classs.add(new Object[] { Long.valueOf(StringUtils.substring(str, 0, str.length() - 1)), Long.class }); + else if (StringUtils.endsWith(str, "L")) { + classs.add(new Object[]{Long.valueOf(StringUtils.substring(str, 0, str.length() - 1)), Long.class}); } // double娴偣绫诲瀷锛屼互D缁撳熬 - else if (StringUtils.endsWith(str, "D")) - { - classs.add(new Object[] { Double.valueOf(StringUtils.substring(str, 0, str.length() - 1)), Double.class }); + else if (StringUtils.endsWith(str, "D")) { + classs.add(new Object[]{Double.valueOf(StringUtils.substring(str, 0, str.length() - 1)), Double.class}); } // 鍏朵粬绫诲瀷褰掔被涓烘暣褰 - else - { - classs.add(new Object[] { Integer.valueOf(str), Integer.class }); + else { + classs.add(new Object[]{Integer.valueOf(str), Integer.class}); } } return classs; @@ -147,16 +127,14 @@ public class JobInvokeUtil /** * 鑾峰彇鍙傛暟绫诲瀷 - * + * * @param methodParams 鍙傛暟鐩稿叧鍒楄〃 * @return 鍙傛暟绫诲瀷鍒楄〃 */ - public static Class[] getMethodParamsType(List methodParams) - { + public static Class[] getMethodParamsType(List methodParams) { Class[] classs = new Class[methodParams.size()]; int index = 0; - for (Object[] os : methodParams) - { + for (Object[] os : methodParams) { classs[index] = (Class) os[1]; index++; } @@ -165,16 +143,14 @@ public class JobInvokeUtil /** * 鑾峰彇鍙傛暟鍊 - * + * * @param methodParams 鍙傛暟鐩稿叧鍒楄〃 * @return 鍙傛暟鍊煎垪琛 */ - public static Object[] getMethodParamsValue(List methodParams) - { + public static Object[] getMethodParamsValue(List methodParams) { Object[] classs = new Object[methodParams.size()]; int index = 0; - for (Object[] os : methodParams) - { + for (Object[] os : methodParams) { classs[index] = (Object) os[0]; index++; } diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java index 9b7a644b..481fa4b8 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java @@ -6,16 +6,13 @@ import org.quartz.JobExecutionContext; /** * 瀹氭椂浠诲姟澶勭悊锛堢姝㈠苟鍙戞墽琛岋級 - * - * @author ruoyi * + * @author ruoyi */ @DisallowConcurrentExecution -public class QuartzDisallowConcurrentExecution extends AbstractQuartzJob -{ +public class QuartzDisallowConcurrentExecution extends AbstractQuartzJob { @Override - protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception - { + protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception { JobInvokeUtil.invokeMethod(sysJob); } } diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java index 4ceb2c3a..80bbc4c3 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java @@ -5,15 +5,12 @@ import org.quartz.JobExecutionContext; /** * 瀹氭椂浠诲姟澶勭悊锛堝厑璁稿苟鍙戞墽琛岋級 - * - * @author ruoyi * + * @author ruoyi */ -public class QuartzJobExecution extends AbstractQuartzJob -{ +public class QuartzJobExecution extends AbstractQuartzJob { @Override - protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception - { + protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception { JobInvokeUtil.invokeMethod(sysJob); } } diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java index af1afac5..a222b00a 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java @@ -11,20 +11,17 @@ import org.quartz.*; /** * 瀹氭椂浠诲姟宸ュ叿绫 - * - * @author ruoyi * + * @author ruoyi */ -public class ScheduleUtils -{ +public class ScheduleUtils { /** * 寰楀埌quartz浠诲姟绫 * * @param sysJob 鎵ц璁″垝 * @return 鍏蜂綋鎵ц浠诲姟绫 */ - private static Class getQuartzJobClass(SysJob sysJob) - { + private static Class getQuartzJobClass(SysJob sysJob) { boolean isConcurrent = "0".equals(sysJob.getConcurrent()); return isConcurrent ? QuartzJobExecution.class : QuartzDisallowConcurrentExecution.class; } @@ -32,24 +29,21 @@ public class ScheduleUtils /** * 鏋勫缓浠诲姟瑙﹀彂瀵硅薄 */ - public static TriggerKey getTriggerKey(Long jobId, String jobGroup) - { + public static TriggerKey getTriggerKey(Long jobId, String jobGroup) { return TriggerKey.triggerKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup); } /** * 鏋勫缓浠诲姟閿璞 */ - public static JobKey getJobKey(Long jobId, String jobGroup) - { + public static JobKey getJobKey(Long jobId, String jobGroup) { return JobKey.jobKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup); } /** * 鍒涘缓瀹氭椂浠诲姟 */ - public static void createScheduleJob(Scheduler scheduler, SysJob job) throws SchedulerException, TaskException - { + public static void createScheduleJob(Scheduler scheduler, SysJob job) throws SchedulerException, TaskException { Class jobClass = getQuartzJobClass(job); // 鏋勫缓job淇℃伅 Long jobId = job.getJobId(); @@ -68,8 +62,7 @@ public class ScheduleUtils jobDetail.getJobDataMap().put(ScheduleConstants.TASK_PROPERTIES, job); // 鍒ゆ柇鏄惁瀛樺湪 - if (scheduler.checkExists(getJobKey(jobId, jobGroup))) - { + if (scheduler.checkExists(getJobKey(jobId, jobGroup))) { // 闃叉鍒涘缓鏃跺瓨鍦ㄦ暟鎹棶棰 鍏堢Щ闄わ紝鐒跺悗鍦ㄦ墽琛屽垱寤烘搷浣 scheduler.deleteJob(getJobKey(jobId, jobGroup)); } @@ -77,8 +70,7 @@ public class ScheduleUtils scheduler.scheduleJob(jobDetail, trigger); // 鏆傚仠浠诲姟 - if (job.getStatus().equals(ScheduleConstants.Status.PAUSE.getValue())) - { + if (job.getStatus().equals(ScheduleConstants.Status.PAUSE.getValue())) { scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup)); } } @@ -87,10 +79,8 @@ public class ScheduleUtils * 璁剧疆瀹氭椂浠诲姟绛栫暐 */ public static CronScheduleBuilder handleCronScheduleMisfirePolicy(SysJob job, CronScheduleBuilder cb) - throws TaskException - { - switch (job.getMisfirePolicy()) - { + throws TaskException { + switch (job.getMisfirePolicy()) { case ScheduleConstants.MISFIRE_DEFAULT: return cb; case ScheduleConstants.MISFIRE_IGNORE_MISFIRES: @@ -107,16 +97,14 @@ public class ScheduleUtils /** * 妫鏌ュ寘鍚嶆槸鍚︿负鐧藉悕鍗曢厤缃 - * + * * @param invokeTarget 鐩爣瀛楃涓 * @return 缁撴灉 */ - public static boolean whiteList(String invokeTarget) - { + public static boolean whiteList(String invokeTarget) { String packageName = StringUtils.substringBefore(invokeTarget, "("); int count = StringUtils.countMatches(packageName, "."); - if (count > 1) - { + if (count > 1) { return StringUtils.containsAnyIgnoreCase(invokeTarget, Constants.JOB_WHITELIST_STR); } Object obj = SpringUtils.getBean(StringUtils.split(invokeTarget, ".")[0]); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java index d072517e..ecb67d9d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java @@ -8,17 +8,15 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; /** * 绯荤粺妯″潡 - * + * * @author ruoyi */ @EnableCustomConfig @EnableCustomSwagger2 @EnableRyFeignClients @SpringBootApplication -public class RuoYiSystemApplication -{ - public static void main(String[] args) - { +public class RuoYiSystemApplication { + public static void main(String[] args) { SpringApplication.run(RuoYiSystemApplication.class, args); System.out.println("(鈾モ棤鈥库棤)锞夛緸 绯荤粺妯″潡鍚姩鎴愬姛 醿(麓凇`醿)锞 \n" + " .-------. ____ __ \n" + diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java index 7f4f7432..2222e6bc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java @@ -20,13 +20,12 @@ import java.util.List; /** * 鍙傛暟閰嶇疆 淇℃伅鎿嶄綔澶勭悊 - * + * * @author ruoyi */ @RestController @RequestMapping("/config") -public class SysConfigController extends BaseController -{ +public class SysConfigController extends BaseController { @Autowired private ISysConfigService configService; @@ -35,8 +34,7 @@ public class SysConfigController extends BaseController */ @RequiresPermissions("system:config:list") @GetMapping("/list") - public TableDataInfo list(SysConfig config) - { + public TableDataInfo list(SysConfig config) { startPage(); List list = configService.selectConfigList(config); return getDataTable(list); @@ -45,8 +43,7 @@ public class SysConfigController extends BaseController @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 list = configService.selectConfigList(config); ExcelUtil util = new ExcelUtil(SysConfig.class); util.exportExcel(response, list, "鍙傛暟鏁版嵁"); @@ -56,8 +53,7 @@ public class SysConfigController extends BaseController * 鏍规嵁鍙傛暟缂栧彿鑾峰彇璇︾粏淇℃伅 */ @GetMapping(value = "/{configId}") - public AjaxResult getInfo(@PathVariable Long configId) - { + public AjaxResult getInfo(@PathVariable Long configId) { return AjaxResult.success(configService.selectConfigById(configId)); } @@ -65,8 +61,7 @@ public class SysConfigController extends BaseController * 鏍规嵁鍙傛暟閿悕鏌ヨ鍙傛暟鍊 */ @GetMapping(value = "/configKey/{configKey}") - public AjaxResult getConfigKey(@PathVariable String configKey) - { + public AjaxResult getConfigKey(@PathVariable String configKey) { return AjaxResult.success(configService.selectConfigByKey(configKey)); } @@ -76,10 +71,8 @@ public class SysConfigController extends BaseController @RequiresPermissions("system:config:add") @Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysConfig config) - { - if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) - { + public AjaxResult add(@Validated @RequestBody SysConfig config) { + if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) { return AjaxResult.error("鏂板鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪"); } config.setCreateBy(SecurityUtils.getUsername()); @@ -92,10 +85,8 @@ public class SysConfigController extends BaseController @RequiresPermissions("system:config:edit") @Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysConfig config) - { - if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) - { + public AjaxResult edit(@Validated @RequestBody SysConfig config) { + if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) { return AjaxResult.error("淇敼鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪"); } config.setUpdateBy(SecurityUtils.getUsername()); @@ -108,8 +99,7 @@ public class SysConfigController extends BaseController @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(); } @@ -120,8 +110,7 @@ public class SysConfigController extends BaseController @RequiresPermissions("system:config:remove") @Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.CLEAN) @DeleteMapping("/refreshCache") - public AjaxResult refreshCache() - { + public AjaxResult refreshCache() { configService.resetConfigCache(); return AjaxResult.success(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java index 2b98d33a..16a37cd1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java @@ -20,13 +20,12 @@ import java.util.List; /** * 閮ㄩ棬淇℃伅 - * + * * @author ruoyi */ @RestController @RequestMapping("/dept") -public class SysDeptController extends BaseController -{ +public class SysDeptController extends BaseController { @Autowired private ISysDeptService deptService; @@ -35,8 +34,7 @@ public class SysDeptController extends BaseController */ @RequiresPermissions("system:dept:list") @GetMapping("/list") - public AjaxResult list(SysDept dept) - { + public AjaxResult list(SysDept dept) { List depts = deptService.selectDeptList(dept); return AjaxResult.success(depts); } @@ -46,16 +44,13 @@ public class SysDeptController extends BaseController */ @RequiresPermissions("system:dept:list") @GetMapping("/list/exclude/{deptId}") - public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) - { + public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) { List depts = deptService.selectDeptList(new SysDept()); Iterator it = depts.iterator(); - while (it.hasNext()) - { + while (it.hasNext()) { SysDept d = (SysDept) it.next(); if (d.getDeptId().intValue() == deptId - || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")) - { + || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")) { it.remove(); } } @@ -67,8 +62,7 @@ public class SysDeptController extends BaseController */ @RequiresPermissions("system:dept:query") @GetMapping(value = "/{deptId}") - public AjaxResult getInfo(@PathVariable Long deptId) - { + public AjaxResult getInfo(@PathVariable Long deptId) { deptService.checkDeptDataScope(deptId); return AjaxResult.success(deptService.selectDeptById(deptId)); } @@ -77,8 +71,7 @@ public class SysDeptController extends BaseController * 鑾峰彇閮ㄩ棬涓嬫媺鏍戝垪琛 */ @GetMapping("/treeselect") - public AjaxResult treeselect(SysDept dept) - { + public AjaxResult treeselect(SysDept dept) { List depts = deptService.selectDeptList(dept); return AjaxResult.success(deptService.buildDeptTreeSelect(depts)); } @@ -87,8 +80,7 @@ public class SysDeptController extends BaseController * 鍔犺浇瀵瑰簲瑙掕壊閮ㄩ棬鍒楄〃鏍 */ @GetMapping(value = "/roleDeptTreeselect/{roleId}") - public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId) - { + public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId) { List depts = deptService.selectDeptList(new SysDept()); AjaxResult ajax = AjaxResult.success(); ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId)); @@ -102,10 +94,8 @@ public class SysDeptController extends BaseController @RequiresPermissions("system:dept:add") @Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysDept dept) - { - if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) - { + public AjaxResult add(@Validated @RequestBody SysDept dept) { + if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) { return AjaxResult.error("鏂板閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛岄儴闂ㄥ悕绉板凡瀛樺湪"); } dept.setCreateBy(SecurityUtils.getUsername()); @@ -118,20 +108,14 @@ public class SysDeptController extends BaseController @RequiresPermissions("system:dept:edit") @Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysDept dept) - { + public AjaxResult edit(@Validated @RequestBody SysDept dept) { Long deptId = dept.getDeptId(); deptService.checkDeptDataScope(deptId); - if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) - { + if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) { return AjaxResult.error("淇敼閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛岄儴闂ㄥ悕绉板凡瀛樺湪"); - } - else if (dept.getParentId().equals(deptId)) - { + } else if (dept.getParentId().equals(deptId)) { return AjaxResult.error("淇敼閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛屼笂绾ч儴闂ㄤ笉鑳芥槸鑷繁"); - } - else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0) - { + } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0) { return AjaxResult.error("璇ラ儴闂ㄥ寘鍚湭鍋滅敤鐨勫瓙閮ㄩ棬锛"); } dept.setUpdateBy(SecurityUtils.getUsername()); @@ -144,14 +128,11 @@ public class SysDeptController extends BaseController @RequiresPermissions("system:dept:remove") @Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.DELETE) @DeleteMapping("/{deptId}") - public AjaxResult remove(@PathVariable Long deptId) - { - if (deptService.hasChildByDeptId(deptId)) - { + public AjaxResult remove(@PathVariable Long deptId) { + if (deptService.hasChildByDeptId(deptId)) { return AjaxResult.error("瀛樺湪涓嬬骇閮ㄩ棬,涓嶅厑璁稿垹闄"); } - if (deptService.checkDeptExistUser(deptId)) - { + if (deptService.checkDeptExistUser(deptId)) { return AjaxResult.error("閮ㄩ棬瀛樺湪鐢ㄦ埛,涓嶅厑璁稿垹闄"); } deptService.checkDeptDataScope(deptId); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java index 4f863452..b487f8f8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java @@ -22,23 +22,21 @@ import java.util.List; /** * 鏁版嵁瀛楀吀淇℃伅 - * + * * @author ruoyi */ @RestController @RequestMapping("/dict/data") -public class SysDictDataController extends BaseController -{ +public class SysDictDataController extends BaseController { @Autowired private ISysDictDataService dictDataService; - + @Autowired private ISysDictTypeService dictTypeService; @RequiresPermissions("system:dict:list") @GetMapping("/list") - public TableDataInfo list(SysDictData dictData) - { + public TableDataInfo list(SysDictData dictData) { startPage(); List list = dictDataService.selectDictDataList(dictData); return getDataTable(list); @@ -47,8 +45,7 @@ public class SysDictDataController extends BaseController @Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.EXPORT) @RequiresPermissions("system:dict:export") @PostMapping("/export") - public void export(HttpServletResponse response, SysDictData dictData) - { + public void export(HttpServletResponse response, SysDictData dictData) { List list = dictDataService.selectDictDataList(dictData); ExcelUtil util = new ExcelUtil(SysDictData.class); util.exportExcel(response, list, "瀛楀吀鏁版嵁"); @@ -59,8 +56,7 @@ public class SysDictDataController extends BaseController */ @RequiresPermissions("system:dict:query") @GetMapping(value = "/{dictCode}") - public AjaxResult getInfo(@PathVariable Long dictCode) - { + public AjaxResult getInfo(@PathVariable Long dictCode) { return AjaxResult.success(dictDataService.selectDictDataById(dictCode)); } @@ -68,11 +64,9 @@ public class SysDictDataController extends BaseController * 鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅 */ @GetMapping(value = "/type/{dictType}") - public AjaxResult dictType(@PathVariable String dictType) - { + public AjaxResult dictType(@PathVariable String dictType) { List data = dictTypeService.selectDictDataByType(dictType); - if (StringUtils.isNull(data)) - { + if (StringUtils.isNull(data)) { data = new ArrayList(); } return AjaxResult.success(data); @@ -84,8 +78,7 @@ public class SysDictDataController extends BaseController @RequiresPermissions("system:dict:add") @Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysDictData dict) - { + public AjaxResult add(@Validated @RequestBody SysDictData dict) { dict.setCreateBy(SecurityUtils.getUsername()); return toAjax(dictDataService.insertDictData(dict)); } @@ -96,8 +89,7 @@ public class SysDictDataController extends BaseController @RequiresPermissions("system:dict:edit") @Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysDictData dict) - { + public AjaxResult edit(@Validated @RequestBody SysDictData dict) { dict.setUpdateBy(SecurityUtils.getUsername()); return toAjax(dictDataService.updateDictData(dict)); } @@ -108,8 +100,7 @@ public class SysDictDataController extends BaseController @RequiresPermissions("system:dict:remove") @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE) @DeleteMapping("/{dictCodes}") - public AjaxResult remove(@PathVariable Long[] dictCodes) - { + public AjaxResult remove(@PathVariable Long[] dictCodes) { dictDataService.deleteDictDataByIds(dictCodes); return success(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java index ef95d57a..5a3d4bec 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java @@ -20,20 +20,18 @@ import java.util.List; /** * 鏁版嵁瀛楀吀淇℃伅 - * + * * @author ruoyi */ @RestController @RequestMapping("/dict/type") -public class SysDictTypeController extends BaseController -{ +public class SysDictTypeController extends BaseController { @Autowired private ISysDictTypeService dictTypeService; @RequiresPermissions("system:dict:list") @GetMapping("/list") - public TableDataInfo list(SysDictType dictType) - { + public TableDataInfo list(SysDictType dictType) { startPage(); List list = dictTypeService.selectDictTypeList(dictType); return getDataTable(list); @@ -42,8 +40,7 @@ public class SysDictTypeController extends BaseController @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.EXPORT) @RequiresPermissions("system:dict:export") @PostMapping("/export") - public void export(HttpServletResponse response, SysDictType dictType) - { + public void export(HttpServletResponse response, SysDictType dictType) { List list = dictTypeService.selectDictTypeList(dictType); ExcelUtil util = new ExcelUtil(SysDictType.class); util.exportExcel(response, list, "瀛楀吀绫诲瀷"); @@ -54,8 +51,7 @@ public class SysDictTypeController extends BaseController */ @RequiresPermissions("system:dict:query") @GetMapping(value = "/{dictId}") - public AjaxResult getInfo(@PathVariable Long dictId) - { + public AjaxResult getInfo(@PathVariable Long dictId) { return AjaxResult.success(dictTypeService.selectDictTypeById(dictId)); } @@ -65,10 +61,8 @@ public class SysDictTypeController extends BaseController @RequiresPermissions("system:dict:add") @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysDictType dict) - { - if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) - { + public AjaxResult add(@Validated @RequestBody SysDictType dict) { + if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { return AjaxResult.error("鏂板瀛楀吀'" + dict.getDictName() + "'澶辫触锛屽瓧鍏哥被鍨嬪凡瀛樺湪"); } dict.setCreateBy(SecurityUtils.getUsername()); @@ -81,10 +75,8 @@ public class SysDictTypeController extends BaseController @RequiresPermissions("system:dict:edit") @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysDictType dict) - { - if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) - { + public AjaxResult edit(@Validated @RequestBody SysDictType dict) { + if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { return AjaxResult.error("淇敼瀛楀吀'" + dict.getDictName() + "'澶辫触锛屽瓧鍏哥被鍨嬪凡瀛樺湪"); } dict.setUpdateBy(SecurityUtils.getUsername()); @@ -97,8 +89,7 @@ public class SysDictTypeController extends BaseController @RequiresPermissions("system:dict:remove") @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE) @DeleteMapping("/{dictIds}") - public AjaxResult remove(@PathVariable Long[] dictIds) - { + public AjaxResult remove(@PathVariable Long[] dictIds) { dictTypeService.deleteDictTypeByIds(dictIds); return success(); } @@ -109,8 +100,7 @@ public class SysDictTypeController extends BaseController @RequiresPermissions("system:dict:remove") @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.CLEAN) @DeleteMapping("/refreshCache") - public AjaxResult refreshCache() - { + public AjaxResult refreshCache() { dictTypeService.resetDictCache(); return AjaxResult.success(); } @@ -119,8 +109,7 @@ public class SysDictTypeController extends BaseController * 鑾峰彇瀛楀吀閫夋嫨妗嗗垪琛 */ @GetMapping("/optionselect") - public AjaxResult optionselect() - { + public AjaxResult optionselect() { List dictTypes = dictTypeService.selectDictTypeAll(); return AjaxResult.success(dictTypes); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java index 01d5a2ad..08b3eb11 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java @@ -18,20 +18,18 @@ import java.util.List; /** * 绯荤粺璁块棶璁板綍 - * + * * @author ruoyi */ @RestController @RequestMapping("/logininfor") -public class SysLogininforController extends BaseController -{ +public class SysLogininforController extends BaseController { @Autowired private ISysLogininforService logininforService; @RequiresPermissions("system:logininfor:list") @GetMapping("/list") - public TableDataInfo list(SysLogininfor logininfor) - { + public TableDataInfo list(SysLogininfor logininfor) { startPage(); List list = logininforService.selectLogininforList(logininfor); return getDataTable(list); @@ -40,8 +38,7 @@ public class SysLogininforController extends BaseController @Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.EXPORT) @RequiresPermissions("system:logininfor:export") @PostMapping("/export") - public void export(HttpServletResponse response, SysLogininfor logininfor) - { + public void export(HttpServletResponse response, SysLogininfor logininfor) { List list = logininforService.selectLogininforList(logininfor); ExcelUtil util = new ExcelUtil(SysLogininfor.class); util.exportExcel(response, list, "鐧诲綍鏃ュ織"); @@ -50,24 +47,21 @@ public class SysLogininforController extends BaseController @RequiresPermissions("system:logininfor:remove") @Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.DELETE) @DeleteMapping("/{infoIds}") - public AjaxResult remove(@PathVariable Long[] infoIds) - { + public AjaxResult remove(@PathVariable Long[] infoIds) { return toAjax(logininforService.deleteLogininforByIds(infoIds)); } @RequiresPermissions("system:logininfor:remove") @Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.DELETE) @DeleteMapping("/clean") - public AjaxResult clean() - { + public AjaxResult clean() { logininforService.cleanLogininfor(); return AjaxResult.success(); } @InnerAuth @PostMapping - public AjaxResult add(@RequestBody SysLogininfor logininfor) - { + public AjaxResult add(@RequestBody SysLogininfor logininfor) { return toAjax(logininforService.insertLogininfor(logininfor)); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java index 77a01a74..42bac2a4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java @@ -18,13 +18,12 @@ import java.util.List; /** * 鑿滃崟淇℃伅 - * + * * @author ruoyi */ @RestController @RequestMapping("/menu") -public class SysMenuController extends BaseController -{ +public class SysMenuController extends BaseController { @Autowired private ISysMenuService menuService; @@ -33,8 +32,7 @@ public class SysMenuController extends BaseController */ @RequiresPermissions("system:menu:list") @GetMapping("/list") - public AjaxResult list(SysMenu menu) - { + public AjaxResult list(SysMenu menu) { Long userId = SecurityUtils.getUserId(); List menus = menuService.selectMenuList(menu, userId); return AjaxResult.success(menus); @@ -45,8 +43,7 @@ public class SysMenuController extends BaseController */ @RequiresPermissions("system:menu:query") @GetMapping(value = "/{menuId}") - public AjaxResult getInfo(@PathVariable Long menuId) - { + public AjaxResult getInfo(@PathVariable Long menuId) { return AjaxResult.success(menuService.selectMenuById(menuId)); } @@ -54,8 +51,7 @@ public class SysMenuController extends BaseController * 鑾峰彇鑿滃崟涓嬫媺鏍戝垪琛 */ @GetMapping("/treeselect") - public AjaxResult treeselect(SysMenu menu) - { + public AjaxResult treeselect(SysMenu menu) { Long userId = SecurityUtils.getUserId(); List menus = menuService.selectMenuList(menu, userId); return AjaxResult.success(menuService.buildMenuTreeSelect(menus)); @@ -65,8 +61,7 @@ public class SysMenuController extends BaseController * 鍔犺浇瀵瑰簲瑙掕壊鑿滃崟鍒楄〃鏍 */ @GetMapping(value = "/roleMenuTreeselect/{roleId}") - public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId) - { + public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId) { Long userId = SecurityUtils.getUserId(); List menus = menuService.selectMenuList(userId); AjaxResult ajax = AjaxResult.success(); @@ -81,14 +76,10 @@ public class SysMenuController extends BaseController @RequiresPermissions("system:menu:add") @Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysMenu menu) - { - if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) - { + public AjaxResult add(@Validated @RequestBody SysMenu menu) { + if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) { return AjaxResult.error("鏂板鑿滃崟'" + menu.getMenuName() + "'澶辫触锛岃彍鍗曞悕绉板凡瀛樺湪"); - } - else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) - { + } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) { return AjaxResult.error("鏂板鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屽湴鍧蹇呴』浠ttp(s)://寮澶"); } menu.setCreateBy(SecurityUtils.getUsername()); @@ -101,18 +92,12 @@ public class SysMenuController extends BaseController @RequiresPermissions("system:menu:edit") @Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysMenu menu) - { - if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) - { + public AjaxResult edit(@Validated @RequestBody SysMenu menu) { + if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) { return AjaxResult.error("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛岃彍鍗曞悕绉板凡瀛樺湪"); - } - else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) - { + } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) { return AjaxResult.error("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屽湴鍧蹇呴』浠ttp(s)://寮澶"); - } - else if (menu.getMenuId().equals(menu.getParentId())) - { + } else if (menu.getMenuId().equals(menu.getParentId())) { return AjaxResult.error("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屼笂绾ц彍鍗曚笉鑳介夋嫨鑷繁"); } menu.setUpdateBy(SecurityUtils.getUsername()); @@ -125,14 +110,11 @@ public class SysMenuController extends BaseController @RequiresPermissions("system:menu:remove") @Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.DELETE) @DeleteMapping("/{menuId}") - public AjaxResult remove(@PathVariable("menuId") Long menuId) - { - if (menuService.hasChildByMenuId(menuId)) - { + public AjaxResult remove(@PathVariable("menuId") Long menuId) { + if (menuService.hasChildByMenuId(menuId)) { return AjaxResult.error("瀛樺湪瀛愯彍鍗,涓嶅厑璁稿垹闄"); } - if (menuService.checkMenuExistRole(menuId)) - { + if (menuService.checkMenuExistRole(menuId)) { return AjaxResult.error("鑿滃崟宸插垎閰,涓嶅厑璁稿垹闄"); } return toAjax(menuService.deleteMenuById(menuId)); @@ -140,12 +122,11 @@ public class SysMenuController extends BaseController /** * 鑾峰彇璺敱淇℃伅 - * + * * @return 璺敱淇℃伅 */ @GetMapping("getRouters") - public AjaxResult getRouters() - { + public AjaxResult getRouters() { Long userId = SecurityUtils.getUserId(); List menus = menuService.selectMenuTreeByUserId(userId); return AjaxResult.success(menuService.buildMenus(menus)); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java index 84deee72..c212c4a4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java @@ -17,13 +17,12 @@ import java.util.List; /** * 鍏憡 淇℃伅鎿嶄綔澶勭悊 - * + * * @author ruoyi */ @RestController @RequestMapping("/notice") -public class SysNoticeController extends BaseController -{ +public class SysNoticeController extends BaseController { @Autowired private ISysNoticeService noticeService; @@ -32,8 +31,7 @@ public class SysNoticeController extends BaseController */ @RequiresPermissions("system:notice:list") @GetMapping("/list") - public TableDataInfo list(SysNotice notice) - { + public TableDataInfo list(SysNotice notice) { startPage(); List list = noticeService.selectNoticeList(notice); return getDataTable(list); @@ -44,8 +42,7 @@ public class SysNoticeController extends BaseController */ @RequiresPermissions("system:notice:query") @GetMapping(value = "/{noticeId}") - public AjaxResult getInfo(@PathVariable Long noticeId) - { + public AjaxResult getInfo(@PathVariable Long noticeId) { return AjaxResult.success(noticeService.selectNoticeById(noticeId)); } @@ -55,8 +52,7 @@ public class SysNoticeController extends BaseController @RequiresPermissions("system:notice:add") @Log(title = "閫氱煡鍏憡", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysNotice notice) - { + public AjaxResult add(@Validated @RequestBody SysNotice notice) { notice.setCreateBy(SecurityUtils.getUsername()); return toAjax(noticeService.insertNotice(notice)); } @@ -67,8 +63,7 @@ public class SysNoticeController extends BaseController @RequiresPermissions("system:notice:edit") @Log(title = "閫氱煡鍏憡", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysNotice notice) - { + public AjaxResult edit(@Validated @RequestBody SysNotice notice) { notice.setUpdateBy(SecurityUtils.getUsername()); return toAjax(noticeService.updateNotice(notice)); } @@ -79,8 +74,7 @@ public class SysNoticeController extends BaseController @RequiresPermissions("system:notice:remove") @Log(title = "閫氱煡鍏憡", businessType = BusinessType.DELETE) @DeleteMapping("/{noticeIds}") - public AjaxResult remove(@PathVariable Long[] noticeIds) - { + public AjaxResult remove(@PathVariable Long[] noticeIds) { return toAjax(noticeService.deleteNoticeByIds(noticeIds)); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java index aac6ae8c..6e05e70e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java @@ -18,20 +18,18 @@ import java.util.List; /** * 鎿嶄綔鏃ュ織璁板綍 - * + * * @author ruoyi */ @RestController @RequestMapping("/operlog") -public class SysOperlogController extends BaseController -{ +public class SysOperlogController extends BaseController { @Autowired private ISysOperLogService operLogService; @RequiresPermissions("system:operlog:list") @GetMapping("/list") - public TableDataInfo list(SysOperLog operLog) - { + public TableDataInfo list(SysOperLog operLog) { startPage(); List list = operLogService.selectOperLogList(operLog); return getDataTable(list); @@ -40,8 +38,7 @@ public class SysOperlogController extends BaseController @Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.EXPORT) @RequiresPermissions("system:operlog:export") @PostMapping("/export") - public void export(HttpServletResponse response, SysOperLog operLog) - { + public void export(HttpServletResponse response, SysOperLog operLog) { List list = operLogService.selectOperLogList(operLog); ExcelUtil util = new ExcelUtil(SysOperLog.class); util.exportExcel(response, list, "鎿嶄綔鏃ュ織"); @@ -50,24 +47,21 @@ public class SysOperlogController extends BaseController @Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.DELETE) @RequiresPermissions("system:operlog:remove") @DeleteMapping("/{operIds}") - public AjaxResult remove(@PathVariable Long[] operIds) - { + public AjaxResult remove(@PathVariable Long[] operIds) { return toAjax(operLogService.deleteOperLogByIds(operIds)); } @RequiresPermissions("system:operlog:remove") @Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.CLEAN) @DeleteMapping("/clean") - public AjaxResult clean() - { + public AjaxResult clean() { operLogService.cleanOperLog(); return AjaxResult.success(); } @InnerAuth @PostMapping - public AjaxResult add(@RequestBody SysOperLog operLog) - { + public AjaxResult add(@RequestBody SysOperLog operLog) { return toAjax(operLogService.insertOperlog(operLog)); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java index 29de163a..2b9950a4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java @@ -20,13 +20,12 @@ import java.util.List; /** * 宀椾綅淇℃伅鎿嶄綔澶勭悊 - * + * * @author ruoyi */ @RestController @RequestMapping("/post") -public class SysPostController extends BaseController -{ +public class SysPostController extends BaseController { @Autowired private ISysPostService postService; @@ -35,8 +34,7 @@ public class SysPostController extends BaseController */ @RequiresPermissions("system:post:list") @GetMapping("/list") - public TableDataInfo list(SysPost post) - { + public TableDataInfo list(SysPost post) { startPage(); List list = postService.selectPostList(post); return getDataTable(list); @@ -45,8 +43,7 @@ public class SysPostController extends BaseController @Log(title = "宀椾綅绠＄悊", businessType = BusinessType.EXPORT) @RequiresPermissions("system:post:export") @PostMapping("/export") - public void export(HttpServletResponse response, SysPost post) - { + public void export(HttpServletResponse response, SysPost post) { List list = postService.selectPostList(post); ExcelUtil util = new ExcelUtil(SysPost.class); util.exportExcel(response, list, "宀椾綅鏁版嵁"); @@ -57,8 +54,7 @@ public class SysPostController extends BaseController */ @RequiresPermissions("system:post:query") @GetMapping(value = "/{postId}") - public AjaxResult getInfo(@PathVariable Long postId) - { + public AjaxResult getInfo(@PathVariable Long postId) { return AjaxResult.success(postService.selectPostById(postId)); } @@ -68,14 +64,10 @@ public class SysPostController extends BaseController @RequiresPermissions("system:post:add") @Log(title = "宀椾綅绠＄悊", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysPost post) - { - if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) - { + public AjaxResult add(@Validated @RequestBody SysPost post) { + if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) { return AjaxResult.error("鏂板宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶅悕绉板凡瀛樺湪"); - } - else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) - { + } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) { return AjaxResult.error("鏂板宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪"); } post.setCreateBy(SecurityUtils.getUsername()); @@ -88,14 +80,10 @@ public class SysPostController extends BaseController @RequiresPermissions("system:post:edit") @Log(title = "宀椾綅绠＄悊", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysPost post) - { - if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) - { + public AjaxResult edit(@Validated @RequestBody SysPost post) { + if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) { return AjaxResult.error("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶅悕绉板凡瀛樺湪"); - } - else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) - { + } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) { return AjaxResult.error("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪"); } post.setUpdateBy(SecurityUtils.getUsername()); @@ -108,8 +96,7 @@ public class SysPostController extends BaseController @RequiresPermissions("system:post:remove") @Log(title = "宀椾綅绠＄悊", businessType = BusinessType.DELETE) @DeleteMapping("/{postIds}") - public AjaxResult remove(@PathVariable Long[] postIds) - { + public AjaxResult remove(@PathVariable Long[] postIds) { return toAjax(postService.deletePostByIds(postIds)); } @@ -117,8 +104,7 @@ public class SysPostController extends BaseController * 鑾峰彇宀椾綅閫夋嫨妗嗗垪琛 */ @GetMapping("/optionselect") - public AjaxResult optionselect() - { + public AjaxResult optionselect() { List posts = postService.selectPostAll(); return AjaxResult.success(posts); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java index e40999a3..38b9c14a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java @@ -22,19 +22,18 @@ import java.io.IOException; /** * 涓汉淇℃伅 涓氬姟澶勭悊 - * + * * @author ruoyi */ @RestController @RequestMapping("/user/profile") -public class SysProfileController extends BaseController -{ +public class SysProfileController extends BaseController { @Autowired private ISysUserService userService; - + @Autowired private TokenService tokenService; - + @Autowired private RemoteFileService remoteFileService; @@ -42,8 +41,7 @@ public class SysProfileController extends BaseController * 涓汉淇℃伅 */ @GetMapping - public AjaxResult profile() - { + public AjaxResult profile() { String username = SecurityUtils.getUsername(); SysUser user = userService.selectUserByUserName(username); AjaxResult ajax = AjaxResult.success(user); @@ -57,25 +55,20 @@ public class SysProfileController extends BaseController */ @Log(title = "涓汉淇℃伅", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult updateProfile(@RequestBody SysUser user) - { + public AjaxResult updateProfile(@RequestBody SysUser user) { LoginUser loginUser = SecurityUtils.getLoginUser(); SysUser sysUser = loginUser.getSysUser(); user.setUserName(sysUser.getUserName()); if (StringUtils.isNotEmpty(user.getPhonenumber()) - && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) - { + && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) { return AjaxResult.error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪"); - } - else if (StringUtils.isNotEmpty(user.getEmail()) - && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) - { + } else if (StringUtils.isNotEmpty(user.getEmail()) + && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) { return AjaxResult.error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪"); } user.setUserId(sysUser.getUserId()); user.setPassword(null); - if (userService.updateUserProfile(user) > 0) - { + if (userService.updateUserProfile(user) > 0) { // 鏇存柊缂撳瓨鐢ㄦ埛淇℃伅 loginUser.getSysUser().setNickName(user.getNickName()); loginUser.getSysUser().setPhonenumber(user.getPhonenumber()); @@ -92,21 +85,17 @@ public class SysProfileController extends BaseController */ @Log(title = "涓汉淇℃伅", businessType = BusinessType.UPDATE) @PutMapping("/updatePwd") - public AjaxResult updatePwd(String oldPassword, String newPassword) - { + public AjaxResult updatePwd(String oldPassword, String newPassword) { String username = SecurityUtils.getUsername(); SysUser user = userService.selectUserByUserName(username); String password = user.getPassword(); - if (!SecurityUtils.matchesPassword(oldPassword, password)) - { + if (!SecurityUtils.matchesPassword(oldPassword, password)) { return AjaxResult.error("淇敼瀵嗙爜澶辫触锛屾棫瀵嗙爜閿欒"); } - if (SecurityUtils.matchesPassword(newPassword, password)) - { + if (SecurityUtils.matchesPassword(newPassword, password)) { return AjaxResult.error("鏂板瘑鐮佷笉鑳戒笌鏃у瘑鐮佺浉鍚"); } - if (userService.resetUserPwd(username, SecurityUtils.encryptPassword(newPassword)) > 0) - { + if (userService.resetUserPwd(username, SecurityUtils.encryptPassword(newPassword)) > 0) { // 鏇存柊缂撳瓨鐢ㄦ埛瀵嗙爜 LoginUser loginUser = SecurityUtils.getLoginUser(); loginUser.getSysUser().setPassword(SecurityUtils.encryptPassword(newPassword)); @@ -115,25 +104,21 @@ public class SysProfileController extends BaseController } return AjaxResult.error("淇敼瀵嗙爜寮傚父锛岃鑱旂郴绠＄悊鍛"); } - + /** * 澶村儚涓婁紶 */ @Log(title = "鐢ㄦ埛澶村儚", businessType = BusinessType.UPDATE) @PostMapping("/avatar") - public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException - { - if (!file.isEmpty()) - { + public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException { + if (!file.isEmpty()) { LoginUser loginUser = SecurityUtils.getLoginUser(); Rust fileResult = remoteFileService.upload(file); - if (StringUtils.isNull(fileResult) || StringUtils.isNull(fileResult.getData())) - { + if (StringUtils.isNull(fileResult) || StringUtils.isNull(fileResult.getData())) { return AjaxResult.error("鏂囦欢鏈嶅姟寮傚父锛岃鑱旂郴绠＄悊鍛"); } String url = fileResult.getData().getUrl(); - if (userService.updateUserAvatar(loginUser.getUsername(), url)) - { + if (userService.updateUserAvatar(loginUser.getUsername(), url)) { AjaxResult ajax = AjaxResult.success(); ajax.put("imgUrl", url); // 鏇存柊缂撳瓨鐢ㄦ埛澶村儚 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java index 4134c3c4..f4b4b10e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java @@ -23,13 +23,12 @@ import java.util.List; /** * 瑙掕壊淇℃伅 - * + * * @author ruoyi */ @RestController @RequestMapping("/role") -public class SysRoleController extends BaseController -{ +public class SysRoleController extends BaseController { @Autowired private ISysRoleService roleService; @@ -38,8 +37,7 @@ public class SysRoleController extends BaseController @RequiresPermissions("system:role:list") @GetMapping("/list") - public TableDataInfo list(SysRole role) - { + public TableDataInfo list(SysRole role) { startPage(); List list = roleService.selectRoleList(role); return getDataTable(list); @@ -48,8 +46,7 @@ public class SysRoleController extends BaseController @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.EXPORT) @RequiresPermissions("system:role:export") @PostMapping("/export") - public void export(HttpServletResponse response, SysRole role) - { + public void export(HttpServletResponse response, SysRole role) { List list = roleService.selectRoleList(role); ExcelUtil util = new ExcelUtil(SysRole.class); util.exportExcel(response, list, "瑙掕壊鏁版嵁"); @@ -60,8 +57,7 @@ public class SysRoleController extends BaseController */ @RequiresPermissions("system:role:query") @GetMapping(value = "/{roleId}") - public AjaxResult getInfo(@PathVariable Long roleId) - { + public AjaxResult getInfo(@PathVariable Long roleId) { roleService.checkRoleDataScope(roleId); return AjaxResult.success(roleService.selectRoleById(roleId)); } @@ -72,14 +68,10 @@ public class SysRoleController extends BaseController @RequiresPermissions("system:role:add") @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysRole role) - { - if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) - { + public AjaxResult add(@Validated @RequestBody SysRole role) { + if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) { return AjaxResult.error("鏂板瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹插悕绉板凡瀛樺湪"); - } - else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) - { + } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) { return AjaxResult.error("鏂板瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹叉潈闄愬凡瀛樺湪"); } role.setCreateBy(SecurityUtils.getUsername()); @@ -93,16 +85,12 @@ public class SysRoleController extends BaseController @RequiresPermissions("system:role:edit") @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysRole role) - { + public AjaxResult edit(@Validated @RequestBody SysRole role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); - if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) - { + if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) { return AjaxResult.error("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹插悕绉板凡瀛樺湪"); - } - else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) - { + } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) { return AjaxResult.error("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹叉潈闄愬凡瀛樺湪"); } role.setUpdateBy(SecurityUtils.getUsername()); @@ -115,8 +103,7 @@ public class SysRoleController extends BaseController @RequiresPermissions("system:role:edit") @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE) @PutMapping("/dataScope") - public AjaxResult dataScope(@RequestBody SysRole role) - { + public AjaxResult dataScope(@RequestBody SysRole role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); return toAjax(roleService.authDataScope(role)); @@ -128,8 +115,7 @@ public class SysRoleController extends BaseController @RequiresPermissions("system:role:edit") @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public AjaxResult changeStatus(@RequestBody SysRole role) - { + public AjaxResult changeStatus(@RequestBody SysRole role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); role.setUpdateBy(SecurityUtils.getUsername()); @@ -142,8 +128,7 @@ public class SysRoleController extends BaseController @RequiresPermissions("system:role:remove") @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.DELETE) @DeleteMapping("/{roleIds}") - public AjaxResult remove(@PathVariable Long[] roleIds) - { + public AjaxResult remove(@PathVariable Long[] roleIds) { return toAjax(roleService.deleteRoleByIds(roleIds)); } @@ -152,17 +137,16 @@ public class SysRoleController extends BaseController */ @RequiresPermissions("system:role:query") @GetMapping("/optionselect") - public AjaxResult optionselect() - { + public AjaxResult optionselect() { return AjaxResult.success(roleService.selectRoleAll()); } + /** * 鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛 */ @RequiresPermissions("system:role:list") @GetMapping("/authUser/allocatedList") - public TableDataInfo allocatedList(SysUser user) - { + public TableDataInfo allocatedList(SysUser user) { startPage(); List list = userService.selectAllocatedList(user); return getDataTable(list); @@ -173,8 +157,7 @@ public class SysRoleController extends BaseController */ @RequiresPermissions("system:role:list") @GetMapping("/authUser/unallocatedList") - public TableDataInfo unallocatedList(SysUser user) - { + public TableDataInfo unallocatedList(SysUser user) { startPage(); List list = userService.selectUnallocatedList(user); return getDataTable(list); @@ -186,8 +169,7 @@ public class SysRoleController extends BaseController @RequiresPermissions("system:role:edit") @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT) @PutMapping("/authUser/cancel") - public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole) - { + public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole) { return toAjax(roleService.deleteAuthUser(userRole)); } @@ -197,8 +179,7 @@ public class SysRoleController extends BaseController @RequiresPermissions("system:role:edit") @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT) @PutMapping("/authUser/cancelAll") - public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds) - { + public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds) { return toAjax(roleService.deleteAuthUsers(roleId, userIds)); } @@ -208,8 +189,7 @@ public class SysRoleController extends BaseController @RequiresPermissions("system:role:edit") @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT) @PutMapping("/authUser/selectAll") - public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds) - { + public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds) { roleService.checkRoleDataScope(roleId); return toAjax(roleService.insertAuthUsers(roleId, userIds)); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java index 2d9c43cd..c7b84b61 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java @@ -30,13 +30,12 @@ import java.util.stream.Collectors; /** * 鐢ㄦ埛淇℃伅 - * + * * @author ruoyi */ @RestController @RequestMapping("/user") -public class SysUserController extends BaseController -{ +public class SysUserController extends BaseController { @Autowired private ISysUserService userService; @@ -57,8 +56,7 @@ public class SysUserController extends BaseController */ @RequiresPermissions("system:user:list") @GetMapping("/list") - public TableDataInfo list(SysUser user) - { + public TableDataInfo list(SysUser user) { startPage(); List list = userService.selectUserList(user); return getDataTable(list); @@ -67,8 +65,7 @@ public class SysUserController extends BaseController @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.EXPORT) @RequiresPermissions("system:user:export") @PostMapping("/export") - public void export(HttpServletResponse response, SysUser user) - { + public void export(HttpServletResponse response, SysUser user) { List list = userService.selectUserList(user); ExcelUtil util = new ExcelUtil(SysUser.class); util.exportExcel(response, list, "鐢ㄦ埛鏁版嵁"); @@ -77,8 +74,7 @@ public class SysUserController extends BaseController @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT) @RequiresPermissions("system:user:import") @PostMapping("/importData") - public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception - { + public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception { ExcelUtil util = new ExcelUtil(SysUser.class); List userList = util.importExcel(file.getInputStream()); String operName = SecurityUtils.getUsername(); @@ -87,8 +83,7 @@ public class SysUserController extends BaseController } @PostMapping("/importTemplate") - public void importTemplate(HttpServletResponse response) throws IOException - { + public void importTemplate(HttpServletResponse response) throws IOException { ExcelUtil util = new ExcelUtil(SysUser.class); util.importTemplateExcel(response, "鐢ㄦ埛鏁版嵁"); } @@ -98,11 +93,9 @@ public class SysUserController extends BaseController */ @InnerAuth @GetMapping("/info/{username}") - public Rust info(@PathVariable("username") String username) - { + public Rust info(@PathVariable("username") String username) { SysUser sysUser = userService.selectUserByUserName(username); - if (StringUtils.isNull(sysUser)) - { + if (StringUtils.isNull(sysUser)) { return Rust.fail("鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒"); } // 瑙掕壊闆嗗悎 @@ -121,15 +114,12 @@ public class SysUserController extends BaseController */ @InnerAuth @PostMapping("/register") - public Rust register(@RequestBody SysUser sysUser) - { + public Rust register(@RequestBody SysUser sysUser) { String username = sysUser.getUserName(); - if (!(StringUtils.TRUE.equals(configService.selectConfigByKey(StringUtils.SYS_ACCOUNT_USER)))) - { + if (!(StringUtils.TRUE.equals(configService.selectConfigByKey(StringUtils.SYS_ACCOUNT_USER)))) { return Rust.fail("褰撳墠绯荤粺娌℃湁寮鍚敞鍐屽姛鑳斤紒"); } - if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(username))) - { + if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(username))) { return Rust.fail("淇濆瓨鐢ㄦ埛'" + username + "'澶辫触锛屾敞鍐岃处鍙峰凡瀛樺湪"); } return Rust.ok(userService.registerUser(sysUser)); @@ -137,12 +127,11 @@ public class SysUserController extends BaseController /** * 鑾峰彇鐢ㄦ埛淇℃伅 - * + * * @return 鐢ㄦ埛淇℃伅 */ @GetMapping("getInfo") - public AjaxResult getInfo() - { + public AjaxResult getInfo() { Long userId = SecurityUtils.getUserId(); // 瑙掕壊闆嗗悎 Set roles = permissionService.getRolePermission(userId); @@ -159,16 +148,14 @@ public class SysUserController extends BaseController * 鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇璇︾粏淇℃伅 */ @RequiresPermissions("system:user:query") - @GetMapping(value = { "/", "/{userId}" }) - public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) - { + @GetMapping(value = {"/", "/{userId}"}) + public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) { userService.checkUserDataScope(userId); AjaxResult ajax = AjaxResult.success(); List roles = roleService.selectRoleAll(); ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); ajax.put("posts", postService.selectPostAll()); - if (StringUtils.isNotNull(userId)) - { + if (StringUtils.isNotNull(userId)) { SysUser sysUser = userService.selectUserById(userId); ajax.put(AjaxResult.DATA_TAG, sysUser); ajax.put("postIds", postService.selectPostListByUserId(userId)); @@ -183,20 +170,14 @@ public class SysUserController extends BaseController @RequiresPermissions("system:user:add") @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysUser user) - { - if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) - { + public AjaxResult add(@Validated @RequestBody SysUser user) { + if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) { return AjaxResult.error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪"); - } - else if (StringUtils.isNotEmpty(user.getPhonenumber()) - && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) - { + } else if (StringUtils.isNotEmpty(user.getPhonenumber()) + && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) { return AjaxResult.error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪"); - } - else if (StringUtils.isNotEmpty(user.getEmail()) - && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) - { + } else if (StringUtils.isNotEmpty(user.getEmail()) + && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) { return AjaxResult.error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪"); } user.setCreateBy(SecurityUtils.getUsername()); @@ -210,18 +191,14 @@ public class SysUserController extends BaseController @RequiresPermissions("system:user:edit") @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysUser user) - { + public AjaxResult edit(@Validated @RequestBody SysUser user) { userService.checkUserAllowed(user); userService.checkUserDataScope(user.getUserId()); if (StringUtils.isNotEmpty(user.getPhonenumber()) - && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) - { + && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) { return AjaxResult.error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪"); - } - else if (StringUtils.isNotEmpty(user.getEmail()) - && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) - { + } else if (StringUtils.isNotEmpty(user.getEmail()) + && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) { return AjaxResult.error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪"); } user.setUpdateBy(SecurityUtils.getUsername()); @@ -234,10 +211,8 @@ public class SysUserController extends BaseController @RequiresPermissions("system:user:remove") @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.DELETE) @DeleteMapping("/{userIds}") - public AjaxResult remove(@PathVariable Long[] userIds) - { - if (ArrayUtils.contains(userIds, SecurityUtils.getUserId())) - { + public AjaxResult remove(@PathVariable Long[] userIds) { + if (ArrayUtils.contains(userIds, SecurityUtils.getUserId())) { return AjaxResult.error("褰撳墠鐢ㄦ埛涓嶈兘鍒犻櫎"); } return toAjax(userService.deleteUserByIds(userIds)); @@ -249,8 +224,7 @@ public class SysUserController extends BaseController @RequiresPermissions("system:user:edit") @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE) @PutMapping("/resetPwd") - public AjaxResult resetPwd(@RequestBody SysUser user) - { + public AjaxResult resetPwd(@RequestBody SysUser user) { userService.checkUserAllowed(user); userService.checkUserDataScope(user.getUserId()); user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); @@ -264,8 +238,7 @@ public class SysUserController extends BaseController @RequiresPermissions("system:user:edit") @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public AjaxResult changeStatus(@RequestBody SysUser user) - { + public AjaxResult changeStatus(@RequestBody SysUser user) { userService.checkUserAllowed(user); userService.checkUserDataScope(user.getUserId()); user.setUpdateBy(SecurityUtils.getUsername()); @@ -277,8 +250,7 @@ public class SysUserController extends BaseController */ @RequiresPermissions("system:user:query") @GetMapping("/authRole/{userId}") - public AjaxResult authRole(@PathVariable("userId") Long userId) - { + public AjaxResult authRole(@PathVariable("userId") Long userId) { AjaxResult ajax = AjaxResult.success(); SysUser user = userService.selectUserById(userId); List roles = roleService.selectRolesByUserId(userId); @@ -293,8 +265,7 @@ public class SysUserController extends BaseController @RequiresPermissions("system:user:edit") @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.GRANT) @PutMapping("/authRole") - public AjaxResult insertAuthRole(Long userId, Long[] roleIds) - { + public AjaxResult insertAuthRole(Long userId, Long[] roleIds) { userService.checkUserDataScope(userId); userService.insertUserAuth(userId, roleIds); return success(); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java index 2c9158b5..11121d4a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java @@ -22,13 +22,12 @@ import java.util.List; /** * 鍦ㄧ嚎鐢ㄦ埛鐩戞帶 - * + * * @author ruoyi */ @RestController @RequestMapping("/online") -public class SysUserOnlineController extends BaseController -{ +public class SysUserOnlineController extends BaseController { @Autowired private ISysUserOnlineService userOnlineService; @@ -37,36 +36,24 @@ public class SysUserOnlineController extends BaseController @RequiresPermissions("monitor:online:list") @GetMapping("/list") - public TableDataInfo list(String ipaddr, String userName) - { + public TableDataInfo list(String ipaddr, String userName) { Collection keys = redisService.keys(CacheConstants.LOGIN_TOKEN_KEY + "*"); List userOnlineList = new ArrayList(); - for (String key : keys) - { + for (String key : keys) { LoginUser user = redisService.getCacheObject(key); - if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) - { - if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) - { + if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) { + if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) { userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user)); } - } - else if (StringUtils.isNotEmpty(ipaddr)) - { - if (StringUtils.equals(ipaddr, user.getIpaddr())) - { + } else if (StringUtils.isNotEmpty(ipaddr)) { + if (StringUtils.equals(ipaddr, user.getIpaddr())) { userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user)); } - } - else if (StringUtils.isNotEmpty(userName)) - { - if (StringUtils.equals(userName, user.getUsername())) - { + } else if (StringUtils.isNotEmpty(userName)) { + if (StringUtils.equals(userName, user.getUsername())) { userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user)); } - } - else - { + } else { userOnlineList.add(userOnlineService.loginUserToUserOnline(user)); } } @@ -81,8 +68,7 @@ public class SysUserOnlineController extends BaseController @RequiresPermissions("monitor:online:forceLogout") @Log(title = "鍦ㄧ嚎鐢ㄦ埛", businessType = BusinessType.FORCE) @DeleteMapping("/{tokenId}") - public AjaxResult forceLogout(@PathVariable String tokenId) - { + public AjaxResult forceLogout(@PathVariable String tokenId) { redisService.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + tokenId); return AjaxResult.success(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java index 410fd13a..90088a91 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java @@ -11,102 +11,101 @@ import javax.validation.constraints.Size; /** * 鍙傛暟閰嶇疆琛 sys_config - * + * * @author ruoyi */ -public class SysConfig extends BaseEntity -{ +public class SysConfig extends BaseEntity { private static final long serialVersionUID = 1L; - /** 鍙傛暟涓婚敭 */ + /** + * 鍙傛暟涓婚敭 + */ @Excel(name = "鍙傛暟涓婚敭", cellType = ColumnType.NUMERIC) private Long configId; - /** 鍙傛暟鍚嶇О */ + /** + * 鍙傛暟鍚嶇О + */ @Excel(name = "鍙傛暟鍚嶇О") private String configName; - /** 鍙傛暟閿悕 */ + /** + * 鍙傛暟閿悕 + */ @Excel(name = "鍙傛暟閿悕") private String configKey; - /** 鍙傛暟閿 */ + /** + * 鍙傛暟閿 + */ @Excel(name = "鍙傛暟閿") private String configValue; - /** 绯荤粺鍐呯疆锛圷鏄 N鍚︼級 */ + /** + * 绯荤粺鍐呯疆锛圷鏄 N鍚︼級 + */ @Excel(name = "绯荤粺鍐呯疆", readConverterExp = "Y=鏄,N=鍚") private String configType; - public Long getConfigId() - { + public Long getConfigId() { return configId; } - public void setConfigId(Long configId) - { + public void setConfigId(Long configId) { this.configId = configId; } @NotBlank(message = "鍙傛暟鍚嶇О涓嶈兘涓虹┖") @Size(min = 0, max = 100, message = "鍙傛暟鍚嶇О涓嶈兘瓒呰繃100涓瓧绗") - public String getConfigName() - { + public String getConfigName() { return configName; } - public void setConfigName(String configName) - { + public void setConfigName(String configName) { this.configName = configName; } @NotBlank(message = "鍙傛暟閿悕闀垮害涓嶈兘涓虹┖") @Size(min = 0, max = 100, message = "鍙傛暟閿悕闀垮害涓嶈兘瓒呰繃100涓瓧绗") - public String getConfigKey() - { + public String getConfigKey() { return configKey; } - public void setConfigKey(String configKey) - { + public void setConfigKey(String configKey) { this.configKey = configKey; } @NotBlank(message = "鍙傛暟閿间笉鑳戒负绌") @Size(min = 0, max = 500, message = "鍙傛暟閿奸暱搴︿笉鑳借秴杩500涓瓧绗") - public String getConfigValue() - { + public String getConfigValue() { return configValue; } - public void setConfigValue(String configValue) - { + public void setConfigValue(String configValue) { this.configValue = configValue; } - public String getConfigType() - { + public String getConfigType() { return configType; } - public void setConfigType(String configType) - { + public void setConfigType(String configType) { this.configType = configType; } - + @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("configId", getConfigId()) - .append("configName", getConfigName()) - .append("configKey", getConfigKey()) - .append("configValue", getConfigValue()) - .append("configType", getConfigType()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("configId", getConfigId()) + .append("configName", getConfigName()) + .append("configKey", getConfigKey()) + .append("configValue", getConfigValue()) + .append("configType", getConfigType()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java index 76fe6eba..b9e1f3e2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java @@ -12,249 +12,248 @@ import java.util.List; /** * 鑿滃崟鏉冮檺琛 sys_menu - * + * * @author ruoyi */ -public class SysMenu extends BaseEntity -{ +public class SysMenu extends BaseEntity { private static final long serialVersionUID = 1L; - /** 鑿滃崟ID */ + /** + * 鑿滃崟ID + */ private Long menuId; - /** 鑿滃崟鍚嶇О */ + /** + * 鑿滃崟鍚嶇О + */ private String menuName; - /** 鐖惰彍鍗曞悕绉 */ + /** + * 鐖惰彍鍗曞悕绉 + */ private String parentName; - /** 鐖惰彍鍗旾D */ + /** + * 鐖惰彍鍗旾D + */ private Long parentId; - /** 鏄剧ず椤哄簭 */ + /** + * 鏄剧ず椤哄簭 + */ private Integer orderNum; - /** 璺敱鍦板潃 */ + /** + * 璺敱鍦板潃 + */ private String path; - /** 缁勪欢璺緞 */ + /** + * 缁勪欢璺緞 + */ private String component; - /** 璺敱鍙傛暟 */ + /** + * 璺敱鍙傛暟 + */ private String query; - /** 鏄惁涓哄閾撅紙0鏄 1鍚︼級 */ + /** + * 鏄惁涓哄閾撅紙0鏄 1鍚︼級 + */ private String isFrame; - /** 鏄惁缂撳瓨锛0缂撳瓨 1涓嶇紦瀛橈級 */ + /** + * 鏄惁缂撳瓨锛0缂撳瓨 1涓嶇紦瀛橈級 + */ private String isCache; - /** 绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛 */ + /** + * 绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛 + */ private String menuType; - /** 鏄剧ず鐘舵侊紙0鏄剧ず 1闅愯棌锛 */ + /** + * 鏄剧ず鐘舵侊紙0鏄剧ず 1闅愯棌锛 + */ private String visible; - - /** 鑿滃崟鐘舵侊紙0鏄剧ず 1闅愯棌锛 */ + + /** + * 鑿滃崟鐘舵侊紙0鏄剧ず 1闅愯棌锛 + */ private String status; - /** 鏉冮檺瀛楃涓 */ + /** + * 鏉冮檺瀛楃涓 + */ private String perms; - /** 鑿滃崟鍥炬爣 */ + /** + * 鑿滃崟鍥炬爣 + */ private String icon; - /** 瀛愯彍鍗 */ + /** + * 瀛愯彍鍗 + */ private List children = new ArrayList(); - public Long getMenuId() - { + public Long getMenuId() { return menuId; } - public void setMenuId(Long menuId) - { + public void setMenuId(Long menuId) { this.menuId = menuId; } @NotBlank(message = "鑿滃崟鍚嶇О涓嶈兘涓虹┖") @Size(min = 0, max = 50, message = "鑿滃崟鍚嶇О闀垮害涓嶈兘瓒呰繃50涓瓧绗") - public String getMenuName() - { + public String getMenuName() { return menuName; } - public void setMenuName(String menuName) - { + public void setMenuName(String menuName) { this.menuName = menuName; } - public String getParentName() - { + public String getParentName() { return parentName; } - public void setParentName(String parentName) - { + public void setParentName(String parentName) { this.parentName = parentName; } - public Long getParentId() - { + public Long getParentId() { return parentId; } - public void setParentId(Long parentId) - { + public void setParentId(Long parentId) { this.parentId = parentId; } @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖") - public Integer getOrderNum() - { + public Integer getOrderNum() { return orderNum; } - public void setOrderNum(Integer orderNum) - { + public void setOrderNum(Integer orderNum) { this.orderNum = orderNum; } @Size(min = 0, max = 200, message = "璺敱鍦板潃涓嶈兘瓒呰繃200涓瓧绗") - public String getPath() - { + public String getPath() { return path; } - public void setPath(String path) - { + public void setPath(String path) { this.path = path; } @Size(min = 0, max = 200, message = "缁勪欢璺緞涓嶈兘瓒呰繃255涓瓧绗") - public String getComponent() - { + public String getComponent() { return component; } - public void setComponent(String component) - { + public void setComponent(String component) { this.component = component; } - public String getQuery() - { + public String getQuery() { return query; } - public void setQuery(String query) - { + public void setQuery(String query) { this.query = query; } - public String getIsFrame() - { + public String getIsFrame() { return isFrame; } - public void setIsFrame(String isFrame) - { + public void setIsFrame(String isFrame) { this.isFrame = isFrame; } - public String getIsCache() - { + public String getIsCache() { return isCache; } - public void setIsCache(String isCache) - { + public void setIsCache(String isCache) { this.isCache = isCache; } @NotBlank(message = "鑿滃崟绫诲瀷涓嶈兘涓虹┖") - public String getMenuType() - { + public String getMenuType() { return menuType; } - public void setMenuType(String menuType) - { + public void setMenuType(String menuType) { this.menuType = menuType; } - public String getVisible() - { + public String getVisible() { return visible; } - public void setVisible(String visible) - { + public void setVisible(String visible) { this.visible = visible; } - public String getStatus() - { + public String getStatus() { return status; } - public void setStatus(String status) - { + public void setStatus(String status) { this.status = status; } @Size(min = 0, max = 100, message = "鏉冮檺鏍囪瘑闀垮害涓嶈兘瓒呰繃100涓瓧绗") - public String getPerms() - { + public String getPerms() { return perms; } - public void setPerms(String perms) - { + public void setPerms(String perms) { this.perms = perms; } - public String getIcon() - { + public String getIcon() { return icon; } - public void setIcon(String icon) - { + public void setIcon(String icon) { this.icon = icon; } - public List getChildren() - { + public List getChildren() { return children; } - public void setChildren(List children) - { + public void setChildren(List children) { this.children = children; } - + @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("menuId", getMenuId()) - .append("menuName", getMenuName()) - .append("parentId", getParentId()) - .append("orderNum", getOrderNum()) - .append("path", getPath()) - .append("component", getComponent()) - .append("isFrame", getIsFrame()) - .append("IsCache", getIsCache()) - .append("menuType", getMenuType()) - .append("visible", getVisible()) - .append("status ", getStatus()) - .append("perms", getPerms()) - .append("icon", getIcon()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("menuId", getMenuId()) + .append("menuName", getMenuName()) + .append("parentId", getParentId()) + .append("orderNum", getOrderNum()) + .append("path", getPath()) + .append("component", getComponent()) + .append("isFrame", getIsFrame()) + .append("IsCache", getIsCache()) + .append("menuType", getMenuType()) + .append("visible", getVisible()) + .append("status ", getStatus()) + .append("perms", getPerms()) + .append("icon", getIcon()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java index 578d7be4..139982c9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java @@ -10,94 +10,93 @@ import javax.validation.constraints.Size; /** * 閫氱煡鍏憡琛 sys_notice - * + * * @author ruoyi */ -public class SysNotice extends BaseEntity -{ +public class SysNotice extends BaseEntity { private static final long serialVersionUID = 1L; - /** 鍏憡ID */ + /** + * 鍏憡ID + */ private Long noticeId; - /** 鍏憡鏍囬 */ + /** + * 鍏憡鏍囬 + */ private String noticeTitle; - /** 鍏憡绫诲瀷锛1閫氱煡 2鍏憡锛 */ + /** + * 鍏憡绫诲瀷锛1閫氱煡 2鍏憡锛 + */ private String noticeType; - /** 鍏憡鍐呭 */ + /** + * 鍏憡鍐呭 + */ private String noticeContent; - /** 鍏憡鐘舵侊紙0姝ｅ父 1鍏抽棴锛 */ + /** + * 鍏憡鐘舵侊紙0姝ｅ父 1鍏抽棴锛 + */ private String status; - public Long getNoticeId() - { + public Long getNoticeId() { return noticeId; } - public void setNoticeId(Long noticeId) - { + public void setNoticeId(Long noticeId) { this.noticeId = noticeId; } - public void setNoticeTitle(String noticeTitle) - { - this.noticeTitle = noticeTitle; - } - @Xss(message = "鍏憡鏍囬涓嶈兘鍖呭惈鑴氭湰瀛楃") @NotBlank(message = "鍏憡鏍囬涓嶈兘涓虹┖") @Size(min = 0, max = 50, message = "鍏憡鏍囬涓嶈兘瓒呰繃50涓瓧绗") - public String getNoticeTitle() - { + public String getNoticeTitle() { return noticeTitle; } - public void setNoticeType(String noticeType) - { - this.noticeType = noticeType; + public void setNoticeTitle(String noticeTitle) { + this.noticeTitle = noticeTitle; } - public String getNoticeType() - { + public String getNoticeType() { return noticeType; } - public void setNoticeContent(String noticeContent) - { - this.noticeContent = noticeContent; + public void setNoticeType(String noticeType) { + this.noticeType = noticeType; } - public String getNoticeContent() - { + public String getNoticeContent() { return noticeContent; } - public void setStatus(String status) - { - this.status = status; + public void setNoticeContent(String noticeContent) { + this.noticeContent = noticeContent; } - public String getStatus() - { + public String getStatus() { return status; } + public void setStatus(String status) { + this.status = status; + } + @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("noticeId", getNoticeId()) - .append("noticeTitle", getNoticeTitle()) - .append("noticeType", getNoticeType()) - .append("noticeContent", getNoticeContent()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("noticeId", getNoticeId()) + .append("noticeTitle", getNoticeTitle()) + .append("noticeType", getNoticeType()) + .append("noticeContent", getNoticeContent()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java index 8fe13dea..eb0daf40 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java @@ -11,114 +11,113 @@ import javax.validation.constraints.Size; /** * 宀椾綅琛 sys_post - * + * * @author ruoyi */ -public class SysPost extends BaseEntity -{ +public class SysPost extends BaseEntity { private static final long serialVersionUID = 1L; - /** 宀椾綅搴忓彿 */ + /** + * 宀椾綅搴忓彿 + */ @Excel(name = "宀椾綅搴忓彿", cellType = ColumnType.NUMERIC) private Long postId; - /** 宀椾綅缂栫爜 */ + /** + * 宀椾綅缂栫爜 + */ @Excel(name = "宀椾綅缂栫爜") private String postCode; - /** 宀椾綅鍚嶇О */ + /** + * 宀椾綅鍚嶇О + */ @Excel(name = "宀椾綅鍚嶇О") private String postName; - /** 宀椾綅鎺掑簭 */ + /** + * 宀椾綅鎺掑簭 + */ @Excel(name = "宀椾綅鎺掑簭") private String postSort; - /** 鐘舵侊紙0姝ｅ父 1鍋滅敤锛 */ + /** + * 鐘舵侊紙0姝ｅ父 1鍋滅敤锛 + */ @Excel(name = "鐘舵", readConverterExp = "0=姝ｅ父,1=鍋滅敤") private String status; - /** 鐢ㄦ埛鏄惁瀛樺湪姝ゅ矖浣嶆爣璇 榛樿涓嶅瓨鍦 */ + /** + * 鐢ㄦ埛鏄惁瀛樺湪姝ゅ矖浣嶆爣璇 榛樿涓嶅瓨鍦 + */ private boolean flag = false; - public Long getPostId() - { + public Long getPostId() { return postId; } - public void setPostId(Long postId) - { + public void setPostId(Long postId) { this.postId = postId; } @NotBlank(message = "宀椾綅缂栫爜涓嶈兘涓虹┖") @Size(min = 0, max = 64, message = "宀椾綅缂栫爜闀垮害涓嶈兘瓒呰繃64涓瓧绗") - public String getPostCode() - { + public String getPostCode() { return postCode; } - public void setPostCode(String postCode) - { + public void setPostCode(String postCode) { this.postCode = postCode; } @NotBlank(message = "宀椾綅鍚嶇О涓嶈兘涓虹┖") @Size(min = 0, max = 50, message = "宀椾綅鍚嶇О闀垮害涓嶈兘瓒呰繃50涓瓧绗") - public String getPostName() - { + public String getPostName() { return postName; } - public void setPostName(String postName) - { + public void setPostName(String postName) { this.postName = postName; } @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖") - public String getPostSort() - { + public String getPostSort() { return postSort; } - public void setPostSort(String postSort) - { + public void setPostSort(String postSort) { this.postSort = postSort; } - public String getStatus() - { + public String getStatus() { return status; } - public void setStatus(String status) - { + public void setStatus(String status) { this.status = status; } - public boolean isFlag() - { + public boolean isFlag() { return flag; } - public void setFlag(boolean flag) - { + public void setFlag(boolean flag) { this.flag = flag; } - + @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("postId", getPostId()) - .append("postCode", getPostCode()) - .append("postName", getPostName()) - .append("postSort", getPostSort()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("postId", getPostId()) + .append("postCode", getPostCode()) + .append("postName", getPostName()) + .append("postSort", getPostSort()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java index 8ed8e473..ccb36c6f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java @@ -5,42 +5,41 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 瑙掕壊鍜岄儴闂ㄥ叧鑱 sys_role_dept - * + * * @author ruoyi */ -public class SysRoleDept -{ - /** 瑙掕壊ID */ +public class SysRoleDept { + /** + * 瑙掕壊ID + */ private Long roleId; - - /** 閮ㄩ棬ID */ + + /** + * 閮ㄩ棬ID + */ private Long deptId; - public Long getRoleId() - { + public Long getRoleId() { return roleId; } - public void setRoleId(Long roleId) - { + public void setRoleId(Long roleId) { this.roleId = roleId; } - public Long getDeptId() - { + public Long getDeptId() { return deptId; } - public void setDeptId(Long deptId) - { + public void setDeptId(Long deptId) { this.deptId = deptId; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("roleId", getRoleId()) - .append("deptId", getDeptId()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("roleId", getRoleId()) + .append("deptId", getDeptId()) + .toString(); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java index 59d28699..0a7c01d5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java @@ -5,42 +5,41 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 瑙掕壊鍜岃彍鍗曞叧鑱 sys_role_menu - * + * * @author ruoyi */ -public class SysRoleMenu -{ - /** 瑙掕壊ID */ +public class SysRoleMenu { + /** + * 瑙掕壊ID + */ private Long roleId; - - /** 鑿滃崟ID */ + + /** + * 鑿滃崟ID + */ private Long menuId; - public Long getRoleId() - { + public Long getRoleId() { return roleId; } - public void setRoleId(Long roleId) - { + public void setRoleId(Long roleId) { this.roleId = roleId; } - public Long getMenuId() - { + public Long getMenuId() { return menuId; } - public void setMenuId(Long menuId) - { + public void setMenuId(Long menuId) { this.menuId = menuId; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("roleId", getRoleId()) - .append("menuId", getMenuId()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("roleId", getRoleId()) + .append("menuId", getMenuId()) + .toString(); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java index d9c8df01..3fc1b256 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java @@ -2,99 +2,98 @@ package com.ruoyi.system.domain; /** * 褰撳墠鍦ㄧ嚎浼氳瘽 - * + * * @author ruoyi */ -public class SysUserOnline -{ - /** 浼氳瘽缂栧彿 */ +public class SysUserOnline { + /** + * 浼氳瘽缂栧彿 + */ private String tokenId; - /** 鐢ㄦ埛鍚嶇О */ + /** + * 鐢ㄦ埛鍚嶇О + */ private String userName; - /** 鐧诲綍IP鍦板潃 */ + /** + * 鐧诲綍IP鍦板潃 + */ private String ipaddr; - /** 鐧诲綍鍦板潃 */ + /** + * 鐧诲綍鍦板潃 + */ private String loginLocation; - /** 娴忚鍣ㄧ被鍨 */ + /** + * 娴忚鍣ㄧ被鍨 + */ private String browser; - /** 鎿嶄綔绯荤粺 */ + /** + * 鎿嶄綔绯荤粺 + */ private String os; - /** 鐧诲綍鏃堕棿 */ + /** + * 鐧诲綍鏃堕棿 + */ private Long loginTime; - public String getTokenId() - { + public String getTokenId() { return tokenId; } - public void setTokenId(String tokenId) - { + public void setTokenId(String tokenId) { this.tokenId = tokenId; } - public String getUserName() - { + public String getUserName() { return userName; } - public void setUserName(String userName) - { + public void setUserName(String userName) { this.userName = userName; } - public String getIpaddr() - { + public String getIpaddr() { return ipaddr; } - public void setIpaddr(String ipaddr) - { + public void setIpaddr(String ipaddr) { this.ipaddr = ipaddr; } - public String getLoginLocation() - { + public String getLoginLocation() { return loginLocation; } - public void setLoginLocation(String loginLocation) - { + public void setLoginLocation(String loginLocation) { this.loginLocation = loginLocation; } - public String getBrowser() - { + public String getBrowser() { return browser; } - public void setBrowser(String browser) - { + public void setBrowser(String browser) { this.browser = browser; } - public String getOs() - { + public String getOs() { return os; } - public void setOs(String os) - { + public void setOs(String os) { this.os = os; } - public Long getLoginTime() - { + public Long getLoginTime() { return loginTime; } - public void setLoginTime(Long loginTime) - { + public void setLoginTime(Long loginTime) { this.loginTime = loginTime; } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java index 07ceb85c..eb2d4f84 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java @@ -5,42 +5,41 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 鐢ㄦ埛鍜屽矖浣嶅叧鑱 sys_user_post - * + * * @author ruoyi */ -public class SysUserPost -{ - /** 鐢ㄦ埛ID */ +public class SysUserPost { + /** + * 鐢ㄦ埛ID + */ private Long userId; - - /** 宀椾綅ID */ + + /** + * 宀椾綅ID + */ private Long postId; - public Long getUserId() - { + public Long getUserId() { return userId; } - public void setUserId(Long userId) - { + public void setUserId(Long userId) { this.userId = userId; } - public Long getPostId() - { + public Long getPostId() { return postId; } - public void setPostId(Long postId) - { + public void setPostId(Long postId) { this.postId = postId; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("userId", getUserId()) - .append("postId", getPostId()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("userId", getUserId()) + .append("postId", getPostId()) + .toString(); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java index ce2af2bd..18cf2bd7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java @@ -5,42 +5,41 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 鐢ㄦ埛鍜岃鑹插叧鑱 sys_user_role - * + * * @author ruoyi */ -public class SysUserRole -{ - /** 鐢ㄦ埛ID */ +public class SysUserRole { + /** + * 鐢ㄦ埛ID + */ private Long userId; - - /** 瑙掕壊ID */ + + /** + * 瑙掕壊ID + */ private Long roleId; - public Long getUserId() - { + public Long getUserId() { return userId; } - public void setUserId(Long userId) - { + public void setUserId(Long userId) { this.userId = userId; } - public Long getRoleId() - { + public Long getRoleId() { return roleId; } - public void setRoleId(Long roleId) - { + public void setRoleId(Long roleId) { this.roleId = roleId; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("userId", getUserId()) - .append("roleId", getRoleId()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("userId", getUserId()) + .append("roleId", getRoleId()) + .toString(); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java index 1df3e890..37d51ecf 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java @@ -4,11 +4,10 @@ import com.ruoyi.common.core.utils.StringUtils; /** * 璺敱鏄剧ず淇℃伅 - * + * * @author ruoyi */ -public class MetaVo -{ +public class MetaVo { /** * 璁剧疆璇ヨ矾鐢卞湪渚ц竟鏍忓拰闈㈠寘灞戜腑灞曠ず鐨勫悕瀛 */ @@ -29,78 +28,64 @@ public class MetaVo */ private String link; - public MetaVo() - { + public MetaVo() { } - public MetaVo(String title, String icon) - { + public MetaVo(String title, String icon) { this.title = title; this.icon = icon; } - public MetaVo(String title, String icon, boolean noCache) - { + public MetaVo(String title, String icon, boolean noCache) { this.title = title; this.icon = icon; this.noCache = noCache; } - public MetaVo(String title, String icon, String link) - { + public MetaVo(String title, String icon, String link) { this.title = title; this.icon = icon; this.link = link; } - public MetaVo(String title, String icon, boolean noCache, String link) - { + public MetaVo(String title, String icon, boolean noCache, String link) { this.title = title; this.icon = icon; this.noCache = noCache; - if (StringUtils.ishttp(link)) - { + if (StringUtils.ishttp(link)) { this.link = link; } } - public boolean isNoCache() - { + public boolean isNoCache() { return noCache; } - public void setNoCache(boolean noCache) - { + public void setNoCache(boolean noCache) { this.noCache = noCache; } - public String getTitle() - { + public String getTitle() { return title; } - public void setTitle(String title) - { + public void setTitle(String title) { this.title = title; } - public String getIcon() - { + public String getIcon() { return icon; } - public void setIcon(String icon) - { + public void setIcon(String icon) { this.icon = icon; } - public String getLink() - { + public String getLink() { return link; } - public void setLink(String link) - { + public void setLink(String link) { this.link = link; } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java index 2f42763f..204df9d6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java @@ -6,12 +6,11 @@ import java.util.List; /** * 璺敱閰嶇疆淇℃伅 - * + * * @author ruoyi */ @JsonInclude(JsonInclude.Include.NON_EMPTY) -public class RouterVo -{ +public class RouterVo { /** * 璺敱鍚嶅瓧 */ @@ -57,93 +56,75 @@ public class RouterVo */ private List children; - public String getName() - { + public String getName() { return name; } - public void setName(String name) - { + public void setName(String name) { this.name = name; } - public String getPath() - { + public String getPath() { return path; } - public void setPath(String path) - { + public void setPath(String path) { this.path = path; } - public boolean getHidden() - { + public boolean getHidden() { return hidden; } - public void setHidden(boolean hidden) - { + public void setHidden(boolean hidden) { this.hidden = hidden; } - public String getRedirect() - { + public String getRedirect() { return redirect; } - public void setRedirect(String redirect) - { + public void setRedirect(String redirect) { this.redirect = redirect; } - public String getComponent() - { + public String getComponent() { return component; } - public void setComponent(String component) - { + public void setComponent(String component) { this.component = component; } - public String getQuery() - { + public String getQuery() { return query; } - public void setQuery(String query) - { + public void setQuery(String query) { this.query = query; } - public Boolean getAlwaysShow() - { + public Boolean getAlwaysShow() { return alwaysShow; } - public void setAlwaysShow(Boolean alwaysShow) - { + public void setAlwaysShow(Boolean alwaysShow) { this.alwaysShow = alwaysShow; } - public MetaVo getMeta() - { + public MetaVo getMeta() { return meta; } - public void setMeta(MetaVo meta) - { + public void setMeta(MetaVo meta) { this.meta = meta; } - public List getChildren() - { + public List getChildren() { return children; } - public void setChildren(List children) - { + public void setChildren(List children) { this.children = children; } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java index edad8283..ce527cd5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java @@ -10,69 +10,65 @@ import java.util.stream.Collectors; /** * Treeselect鏍戠粨鏋勫疄浣撶被 - * + * * @author ruoyi */ -public class TreeSelect implements Serializable -{ +public class TreeSelect implements Serializable { private static final long serialVersionUID = 1L; - /** 鑺傜偣ID */ + /** + * 鑺傜偣ID + */ private Long id; - /** 鑺傜偣鍚嶇О */ + /** + * 鑺傜偣鍚嶇О + */ private String label; - /** 瀛愯妭鐐 */ + /** + * 瀛愯妭鐐 + */ @JsonInclude(JsonInclude.Include.NON_EMPTY) private List children; - public TreeSelect() - { + public TreeSelect() { } - public TreeSelect(SysDept dept) - { + public TreeSelect(SysDept dept) { this.id = dept.getDeptId(); this.label = dept.getDeptName(); this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); } - public TreeSelect(SysMenu menu) - { + public TreeSelect(SysMenu menu) { this.id = menu.getMenuId(); this.label = menu.getMenuName(); this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); } - public Long getId() - { + public Long getId() { return id; } - public void setId(Long id) - { + public void setId(Long id) { this.id = id; } - public String getLabel() - { + public String getLabel() { return label; } - public void setLabel(String label) - { + public void setLabel(String label) { this.label = label; } - public List getChildren() - { + public List getChildren() { return children; } - public void setChildren(List children) - { + public void setChildren(List children) { this.children = children; } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java index 41618c63..7ed5d4a4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java @@ -6,14 +6,13 @@ import java.util.List; /** * 鍙傛暟閰嶇疆 鏁版嵁灞 - * + * * @author ruoyi */ -public interface SysConfigMapper -{ +public interface SysConfigMapper { /** * 鏌ヨ鍙傛暟閰嶇疆淇℃伅 - * + * * @param config 鍙傛暟閰嶇疆淇℃伅 * @return 鍙傛暟閰嶇疆淇℃伅 */ @@ -21,7 +20,7 @@ public interface SysConfigMapper /** * 鏌ヨ鍙傛暟閰嶇疆鍒楄〃 - * + * * @param config 鍙傛暟閰嶇疆淇℃伅 * @return 鍙傛暟閰嶇疆闆嗗悎 */ @@ -29,7 +28,7 @@ public interface SysConfigMapper /** * 鏍规嵁閿悕鏌ヨ鍙傛暟閰嶇疆淇℃伅 - * + * * @param configKey 鍙傛暟閿悕 * @return 鍙傛暟閰嶇疆淇℃伅 */ @@ -37,7 +36,7 @@ public interface SysConfigMapper /** * 鏂板鍙傛暟閰嶇疆 - * + * * @param config 鍙傛暟閰嶇疆淇℃伅 * @return 缁撴灉 */ @@ -45,7 +44,7 @@ public interface SysConfigMapper /** * 淇敼鍙傛暟閰嶇疆 - * + * * @param config 鍙傛暟閰嶇疆淇℃伅 * @return 缁撴灉 */ @@ -53,7 +52,7 @@ public interface SysConfigMapper /** * 鍒犻櫎鍙傛暟閰嶇疆 - * + * * @param configId 鍙傛暟ID * @return 缁撴灉 */ @@ -61,7 +60,7 @@ public interface SysConfigMapper /** * 鎵归噺鍒犻櫎鍙傛暟淇℃伅 - * + * * @param configIds 闇瑕佸垹闄ょ殑鍙傛暟ID * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java index cad521cc..004030d7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java @@ -7,14 +7,13 @@ import java.util.List; /** * 閮ㄩ棬绠＄悊 鏁版嵁灞 - * + * * @author ruoyi */ -public interface SysDeptMapper -{ +public interface SysDeptMapper { /** * 鏌ヨ閮ㄩ棬绠＄悊鏁版嵁 - * + * * @param dept 閮ㄩ棬淇℃伅 * @return 閮ㄩ棬淇℃伅闆嗗悎 */ @@ -22,8 +21,8 @@ public interface SysDeptMapper /** * 鏍规嵁瑙掕壊ID鏌ヨ閮ㄩ棬鏍戜俊鎭 - * - * @param roleId 瑙掕壊ID + * + * @param roleId 瑙掕壊ID * @param deptCheckStrictly 閮ㄩ棬鏍戦夋嫨椤规槸鍚﹀叧鑱旀樉绀 * @return 閫変腑閮ㄩ棬鍒楄〃 */ @@ -31,7 +30,7 @@ public interface SysDeptMapper /** * 鏍规嵁閮ㄩ棬ID鏌ヨ淇℃伅 - * + * * @param deptId 閮ㄩ棬ID * @return 閮ㄩ棬淇℃伅 */ @@ -39,7 +38,7 @@ public interface SysDeptMapper /** * 鏍规嵁ID鏌ヨ鎵鏈夊瓙閮ㄩ棬 - * + * * @param deptId 閮ㄩ棬ID * @return 閮ㄩ棬鍒楄〃 */ @@ -47,7 +46,7 @@ public interface SysDeptMapper /** * 鏍规嵁ID鏌ヨ鎵鏈夊瓙閮ㄩ棬锛堟甯哥姸鎬侊級 - * + * * @param deptId 閮ㄩ棬ID * @return 瀛愰儴闂ㄦ暟 */ @@ -55,7 +54,7 @@ public interface SysDeptMapper /** * 鏄惁瀛樺湪瀛愯妭鐐 - * + * * @param deptId 閮ㄩ棬ID * @return 缁撴灉 */ @@ -63,7 +62,7 @@ public interface SysDeptMapper /** * 鏌ヨ閮ㄩ棬鏄惁瀛樺湪鐢ㄦ埛 - * + * * @param deptId 閮ㄩ棬ID * @return 缁撴灉 */ @@ -71,7 +70,7 @@ public interface SysDeptMapper /** * 鏍￠獙閮ㄩ棬鍚嶇О鏄惁鍞竴 - * + * * @param deptName 閮ㄩ棬鍚嶇О * @param parentId 鐖堕儴闂↖D * @return 缁撴灉 @@ -80,7 +79,7 @@ public interface SysDeptMapper /** * 鏂板閮ㄩ棬淇℃伅 - * + * * @param dept 閮ㄩ棬淇℃伅 * @return 缁撴灉 */ @@ -88,7 +87,7 @@ public interface SysDeptMapper /** * 淇敼閮ㄩ棬淇℃伅 - * + * * @param dept 閮ㄩ棬淇℃伅 * @return 缁撴灉 */ @@ -96,14 +95,14 @@ public interface SysDeptMapper /** * 淇敼鎵鍦ㄩ儴闂ㄦ甯哥姸鎬 - * + * * @param deptIds 閮ㄩ棬ID缁 */ public void updateDeptStatusNormal(Long[] deptIds); /** * 淇敼瀛愬厓绱犲叧绯 - * + * * @param depts 瀛愬厓绱 * @return 缁撴灉 */ @@ -111,7 +110,7 @@ public interface SysDeptMapper /** * 鍒犻櫎閮ㄩ棬绠＄悊淇℃伅 - * + * * @param deptId 閮ㄩ棬ID * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java index 0fc77aed..d289f6df 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java @@ -7,14 +7,13 @@ import java.util.List; /** * 瀛楀吀琛 鏁版嵁灞 - * + * * @author ruoyi */ -public interface SysDictDataMapper -{ +public interface SysDictDataMapper { /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瀛楀吀鏁版嵁 - * + * * @param dictData 瀛楀吀鏁版嵁淇℃伅 * @return 瀛楀吀鏁版嵁闆嗗悎淇℃伅 */ @@ -22,7 +21,7 @@ public interface SysDictDataMapper /** * 鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁 - * + * * @param dictType 瀛楀吀绫诲瀷 * @return 瀛楀吀鏁版嵁闆嗗悎淇℃伅 */ @@ -30,8 +29,8 @@ public interface SysDictDataMapper /** * 鏍规嵁瀛楀吀绫诲瀷鍜屽瓧鍏搁敭鍊兼煡璇㈠瓧鍏告暟鎹俊鎭 - * - * @param dictType 瀛楀吀绫诲瀷 + * + * @param dictType 瀛楀吀绫诲瀷 * @param dictValue 瀛楀吀閿 * @return 瀛楀吀鏍囩 */ @@ -39,7 +38,7 @@ public interface SysDictDataMapper /** * 鏍规嵁瀛楀吀鏁版嵁ID鏌ヨ淇℃伅 - * + * * @param dictCode 瀛楀吀鏁版嵁ID * @return 瀛楀吀鏁版嵁 */ @@ -47,7 +46,7 @@ public interface SysDictDataMapper /** * 鏌ヨ瀛楀吀鏁版嵁 - * + * * @param dictType 瀛楀吀绫诲瀷 * @return 瀛楀吀鏁版嵁 */ @@ -55,7 +54,7 @@ public interface SysDictDataMapper /** * 閫氳繃瀛楀吀ID鍒犻櫎瀛楀吀鏁版嵁淇℃伅 - * + * * @param dictCode 瀛楀吀鏁版嵁ID * @return 缁撴灉 */ @@ -63,7 +62,7 @@ public interface SysDictDataMapper /** * 鎵归噺鍒犻櫎瀛楀吀鏁版嵁淇℃伅 - * + * * @param dictCodes 闇瑕佸垹闄ょ殑瀛楀吀鏁版嵁ID * @return 缁撴灉 */ @@ -71,7 +70,7 @@ public interface SysDictDataMapper /** * 鏂板瀛楀吀鏁版嵁淇℃伅 - * + * * @param dictData 瀛楀吀鏁版嵁淇℃伅 * @return 缁撴灉 */ @@ -79,7 +78,7 @@ public interface SysDictDataMapper /** * 淇敼瀛楀吀鏁版嵁淇℃伅 - * + * * @param dictData 瀛楀吀鏁版嵁淇℃伅 * @return 缁撴灉 */ @@ -87,7 +86,7 @@ public interface SysDictDataMapper /** * 鍚屾淇敼瀛楀吀绫诲瀷 - * + * * @param oldDictType 鏃у瓧鍏哥被鍨 * @param newDictType 鏂版棫瀛楀吀绫诲瀷 * @return 缁撴灉 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java index 5b9f867f..ff6d4c2a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java @@ -7,15 +7,14 @@ import java.util.List; /** * 瀛楀吀琛 鏁版嵁灞 - * + * * @author ruoyi */ @Mapper -public interface SysDictTypeMapper -{ +public interface SysDictTypeMapper { /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瀛楀吀绫诲瀷 - * + * * @param dictType 瀛楀吀绫诲瀷淇℃伅 * @return 瀛楀吀绫诲瀷闆嗗悎淇℃伅 */ @@ -23,14 +22,14 @@ public interface SysDictTypeMapper /** * 鏍规嵁鎵鏈夊瓧鍏哥被鍨 - * + * * @return 瀛楀吀绫诲瀷闆嗗悎淇℃伅 */ public List selectDictTypeAll(); /** * 鏍规嵁瀛楀吀绫诲瀷ID鏌ヨ淇℃伅 - * + * * @param dictId 瀛楀吀绫诲瀷ID * @return 瀛楀吀绫诲瀷 */ @@ -38,7 +37,7 @@ public interface SysDictTypeMapper /** * 鏍规嵁瀛楀吀绫诲瀷鏌ヨ淇℃伅 - * + * * @param dictType 瀛楀吀绫诲瀷 * @return 瀛楀吀绫诲瀷 */ @@ -46,7 +45,7 @@ public interface SysDictTypeMapper /** * 閫氳繃瀛楀吀ID鍒犻櫎瀛楀吀淇℃伅 - * + * * @param dictId 瀛楀吀ID * @return 缁撴灉 */ @@ -54,7 +53,7 @@ public interface SysDictTypeMapper /** * 鎵归噺鍒犻櫎瀛楀吀绫诲瀷淇℃伅 - * + * * @param dictIds 闇瑕佸垹闄ょ殑瀛楀吀ID * @return 缁撴灉 */ @@ -62,7 +61,7 @@ public interface SysDictTypeMapper /** * 鏂板瀛楀吀绫诲瀷淇℃伅 - * + * * @param dictType 瀛楀吀绫诲瀷淇℃伅 * @return 缁撴灉 */ @@ -70,7 +69,7 @@ public interface SysDictTypeMapper /** * 淇敼瀛楀吀绫诲瀷淇℃伅 - * + * * @param dictType 瀛楀吀绫诲瀷淇℃伅 * @return 缁撴灉 */ @@ -78,7 +77,7 @@ public interface SysDictTypeMapper /** * 鏍￠獙瀛楀吀绫诲瀷绉版槸鍚﹀敮涓 - * + * * @param dictType 瀛楀吀绫诲瀷 * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java index c49b9acb..dca67f16 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java @@ -6,14 +6,13 @@ import java.util.List; /** * 绯荤粺璁块棶鏃ュ織鎯呭喌淇℃伅 鏁版嵁灞 - * + * * @author ruoyi */ -public interface SysLogininforMapper -{ +public interface SysLogininforMapper { /** * 鏂板绯荤粺鐧诲綍鏃ュ織 - * + * * @param logininfor 璁块棶鏃ュ織瀵硅薄 * @return int */ @@ -21,7 +20,7 @@ public interface SysLogininforMapper /** * 鏌ヨ绯荤粺鐧诲綍鏃ュ織闆嗗悎 - * + * * @param logininfor 璁块棶鏃ュ織瀵硅薄 * @return 鐧诲綍璁板綍闆嗗悎 */ @@ -29,7 +28,7 @@ public interface SysLogininforMapper /** * 鎵归噺鍒犻櫎绯荤粺鐧诲綍鏃ュ織 - * + * * @param infoIds 闇瑕佸垹闄ょ殑鐧诲綍鏃ュ織ID * @return 缁撴灉 */ @@ -37,7 +36,7 @@ public interface SysLogininforMapper /** * 娓呯┖绯荤粺鐧诲綍鏃ュ織 - * + * * @return 缁撴灉 */ public int cleanLogininfor(); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java index 5ad84eb6..a4f951c4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java @@ -7,14 +7,13 @@ import java.util.List; /** * 鑿滃崟琛 鏁版嵁灞 - * + * * @author ruoyi */ -public interface SysMenuMapper -{ +public interface SysMenuMapper { /** * 鏌ヨ绯荤粺鑿滃崟鍒楄〃 - * + * * @param menu 鑿滃崟淇℃伅 * @return 鑿滃崟鍒楄〃 */ @@ -22,14 +21,14 @@ public interface SysMenuMapper /** * 鏍规嵁鐢ㄦ埛鎵鏈夋潈闄 - * + * * @return 鏉冮檺鍒楄〃 */ public List selectMenuPerms(); /** * 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃 - * + * * @param menu 鑿滃崟淇℃伅 * @return 鑿滃崟鍒楄〃 */ @@ -37,7 +36,7 @@ public interface SysMenuMapper /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ鏉冮檺 - * + * * @param userId 鐢ㄦ埛ID * @return 鏉冮檺鍒楄〃 */ @@ -45,14 +44,14 @@ public interface SysMenuMapper /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ鑿滃崟 - * + * * @return 鑿滃崟鍒楄〃 */ public List selectMenuTreeAll(); /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ鑿滃崟 - * + * * @param userId 鐢ㄦ埛ID * @return 鑿滃崟鍒楄〃 */ @@ -60,8 +59,8 @@ public interface SysMenuMapper /** * 鏍规嵁瑙掕壊ID鏌ヨ鑿滃崟鏍戜俊鎭 - * - * @param roleId 瑙掕壊ID + * + * @param roleId 瑙掕壊ID * @param menuCheckStrictly 鑿滃崟鏍戦夋嫨椤规槸鍚﹀叧鑱旀樉绀 * @return 閫変腑鑿滃崟鍒楄〃 */ @@ -69,7 +68,7 @@ public interface SysMenuMapper /** * 鏍规嵁鑿滃崟ID鏌ヨ淇℃伅 - * + * * @param menuId 鑿滃崟ID * @return 鑿滃崟淇℃伅 */ @@ -77,7 +76,7 @@ public interface SysMenuMapper /** * 鏄惁瀛樺湪鑿滃崟瀛愯妭鐐 - * + * * @param menuId 鑿滃崟ID * @return 缁撴灉 */ @@ -85,7 +84,7 @@ public interface SysMenuMapper /** * 鏂板鑿滃崟淇℃伅 - * + * * @param menu 鑿滃崟淇℃伅 * @return 缁撴灉 */ @@ -93,7 +92,7 @@ public interface SysMenuMapper /** * 淇敼鑿滃崟淇℃伅 - * + * * @param menu 鑿滃崟淇℃伅 * @return 缁撴灉 */ @@ -101,7 +100,7 @@ public interface SysMenuMapper /** * 鍒犻櫎鑿滃崟绠＄悊淇℃伅 - * + * * @param menuId 鑿滃崟ID * @return 缁撴灉 */ @@ -109,7 +108,7 @@ public interface SysMenuMapper /** * 鏍￠獙鑿滃崟鍚嶇О鏄惁鍞竴 - * + * * @param menuName 鑿滃崟鍚嶇О * @param parentId 鐖惰彍鍗旾D * @return 缁撴灉 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java index a5765d09..04a168b4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java @@ -6,14 +6,13 @@ import java.util.List; /** * 閫氱煡鍏憡琛 鏁版嵁灞 - * + * * @author ruoyi */ -public interface SysNoticeMapper -{ +public interface SysNoticeMapper { /** * 鏌ヨ鍏憡淇℃伅 - * + * * @param noticeId 鍏憡ID * @return 鍏憡淇℃伅 */ @@ -21,7 +20,7 @@ public interface SysNoticeMapper /** * 鏌ヨ鍏憡鍒楄〃 - * + * * @param notice 鍏憡淇℃伅 * @return 鍏憡闆嗗悎 */ @@ -29,7 +28,7 @@ public interface SysNoticeMapper /** * 鏂板鍏憡 - * + * * @param notice 鍏憡淇℃伅 * @return 缁撴灉 */ @@ -37,7 +36,7 @@ public interface SysNoticeMapper /** * 淇敼鍏憡 - * + * * @param notice 鍏憡淇℃伅 * @return 缁撴灉 */ @@ -45,7 +44,7 @@ public interface SysNoticeMapper /** * 鎵归噺鍒犻櫎鍏憡 - * + * * @param noticeId 鍏憡ID * @return 缁撴灉 */ @@ -53,7 +52,7 @@ public interface SysNoticeMapper /** * 鎵归噺鍒犻櫎鍏憡淇℃伅 - * + * * @param noticeIds 闇瑕佸垹闄ょ殑鍏憡ID * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java index d829a540..3cd241f0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java @@ -6,14 +6,13 @@ import java.util.List; /** * 鎿嶄綔鏃ュ織 鏁版嵁灞 - * + * * @author ruoyi */ -public interface SysOperLogMapper -{ +public interface SysOperLogMapper { /** * 鏂板鎿嶄綔鏃ュ織 - * + * * @param operLog 鎿嶄綔鏃ュ織瀵硅薄 * @return int */ @@ -21,7 +20,7 @@ public interface SysOperLogMapper /** * 鏌ヨ绯荤粺鎿嶄綔鏃ュ織闆嗗悎 - * + * * @param operLog 鎿嶄綔鏃ュ織瀵硅薄 * @return 鎿嶄綔鏃ュ織闆嗗悎 */ @@ -29,7 +28,7 @@ public interface SysOperLogMapper /** * 鎵归噺鍒犻櫎绯荤粺鎿嶄綔鏃ュ織 - * + * * @param operIds 闇瑕佸垹闄ょ殑鎿嶄綔鏃ュ織ID * @return 缁撴灉 */ @@ -37,7 +36,7 @@ public interface SysOperLogMapper /** * 鏌ヨ鎿嶄綔鏃ュ織璇︾粏 - * + * * @param operId 鎿嶄綔ID * @return 鎿嶄綔鏃ュ織瀵硅薄 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java index d65faa2b..e2d99482 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java @@ -6,14 +6,13 @@ import java.util.List; /** * 宀椾綅淇℃伅 鏁版嵁灞 - * + * * @author ruoyi */ -public interface SysPostMapper -{ +public interface SysPostMapper { /** * 鏌ヨ宀椾綅鏁版嵁闆嗗悎 - * + * * @param post 宀椾綅淇℃伅 * @return 宀椾綅鏁版嵁闆嗗悎 */ @@ -21,14 +20,14 @@ public interface SysPostMapper /** * 鏌ヨ鎵鏈夊矖浣 - * + * * @return 宀椾綅鍒楄〃 */ public List selectPostAll(); /** * 閫氳繃宀椾綅ID鏌ヨ宀椾綅淇℃伅 - * + * * @param postId 宀椾綅ID * @return 瑙掕壊瀵硅薄淇℃伅 */ @@ -36,7 +35,7 @@ public interface SysPostMapper /** * 鏍规嵁鐢ㄦ埛ID鑾峰彇宀椾綅閫夋嫨妗嗗垪琛 - * + * * @param userId 鐢ㄦ埛ID * @return 閫変腑宀椾綅ID鍒楄〃 */ @@ -44,7 +43,7 @@ public interface SysPostMapper /** * 鏌ヨ鐢ㄦ埛鎵灞炲矖浣嶇粍 - * + * * @param userName 鐢ㄦ埛鍚 * @return 缁撴灉 */ @@ -52,7 +51,7 @@ public interface SysPostMapper /** * 鍒犻櫎宀椾綅淇℃伅 - * + * * @param postId 宀椾綅ID * @return 缁撴灉 */ @@ -60,7 +59,7 @@ public interface SysPostMapper /** * 鎵归噺鍒犻櫎宀椾綅淇℃伅 - * + * * @param postIds 闇瑕佸垹闄ょ殑宀椾綅ID * @return 缁撴灉 */ @@ -68,7 +67,7 @@ public interface SysPostMapper /** * 淇敼宀椾綅淇℃伅 - * + * * @param post 宀椾綅淇℃伅 * @return 缁撴灉 */ @@ -76,7 +75,7 @@ public interface SysPostMapper /** * 鏂板宀椾綅淇℃伅 - * + * * @param post 宀椾綅淇℃伅 * @return 缁撴灉 */ @@ -84,7 +83,7 @@ public interface SysPostMapper /** * 鏍￠獙宀椾綅鍚嶇О - * + * * @param postName 宀椾綅鍚嶇О * @return 缁撴灉 */ @@ -92,7 +91,7 @@ public interface SysPostMapper /** * 鏍￠獙宀椾綅缂栫爜 - * + * * @param postCode 宀椾綅缂栫爜 * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java index 45e1c0cb..f26fe749 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java @@ -6,14 +6,13 @@ import java.util.List; /** * 瑙掕壊涓庨儴闂ㄥ叧鑱旇〃 鏁版嵁灞 - * + * * @author ruoyi */ -public interface SysRoleDeptMapper -{ +public interface SysRoleDeptMapper { /** * 閫氳繃瑙掕壊ID鍒犻櫎瑙掕壊鍜岄儴闂ㄥ叧鑱 - * + * * @param roleId 瑙掕壊ID * @return 缁撴灉 */ @@ -21,7 +20,7 @@ public interface SysRoleDeptMapper /** * 鎵归噺鍒犻櫎瑙掕壊閮ㄩ棬鍏宠仈淇℃伅 - * + * * @param ids 闇瑕佸垹闄ょ殑鏁版嵁ID * @return 缁撴灉 */ @@ -29,7 +28,7 @@ public interface SysRoleDeptMapper /** * 鏌ヨ閮ㄩ棬浣跨敤鏁伴噺 - * + * * @param deptId 閮ㄩ棬ID * @return 缁撴灉 */ @@ -37,7 +36,7 @@ public interface SysRoleDeptMapper /** * 鎵归噺鏂板瑙掕壊閮ㄩ棬淇℃伅 - * + * * @param roleDeptList 瑙掕壊閮ㄩ棬鍒楄〃 * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java index 1a1762ea..9f3f9dff 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java @@ -6,14 +6,13 @@ import java.util.List; /** * 瑙掕壊琛 鏁版嵁灞 - * + * * @author ruoyi */ -public interface SysRoleMapper -{ +public interface SysRoleMapper { /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瑙掕壊鏁版嵁 - * + * * @param role 瑙掕壊淇℃伅 * @return 瑙掕壊鏁版嵁闆嗗悎淇℃伅 */ @@ -21,7 +20,7 @@ public interface SysRoleMapper /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊 - * + * * @param userId 鐢ㄦ埛ID * @return 瑙掕壊鍒楄〃 */ @@ -29,14 +28,14 @@ public interface SysRoleMapper /** * 鏌ヨ鎵鏈夎鑹 - * + * * @return 瑙掕壊鍒楄〃 */ public List selectRoleAll(); /** * 鏍规嵁鐢ㄦ埛ID鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛 - * + * * @param userId 鐢ㄦ埛ID * @return 閫変腑瑙掕壊ID鍒楄〃 */ @@ -44,7 +43,7 @@ public interface SysRoleMapper /** * 閫氳繃瑙掕壊ID鏌ヨ瑙掕壊 - * + * * @param roleId 瑙掕壊ID * @return 瑙掕壊瀵硅薄淇℃伅 */ @@ -52,7 +51,7 @@ public interface SysRoleMapper /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊 - * + * * @param userName 鐢ㄦ埛鍚 * @return 瑙掕壊鍒楄〃 */ @@ -60,7 +59,7 @@ public interface SysRoleMapper /** * 鏍￠獙瑙掕壊鍚嶇О鏄惁鍞竴 - * + * * @param roleName 瑙掕壊鍚嶇О * @return 瑙掕壊淇℃伅 */ @@ -68,7 +67,7 @@ public interface SysRoleMapper /** * 鏍￠獙瑙掕壊鏉冮檺鏄惁鍞竴 - * + * * @param roleKey 瑙掕壊鏉冮檺 * @return 瑙掕壊淇℃伅 */ @@ -76,7 +75,7 @@ public interface SysRoleMapper /** * 淇敼瑙掕壊淇℃伅 - * + * * @param role 瑙掕壊淇℃伅 * @return 缁撴灉 */ @@ -84,7 +83,7 @@ public interface SysRoleMapper /** * 鏂板瑙掕壊淇℃伅 - * + * * @param role 瑙掕壊淇℃伅 * @return 缁撴灉 */ @@ -92,7 +91,7 @@ public interface SysRoleMapper /** * 閫氳繃瑙掕壊ID鍒犻櫎瑙掕壊 - * + * * @param roleId 瑙掕壊ID * @return 缁撴灉 */ @@ -100,7 +99,7 @@ public interface SysRoleMapper /** * 鎵归噺鍒犻櫎瑙掕壊淇℃伅 - * + * * @param roleIds 闇瑕佸垹闄ょ殑瑙掕壊ID * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java index a86886b8..f63633b2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java @@ -6,14 +6,13 @@ import java.util.List; /** * 瑙掕壊涓庤彍鍗曞叧鑱旇〃 鏁版嵁灞 - * + * * @author ruoyi */ -public interface SysRoleMenuMapper -{ +public interface SysRoleMenuMapper { /** * 鏌ヨ鑿滃崟浣跨敤鏁伴噺 - * + * * @param menuId 鑿滃崟ID * @return 缁撴灉 */ @@ -21,7 +20,7 @@ public interface SysRoleMenuMapper /** * 閫氳繃瑙掕壊ID鍒犻櫎瑙掕壊鍜岃彍鍗曞叧鑱 - * + * * @param roleId 瑙掕壊ID * @return 缁撴灉 */ @@ -29,7 +28,7 @@ public interface SysRoleMenuMapper /** * 鎵归噺鍒犻櫎瑙掕壊鑿滃崟鍏宠仈淇℃伅 - * + * * @param ids 闇瑕佸垹闄ょ殑鏁版嵁ID * @return 缁撴灉 */ @@ -37,7 +36,7 @@ public interface SysRoleMenuMapper /** * 鎵归噺鏂板瑙掕壊鑿滃崟淇℃伅 - * + * * @param roleMenuList 瑙掕壊鑿滃崟鍒楄〃 * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index 260c4f04..2cd1fe69 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -7,14 +7,13 @@ import java.util.List; /** * 鐢ㄦ埛琛 鏁版嵁灞 - * + * * @author ruoyi */ -public interface SysUserMapper -{ +public interface SysUserMapper { /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃 - * + * * @param sysUser 鐢ㄦ埛淇℃伅 * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅 */ @@ -22,7 +21,7 @@ public interface SysUserMapper /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ宸查厤鐢ㄦ埛瑙掕壊鍒楄〃 - * + * * @param user 鐢ㄦ埛淇℃伅 * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅 */ @@ -30,7 +29,7 @@ public interface SysUserMapper /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛 - * + * * @param user 鐢ㄦ埛淇℃伅 * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅 */ @@ -38,7 +37,7 @@ public interface SysUserMapper /** * 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤鎴 - * + * * @param userName 鐢ㄦ埛鍚 * @return 鐢ㄦ埛瀵硅薄淇℃伅 */ @@ -46,7 +45,7 @@ public interface SysUserMapper /** * 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛 - * + * * @param userId 鐢ㄦ埛ID * @return 鐢ㄦ埛瀵硅薄淇℃伅 */ @@ -54,7 +53,7 @@ public interface SysUserMapper /** * 鏂板鐢ㄦ埛淇℃伅 - * + * * @param user 鐢ㄦ埛淇℃伅 * @return 缁撴灉 */ @@ -62,7 +61,7 @@ public interface SysUserMapper /** * 淇敼鐢ㄦ埛淇℃伅 - * + * * @param user 鐢ㄦ埛淇℃伅 * @return 缁撴灉 */ @@ -70,16 +69,16 @@ public interface SysUserMapper /** * 淇敼鐢ㄦ埛澶村儚 - * + * * @param userName 鐢ㄦ埛鍚 - * @param avatar 澶村儚鍦板潃 + * @param avatar 澶村儚鍦板潃 * @return 缁撴灉 */ public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar); /** * 閲嶇疆鐢ㄦ埛瀵嗙爜 - * + * * @param userName 鐢ㄦ埛鍚 * @param password 瀵嗙爜 * @return 缁撴灉 @@ -88,7 +87,7 @@ public interface SysUserMapper /** * 閫氳繃鐢ㄦ埛ID鍒犻櫎鐢ㄦ埛 - * + * * @param userId 鐢ㄦ埛ID * @return 缁撴灉 */ @@ -96,7 +95,7 @@ public interface SysUserMapper /** * 鎵归噺鍒犻櫎鐢ㄦ埛淇℃伅 - * + * * @param userIds 闇瑕佸垹闄ょ殑鐢ㄦ埛ID * @return 缁撴灉 */ @@ -104,7 +103,7 @@ public interface SysUserMapper /** * 鏍￠獙鐢ㄦ埛鍚嶇О鏄惁鍞竴 - * + * * @param userName 鐢ㄦ埛鍚嶇О * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java index 8ed12044..df414538 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java @@ -6,14 +6,13 @@ import java.util.List; /** * 鐢ㄦ埛涓庡矖浣嶅叧鑱旇〃 鏁版嵁灞 - * + * * @author ruoyi */ -public interface SysUserPostMapper -{ +public interface SysUserPostMapper { /** * 閫氳繃鐢ㄦ埛ID鍒犻櫎鐢ㄦ埛鍜屽矖浣嶅叧鑱 - * + * * @param userId 鐢ㄦ埛ID * @return 缁撴灉 */ @@ -21,7 +20,7 @@ public interface SysUserPostMapper /** * 閫氳繃宀椾綅ID鏌ヨ宀椾綅浣跨敤鏁伴噺 - * + * * @param postId 宀椾綅ID * @return 缁撴灉 */ @@ -29,7 +28,7 @@ public interface SysUserPostMapper /** * 鎵归噺鍒犻櫎鐢ㄦ埛鍜屽矖浣嶅叧鑱 - * + * * @param ids 闇瑕佸垹闄ょ殑鏁版嵁ID * @return 缁撴灉 */ @@ -37,7 +36,7 @@ public interface SysUserPostMapper /** * 鎵归噺鏂板鐢ㄦ埛宀椾綅淇℃伅 - * + * * @param userPostList 鐢ㄦ埛瑙掕壊鍒楄〃 * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java index dd0afc54..c1c465d4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java @@ -7,14 +7,13 @@ import java.util.List; /** * 鐢ㄦ埛涓庤鑹插叧鑱旇〃 鏁版嵁灞 - * + * * @author ruoyi */ -public interface SysUserRoleMapper -{ +public interface SysUserRoleMapper { /** * 閫氳繃鐢ㄦ埛ID鍒犻櫎鐢ㄦ埛鍜岃鑹插叧鑱 - * + * * @param userId 鐢ㄦ埛ID * @return 缁撴灉 */ @@ -22,7 +21,7 @@ public interface SysUserRoleMapper /** * 鎵归噺鍒犻櫎鐢ㄦ埛鍜岃鑹插叧鑱 - * + * * @param ids 闇瑕佸垹闄ょ殑鏁版嵁ID * @return 缁撴灉 */ @@ -30,7 +29,7 @@ public interface SysUserRoleMapper /** * 閫氳繃瑙掕壊ID鏌ヨ瑙掕壊浣跨敤鏁伴噺 - * + * * @param roleId 瑙掕壊ID * @return 缁撴灉 */ @@ -38,7 +37,7 @@ public interface SysUserRoleMapper /** * 鎵归噺鏂板鐢ㄦ埛瑙掕壊淇℃伅 - * + * * @param userRoleList 鐢ㄦ埛瑙掕壊鍒楄〃 * @return 缁撴灉 */ @@ -46,7 +45,7 @@ public interface SysUserRoleMapper /** * 鍒犻櫎鐢ㄦ埛鍜岃鑹插叧鑱斾俊鎭 - * + * * @param userRole 鐢ㄦ埛鍜岃鑹插叧鑱斾俊鎭 * @return 缁撴灉 */ @@ -54,8 +53,8 @@ public interface SysUserRoleMapper /** * 鎵归噺鍙栨秷鎺堟潈鐢ㄦ埛瑙掕壊 - * - * @param roleId 瑙掕壊ID + * + * @param roleId 瑙掕壊ID * @param userIds 闇瑕佸垹闄ょ殑鐢ㄦ埛鏁版嵁ID * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java index f127d307..dce60bfa 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java @@ -6,14 +6,13 @@ import java.util.List; /** * 鍙傛暟閰嶇疆 鏈嶅姟灞 - * + * * @author ruoyi */ -public interface ISysConfigService -{ +public interface ISysConfigService { /** * 鏌ヨ鍙傛暟閰嶇疆淇℃伅 - * + * * @param configId 鍙傛暟閰嶇疆ID * @return 鍙傛暟閰嶇疆淇℃伅 */ @@ -21,7 +20,7 @@ public interface ISysConfigService /** * 鏍规嵁閿悕鏌ヨ鍙傛暟閰嶇疆淇℃伅 - * + * * @param configKey 鍙傛暟閿悕 * @return 鍙傛暟閿 */ @@ -29,7 +28,7 @@ public interface ISysConfigService /** * 鏌ヨ鍙傛暟閰嶇疆鍒楄〃 - * + * * @param config 鍙傛暟閰嶇疆淇℃伅 * @return 鍙傛暟閰嶇疆闆嗗悎 */ @@ -37,7 +36,7 @@ public interface ISysConfigService /** * 鏂板鍙傛暟閰嶇疆 - * + * * @param config 鍙傛暟閰嶇疆淇℃伅 * @return 缁撴灉 */ @@ -45,7 +44,7 @@ public interface ISysConfigService /** * 淇敼鍙傛暟閰嶇疆 - * + * * @param config 鍙傛暟閰嶇疆淇℃伅 * @return 缁撴灉 */ @@ -53,7 +52,7 @@ public interface ISysConfigService /** * 鎵归噺鍒犻櫎鍙傛暟淇℃伅 - * + * * @param configIds 闇瑕佸垹闄ょ殑鍙傛暟ID */ public void deleteConfigByIds(Long[] configIds); @@ -75,7 +74,7 @@ public interface ISysConfigService /** * 鏍￠獙鍙傛暟閿悕鏄惁鍞竴 - * + * * @param config 鍙傛暟淇℃伅 * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java index afd6ddaf..31c01417 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java @@ -7,14 +7,13 @@ import java.util.List; /** * 閮ㄩ棬绠＄悊 鏈嶅姟灞 - * + * * @author ruoyi */ -public interface ISysDeptService -{ +public interface ISysDeptService { /** * 鏌ヨ閮ㄩ棬绠＄悊鏁版嵁 - * + * * @param dept 閮ㄩ棬淇℃伅 * @return 閮ㄩ棬淇℃伅闆嗗悎 */ @@ -22,7 +21,7 @@ public interface ISysDeptService /** * 鏋勫缓鍓嶇鎵闇瑕佹爲缁撴瀯 - * + * * @param depts 閮ㄩ棬鍒楄〃 * @return 鏍戠粨鏋勫垪琛 */ @@ -30,7 +29,7 @@ public interface ISysDeptService /** * 鏋勫缓鍓嶇鎵闇瑕佷笅鎷夋爲缁撴瀯 - * + * * @param depts 閮ㄩ棬鍒楄〃 * @return 涓嬫媺鏍戠粨鏋勫垪琛 */ @@ -38,7 +37,7 @@ public interface ISysDeptService /** * 鏍规嵁瑙掕壊ID鏌ヨ閮ㄩ棬鏍戜俊鎭 - * + * * @param roleId 瑙掕壊ID * @return 閫変腑閮ㄩ棬鍒楄〃 */ @@ -46,7 +45,7 @@ public interface ISysDeptService /** * 鏍规嵁閮ㄩ棬ID鏌ヨ淇℃伅 - * + * * @param deptId 閮ㄩ棬ID * @return 閮ㄩ棬淇℃伅 */ @@ -54,7 +53,7 @@ public interface ISysDeptService /** * 鏍规嵁ID鏌ヨ鎵鏈夊瓙閮ㄩ棬锛堟甯哥姸鎬侊級 - * + * * @param deptId 閮ㄩ棬ID * @return 瀛愰儴闂ㄦ暟 */ @@ -62,7 +61,7 @@ public interface ISysDeptService /** * 鏄惁瀛樺湪閮ㄩ棬瀛愯妭鐐 - * + * * @param deptId 閮ㄩ棬ID * @return 缁撴灉 */ @@ -70,7 +69,7 @@ public interface ISysDeptService /** * 鏌ヨ閮ㄩ棬鏄惁瀛樺湪鐢ㄦ埛 - * + * * @param deptId 閮ㄩ棬ID * @return 缁撴灉 true 瀛樺湪 false 涓嶅瓨鍦 */ @@ -78,7 +77,7 @@ public interface ISysDeptService /** * 鏍￠獙閮ㄩ棬鍚嶇О鏄惁鍞竴 - * + * * @param dept 閮ㄩ棬淇℃伅 * @return 缁撴灉 */ @@ -86,14 +85,14 @@ public interface ISysDeptService /** * 鏍￠獙閮ㄩ棬鏄惁鏈夋暟鎹潈闄 - * + * * @param deptId 閮ㄩ棬id */ public void checkDeptDataScope(Long deptId); /** * 鏂板淇濆瓨閮ㄩ棬淇℃伅 - * + * * @param dept 閮ㄩ棬淇℃伅 * @return 缁撴灉 */ @@ -101,7 +100,7 @@ public interface ISysDeptService /** * 淇敼淇濆瓨閮ㄩ棬淇℃伅 - * + * * @param dept 閮ㄩ棬淇℃伅 * @return 缁撴灉 */ @@ -109,7 +108,7 @@ public interface ISysDeptService /** * 鍒犻櫎閮ㄩ棬绠＄悊淇℃伅 - * + * * @param deptId 閮ㄩ棬ID * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java index eb8928f2..b133aebd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java @@ -6,14 +6,13 @@ import java.util.List; /** * 瀛楀吀 涓氬姟灞 - * + * * @author ruoyi */ -public interface ISysDictDataService -{ +public interface ISysDictDataService { /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瀛楀吀鏁版嵁 - * + * * @param dictData 瀛楀吀鏁版嵁淇℃伅 * @return 瀛楀吀鏁版嵁闆嗗悎淇℃伅 */ @@ -21,8 +20,8 @@ public interface ISysDictDataService /** * 鏍规嵁瀛楀吀绫诲瀷鍜屽瓧鍏搁敭鍊兼煡璇㈠瓧鍏告暟鎹俊鎭 - * - * @param dictType 瀛楀吀绫诲瀷 + * + * @param dictType 瀛楀吀绫诲瀷 * @param dictValue 瀛楀吀閿 * @return 瀛楀吀鏍囩 */ @@ -30,7 +29,7 @@ public interface ISysDictDataService /** * 鏍规嵁瀛楀吀鏁版嵁ID鏌ヨ淇℃伅 - * + * * @param dictCode 瀛楀吀鏁版嵁ID * @return 瀛楀吀鏁版嵁 */ @@ -38,14 +37,14 @@ public interface ISysDictDataService /** * 鎵归噺鍒犻櫎瀛楀吀鏁版嵁淇℃伅 - * + * * @param dictCodes 闇瑕佸垹闄ょ殑瀛楀吀鏁版嵁ID */ public void deleteDictDataByIds(Long[] dictCodes); /** * 鏂板淇濆瓨瀛楀吀鏁版嵁淇℃伅 - * + * * @param dictData 瀛楀吀鏁版嵁淇℃伅 * @return 缁撴灉 */ @@ -53,7 +52,7 @@ public interface ISysDictDataService /** * 淇敼淇濆瓨瀛楀吀鏁版嵁淇℃伅 - * + * * @param dictData 瀛楀吀鏁版嵁淇℃伅 * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java index b2863b71..7039b82c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java @@ -7,14 +7,13 @@ import java.util.List; /** * 瀛楀吀 涓氬姟灞 - * + * * @author ruoyi */ -public interface ISysDictTypeService -{ +public interface ISysDictTypeService { /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瀛楀吀绫诲瀷 - * + * * @param dictType 瀛楀吀绫诲瀷淇℃伅 * @return 瀛楀吀绫诲瀷闆嗗悎淇℃伅 */ @@ -22,14 +21,14 @@ public interface ISysDictTypeService /** * 鏍规嵁鎵鏈夊瓧鍏哥被鍨 - * + * * @return 瀛楀吀绫诲瀷闆嗗悎淇℃伅 */ public List selectDictTypeAll(); /** * 鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁 - * + * * @param dictType 瀛楀吀绫诲瀷 * @return 瀛楀吀鏁版嵁闆嗗悎淇℃伅 */ @@ -37,7 +36,7 @@ public interface ISysDictTypeService /** * 鏍规嵁瀛楀吀绫诲瀷ID鏌ヨ淇℃伅 - * + * * @param dictId 瀛楀吀绫诲瀷ID * @return 瀛楀吀绫诲瀷 */ @@ -45,7 +44,7 @@ public interface ISysDictTypeService /** * 鏍规嵁瀛楀吀绫诲瀷鏌ヨ淇℃伅 - * + * * @param dictType 瀛楀吀绫诲瀷 * @return 瀛楀吀绫诲瀷 */ @@ -53,7 +52,7 @@ public interface ISysDictTypeService /** * 鎵归噺鍒犻櫎瀛楀吀淇℃伅 - * + * * @param dictIds 闇瑕佸垹闄ょ殑瀛楀吀ID */ public void deleteDictTypeByIds(Long[] dictIds); @@ -75,7 +74,7 @@ public interface ISysDictTypeService /** * 鏂板淇濆瓨瀛楀吀绫诲瀷淇℃伅 - * + * * @param dictType 瀛楀吀绫诲瀷淇℃伅 * @return 缁撴灉 */ @@ -83,7 +82,7 @@ public interface ISysDictTypeService /** * 淇敼淇濆瓨瀛楀吀绫诲瀷淇℃伅 - * + * * @param dictType 瀛楀吀绫诲瀷淇℃伅 * @return 缁撴灉 */ @@ -91,7 +90,7 @@ public interface ISysDictTypeService /** * 鏍￠獙瀛楀吀绫诲瀷绉版槸鍚﹀敮涓 - * + * * @param dictType 瀛楀吀绫诲瀷 * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java index 54fab043..0a2b747c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java @@ -6,14 +6,13 @@ import java.util.List; /** * 绯荤粺璁块棶鏃ュ織鎯呭喌淇℃伅 鏈嶅姟灞 - * + * * @author ruoyi */ -public interface ISysLogininforService -{ +public interface ISysLogininforService { /** * 鏂板绯荤粺鐧诲綍鏃ュ織 - * + * * @param logininfor 璁块棶鏃ュ織瀵硅薄 * @return int */ @@ -21,7 +20,7 @@ public interface ISysLogininforService /** * 鏌ヨ绯荤粺鐧诲綍鏃ュ織闆嗗悎 - * + * * @param logininfor 璁块棶鏃ュ織瀵硅薄 * @return 鐧诲綍璁板綍闆嗗悎 */ @@ -29,7 +28,7 @@ public interface ISysLogininforService /** * 鎵归噺鍒犻櫎绯荤粺鐧诲綍鏃ュ織 - * + * * @param infoIds 闇瑕佸垹闄ょ殑鐧诲綍鏃ュ織ID * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java index d0838a76..ca3b0f38 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java @@ -9,14 +9,13 @@ import java.util.Set; /** * 鑿滃崟 涓氬姟灞 - * + * * @author ruoyi */ -public interface ISysMenuService -{ +public interface ISysMenuService { /** * 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃 - * + * * @param userId 鐢ㄦ埛ID * @return 鑿滃崟鍒楄〃 */ @@ -24,8 +23,8 @@ public interface ISysMenuService /** * 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃 - * - * @param menu 鑿滃崟淇℃伅 + * + * @param menu 鑿滃崟淇℃伅 * @param userId 鐢ㄦ埛ID * @return 鑿滃崟鍒楄〃 */ @@ -33,7 +32,7 @@ public interface ISysMenuService /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ鏉冮檺 - * + * * @param userId 鐢ㄦ埛ID * @return 鏉冮檺鍒楄〃 */ @@ -41,7 +40,7 @@ public interface ISysMenuService /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ鑿滃崟鏍戜俊鎭 - * + * * @param userId 鐢ㄦ埛ID * @return 鑿滃崟鍒楄〃 */ @@ -49,7 +48,7 @@ public interface ISysMenuService /** * 鏍规嵁瑙掕壊ID鏌ヨ鑿滃崟鏍戜俊鎭 - * + * * @param roleId 瑙掕壊ID * @return 閫変腑鑿滃崟鍒楄〃 */ @@ -57,7 +56,7 @@ public interface ISysMenuService /** * 鏋勫缓鍓嶇璺敱鎵闇瑕佺殑鑿滃崟 - * + * * @param menus 鑿滃崟鍒楄〃 * @return 璺敱鍒楄〃 */ @@ -65,7 +64,7 @@ public interface ISysMenuService /** * 鏋勫缓鍓嶇鎵闇瑕佹爲缁撴瀯 - * + * * @param menus 鑿滃崟鍒楄〃 * @return 鏍戠粨鏋勫垪琛 */ @@ -73,7 +72,7 @@ public interface ISysMenuService /** * 鏋勫缓鍓嶇鎵闇瑕佷笅鎷夋爲缁撴瀯 - * + * * @param menus 鑿滃崟鍒楄〃 * @return 涓嬫媺鏍戠粨鏋勫垪琛 */ @@ -81,7 +80,7 @@ public interface ISysMenuService /** * 鏍规嵁鑿滃崟ID鏌ヨ淇℃伅 - * + * * @param menuId 鑿滃崟ID * @return 鑿滃崟淇℃伅 */ @@ -89,7 +88,7 @@ public interface ISysMenuService /** * 鏄惁瀛樺湪鑿滃崟瀛愯妭鐐 - * + * * @param menuId 鑿滃崟ID * @return 缁撴灉 true 瀛樺湪 false 涓嶅瓨鍦 */ @@ -97,7 +96,7 @@ public interface ISysMenuService /** * 鏌ヨ鑿滃崟鏄惁瀛樺湪瑙掕壊 - * + * * @param menuId 鑿滃崟ID * @return 缁撴灉 true 瀛樺湪 false 涓嶅瓨鍦 */ @@ -105,7 +104,7 @@ public interface ISysMenuService /** * 鏂板淇濆瓨鑿滃崟淇℃伅 - * + * * @param menu 鑿滃崟淇℃伅 * @return 缁撴灉 */ @@ -113,7 +112,7 @@ public interface ISysMenuService /** * 淇敼淇濆瓨鑿滃崟淇℃伅 - * + * * @param menu 鑿滃崟淇℃伅 * @return 缁撴灉 */ @@ -121,7 +120,7 @@ public interface ISysMenuService /** * 鍒犻櫎鑿滃崟绠＄悊淇℃伅 - * + * * @param menuId 鑿滃崟ID * @return 缁撴灉 */ @@ -129,7 +128,7 @@ public interface ISysMenuService /** * 鏍￠獙鑿滃崟鍚嶇О鏄惁鍞竴 - * + * * @param menu 鑿滃崟淇℃伅 * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java index 826758c4..88a38b35 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java @@ -6,14 +6,13 @@ import java.util.List; /** * 鍏憡 鏈嶅姟灞 - * + * * @author ruoyi */ -public interface ISysNoticeService -{ +public interface ISysNoticeService { /** * 鏌ヨ鍏憡淇℃伅 - * + * * @param noticeId 鍏憡ID * @return 鍏憡淇℃伅 */ @@ -21,7 +20,7 @@ public interface ISysNoticeService /** * 鏌ヨ鍏憡鍒楄〃 - * + * * @param notice 鍏憡淇℃伅 * @return 鍏憡闆嗗悎 */ @@ -29,7 +28,7 @@ public interface ISysNoticeService /** * 鏂板鍏憡 - * + * * @param notice 鍏憡淇℃伅 * @return 缁撴灉 */ @@ -37,7 +36,7 @@ public interface ISysNoticeService /** * 淇敼鍏憡 - * + * * @param notice 鍏憡淇℃伅 * @return 缁撴灉 */ @@ -45,15 +44,15 @@ public interface ISysNoticeService /** * 鍒犻櫎鍏憡淇℃伅 - * + * * @param noticeId 鍏憡ID * @return 缁撴灉 */ public int deleteNoticeById(Long noticeId); - + /** * 鎵归噺鍒犻櫎鍏憡淇℃伅 - * + * * @param noticeIds 闇瑕佸垹闄ょ殑鍏憡ID * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java index a95fe2ab..35f449fc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java @@ -6,14 +6,13 @@ import java.util.List; /** * 鎿嶄綔鏃ュ織 鏈嶅姟灞 - * + * * @author ruoyi */ -public interface ISysOperLogService -{ +public interface ISysOperLogService { /** * 鏂板鎿嶄綔鏃ュ織 - * + * * @param operLog 鎿嶄綔鏃ュ織瀵硅薄 * @return 缁撴灉 */ @@ -21,7 +20,7 @@ public interface ISysOperLogService /** * 鏌ヨ绯荤粺鎿嶄綔鏃ュ織闆嗗悎 - * + * * @param operLog 鎿嶄綔鏃ュ織瀵硅薄 * @return 鎿嶄綔鏃ュ織闆嗗悎 */ @@ -29,7 +28,7 @@ public interface ISysOperLogService /** * 鎵归噺鍒犻櫎绯荤粺鎿嶄綔鏃ュ織 - * + * * @param operIds 闇瑕佸垹闄ょ殑鎿嶄綔鏃ュ織ID * @return 缁撴灉 */ @@ -37,7 +36,7 @@ public interface ISysOperLogService /** * 鏌ヨ鎿嶄綔鏃ュ織璇︾粏 - * + * * @param operId 鎿嶄綔ID * @return 鎿嶄綔鏃ュ織瀵硅薄 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java index dfe1913f..1d97e549 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java @@ -5,11 +5,10 @@ import java.util.Set; /** * @author pan */ -public interface ISysPermissionService -{ +public interface ISysPermissionService { /** * 鑾峰彇瑙掕壊鏁版嵁鏉冮檺 - * + * * @param userId 鐢ㄦ埛Id * @return 瑙掕壊鏉冮檺淇℃伅 */ @@ -17,7 +16,7 @@ public interface ISysPermissionService /** * 鑾峰彇鑿滃崟鏁版嵁鏉冮檺 - * + * * @param userId 鐢ㄦ埛Id * @return 鑿滃崟鏉冮檺淇℃伅 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java index 14aaef09..60c3c980 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java @@ -6,14 +6,13 @@ import java.util.List; /** * 宀椾綅淇℃伅 鏈嶅姟灞 - * + * * @author ruoyi */ -public interface ISysPostService -{ +public interface ISysPostService { /** * 鏌ヨ宀椾綅淇℃伅闆嗗悎 - * + * * @param post 宀椾綅淇℃伅 * @return 宀椾綅鍒楄〃 */ @@ -21,14 +20,14 @@ public interface ISysPostService /** * 鏌ヨ鎵鏈夊矖浣 - * + * * @return 宀椾綅鍒楄〃 */ public List selectPostAll(); /** * 閫氳繃宀椾綅ID鏌ヨ宀椾綅淇℃伅 - * + * * @param postId 宀椾綅ID * @return 瑙掕壊瀵硅薄淇℃伅 */ @@ -36,7 +35,7 @@ public interface ISysPostService /** * 鏍规嵁鐢ㄦ埛ID鑾峰彇宀椾綅閫夋嫨妗嗗垪琛 - * + * * @param userId 鐢ㄦ埛ID * @return 閫変腑宀椾綅ID鍒楄〃 */ @@ -44,7 +43,7 @@ public interface ISysPostService /** * 鏍￠獙宀椾綅鍚嶇О - * + * * @param post 宀椾綅淇℃伅 * @return 缁撴灉 */ @@ -52,7 +51,7 @@ public interface ISysPostService /** * 鏍￠獙宀椾綅缂栫爜 - * + * * @param post 宀椾綅淇℃伅 * @return 缁撴灉 */ @@ -60,7 +59,7 @@ public interface ISysPostService /** * 閫氳繃宀椾綅ID鏌ヨ宀椾綅浣跨敤鏁伴噺 - * + * * @param postId 宀椾綅ID * @return 缁撴灉 */ @@ -68,7 +67,7 @@ public interface ISysPostService /** * 鍒犻櫎宀椾綅淇℃伅 - * + * * @param postId 宀椾綅ID * @return 缁撴灉 */ @@ -76,7 +75,7 @@ public interface ISysPostService /** * 鎵归噺鍒犻櫎宀椾綅淇℃伅 - * + * * @param postIds 闇瑕佸垹闄ょ殑宀椾綅ID * @return 缁撴灉 */ @@ -84,7 +83,7 @@ public interface ISysPostService /** * 鏂板淇濆瓨宀椾綅淇℃伅 - * + * * @param post 宀椾綅淇℃伅 * @return 缁撴灉 */ @@ -92,7 +91,7 @@ public interface ISysPostService /** * 淇敼淇濆瓨宀椾綅淇℃伅 - * + * * @param post 宀椾綅淇℃伅 * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java index fd5586a9..5829bf86 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java @@ -8,14 +8,13 @@ import java.util.Set; /** * 瑙掕壊涓氬姟灞 - * + * * @author ruoyi */ -public interface ISysRoleService -{ +public interface ISysRoleService { /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瑙掕壊鏁版嵁 - * + * * @param role 瑙掕壊淇℃伅 * @return 瑙掕壊鏁版嵁闆嗗悎淇℃伅 */ @@ -23,7 +22,7 @@ public interface ISysRoleService /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊鍒楄〃 - * + * * @param userId 鐢ㄦ埛ID * @return 瑙掕壊鍒楄〃 */ @@ -31,7 +30,7 @@ public interface ISysRoleService /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊鏉冮檺 - * + * * @param userId 鐢ㄦ埛ID * @return 鏉冮檺鍒楄〃 */ @@ -39,14 +38,14 @@ public interface ISysRoleService /** * 鏌ヨ鎵鏈夎鑹 - * + * * @return 瑙掕壊鍒楄〃 */ public List selectRoleAll(); /** * 鏍规嵁鐢ㄦ埛ID鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛 - * + * * @param userId 鐢ㄦ埛ID * @return 閫変腑瑙掕壊ID鍒楄〃 */ @@ -54,7 +53,7 @@ public interface ISysRoleService /** * 閫氳繃瑙掕壊ID鏌ヨ瑙掕壊 - * + * * @param roleId 瑙掕壊ID * @return 瑙掕壊瀵硅薄淇℃伅 */ @@ -62,7 +61,7 @@ public interface ISysRoleService /** * 鏍￠獙瑙掕壊鍚嶇О鏄惁鍞竴 - * + * * @param role 瑙掕壊淇℃伅 * @return 缁撴灉 */ @@ -70,7 +69,7 @@ public interface ISysRoleService /** * 鏍￠獙瑙掕壊鏉冮檺鏄惁鍞竴 - * + * * @param role 瑙掕壊淇℃伅 * @return 缁撴灉 */ @@ -78,21 +77,21 @@ public interface ISysRoleService /** * 鏍￠獙瑙掕壊鏄惁鍏佽鎿嶄綔 - * + * * @param role 瑙掕壊淇℃伅 */ public void checkRoleAllowed(SysRole role); /** * 鏍￠獙瑙掕壊鏄惁鏈夋暟鎹潈闄 - * + * * @param roleId 瑙掕壊id */ public void checkRoleDataScope(Long roleId); /** * 閫氳繃瑙掕壊ID鏌ヨ瑙掕壊浣跨敤鏁伴噺 - * + * * @param roleId 瑙掕壊ID * @return 缁撴灉 */ @@ -100,7 +99,7 @@ public interface ISysRoleService /** * 鏂板淇濆瓨瑙掕壊淇℃伅 - * + * * @param role 瑙掕壊淇℃伅 * @return 缁撴灉 */ @@ -108,7 +107,7 @@ public interface ISysRoleService /** * 淇敼淇濆瓨瑙掕壊淇℃伅 - * + * * @param role 瑙掕壊淇℃伅 * @return 缁撴灉 */ @@ -116,7 +115,7 @@ public interface ISysRoleService /** * 淇敼瑙掕壊鐘舵 - * + * * @param role 瑙掕壊淇℃伅 * @return 缁撴灉 */ @@ -124,7 +123,7 @@ public interface ISysRoleService /** * 淇敼鏁版嵁鏉冮檺淇℃伅 - * + * * @param role 瑙掕壊淇℃伅 * @return 缁撴灉 */ @@ -132,7 +131,7 @@ public interface ISysRoleService /** * 閫氳繃瑙掕壊ID鍒犻櫎瑙掕壊 - * + * * @param roleId 瑙掕壊ID * @return 缁撴灉 */ @@ -140,7 +139,7 @@ public interface ISysRoleService /** * 鎵归噺鍒犻櫎瑙掕壊淇℃伅 - * + * * @param roleIds 闇瑕佸垹闄ょ殑瑙掕壊ID * @return 缁撴灉 */ @@ -148,7 +147,7 @@ public interface ISysRoleService /** * 鍙栨秷鎺堟潈鐢ㄦ埛瑙掕壊 - * + * * @param userRole 鐢ㄦ埛鍜岃鑹插叧鑱斾俊鎭 * @return 缁撴灉 */ @@ -156,8 +155,8 @@ public interface ISysRoleService /** * 鎵归噺鍙栨秷鎺堟潈鐢ㄦ埛瑙掕壊 - * - * @param roleId 瑙掕壊ID + * + * @param roleId 瑙掕壊ID * @param userIds 闇瑕佸彇娑堟巿鏉冪殑鐢ㄦ埛鏁版嵁ID * @return 缁撴灉 */ @@ -165,8 +164,8 @@ public interface ISysRoleService /** * 鎵归噺閫夋嫨鎺堟潈鐢ㄦ埛瑙掕壊 - * - * @param roleId 瑙掕壊ID + * + * @param roleId 瑙掕壊ID * @param userIds 闇瑕佸垹闄ょ殑鐢ㄦ埛鏁版嵁ID * @return 缁撴灉 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java index dd602b25..2a2dd519 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java @@ -5,42 +5,41 @@ import com.ruoyi.system.domain.SysUserOnline; /** * 鍦ㄧ嚎鐢ㄦ埛 鏈嶅姟灞 - * + * * @author ruoyi */ -public interface ISysUserOnlineService -{ +public interface ISysUserOnlineService { /** * 閫氳繃鐧诲綍鍦板潃鏌ヨ淇℃伅 - * + * * @param ipaddr 鐧诲綍鍦板潃 - * @param user 鐢ㄦ埛淇℃伅 + * @param user 鐢ㄦ埛淇℃伅 * @return 鍦ㄧ嚎鐢ㄦ埛淇℃伅 */ public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user); /** * 閫氳繃鐢ㄦ埛鍚嶇О鏌ヨ淇℃伅 - * + * * @param userName 鐢ㄦ埛鍚嶇О - * @param user 鐢ㄦ埛淇℃伅 + * @param user 鐢ㄦ埛淇℃伅 * @return 鍦ㄧ嚎鐢ㄦ埛淇℃伅 */ public SysUserOnline selectOnlineByUserName(String userName, LoginUser user); /** * 閫氳繃鐧诲綍鍦板潃/鐢ㄦ埛鍚嶇О鏌ヨ淇℃伅 - * - * @param ipaddr 鐧诲綍鍦板潃 + * + * @param ipaddr 鐧诲綍鍦板潃 * @param userName 鐢ㄦ埛鍚嶇О - * @param user 鐢ㄦ埛淇℃伅 + * @param user 鐢ㄦ埛淇℃伅 * @return 鍦ㄧ嚎鐢ㄦ埛淇℃伅 */ public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user); /** * 璁剧疆鍦ㄧ嚎鐢ㄦ埛淇℃伅 - * + * * @param user 鐢ㄦ埛淇℃伅 * @return 鍦ㄧ嚎鐢ㄦ埛 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java index a85b7475..0ec2c6bc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -6,14 +6,13 @@ import java.util.List; /** * 鐢ㄦ埛 涓氬姟灞 - * + * * @author ruoyi */ -public interface ISysUserService -{ +public interface ISysUserService { /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃 - * + * * @param user 鐢ㄦ埛淇℃伅 * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅 */ @@ -21,7 +20,7 @@ public interface ISysUserService /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛 - * + * * @param user 鐢ㄦ埛淇℃伅 * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅 */ @@ -29,7 +28,7 @@ public interface ISysUserService /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛 - * + * * @param user 鐢ㄦ埛淇℃伅 * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅 */ @@ -37,7 +36,7 @@ public interface ISysUserService /** * 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤鎴 - * + * * @param userName 鐢ㄦ埛鍚 * @return 鐢ㄦ埛瀵硅薄淇℃伅 */ @@ -45,7 +44,7 @@ public interface ISysUserService /** * 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛 - * + * * @param userId 鐢ㄦ埛ID * @return 鐢ㄦ埛瀵硅薄淇℃伅 */ @@ -53,7 +52,7 @@ public interface ISysUserService /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ鐢ㄦ埛鎵灞炶鑹茬粍 - * + * * @param userName 鐢ㄦ埛鍚 * @return 缁撴灉 */ @@ -61,7 +60,7 @@ public interface ISysUserService /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ鐢ㄦ埛鎵灞炲矖浣嶇粍 - * + * * @param userName 鐢ㄦ埛鍚 * @return 缁撴灉 */ @@ -69,7 +68,7 @@ public interface ISysUserService /** * 鏍￠獙鐢ㄦ埛鍚嶇О鏄惁鍞竴 - * + * * @param userName 鐢ㄦ埛鍚嶇О * @return 缁撴灉 */ @@ -93,21 +92,21 @@ public interface ISysUserService /** * 鏍￠獙鐢ㄦ埛鏄惁鍏佽鎿嶄綔 - * + * * @param user 鐢ㄦ埛淇℃伅 */ public void checkUserAllowed(SysUser user); /** * 鏍￠獙鐢ㄦ埛鏄惁鏈夋暟鎹潈闄 - * + * * @param userId 鐢ㄦ埛id */ public void checkUserDataScope(Long userId); /** * 鏂板鐢ㄦ埛淇℃伅 - * + * * @param user 鐢ㄦ埛淇℃伅 * @return 缁撴灉 */ @@ -115,7 +114,7 @@ public interface ISysUserService /** * 娉ㄥ唽鐢ㄦ埛淇℃伅 - * + * * @param user 鐢ㄦ埛淇℃伅 * @return 缁撴灉 */ @@ -123,7 +122,7 @@ public interface ISysUserService /** * 淇敼鐢ㄦ埛淇℃伅 - * + * * @param user 鐢ㄦ埛淇℃伅 * @return 缁撴灉 */ @@ -131,15 +130,15 @@ public interface ISysUserService /** * 鐢ㄦ埛鎺堟潈瑙掕壊 - * - * @param userId 鐢ㄦ埛ID + * + * @param userId 鐢ㄦ埛ID * @param roleIds 瑙掕壊缁 */ public void insertUserAuth(Long userId, Long[] roleIds); /** * 淇敼鐢ㄦ埛鐘舵 - * + * * @param user 鐢ㄦ埛淇℃伅 * @return 缁撴灉 */ @@ -147,7 +146,7 @@ public interface ISysUserService /** * 淇敼鐢ㄦ埛鍩烘湰淇℃伅 - * + * * @param user 鐢ㄦ埛淇℃伅 * @return 缁撴灉 */ @@ -155,16 +154,16 @@ public interface ISysUserService /** * 淇敼鐢ㄦ埛澶村儚 - * + * * @param userName 鐢ㄦ埛鍚 - * @param avatar 澶村儚鍦板潃 + * @param avatar 澶村儚鍦板潃 * @return 缁撴灉 */ public boolean updateUserAvatar(String userName, String avatar); /** * 閲嶇疆鐢ㄦ埛瀵嗙爜 - * + * * @param user 鐢ㄦ埛淇℃伅 * @return 缁撴灉 */ @@ -172,7 +171,7 @@ public interface ISysUserService /** * 閲嶇疆鐢ㄦ埛瀵嗙爜 - * + * * @param userName 鐢ㄦ埛鍚 * @param password 瀵嗙爜 * @return 缁撴灉 @@ -181,7 +180,7 @@ public interface ISysUserService /** * 閫氳繃鐢ㄦ埛ID鍒犻櫎鐢ㄦ埛 - * + * * @param userId 鐢ㄦ埛ID * @return 缁撴灉 */ @@ -189,7 +188,7 @@ public interface ISysUserService /** * 鎵归噺鍒犻櫎鐢ㄦ埛淇℃伅 - * + * * @param userIds 闇瑕佸垹闄ょ殑鐢ㄦ埛ID * @return 缁撴灉 */ @@ -197,10 +196,10 @@ public interface ISysUserService /** * 瀵煎叆鐢ㄦ埛鏁版嵁 - * - * @param userList 鐢ㄦ埛鏁版嵁鍒楄〃 + * + * @param userList 鐢ㄦ埛鏁版嵁鍒楄〃 * @param isUpdateSupport 鏄惁鏇存柊鏀寔锛屽鏋滃凡瀛樺湪锛屽垯杩涜鏇存柊鏁版嵁 - * @param operName 鎿嶄綔鐢ㄦ埛 + * @param operName 鎿嶄綔鐢ㄦ埛 * @return 缁撴灉 */ public String importUser(List userList, Boolean isUpdateSupport, String operName); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java index 36982541..50e635b0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java @@ -18,12 +18,11 @@ import java.util.List; /** * 鍙傛暟閰嶇疆 鏈嶅姟灞傚疄鐜 - * + * * @author ruoyi */ @Service -public class SysConfigServiceImpl implements ISysConfigService -{ +public class SysConfigServiceImpl implements ISysConfigService { @Autowired private SysConfigMapper configMapper; @@ -34,20 +33,18 @@ public class SysConfigServiceImpl implements ISysConfigService * 椤圭洰鍚姩鏃讹紝鍒濆鍖栧弬鏁板埌缂撳瓨 */ @PostConstruct - public void init() - { + public void init() { loadingConfigCache(); } /** * 鏌ヨ鍙傛暟閰嶇疆淇℃伅 - * + * * @param configId 鍙傛暟閰嶇疆ID * @return 鍙傛暟閰嶇疆淇℃伅 */ @Override - public SysConfig selectConfigById(Long configId) - { + public SysConfig selectConfigById(Long configId) { SysConfig config = new SysConfig(); config.setConfigId(configId); return configMapper.selectConfig(config); @@ -55,23 +52,20 @@ public class SysConfigServiceImpl implements ISysConfigService /** * 鏍规嵁閿悕鏌ヨ鍙傛暟閰嶇疆淇℃伅 - * + * * @param configKey 鍙傛暟key * @return 鍙傛暟閿 */ @Override - public String selectConfigByKey(String configKey) - { + public String selectConfigByKey(String configKey) { String configValue = Convert.toStr(redisService.getCacheObject(getCacheKey(configKey))); - if (StringUtils.isNotEmpty(configValue)) - { + if (StringUtils.isNotEmpty(configValue)) { return configValue; } SysConfig config = new SysConfig(); config.setConfigKey(configKey); SysConfig retConfig = configMapper.selectConfig(config); - if (StringUtils.isNotNull(retConfig)) - { + if (StringUtils.isNotNull(retConfig)) { redisService.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue()); return retConfig.getConfigValue(); } @@ -80,28 +74,25 @@ public class SysConfigServiceImpl implements ISysConfigService /** * 鏌ヨ鍙傛暟閰嶇疆鍒楄〃 - * + * * @param config 鍙傛暟閰嶇疆淇℃伅 * @return 鍙傛暟閰嶇疆闆嗗悎 */ @Override - public List selectConfigList(SysConfig config) - { + public List selectConfigList(SysConfig config) { return configMapper.selectConfigList(config); } /** * 鏂板鍙傛暟閰嶇疆 - * + * * @param config 鍙傛暟閰嶇疆淇℃伅 * @return 缁撴灉 */ @Override - public int insertConfig(SysConfig config) - { + public int insertConfig(SysConfig config) { int row = configMapper.insertConfig(config); - if (row > 0) - { + if (row > 0) { redisService.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); } return row; @@ -109,16 +100,14 @@ public class SysConfigServiceImpl implements ISysConfigService /** * 淇敼鍙傛暟閰嶇疆 - * + * * @param config 鍙傛暟閰嶇疆淇℃伅 * @return 缁撴灉 */ @Override - public int updateConfig(SysConfig config) - { + public int updateConfig(SysConfig config) { int row = configMapper.updateConfig(config); - if (row > 0) - { + if (row > 0) { redisService.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); } return row; @@ -126,17 +115,14 @@ public class SysConfigServiceImpl implements ISysConfigService /** * 鎵归噺鍒犻櫎鍙傛暟淇℃伅 - * + * * @param configIds 闇瑕佸垹闄ょ殑鍙傛暟ID */ @Override - public void deleteConfigByIds(Long[] configIds) - { - for (Long configId : configIds) - { + public void deleteConfigByIds(Long[] configIds) { + for (Long configId : configIds) { SysConfig config = selectConfigById(configId); - if (StringUtils.equals(UserConstants.YES, config.getConfigType())) - { + if (StringUtils.equals(UserConstants.YES, config.getConfigType())) { throw new ServiceException(String.format("鍐呯疆鍙傛暟銆%1$s銆戜笉鑳藉垹闄 ", config.getConfigKey())); } configMapper.deleteConfigById(configId); @@ -148,11 +134,9 @@ public class SysConfigServiceImpl implements ISysConfigService * 鍔犺浇鍙傛暟缂撳瓨鏁版嵁 */ @Override - public void loadingConfigCache() - { + public void loadingConfigCache() { List configsList = configMapper.selectConfigList(new SysConfig()); - for (SysConfig config : configsList) - { + for (SysConfig config : configsList) { redisService.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); } } @@ -161,8 +145,7 @@ public class SysConfigServiceImpl implements ISysConfigService * 娓呯┖鍙傛暟缂撳瓨鏁版嵁 */ @Override - public void clearConfigCache() - { + public void clearConfigCache() { Collection keys = redisService.keys(Constants.SYS_CONFIG_KEY + "*"); redisService.deleteObject(keys); } @@ -171,25 +154,22 @@ public class SysConfigServiceImpl implements ISysConfigService * 閲嶇疆鍙傛暟缂撳瓨鏁版嵁 */ @Override - public void resetConfigCache() - { + public void resetConfigCache() { clearConfigCache(); loadingConfigCache(); } /** * 鏍￠獙鍙傛暟閿悕鏄惁鍞竴 - * + * * @param config 鍙傛暟閰嶇疆淇℃伅 * @return 缁撴灉 */ @Override - public String checkConfigKeyUnique(SysConfig config) - { + public String checkConfigKeyUnique(SysConfig config) { Long configId = StringUtils.isNull(config.getConfigId()) ? -1L : config.getConfigId(); SysConfig info = configMapper.checkConfigKeyUnique(config.getConfigKey()); - if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue()) - { + if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue()) { return UserConstants.NOT_UNIQUE; } return UserConstants.UNIQUE; @@ -197,12 +177,11 @@ public class SysConfigServiceImpl implements ISysConfigService /** * 璁剧疆cache key - * + * * @param configKey 鍙傛暟閿 * @return 缂撳瓨閿甼ey */ - private String getCacheKey(String configKey) - { + private String getCacheKey(String configKey) { return Constants.SYS_CONFIG_KEY + configKey; } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index 0e71ae26..8fe4a496 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -24,12 +24,11 @@ import java.util.stream.Collectors; /** * 閮ㄩ棬绠＄悊 鏈嶅姟瀹炵幇 - * + * * @author ruoyi */ @Service -public class SysDeptServiceImpl implements ISysDeptService -{ +public class SysDeptServiceImpl implements ISysDeptService { @Autowired private SysDeptMapper deptMapper; @@ -38,43 +37,37 @@ public class SysDeptServiceImpl implements ISysDeptService /** * 鏌ヨ閮ㄩ棬绠＄悊鏁版嵁 - * + * * @param dept 閮ㄩ棬淇℃伅 * @return 閮ㄩ棬淇℃伅闆嗗悎 */ @Override @DataScope(deptAlias = "d") - public List selectDeptList(SysDept dept) - { + public List selectDeptList(SysDept dept) { return deptMapper.selectDeptList(dept); } /** * 鏋勫缓鍓嶇鎵闇瑕佹爲缁撴瀯 - * + * * @param depts 閮ㄩ棬鍒楄〃 * @return 鏍戠粨鏋勫垪琛 */ @Override - public List buildDeptTree(List depts) - { + public List buildDeptTree(List depts) { List returnList = new ArrayList(); List tempList = new ArrayList(); - for (SysDept dept : depts) - { + for (SysDept dept : depts) { tempList.add(dept.getDeptId()); } - for (SysDept dept : depts) - { + for (SysDept dept : depts) { // 濡傛灉鏄《绾ц妭鐐, 閬嶅巻璇ョ埗鑺傜偣鐨勬墍鏈夊瓙鑺傜偣 - if (!tempList.contains(dept.getParentId())) - { + if (!tempList.contains(dept.getParentId())) { recursionFn(depts, dept); returnList.add(dept); } } - if (returnList.isEmpty()) - { + if (returnList.isEmpty()) { returnList = depts; } return returnList; @@ -82,93 +75,85 @@ public class SysDeptServiceImpl implements ISysDeptService /** * 鏋勫缓鍓嶇鎵闇瑕佷笅鎷夋爲缁撴瀯 - * + * * @param depts 閮ㄩ棬鍒楄〃 * @return 涓嬫媺鏍戠粨鏋勫垪琛 */ @Override - public List buildDeptTreeSelect(List depts) - { + public List buildDeptTreeSelect(List depts) { List deptTrees = buildDeptTree(depts); return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList()); } /** * 鏍规嵁瑙掕壊ID鏌ヨ閮ㄩ棬鏍戜俊鎭 - * + * * @param roleId 瑙掕壊ID * @return 閫変腑閮ㄩ棬鍒楄〃 */ @Override - public List selectDeptListByRoleId(Long roleId) - { + public List selectDeptListByRoleId(Long roleId) { SysRole role = roleMapper.selectRoleById(roleId); return deptMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly()); } /** * 鏍规嵁閮ㄩ棬ID鏌ヨ淇℃伅 - * + * * @param deptId 閮ㄩ棬ID * @return 閮ㄩ棬淇℃伅 */ @Override - public SysDept selectDeptById(Long deptId) - { + public SysDept selectDeptById(Long deptId) { return deptMapper.selectDeptById(deptId); } /** * 鏍规嵁ID鏌ヨ鎵鏈夊瓙閮ㄩ棬锛堟甯哥姸鎬侊級 - * + * * @param deptId 閮ㄩ棬ID * @return 瀛愰儴闂ㄦ暟 */ @Override - public int selectNormalChildrenDeptById(Long deptId) - { + public int selectNormalChildrenDeptById(Long deptId) { return deptMapper.selectNormalChildrenDeptById(deptId); } /** * 鏄惁瀛樺湪瀛愯妭鐐 - * + * * @param deptId 閮ㄩ棬ID * @return 缁撴灉 */ @Override - public boolean hasChildByDeptId(Long deptId) - { + public boolean hasChildByDeptId(Long deptId) { int result = deptMapper.hasChildByDeptId(deptId); return result > 0 ? true : false; } /** * 鏌ヨ閮ㄩ棬鏄惁瀛樺湪鐢ㄦ埛 - * + * * @param deptId 閮ㄩ棬ID * @return 缁撴灉 true 瀛樺湪 false 涓嶅瓨鍦 */ @Override - public boolean checkDeptExistUser(Long deptId) - { + public boolean checkDeptExistUser(Long deptId) { int result = deptMapper.checkDeptExistUser(deptId); return result > 0 ? true : false; } /** * 鏍￠獙閮ㄩ棬鍚嶇О鏄惁鍞竴 - * + * * @param dept 閮ㄩ棬淇℃伅 * @return 缁撴灉 */ @Override - public String checkDeptNameUnique(SysDept dept) - { + public String checkDeptNameUnique(SysDept dept) { Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId(); SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId()); - if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue()) - { + if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue()) { return UserConstants.NOT_UNIQUE; } return UserConstants.UNIQUE; @@ -176,19 +161,16 @@ public class SysDeptServiceImpl implements ISysDeptService /** * 鏍￠獙閮ㄩ棬鏄惁鏈夋暟鎹潈闄 - * + * * @param deptId 閮ㄩ棬id */ @Override - public void checkDeptDataScope(Long deptId) - { - if (!SysUser.isAdmin(SecurityUtils.getUserId())) - { + public void checkDeptDataScope(Long deptId) { + if (!SysUser.isAdmin(SecurityUtils.getUserId())) { SysDept dept = new SysDept(); dept.setDeptId(deptId); List depts = SpringUtils.getAopProxy(this).selectDeptList(dept); - if (StringUtils.isEmpty(depts)) - { + if (StringUtils.isEmpty(depts)) { throw new ServiceException("娌℃湁鏉冮檺璁块棶閮ㄩ棬鏁版嵁锛"); } } @@ -196,17 +178,15 @@ public class SysDeptServiceImpl implements ISysDeptService /** * 鏂板淇濆瓨閮ㄩ棬淇℃伅 - * + * * @param dept 閮ㄩ棬淇℃伅 * @return 缁撴灉 */ @Override - public int insertDept(SysDept dept) - { + public int insertDept(SysDept dept) { SysDept info = deptMapper.selectDeptById(dept.getParentId()); // 濡傛灉鐖惰妭鐐逛笉涓烘甯哥姸鎬,鍒欎笉鍏佽鏂板瀛愯妭鐐 - if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) - { + if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) { throw new ServiceException("閮ㄩ棬鍋滅敤锛屼笉鍏佽鏂板"); } dept.setAncestors(info.getAncestors() + "," + dept.getParentId()); @@ -215,17 +195,15 @@ public class SysDeptServiceImpl implements ISysDeptService /** * 淇敼淇濆瓨閮ㄩ棬淇℃伅 - * + * * @param dept 閮ㄩ棬淇℃伅 * @return 缁撴灉 */ @Override - public int updateDept(SysDept dept) - { + public int updateDept(SysDept dept) { SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId()); SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId()); - if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept)) - { + if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept)) { String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId(); String oldAncestors = oldDept.getAncestors(); dept.setAncestors(newAncestors); @@ -233,8 +211,7 @@ public class SysDeptServiceImpl implements ISysDeptService } int result = deptMapper.updateDept(dept); if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()) && StringUtils.isNotEmpty(dept.getAncestors()) - && !StringUtils.equals("0", dept.getAncestors())) - { + && !StringUtils.equals("0", dept.getAncestors())) { // 濡傛灉璇ラ儴闂ㄦ槸鍚敤鐘舵侊紝鍒欏惎鐢ㄨ閮ㄩ棬鐨勬墍鏈変笂绾ч儴闂 updateParentDeptStatusNormal(dept); } @@ -243,11 +220,10 @@ public class SysDeptServiceImpl implements ISysDeptService /** * 淇敼璇ラ儴闂ㄧ殑鐖剁骇閮ㄩ棬鐘舵 - * + * * @param dept 褰撳墠閮ㄩ棬 */ - private void updateParentDeptStatusNormal(SysDept dept) - { + private void updateParentDeptStatusNormal(SysDept dept) { String ancestors = dept.getAncestors(); Long[] deptIds = Convert.toLongArray(ancestors); deptMapper.updateDeptStatusNormal(deptIds); @@ -255,48 +231,41 @@ public class SysDeptServiceImpl implements ISysDeptService /** * 淇敼瀛愬厓绱犲叧绯 - * - * @param deptId 琚慨鏀圭殑閮ㄩ棬ID + * + * @param deptId 琚慨鏀圭殑閮ㄩ棬ID * @param newAncestors 鏂扮殑鐖禝D闆嗗悎 * @param oldAncestors 鏃х殑鐖禝D闆嗗悎 */ - public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) - { + public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) { List children = deptMapper.selectChildrenDeptById(deptId); - for (SysDept child : children) - { + for (SysDept child : children) { child.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors)); } - if (children.size() > 0) - { + if (children.size() > 0) { deptMapper.updateDeptChildren(children); } } /** * 鍒犻櫎閮ㄩ棬绠＄悊淇℃伅 - * + * * @param deptId 閮ㄩ棬ID * @return 缁撴灉 */ @Override - public int deleteDeptById(Long deptId) - { + public int deleteDeptById(Long deptId) { return deptMapper.deleteDeptById(deptId); } /** * 閫掑綊鍒楄〃 */ - private void recursionFn(List list, SysDept t) - { + private void recursionFn(List list, SysDept t) { // 寰楀埌瀛愯妭鐐瑰垪琛 List childList = getChildList(list, t); t.setChildren(childList); - for (SysDept tChild : childList) - { - if (hasChild(list, tChild)) - { + for (SysDept tChild : childList) { + if (hasChild(list, tChild)) { recursionFn(list, tChild); } } @@ -305,15 +274,12 @@ public class SysDeptServiceImpl implements ISysDeptService /** * 寰楀埌瀛愯妭鐐瑰垪琛 */ - private List getChildList(List list, SysDept t) - { + private List getChildList(List list, SysDept t) { List tlist = new ArrayList(); Iterator it = list.iterator(); - while (it.hasNext()) - { + while (it.hasNext()) { SysDept n = (SysDept) it.next(); - if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) - { + if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) { tlist.add(n); } } @@ -323,8 +289,7 @@ public class SysDeptServiceImpl implements ISysDeptService /** * 鍒ゆ柇鏄惁鏈夊瓙鑺傜偣 */ - private boolean hasChild(List list, SysDept t) - { + private boolean hasChild(List list, SysDept t) { return getChildList(list, t).size() > 0 ? true : false; } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java index 4b1a0014..d4142c1c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java @@ -11,62 +11,56 @@ import java.util.List; /** * 瀛楀吀 涓氬姟灞傚鐞 - * + * * @author ruoyi */ @Service -public class SysDictDataServiceImpl implements ISysDictDataService -{ +public class SysDictDataServiceImpl implements ISysDictDataService { @Autowired private SysDictDataMapper dictDataMapper; /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瀛楀吀鏁版嵁 - * + * * @param dictData 瀛楀吀鏁版嵁淇℃伅 * @return 瀛楀吀鏁版嵁闆嗗悎淇℃伅 */ @Override - public List selectDictDataList(SysDictData dictData) - { + public List selectDictDataList(SysDictData dictData) { return dictDataMapper.selectDictDataList(dictData); } /** * 鏍规嵁瀛楀吀绫诲瀷鍜屽瓧鍏搁敭鍊兼煡璇㈠瓧鍏告暟鎹俊鎭 - * - * @param dictType 瀛楀吀绫诲瀷 + * + * @param dictType 瀛楀吀绫诲瀷 * @param dictValue 瀛楀吀閿 * @return 瀛楀吀鏍囩 */ @Override - public String selectDictLabel(String dictType, String dictValue) - { + public String selectDictLabel(String dictType, String dictValue) { return dictDataMapper.selectDictLabel(dictType, dictValue); } /** * 鏍规嵁瀛楀吀鏁版嵁ID鏌ヨ淇℃伅 - * + * * @param dictCode 瀛楀吀鏁版嵁ID * @return 瀛楀吀鏁版嵁 */ @Override - public SysDictData selectDictDataById(Long dictCode) - { + public SysDictData selectDictDataById(Long dictCode) { return dictDataMapper.selectDictDataById(dictCode); } /** * 鎵归噺鍒犻櫎瀛楀吀鏁版嵁淇℃伅 - * + * * @param dictCodes 闇瑕佸垹闄ょ殑瀛楀吀鏁版嵁ID */ @Override - public void deleteDictDataByIds(Long[] dictCodes) - { - for (Long dictCode : dictCodes) - { + public void deleteDictDataByIds(Long[] dictCodes) { + for (Long dictCode : dictCodes) { SysDictData data = selectDictDataById(dictCode); dictDataMapper.deleteDictDataById(dictCode); List dictDatas = dictDataMapper.selectDictDataByType(data.getDictType()); @@ -76,16 +70,14 @@ public class SysDictDataServiceImpl implements ISysDictDataService /** * 鏂板淇濆瓨瀛楀吀鏁版嵁淇℃伅 - * + * * @param data 瀛楀吀鏁版嵁淇℃伅 * @return 缁撴灉 */ @Override - public int insertDictData(SysDictData data) - { + public int insertDictData(SysDictData data) { int row = dictDataMapper.insertDictData(data); - if (row > 0) - { + if (row > 0) { List dictDatas = dictDataMapper.selectDictDataByType(data.getDictType()); DictUtils.setDictCache(data.getDictType(), dictDatas); } @@ -94,16 +86,14 @@ public class SysDictDataServiceImpl implements ISysDictDataService /** * 淇敼淇濆瓨瀛楀吀鏁版嵁淇℃伅 - * + * * @param data 瀛楀吀鏁版嵁淇℃伅 * @return 缁撴灉 */ @Override - public int updateDictData(SysDictData data) - { + public int updateDictData(SysDictData data) { int row = dictDataMapper.updateDictData(data); - if (row > 0) - { + if (row > 0) { List dictDatas = dictDataMapper.selectDictDataByType(data.getDictType()); DictUtils.setDictCache(data.getDictType(), dictDatas); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java index 2ba5f1b9..2a474c93 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java @@ -21,12 +21,11 @@ import java.util.stream.Collectors; /** * 瀛楀吀 涓氬姟灞傚鐞 - * + * * @author ruoyi */ @Service -public class SysDictTypeServiceImpl implements ISysDictTypeService -{ +public class SysDictTypeServiceImpl implements ISysDictTypeService { @Autowired private SysDictTypeMapper dictTypeMapper; @@ -37,51 +36,45 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService * 椤圭洰鍚姩鏃讹紝鍒濆鍖栧瓧鍏稿埌缂撳瓨 */ @PostConstruct - public void init() - { + public void init() { loadingDictCache(); } /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瀛楀吀绫诲瀷 - * + * * @param dictType 瀛楀吀绫诲瀷淇℃伅 * @return 瀛楀吀绫诲瀷闆嗗悎淇℃伅 */ @Override - public List selectDictTypeList(SysDictType dictType) - { + public List selectDictTypeList(SysDictType dictType) { return dictTypeMapper.selectDictTypeList(dictType); } /** * 鏍规嵁鎵鏈夊瓧鍏哥被鍨 - * + * * @return 瀛楀吀绫诲瀷闆嗗悎淇℃伅 */ @Override - public List selectDictTypeAll() - { + public List selectDictTypeAll() { return dictTypeMapper.selectDictTypeAll(); } /** * 鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁 - * + * * @param dictType 瀛楀吀绫诲瀷 * @return 瀛楀吀鏁版嵁闆嗗悎淇℃伅 */ @Override - public List selectDictDataByType(String dictType) - { + public List selectDictDataByType(String dictType) { List dictDatas = DictUtils.getDictCache(dictType); - if (StringUtils.isNotEmpty(dictDatas)) - { + if (StringUtils.isNotEmpty(dictDatas)) { return dictDatas; } dictDatas = dictDataMapper.selectDictDataByType(dictType); - if (StringUtils.isNotEmpty(dictDatas)) - { + if (StringUtils.isNotEmpty(dictDatas)) { DictUtils.setDictCache(dictType, dictDatas); return dictDatas; } @@ -90,41 +83,36 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService /** * 鏍规嵁瀛楀吀绫诲瀷ID鏌ヨ淇℃伅 - * + * * @param dictId 瀛楀吀绫诲瀷ID * @return 瀛楀吀绫诲瀷 */ @Override - public SysDictType selectDictTypeById(Long dictId) - { + public SysDictType selectDictTypeById(Long dictId) { return dictTypeMapper.selectDictTypeById(dictId); } /** * 鏍规嵁瀛楀吀绫诲瀷鏌ヨ淇℃伅 - * + * * @param dictType 瀛楀吀绫诲瀷 * @return 瀛楀吀绫诲瀷 */ @Override - public SysDictType selectDictTypeByType(String dictType) - { + public SysDictType selectDictTypeByType(String dictType) { return dictTypeMapper.selectDictTypeByType(dictType); } /** * 鎵归噺鍒犻櫎瀛楀吀绫诲瀷淇℃伅 - * + * * @param dictIds 闇瑕佸垹闄ょ殑瀛楀吀ID */ @Override - public void deleteDictTypeByIds(Long[] dictIds) - { - for (Long dictId : dictIds) - { + public void deleteDictTypeByIds(Long[] dictIds) { + for (Long dictId : dictIds) { SysDictType dictType = selectDictTypeById(dictId); - if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0) - { + if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0) { throw new ServiceException(String.format("%1$s宸插垎閰,涓嶈兘鍒犻櫎", dictType.getDictName())); } dictTypeMapper.deleteDictTypeById(dictId); @@ -136,13 +124,11 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService * 鍔犺浇瀛楀吀缂撳瓨鏁版嵁 */ @Override - public void loadingDictCache() - { + public void loadingDictCache() { SysDictData dictData = new SysDictData(); dictData.setStatus("0"); Map> dictDataMap = dictDataMapper.selectDictDataList(dictData).stream().collect(Collectors.groupingBy(SysDictData::getDictType)); - for (Map.Entry> entry : dictDataMap.entrySet()) - { + for (Map.Entry> entry : dictDataMap.entrySet()) { DictUtils.setDictCache(entry.getKey(), entry.getValue().stream().sorted(Comparator.comparing(SysDictData::getDictSort)).collect(Collectors.toList())); } } @@ -151,8 +137,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService * 娓呯┖瀛楀吀缂撳瓨鏁版嵁 */ @Override - public void clearDictCache() - { + public void clearDictCache() { DictUtils.clearDictCache(); } @@ -160,24 +145,21 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService * 閲嶇疆瀛楀吀缂撳瓨鏁版嵁 */ @Override - public void resetDictCache() - { + public void resetDictCache() { clearDictCache(); loadingDictCache(); } /** * 鏂板淇濆瓨瀛楀吀绫诲瀷淇℃伅 - * + * * @param dict 瀛楀吀绫诲瀷淇℃伅 * @return 缁撴灉 */ @Override - public int insertDictType(SysDictType dict) - { + public int insertDictType(SysDictType dict) { int row = dictTypeMapper.insertDictType(dict); - if (row > 0) - { + if (row > 0) { DictUtils.setDictCache(dict.getDictType(), null); } return row; @@ -185,19 +167,17 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService /** * 淇敼淇濆瓨瀛楀吀绫诲瀷淇℃伅 - * + * * @param dict 瀛楀吀绫诲瀷淇℃伅 * @return 缁撴灉 */ @Override @Transactional(rollbackFor = Exception.class) - public int updateDictType(SysDictType dict) - { + public int updateDictType(SysDictType dict) { SysDictType oldDict = dictTypeMapper.selectDictTypeById(dict.getDictId()); dictDataMapper.updateDictDataType(oldDict.getDictType(), dict.getDictType()); int row = dictTypeMapper.updateDictType(dict); - if (row > 0) - { + if (row > 0) { List dictDatas = dictDataMapper.selectDictDataByType(dict.getDictType()); DictUtils.setDictCache(dict.getDictType(), dictDatas); } @@ -206,17 +186,15 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService /** * 鏍￠獙瀛楀吀绫诲瀷绉版槸鍚﹀敮涓 - * + * * @param dict 瀛楀吀绫诲瀷 * @return 缁撴灉 */ @Override - public String checkDictTypeUnique(SysDictType dict) - { + public String checkDictTypeUnique(SysDictType dict) { Long dictId = StringUtils.isNull(dict.getDictId()) ? -1L : dict.getDictId(); SysDictType dictType = dictTypeMapper.checkDictTypeUnique(dict.getDictType()); - if (StringUtils.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue()) - { + if (StringUtils.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue()) { return UserConstants.NOT_UNIQUE; } return UserConstants.UNIQUE; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java index f3f1d167..fc631bcb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java @@ -10,48 +10,44 @@ import java.util.List; /** * 绯荤粺璁块棶鏃ュ織鎯呭喌淇℃伅 鏈嶅姟灞傚鐞 - * + * * @author ruoyi */ @Service -public class SysLogininforServiceImpl implements ISysLogininforService -{ +public class SysLogininforServiceImpl implements ISysLogininforService { @Autowired private SysLogininforMapper logininforMapper; /** * 鏂板绯荤粺鐧诲綍鏃ュ織 - * + * * @param logininfor 璁块棶鏃ュ織瀵硅薄 */ @Override - public int insertLogininfor(SysLogininfor logininfor) - { + public int insertLogininfor(SysLogininfor logininfor) { return logininforMapper.insertLogininfor(logininfor); } /** * 鏌ヨ绯荤粺鐧诲綍鏃ュ織闆嗗悎 - * + * * @param logininfor 璁块棶鏃ュ織瀵硅薄 * @return 鐧诲綍璁板綍闆嗗悎 */ @Override - public List selectLogininforList(SysLogininfor logininfor) - { + public List selectLogininforList(SysLogininfor logininfor) { return logininforMapper.selectLogininforList(logininfor); } /** * 鎵归噺鍒犻櫎绯荤粺鐧诲綍鏃ュ織 - * + * * @param infoIds 闇瑕佸垹闄ょ殑鐧诲綍鏃ュ織ID * @return 缁撴灉 */ @Override - public int deleteLogininforByIds(Long[] infoIds) - { + public int deleteLogininforByIds(Long[] infoIds) { return logininforMapper.deleteLogininforByIds(infoIds); } @@ -59,8 +55,7 @@ public class SysLogininforServiceImpl implements ISysLogininforService * 娓呯┖绯荤粺鐧诲綍鏃ュ織 */ @Override - public void cleanLogininfor() - { + public void cleanLogininfor() { logininforMapper.cleanLogininfor(); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java index 5db0eb3f..8bee8ae4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java @@ -22,12 +22,11 @@ import java.util.stream.Collectors; /** * 鑿滃崟 涓氬姟灞傚鐞 - * + * * @author ruoyi */ @Service -public class SysMenuServiceImpl implements ISysMenuService -{ +public class SysMenuServiceImpl implements ISysMenuService { public static final String PREMISSION_STRING = "perms[\"{0}\"]"; @Autowired @@ -41,33 +40,28 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃 - * + * * @param userId 鐢ㄦ埛ID * @return 鑿滃崟鍒楄〃 */ @Override - public List selectMenuList(Long userId) - { + public List selectMenuList(Long userId) { return selectMenuList(new SysMenu(), userId); } /** * 鏌ヨ绯荤粺鑿滃崟鍒楄〃 - * + * * @param menu 鑿滃崟淇℃伅 * @return 鑿滃崟鍒楄〃 */ @Override - public List selectMenuList(SysMenu menu, Long userId) - { + public List selectMenuList(SysMenu menu, Long userId) { List menuList = null; // 绠＄悊鍛樻樉绀烘墍鏈夎彍鍗曚俊鎭 - if (SysUser.isAdmin(userId)) - { + if (SysUser.isAdmin(userId)) { menuList = menuMapper.selectMenuList(menu); - } - else - { + } else { menu.getParams().put("userId", userId); menuList = menuMapper.selectMenuListByUserId(menu); } @@ -76,19 +70,16 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ鏉冮檺 - * + * * @param userId 鐢ㄦ埛ID * @return 鏉冮檺鍒楄〃 */ @Override - public Set selectMenuPermsByUserId(Long userId) - { + public Set selectMenuPermsByUserId(Long userId) { List perms = menuMapper.selectMenuPermsByUserId(userId); Set permsSet = new HashSet<>(); - for (String perm : perms) - { - if (StringUtils.isNotEmpty(perm)) - { + for (String perm : perms) { + if (StringUtils.isNotEmpty(perm)) { permsSet.addAll(Arrays.asList(perm.trim().split(","))); } } @@ -97,20 +88,16 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ鑿滃崟 - * + * * @param userId 鐢ㄦ埛鍚嶇О * @return 鑿滃崟鍒楄〃 */ @Override - public List selectMenuTreeByUserId(Long userId) - { + public List selectMenuTreeByUserId(Long userId) { List menus = null; - if (SecurityUtils.isAdmin(userId)) - { + if (SecurityUtils.isAdmin(userId)) { menus = menuMapper.selectMenuTreeAll(); - } - else - { + } else { menus = menuMapper.selectMenuTreeByUserId(userId); } return getChildPerms(menus, 0); @@ -118,29 +105,26 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 鏍规嵁瑙掕壊ID鏌ヨ鑿滃崟鏍戜俊鎭 - * + * * @param roleId 瑙掕壊ID * @return 閫変腑鑿滃崟鍒楄〃 */ @Override - public List selectMenuListByRoleId(Long roleId) - { + public List selectMenuListByRoleId(Long roleId) { SysRole role = roleMapper.selectRoleById(roleId); return menuMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly()); } /** * 鏋勫缓鍓嶇璺敱鎵闇瑕佺殑鑿滃崟 - * + * * @param menus 鑿滃崟鍒楄〃 * @return 璺敱鍒楄〃 */ @Override - public List buildMenus(List menus) - { + public List buildMenus(List menus) { List routers = new LinkedList(); - for (SysMenu menu : menus) - { + for (SysMenu menu : menus) { RouterVo router = new RouterVo(); router.setHidden("1".equals(menu.getVisible())); router.setName(getRouteName(menu)); @@ -149,14 +133,11 @@ public class SysMenuServiceImpl implements ISysMenuService router.setQuery(menu.getQuery()); router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); List cMenus = menu.getChildren(); - if (!cMenus.isEmpty() && cMenus.size() > 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType())) - { + if (!cMenus.isEmpty() && cMenus.size() > 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType())) { router.setAlwaysShow(true); router.setRedirect("noRedirect"); router.setChildren(buildMenus(cMenus)); - } - else if (isMenuFrame(menu)) - { + } else if (isMenuFrame(menu)) { router.setMeta(null); List childrenList = new ArrayList(); RouterVo children = new RouterVo(); @@ -167,9 +148,7 @@ public class SysMenuServiceImpl implements ISysMenuService children.setQuery(menu.getQuery()); childrenList.add(children); router.setChildren(childrenList); - } - else if (menu.getParentId().intValue() == 0 && isInnerLink(menu)) - { + } else if (menu.getParentId().intValue() == 0 && isInnerLink(menu)) { router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon())); router.setPath("/"); List childrenList = new ArrayList(); @@ -189,31 +168,26 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 鏋勫缓鍓嶇鎵闇瑕佹爲缁撴瀯 - * + * * @param menus 鑿滃崟鍒楄〃 * @return 鏍戠粨鏋勫垪琛 */ @Override - public List buildMenuTree(List menus) - { + public List buildMenuTree(List menus) { List returnList = new ArrayList(); List tempList = new ArrayList(); - for (SysMenu dept : menus) - { + for (SysMenu dept : menus) { tempList.add(dept.getMenuId()); } - for (Iterator iterator = menus.iterator(); iterator.hasNext();) - { + for (Iterator iterator = menus.iterator(); iterator.hasNext(); ) { SysMenu menu = (SysMenu) iterator.next(); // 濡傛灉鏄《绾ц妭鐐, 閬嶅巻璇ョ埗鑺傜偣鐨勬墍鏈夊瓙鑺傜偣 - if (!tempList.contains(menu.getParentId())) - { + if (!tempList.contains(menu.getParentId())) { recursionFn(menus, menu); returnList.add(menu); } } - if (returnList.isEmpty()) - { + if (returnList.isEmpty()) { returnList = menus; } return returnList; @@ -221,104 +195,95 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 鏋勫缓鍓嶇鎵闇瑕佷笅鎷夋爲缁撴瀯 - * + * * @param menus 鑿滃崟鍒楄〃 * @return 涓嬫媺鏍戠粨鏋勫垪琛 */ @Override - public List buildMenuTreeSelect(List menus) - { + public List buildMenuTreeSelect(List menus) { List menuTrees = buildMenuTree(menus); return menuTrees.stream().map(TreeSelect::new).collect(Collectors.toList()); } /** * 鏍规嵁鑿滃崟ID鏌ヨ淇℃伅 - * + * * @param menuId 鑿滃崟ID * @return 鑿滃崟淇℃伅 */ @Override - public SysMenu selectMenuById(Long menuId) - { + public SysMenu selectMenuById(Long menuId) { return menuMapper.selectMenuById(menuId); } /** * 鏄惁瀛樺湪鑿滃崟瀛愯妭鐐 - * + * * @param menuId 鑿滃崟ID * @return 缁撴灉 */ @Override - public boolean hasChildByMenuId(Long menuId) - { + public boolean hasChildByMenuId(Long menuId) { int result = menuMapper.hasChildByMenuId(menuId); return result > 0 ? true : false; } /** * 鏌ヨ鑿滃崟浣跨敤鏁伴噺 - * + * * @param menuId 鑿滃崟ID * @return 缁撴灉 */ @Override - public boolean checkMenuExistRole(Long menuId) - { + public boolean checkMenuExistRole(Long menuId) { int result = roleMenuMapper.checkMenuExistRole(menuId); return result > 0 ? true : false; } /** * 鏂板淇濆瓨鑿滃崟淇℃伅 - * + * * @param menu 鑿滃崟淇℃伅 * @return 缁撴灉 */ @Override - public int insertMenu(SysMenu menu) - { + public int insertMenu(SysMenu menu) { return menuMapper.insertMenu(menu); } /** * 淇敼淇濆瓨鑿滃崟淇℃伅 - * + * * @param menu 鑿滃崟淇℃伅 * @return 缁撴灉 */ @Override - public int updateMenu(SysMenu menu) - { + public int updateMenu(SysMenu menu) { return menuMapper.updateMenu(menu); } /** * 鍒犻櫎鑿滃崟绠＄悊淇℃伅 - * + * * @param menuId 鑿滃崟ID * @return 缁撴灉 */ @Override - public int deleteMenuById(Long menuId) - { + public int deleteMenuById(Long menuId) { return menuMapper.deleteMenuById(menuId); } /** * 鏍￠獙鑿滃崟鍚嶇О鏄惁鍞竴 - * + * * @param menu 鑿滃崟淇℃伅 * @return 缁撴灉 */ @Override - public String checkMenuNameUnique(SysMenu menu) - { + public String checkMenuNameUnique(SysMenu menu) { Long menuId = StringUtils.isNull(menu.getMenuId()) ? -1L : menu.getMenuId(); SysMenu info = menuMapper.checkMenuNameUnique(menu.getMenuName(), menu.getParentId()); - if (StringUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue()) - { + if (StringUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue()) { return UserConstants.NOT_UNIQUE; } return UserConstants.UNIQUE; @@ -326,16 +291,14 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 鑾峰彇璺敱鍚嶇О - * + * * @param menu 鑿滃崟淇℃伅 * @return 璺敱鍚嶇О */ - public String getRouteName(SysMenu menu) - { + public String getRouteName(SysMenu menu) { String routerName = StringUtils.capitalize(menu.getPath()); // 闈炲閾惧苟涓旀槸涓绾х洰褰曪紙绫诲瀷涓虹洰褰曪級 - if (isMenuFrame(menu)) - { + if (isMenuFrame(menu)) { routerName = StringUtils.EMPTY; } return routerName; @@ -343,27 +306,23 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 鑾峰彇璺敱鍦板潃 - * + * * @param menu 鑿滃崟淇℃伅 * @return 璺敱鍦板潃 */ - public String getRouterPath(SysMenu menu) - { + public String getRouterPath(SysMenu menu) { String routerPath = menu.getPath(); // 鍐呴摼鎵撳紑澶栫綉鏂瑰紡 - if (menu.getParentId().intValue() != 0 && isInnerLink(menu)) - { + if (menu.getParentId().intValue() != 0 && isInnerLink(menu)) { routerPath = innerLinkReplaceEach(routerPath); } // 闈炲閾惧苟涓旀槸涓绾х洰褰曪紙绫诲瀷涓虹洰褰曪級 if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType()) - && UserConstants.NO_FRAME.equals(menu.getIsFrame())) - { + && UserConstants.NO_FRAME.equals(menu.getIsFrame())) { routerPath = "/" + menu.getPath(); } // 闈炲閾惧苟涓旀槸涓绾х洰褰曪紙绫诲瀷涓鸿彍鍗曪級 - else if (isMenuFrame(menu)) - { + else if (isMenuFrame(menu)) { routerPath = "/"; } return routerPath; @@ -371,23 +330,17 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 鑾峰彇缁勪欢淇℃伅 - * + * * @param menu 鑿滃崟淇℃伅 * @return 缁勪欢淇℃伅 */ - public String getComponent(SysMenu menu) - { + public String getComponent(SysMenu menu) { String component = UserConstants.LAYOUT; - if (StringUtils.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu)) - { + if (StringUtils.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu)) { component = menu.getComponent(); - } - else if (StringUtils.isEmpty(menu.getComponent()) && menu.getParentId().intValue() != 0 && isInnerLink(menu)) - { + } else if (StringUtils.isEmpty(menu.getComponent()) && menu.getParentId().intValue() != 0 && isInnerLink(menu)) { component = UserConstants.INNER_LINK; - } - else if (StringUtils.isEmpty(menu.getComponent()) && isParentView(menu)) - { + } else if (StringUtils.isEmpty(menu.getComponent()) && isParentView(menu)) { component = UserConstants.PARENT_VIEW; } return component; @@ -395,54 +348,48 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 鏄惁涓鸿彍鍗曞唴閮ㄨ烦杞 - * + * * @param menu 鑿滃崟淇℃伅 * @return 缁撴灉 */ - public boolean isMenuFrame(SysMenu menu) - { + public boolean isMenuFrame(SysMenu menu) { return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType()) && menu.getIsFrame().equals(UserConstants.NO_FRAME); } /** * 鏄惁涓哄唴閾剧粍浠 - * + * * @param menu 鑿滃崟淇℃伅 * @return 缁撴灉 */ - public boolean isInnerLink(SysMenu menu) - { + public boolean isInnerLink(SysMenu menu) { return menu.getIsFrame().equals(UserConstants.NO_FRAME) && StringUtils.ishttp(menu.getPath()); } /** * 鏄惁涓簆arent_view缁勪欢 - * + * * @param menu 鑿滃崟淇℃伅 * @return 缁撴灉 */ - public boolean isParentView(SysMenu menu) - { + public boolean isParentView(SysMenu menu) { return menu.getParentId().intValue() != 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType()); } /** * 鏍规嵁鐖惰妭鐐圭殑ID鑾峰彇鎵鏈夊瓙鑺傜偣 - * - * @param list 鍒嗙被琛 + * + * @param list 鍒嗙被琛 * @param parentId 浼犲叆鐨勭埗鑺傜偣ID * @return String */ - public List getChildPerms(List list, int parentId) - { + public List getChildPerms(List list, int parentId) { List returnList = new ArrayList(); - for (Iterator iterator = list.iterator(); iterator.hasNext();) - { + for (Iterator iterator = list.iterator(); iterator.hasNext(); ) { SysMenu t = (SysMenu) iterator.next(); // 涓銆佹牴鎹紶鍏ョ殑鏌愪釜鐖惰妭鐐笽D,閬嶅巻璇ョ埗鑺傜偣鐨勬墍鏈夊瓙鑺傜偣 - if (t.getParentId() == parentId) - { + if (t.getParentId() == parentId) { recursionFn(list, t); returnList.add(t); } @@ -452,19 +399,16 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 閫掑綊鍒楄〃 - * + * * @param list * @param t */ - private void recursionFn(List list, SysMenu t) - { + private void recursionFn(List list, SysMenu t) { // 寰楀埌瀛愯妭鐐瑰垪琛 List childList = getChildList(list, t); t.setChildren(childList); - for (SysMenu tChild : childList) - { - if (hasChild(list, tChild)) - { + for (SysMenu tChild : childList) { + if (hasChild(list, tChild)) { recursionFn(list, tChild); } } @@ -473,15 +417,12 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 寰楀埌瀛愯妭鐐瑰垪琛 */ - private List getChildList(List list, SysMenu t) - { + private List getChildList(List list, SysMenu t) { List tlist = new ArrayList(); Iterator it = list.iterator(); - while (it.hasNext()) - { + while (it.hasNext()) { SysMenu n = (SysMenu) it.next(); - if (n.getParentId().longValue() == t.getMenuId().longValue()) - { + if (n.getParentId().longValue() == t.getMenuId().longValue()) { tlist.add(n); } } @@ -491,19 +432,17 @@ public class SysMenuServiceImpl implements ISysMenuService /** * 鍒ゆ柇鏄惁鏈夊瓙鑺傜偣 */ - private boolean hasChild(List list, SysMenu t) - { + private boolean hasChild(List list, SysMenu t) { return getChildList(list, t).size() > 0; } /** * 鍐呴摼鍩熷悕鐗规畩瀛楃鏇挎崲 - * + * * @return */ - public String innerLinkReplaceEach(String path) - { - return StringUtils.replaceEach(path, new String[] { Constants.HTTP, Constants.HTTPS }, - new String[] { "", "" }); + public String innerLinkReplaceEach(String path) { + return StringUtils.replaceEach(path, new String[]{Constants.HTTP, Constants.HTTPS}, + new String[]{"", ""}); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java index d3cfd6ab..97071ccd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java @@ -10,84 +10,77 @@ import java.util.List; /** * 鍏憡 鏈嶅姟灞傚疄鐜 - * + * * @author ruoyi */ @Service -public class SysNoticeServiceImpl implements ISysNoticeService -{ +public class SysNoticeServiceImpl implements ISysNoticeService { @Autowired private SysNoticeMapper noticeMapper; /** * 鏌ヨ鍏憡淇℃伅 - * + * * @param noticeId 鍏憡ID * @return 鍏憡淇℃伅 */ @Override - public SysNotice selectNoticeById(Long noticeId) - { + public SysNotice selectNoticeById(Long noticeId) { return noticeMapper.selectNoticeById(noticeId); } /** * 鏌ヨ鍏憡鍒楄〃 - * + * * @param notice 鍏憡淇℃伅 * @return 鍏憡闆嗗悎 */ @Override - public List selectNoticeList(SysNotice notice) - { + public List selectNoticeList(SysNotice notice) { return noticeMapper.selectNoticeList(notice); } /** * 鏂板鍏憡 - * + * * @param notice 鍏憡淇℃伅 * @return 缁撴灉 */ @Override - public int insertNotice(SysNotice notice) - { + public int insertNotice(SysNotice notice) { return noticeMapper.insertNotice(notice); } /** * 淇敼鍏憡 - * + * * @param notice 鍏憡淇℃伅 * @return 缁撴灉 */ @Override - public int updateNotice(SysNotice notice) - { + public int updateNotice(SysNotice notice) { return noticeMapper.updateNotice(notice); } /** * 鍒犻櫎鍏憡瀵硅薄 - * + * * @param noticeId 鍏憡ID * @return 缁撴灉 */ @Override - public int deleteNoticeById(Long noticeId) - { + public int deleteNoticeById(Long noticeId) { return noticeMapper.deleteNoticeById(noticeId); } /** * 鎵归噺鍒犻櫎鍏憡淇℃伅 - * + * * @param noticeIds 闇瑕佸垹闄ょ殑鍏憡ID * @return 缁撴灉 */ @Override - public int deleteNoticeByIds(Long[] noticeIds) - { + public int deleteNoticeByIds(Long[] noticeIds) { return noticeMapper.deleteNoticeByIds(noticeIds); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java index 0b5b65aa..7ad7400d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java @@ -10,60 +10,55 @@ import java.util.List; /** * 鎿嶄綔鏃ュ織 鏈嶅姟灞傚鐞 - * + * * @author ruoyi */ @Service -public class SysOperLogServiceImpl implements ISysOperLogService -{ +public class SysOperLogServiceImpl implements ISysOperLogService { @Autowired private SysOperLogMapper operLogMapper; /** * 鏂板鎿嶄綔鏃ュ織 - * + * * @param operLog 鎿嶄綔鏃ュ織瀵硅薄 * @return 缁撴灉 */ @Override - public int insertOperlog(SysOperLog operLog) - { + public int insertOperlog(SysOperLog operLog) { return operLogMapper.insertOperlog(operLog); } /** * 鏌ヨ绯荤粺鎿嶄綔鏃ュ織闆嗗悎 - * + * * @param operLog 鎿嶄綔鏃ュ織瀵硅薄 * @return 鎿嶄綔鏃ュ織闆嗗悎 */ @Override - public List selectOperLogList(SysOperLog operLog) - { + public List selectOperLogList(SysOperLog operLog) { return operLogMapper.selectOperLogList(operLog); } /** * 鎵归噺鍒犻櫎绯荤粺鎿嶄綔鏃ュ織 - * + * * @param operIds 闇瑕佸垹闄ょ殑鎿嶄綔鏃ュ織ID * @return 缁撴灉 */ @Override - public int deleteOperLogByIds(Long[] operIds) - { + public int deleteOperLogByIds(Long[] operIds) { return operLogMapper.deleteOperLogByIds(operIds); } /** * 鏌ヨ鎿嶄綔鏃ュ織璇︾粏 - * + * * @param operId 鎿嶄綔ID * @return 鎿嶄綔鏃ュ織瀵硅薄 */ @Override - public SysOperLog selectOperLogById(Long operId) - { + public SysOperLog selectOperLogById(Long operId) { return operLogMapper.selectOperLogById(operId); } @@ -71,8 +66,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService * 娓呯┖鎿嶄綔鏃ュ織 */ @Override - public void cleanOperLog() - { + public void cleanOperLog() { operLogMapper.cleanOperLog(); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java index 632a8814..5a0c84b5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java @@ -14,8 +14,7 @@ import java.util.Set; * @author pan */ @Service -public class SysPermissionServiceImpl implements ISysPermissionService -{ +public class SysPermissionServiceImpl implements ISysPermissionService { @Autowired private ISysRoleService roleService; @@ -24,21 +23,17 @@ public class SysPermissionServiceImpl implements ISysPermissionService /** * 鑾峰彇瑙掕壊鏁版嵁鏉冮檺 - * + * * @param userId 鐢ㄦ埛Id * @return 瑙掕壊鏉冮檺淇℃伅 */ @Override - public Set getRolePermission(Long userId) - { + public Set getRolePermission(Long userId) { Set roles = new HashSet(); // 绠＄悊鍛樻嫢鏈夋墍鏈夋潈闄 - if (SysUser.isAdmin(userId)) - { + if (SysUser.isAdmin(userId)) { roles.add("admin"); - } - else - { + } else { roles.addAll(roleService.selectRolePermissionByUserId(userId)); } return roles; @@ -46,21 +41,17 @@ public class SysPermissionServiceImpl implements ISysPermissionService /** * 鑾峰彇鑿滃崟鏁版嵁鏉冮檺 - * + * * @param userId 鐢ㄦ埛Id * @return 鑿滃崟鏉冮檺淇℃伅 */ @Override - public Set getMenuPermission(Long userId) - { + public Set getMenuPermission(Long userId) { Set perms = new HashSet(); // 绠＄悊鍛樻嫢鏈夋墍鏈夋潈闄 - if (SysUser.isAdmin(userId)) - { + if (SysUser.isAdmin(userId)) { perms.add("*:*:*"); - } - else - { + } else { perms.addAll(menuService.selectMenuPermsByUserId(userId)); } return perms; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java index f46f41b7..c682c1aa 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java @@ -14,12 +14,11 @@ import java.util.List; /** * 宀椾綅淇℃伅 鏈嶅姟灞傚鐞 - * + * * @author ruoyi */ @Service -public class SysPostServiceImpl implements ISysPostService -{ +public class SysPostServiceImpl implements ISysPostService { @Autowired private SysPostMapper postMapper; @@ -28,64 +27,58 @@ public class SysPostServiceImpl implements ISysPostService /** * 鏌ヨ宀椾綅淇℃伅闆嗗悎 - * + * * @param post 宀椾綅淇℃伅 * @return 宀椾綅淇℃伅闆嗗悎 */ @Override - public List selectPostList(SysPost post) - { + public List selectPostList(SysPost post) { return postMapper.selectPostList(post); } /** * 鏌ヨ鎵鏈夊矖浣 - * + * * @return 宀椾綅鍒楄〃 */ @Override - public List selectPostAll() - { + public List selectPostAll() { return postMapper.selectPostAll(); } /** * 閫氳繃宀椾綅ID鏌ヨ宀椾綅淇℃伅 - * + * * @param postId 宀椾綅ID * @return 瑙掕壊瀵硅薄淇℃伅 */ @Override - public SysPost selectPostById(Long postId) - { + public SysPost selectPostById(Long postId) { return postMapper.selectPostById(postId); } /** * 鏍规嵁鐢ㄦ埛ID鑾峰彇宀椾綅閫夋嫨妗嗗垪琛 - * + * * @param userId 鐢ㄦ埛ID * @return 閫変腑宀椾綅ID鍒楄〃 */ @Override - public List selectPostListByUserId(Long userId) - { + public List selectPostListByUserId(Long userId) { return postMapper.selectPostListByUserId(userId); } /** * 鏍￠獙宀椾綅鍚嶇О鏄惁鍞竴 - * + * * @param post 宀椾綅淇℃伅 * @return 缁撴灉 */ @Override - public String checkPostNameUnique(SysPost post) - { + public String checkPostNameUnique(SysPost post) { Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId(); SysPost info = postMapper.checkPostNameUnique(post.getPostName()); - if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) - { + if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) { return UserConstants.NOT_UNIQUE; } return UserConstants.UNIQUE; @@ -93,17 +86,15 @@ public class SysPostServiceImpl implements ISysPostService /** * 鏍￠獙宀椾綅缂栫爜鏄惁鍞竴 - * + * * @param post 宀椾綅淇℃伅 * @return 缁撴灉 */ @Override - public String checkPostCodeUnique(SysPost post) - { + public String checkPostCodeUnique(SysPost post) { Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId(); SysPost info = postMapper.checkPostCodeUnique(post.getPostCode()); - if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) - { + if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) { return UserConstants.NOT_UNIQUE; } return UserConstants.UNIQUE; @@ -111,42 +102,37 @@ public class SysPostServiceImpl implements ISysPostService /** * 閫氳繃宀椾綅ID鏌ヨ宀椾綅浣跨敤鏁伴噺 - * + * * @param postId 宀椾綅ID * @return 缁撴灉 */ @Override - public int countUserPostById(Long postId) - { + public int countUserPostById(Long postId) { return userPostMapper.countUserPostById(postId); } /** * 鍒犻櫎宀椾綅淇℃伅 - * + * * @param postId 宀椾綅ID * @return 缁撴灉 */ @Override - public int deletePostById(Long postId) - { + public int deletePostById(Long postId) { return postMapper.deletePostById(postId); } /** * 鎵归噺鍒犻櫎宀椾綅淇℃伅 - * + * * @param postIds 闇瑕佸垹闄ょ殑宀椾綅ID * @return 缁撴灉 */ @Override - public int deletePostByIds(Long[] postIds) - { - for (Long postId : postIds) - { + public int deletePostByIds(Long[] postIds) { + for (Long postId : postIds) { SysPost post = selectPostById(postId); - if (countUserPostById(postId) > 0) - { + if (countUserPostById(postId) > 0) { throw new ServiceException(String.format("%1$s宸插垎閰,涓嶈兘鍒犻櫎", post.getPostName())); } } @@ -155,25 +141,23 @@ public class SysPostServiceImpl implements ISysPostService /** * 鏂板淇濆瓨宀椾綅淇℃伅 - * + * * @param post 宀椾綅淇℃伅 * @return 缁撴灉 */ @Override - public int insertPost(SysPost post) - { + public int insertPost(SysPost post) { return postMapper.insertPost(post); } /** * 淇敼淇濆瓨宀椾綅淇℃伅 - * + * * @param post 宀椾綅淇℃伅 * @return 缁撴灉 */ @Override - public int updatePost(SysPost post) - { + public int updatePost(SysPost post) { return postMapper.updatePost(post); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index ca8191a0..8ea03ae5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -24,12 +24,11 @@ import java.util.*; /** * 瑙掕壊 涓氬姟灞傚鐞 - * + * * @author ruoyi */ @Service -public class SysRoleServiceImpl implements ISysRoleService -{ +public class SysRoleServiceImpl implements ISysRoleService { @Autowired private SysRoleMapper roleMapper; @@ -44,34 +43,29 @@ public class SysRoleServiceImpl implements ISysRoleService /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瑙掕壊鏁版嵁 - * + * * @param role 瑙掕壊淇℃伅 * @return 瑙掕壊鏁版嵁闆嗗悎淇℃伅 */ @Override @DataScope(deptAlias = "d") - public List selectRoleList(SysRole role) - { + public List selectRoleList(SysRole role) { return roleMapper.selectRoleList(role); } /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊 - * + * * @param userId 鐢ㄦ埛ID * @return 瑙掕壊鍒楄〃 */ @Override - public List selectRolesByUserId(Long userId) - { + public List selectRolesByUserId(Long userId) { List userRoles = roleMapper.selectRolePermissionByUserId(userId); List roles = selectRoleAll(); - for (SysRole role : roles) - { - for (SysRole userRole : userRoles) - { - if (role.getRoleId().longValue() == userRole.getRoleId().longValue()) - { + for (SysRole role : roles) { + for (SysRole userRole : userRoles) { + if (role.getRoleId().longValue() == userRole.getRoleId().longValue()) { role.setFlag(true); break; } @@ -82,19 +76,16 @@ public class SysRoleServiceImpl implements ISysRoleService /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ鏉冮檺 - * + * * @param userId 鐢ㄦ埛ID * @return 鏉冮檺鍒楄〃 */ @Override - public Set selectRolePermissionByUserId(Long userId) - { + public Set selectRolePermissionByUserId(Long userId) { List perms = roleMapper.selectRolePermissionByUserId(userId); Set permsSet = new HashSet<>(); - for (SysRole perm : perms) - { - if (StringUtils.isNotNull(perm)) - { + for (SysRole perm : perms) { + if (StringUtils.isNotNull(perm)) { permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(","))); } } @@ -103,52 +94,47 @@ public class SysRoleServiceImpl implements ISysRoleService /** * 鏌ヨ鎵鏈夎鑹 - * + * * @return 瑙掕壊鍒楄〃 */ @Override - public List selectRoleAll() - { + public List selectRoleAll() { return SpringUtils.getAopProxy(this).selectRoleList(new SysRole()); } /** * 鏍规嵁鐢ㄦ埛ID鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛 - * + * * @param userId 鐢ㄦ埛ID * @return 閫変腑瑙掕壊ID鍒楄〃 */ @Override - public List selectRoleListByUserId(Long userId) - { + public List selectRoleListByUserId(Long userId) { return roleMapper.selectRoleListByUserId(userId); } /** * 閫氳繃瑙掕壊ID鏌ヨ瑙掕壊 - * + * * @param roleId 瑙掕壊ID * @return 瑙掕壊瀵硅薄淇℃伅 */ @Override - public SysRole selectRoleById(Long roleId) - { + public SysRole selectRoleById(Long roleId) { return roleMapper.selectRoleById(roleId); } /** * 鏍￠獙瑙掕壊鍚嶇О鏄惁鍞竴 - * + * * @param role 瑙掕壊淇℃伅 * @return 缁撴灉 */ @Override - public String checkRoleNameUnique(SysRole role) - { + public String checkRoleNameUnique(SysRole role) { Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId(); SysRole info = roleMapper.checkRoleNameUnique(role.getRoleName()); - if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) - { + if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) { return UserConstants.NOT_UNIQUE; } return UserConstants.UNIQUE; @@ -156,17 +142,15 @@ public class SysRoleServiceImpl implements ISysRoleService /** * 鏍￠獙瑙掕壊鏉冮檺鏄惁鍞竴 - * + * * @param role 瑙掕壊淇℃伅 * @return 缁撴灉 */ @Override - public String checkRoleKeyUnique(SysRole role) - { + public String checkRoleKeyUnique(SysRole role) { Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId(); SysRole info = roleMapper.checkRoleKeyUnique(role.getRoleKey()); - if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) - { + if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) { return UserConstants.NOT_UNIQUE; } return UserConstants.UNIQUE; @@ -174,33 +158,28 @@ public class SysRoleServiceImpl implements ISysRoleService /** * 鏍￠獙瑙掕壊鏄惁鍏佽鎿嶄綔 - * + * * @param role 瑙掕壊淇℃伅 */ @Override - public void checkRoleAllowed(SysRole role) - { - if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin()) - { + public void checkRoleAllowed(SysRole role) { + if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin()) { throw new ServiceException("涓嶅厑璁告搷浣滆秴绾х鐞嗗憳瑙掕壊"); } } /** * 鏍￠獙瑙掕壊鏄惁鏈夋暟鎹潈闄 - * + * * @param roleId 瑙掕壊id */ @Override - public void checkRoleDataScope(Long roleId) - { - if (!SysUser.isAdmin(SecurityUtils.getUserId())) - { + public void checkRoleDataScope(Long roleId) { + if (!SysUser.isAdmin(SecurityUtils.getUserId())) { SysRole role = new SysRole(); role.setRoleId(roleId); List roles = SpringUtils.getAopProxy(this).selectRoleList(role); - if (StringUtils.isEmpty(roles)) - { + if (StringUtils.isEmpty(roles)) { throw new ServiceException("娌℃湁鏉冮檺璁块棶瑙掕壊鏁版嵁锛"); } } @@ -208,26 +187,24 @@ public class SysRoleServiceImpl implements ISysRoleService /** * 閫氳繃瑙掕壊ID鏌ヨ瑙掕壊浣跨敤鏁伴噺 - * + * * @param roleId 瑙掕壊ID * @return 缁撴灉 */ @Override - public int countUserRoleByRoleId(Long roleId) - { + public int countUserRoleByRoleId(Long roleId) { return userRoleMapper.countUserRoleByRoleId(roleId); } /** * 鏂板淇濆瓨瑙掕壊淇℃伅 - * + * * @param role 瑙掕壊淇℃伅 * @return 缁撴灉 */ @Override @Transactional(rollbackFor = Exception.class) - public int insertRole(SysRole role) - { + public int insertRole(SysRole role) { // 鏂板瑙掕壊淇℃伅 roleMapper.insertRole(role); return insertRoleMenu(role); @@ -235,14 +212,13 @@ public class SysRoleServiceImpl implements ISysRoleService /** * 淇敼淇濆瓨瑙掕壊淇℃伅 - * + * * @param role 瑙掕壊淇℃伅 * @return 缁撴灉 */ @Override @Transactional(rollbackFor = Exception.class) - public int updateRole(SysRole role) - { + public int updateRole(SysRole role) { // 淇敼瑙掕壊淇℃伅 roleMapper.updateRole(role); // 鍒犻櫎瑙掕壊涓庤彍鍗曞叧鑱 @@ -252,26 +228,24 @@ public class SysRoleServiceImpl implements ISysRoleService /** * 淇敼瑙掕壊鐘舵 - * + * * @param role 瑙掕壊淇℃伅 * @return 缁撴灉 */ @Override - public int updateRoleStatus(SysRole role) - { + public int updateRoleStatus(SysRole role) { return roleMapper.updateRole(role); } /** * 淇敼鏁版嵁鏉冮檺淇℃伅 - * + * * @param role 瑙掕壊淇℃伅 * @return 缁撴灉 */ @Override @Transactional(rollbackFor = Exception.class) - public int authDataScope(SysRole role) - { + public int authDataScope(SysRole role) { // 淇敼瑙掕壊淇℃伅 roleMapper.updateRole(role); // 鍒犻櫎瑙掕壊涓庨儴闂ㄥ叧鑱 @@ -282,23 +256,20 @@ public class SysRoleServiceImpl implements ISysRoleService /** * 鏂板瑙掕壊鑿滃崟淇℃伅 - * + * * @param role 瑙掕壊瀵硅薄 */ - public int insertRoleMenu(SysRole role) - { + public int insertRoleMenu(SysRole role) { int rows = 1; // 鏂板鐢ㄦ埛涓庤鑹茬鐞 List list = new ArrayList(); - for (Long menuId : role.getMenuIds()) - { + for (Long menuId : role.getMenuIds()) { SysRoleMenu rm = new SysRoleMenu(); rm.setRoleId(role.getRoleId()); rm.setMenuId(menuId); list.add(rm); } - if (list.size() > 0) - { + if (list.size() > 0) { rows = roleMenuMapper.batchRoleMenu(list); } return rows; @@ -309,20 +280,17 @@ public class SysRoleServiceImpl implements ISysRoleService * * @param role 瑙掕壊瀵硅薄 */ - public int insertRoleDept(SysRole role) - { + public int insertRoleDept(SysRole role) { int rows = 1; // 鏂板瑙掕壊涓庨儴闂紙鏁版嵁鏉冮檺锛夌鐞 List list = new ArrayList(); - for (Long deptId : role.getDeptIds()) - { + for (Long deptId : role.getDeptIds()) { SysRoleDept rd = new SysRoleDept(); rd.setRoleId(role.getRoleId()); rd.setDeptId(deptId); list.add(rd); } - if (list.size() > 0) - { + if (list.size() > 0) { rows = roleDeptMapper.batchRoleDept(list); } return rows; @@ -330,14 +298,13 @@ public class SysRoleServiceImpl implements ISysRoleService /** * 閫氳繃瑙掕壊ID鍒犻櫎瑙掕壊 - * + * * @param roleId 瑙掕壊ID * @return 缁撴灉 */ @Override @Transactional(rollbackFor = Exception.class) - public int deleteRoleById(Long roleId) - { + public int deleteRoleById(Long roleId) { // 鍒犻櫎瑙掕壊涓庤彍鍗曞叧鑱 roleMenuMapper.deleteRoleMenuByRoleId(roleId); // 鍒犻櫎瑙掕壊涓庨儴闂ㄥ叧鑱 @@ -347,21 +314,18 @@ public class SysRoleServiceImpl implements ISysRoleService /** * 鎵归噺鍒犻櫎瑙掕壊淇℃伅 - * + * * @param roleIds 闇瑕佸垹闄ょ殑瑙掕壊ID * @return 缁撴灉 */ @Override @Transactional(rollbackFor = Exception.class) - public int deleteRoleByIds(Long[] roleIds) - { - for (Long roleId : roleIds) - { + public int deleteRoleByIds(Long[] roleIds) { + for (Long roleId : roleIds) { checkRoleAllowed(new SysRole(roleId)); checkRoleDataScope(roleId); SysRole role = selectRoleById(roleId); - if (countUserRoleByRoleId(roleId) > 0) - { + if (countUserRoleByRoleId(roleId) > 0) { throw new ServiceException(String.format("%1$s宸插垎閰,涓嶈兘鍒犻櫎", role.getRoleName())); } } @@ -374,43 +338,39 @@ public class SysRoleServiceImpl implements ISysRoleService /** * 鍙栨秷鎺堟潈鐢ㄦ埛瑙掕壊 - * + * * @param userRole 鐢ㄦ埛鍜岃鑹插叧鑱斾俊鎭 * @return 缁撴灉 */ @Override - public int deleteAuthUser(SysUserRole userRole) - { + public int deleteAuthUser(SysUserRole userRole) { return userRoleMapper.deleteUserRoleInfo(userRole); } /** * 鎵归噺鍙栨秷鎺堟潈鐢ㄦ埛瑙掕壊 - * - * @param roleId 瑙掕壊ID + * + * @param roleId 瑙掕壊ID * @param userIds 闇瑕佸彇娑堟巿鏉冪殑鐢ㄦ埛鏁版嵁ID * @return 缁撴灉 */ @Override - public int deleteAuthUsers(Long roleId, Long[] userIds) - { + public int deleteAuthUsers(Long roleId, Long[] userIds) { return userRoleMapper.deleteUserRoleInfos(roleId, userIds); } /** * 鎵归噺閫夋嫨鎺堟潈鐢ㄦ埛瑙掕壊 - * - * @param roleId 瑙掕壊ID + * + * @param roleId 瑙掕壊ID * @param userIds 闇瑕佹巿鏉冪殑鐢ㄦ埛鏁版嵁ID * @return 缁撴灉 */ @Override - public int insertAuthUsers(Long roleId, Long[] userIds) - { + public int insertAuthUsers(Long roleId, Long[] userIds) { // 鏂板鐢ㄦ埛涓庤鑹茬鐞 List list = new ArrayList(); - for (Long userId : userIds) - { + for (Long userId : userIds) { SysUserRole ur = new SysUserRole(); ur.setUserId(userId); ur.setRoleId(roleId); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java index bb577203..5e84b3b6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java @@ -8,24 +8,21 @@ import org.springframework.stereotype.Service; /** * 鍦ㄧ嚎鐢ㄦ埛 鏈嶅姟灞傚鐞 - * + * * @author ruoyi */ @Service -public class SysUserOnlineServiceImpl implements ISysUserOnlineService -{ +public class SysUserOnlineServiceImpl implements ISysUserOnlineService { /** * 閫氳繃鐧诲綍鍦板潃鏌ヨ淇℃伅 - * + * * @param ipaddr 鐧诲綍鍦板潃 - * @param user 鐢ㄦ埛淇℃伅 + * @param user 鐢ㄦ埛淇℃伅 * @return 鍦ㄧ嚎鐢ㄦ埛淇℃伅 */ @Override - public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user) - { - if (StringUtils.equals(ipaddr, user.getIpaddr())) - { + public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user) { + if (StringUtils.equals(ipaddr, user.getIpaddr())) { return loginUserToUserOnline(user); } return null; @@ -33,16 +30,14 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService /** * 閫氳繃鐢ㄦ埛鍚嶇О鏌ヨ淇℃伅 - * + * * @param userName 鐢ㄦ埛鍚嶇О - * @param user 鐢ㄦ埛淇℃伅 + * @param user 鐢ㄦ埛淇℃伅 * @return 鍦ㄧ嚎鐢ㄦ埛淇℃伅 */ @Override - public SysUserOnline selectOnlineByUserName(String userName, LoginUser user) - { - if (StringUtils.equals(userName, user.getUsername())) - { + public SysUserOnline selectOnlineByUserName(String userName, LoginUser user) { + if (StringUtils.equals(userName, user.getUsername())) { return loginUserToUserOnline(user); } return null; @@ -50,17 +45,15 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService /** * 閫氳繃鐧诲綍鍦板潃/鐢ㄦ埛鍚嶇О鏌ヨ淇℃伅 - * - * @param ipaddr 鐧诲綍鍦板潃 + * + * @param ipaddr 鐧诲綍鍦板潃 * @param userName 鐢ㄦ埛鍚嶇О - * @param user 鐢ㄦ埛淇℃伅 + * @param user 鐢ㄦ埛淇℃伅 * @return 鍦ㄧ嚎鐢ㄦ埛淇℃伅 */ @Override - public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user) - { - if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) - { + public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user) { + if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) { return loginUserToUserOnline(user); } return null; @@ -68,15 +61,13 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService /** * 璁剧疆鍦ㄧ嚎鐢ㄦ埛淇℃伅 - * + * * @param user 鐢ㄦ埛淇℃伅 * @return 鍦ㄧ嚎鐢ㄦ埛 */ @Override - public SysUserOnline loginUserToUserOnline(LoginUser user) - { - if (StringUtils.isNull(user)) - { + public SysUserOnline loginUserToUserOnline(LoginUser user) { + if (StringUtils.isNull(user)) { return null; } SysUserOnline sysUserOnline = new SysUserOnline(); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 4fd12cfd..dca27b8a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -29,110 +29,95 @@ import java.util.stream.Collectors; /** * 鐢ㄦ埛 涓氬姟灞傚鐞 - * + * * @author ruoyi */ @Service -public class SysUserServiceImpl implements ISysUserService -{ +public class SysUserServiceImpl implements ISysUserService { private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class); - + @Autowired + protected Validator validator; @Autowired private SysUserMapper userMapper; - @Autowired private SysRoleMapper roleMapper; - @Autowired private SysPostMapper postMapper; - @Autowired private SysUserRoleMapper userRoleMapper; - @Autowired private SysUserPostMapper userPostMapper; - @Autowired private ISysConfigService configService; - @Autowired - protected Validator validator; - /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃 - * + * * @param user 鐢ㄦ埛淇℃伅 * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅 */ @Override @DataScope(deptAlias = "d", userAlias = "u") - public List selectUserList(SysUser user) - { + public List selectUserList(SysUser user) { return userMapper.selectUserList(user); } /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛 - * + * * @param user 鐢ㄦ埛淇℃伅 * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅 */ @Override @DataScope(deptAlias = "d", userAlias = "u") - public List selectAllocatedList(SysUser user) - { + public List selectAllocatedList(SysUser user) { return userMapper.selectAllocatedList(user); } /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛 - * + * * @param user 鐢ㄦ埛淇℃伅 * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅 */ @Override @DataScope(deptAlias = "d", userAlias = "u") - public List selectUnallocatedList(SysUser user) - { + public List selectUnallocatedList(SysUser user) { return userMapper.selectUnallocatedList(user); } /** * 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤鎴 - * + * * @param userName 鐢ㄦ埛鍚 * @return 鐢ㄦ埛瀵硅薄淇℃伅 */ @Override - public SysUser selectUserByUserName(String userName) - { + public SysUser selectUserByUserName(String userName) { return userMapper.selectUserByUserName(userName); } /** * 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛 - * + * * @param userId 鐢ㄦ埛ID * @return 鐢ㄦ埛瀵硅薄淇℃伅 */ @Override - public SysUser selectUserById(Long userId) - { + public SysUser selectUserById(Long userId) { return userMapper.selectUserById(userId); } /** * 鏌ヨ鐢ㄦ埛鎵灞炶鑹茬粍 - * + * * @param userName 鐢ㄦ埛鍚 * @return 缁撴灉 */ @Override - public String selectUserRoleGroup(String userName) - { + public String selectUserRoleGroup(String userName) { List list = roleMapper.selectRolesByUserName(userName); - if (CollectionUtils.isEmpty(list)) - { + if (CollectionUtils.isEmpty(list)) { return StringUtils.EMPTY; } return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(",")); @@ -140,16 +125,14 @@ public class SysUserServiceImpl implements ISysUserService /** * 鏌ヨ鐢ㄦ埛鎵灞炲矖浣嶇粍 - * + * * @param userName 鐢ㄦ埛鍚 * @return 缁撴灉 */ @Override - public String selectUserPostGroup(String userName) - { + public String selectUserPostGroup(String userName) { List list = postMapper.selectPostsByUserName(userName); - if (CollectionUtils.isEmpty(list)) - { + if (CollectionUtils.isEmpty(list)) { return StringUtils.EMPTY; } return list.stream().map(SysPost::getPostName).collect(Collectors.joining(",")); @@ -157,16 +140,14 @@ public class SysUserServiceImpl implements ISysUserService /** * 鏍￠獙鐢ㄦ埛鍚嶇О鏄惁鍞竴 - * + * * @param userName 鐢ㄦ埛鍚嶇О * @return 缁撴灉 */ @Override - public String checkUserNameUnique(String userName) - { + public String checkUserNameUnique(String userName) { int count = userMapper.checkUserNameUnique(userName); - if (count > 0) - { + if (count > 0) { return UserConstants.NOT_UNIQUE; } return UserConstants.UNIQUE; @@ -179,12 +160,10 @@ public class SysUserServiceImpl implements ISysUserService * @return */ @Override - public String checkPhoneUnique(SysUser user) - { + public String checkPhoneUnique(SysUser user) { Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber()); - if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) - { + if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) { return UserConstants.NOT_UNIQUE; } return UserConstants.UNIQUE; @@ -197,12 +176,10 @@ public class SysUserServiceImpl implements ISysUserService * @return */ @Override - public String checkEmailUnique(SysUser user) - { + public String checkEmailUnique(SysUser user) { Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); SysUser info = userMapper.checkEmailUnique(user.getEmail()); - if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) - { + if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) { return UserConstants.NOT_UNIQUE; } return UserConstants.UNIQUE; @@ -210,33 +187,28 @@ public class SysUserServiceImpl implements ISysUserService /** * 鏍￠獙鐢ㄦ埛鏄惁鍏佽鎿嶄綔 - * + * * @param user 鐢ㄦ埛淇℃伅 */ @Override - public void checkUserAllowed(SysUser user) - { - if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) - { + public void checkUserAllowed(SysUser user) { + if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) { throw new ServiceException("涓嶅厑璁告搷浣滆秴绾х鐞嗗憳鐢ㄦ埛"); } } /** * 鏍￠獙鐢ㄦ埛鏄惁鏈夋暟鎹潈闄 - * + * * @param userId 鐢ㄦ埛id */ @Override - public void checkUserDataScope(Long userId) - { - if (!SysUser.isAdmin(SecurityUtils.getUserId())) - { + public void checkUserDataScope(Long userId) { + if (!SysUser.isAdmin(SecurityUtils.getUserId())) { SysUser user = new SysUser(); user.setUserId(userId); List users = SpringUtils.getAopProxy(this).selectUserList(user); - if (StringUtils.isEmpty(users)) - { + if (StringUtils.isEmpty(users)) { throw new ServiceException("娌℃湁鏉冮檺璁块棶鐢ㄦ埛鏁版嵁锛"); } } @@ -244,14 +216,13 @@ public class SysUserServiceImpl implements ISysUserService /** * 鏂板淇濆瓨鐢ㄦ埛淇℃伅 - * + * * @param user 鐢ㄦ埛淇℃伅 * @return 缁撴灉 */ @Override @Transactional(rollbackFor = Exception.class) - public int insertUser(SysUser user) - { + public int insertUser(SysUser user) { // 鏂板鐢ㄦ埛淇℃伅 int rows = userMapper.insertUser(user); // 鏂板鐢ㄦ埛宀椾綅鍏宠仈 @@ -263,26 +234,24 @@ public class SysUserServiceImpl implements ISysUserService /** * 娉ㄥ唽鐢ㄦ埛淇℃伅 - * + * * @param user 鐢ㄦ埛淇℃伅 * @return 缁撴灉 */ @Override - public boolean registerUser(SysUser user) - { + public boolean registerUser(SysUser user) { return userMapper.insertUser(user) > 0; } /** * 淇敼淇濆瓨鐢ㄦ埛淇℃伅 - * + * * @param user 鐢ㄦ埛淇℃伅 * @return 缁撴灉 */ @Override @Transactional(rollbackFor = Exception.class) - public int updateUser(SysUser user) - { + public int updateUser(SysUser user) { Long userId = user.getUserId(); // 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱 userRoleMapper.deleteUserRoleByUserId(userId); @@ -297,101 +266,91 @@ public class SysUserServiceImpl implements ISysUserService /** * 鐢ㄦ埛鎺堟潈瑙掕壊 - * - * @param userId 鐢ㄦ埛ID + * + * @param userId 鐢ㄦ埛ID * @param roleIds 瑙掕壊缁 */ @Override @Transactional(rollbackFor = Exception.class) - public void insertUserAuth(Long userId, Long[] roleIds) - { + public void insertUserAuth(Long userId, Long[] roleIds) { userRoleMapper.deleteUserRoleByUserId(userId); insertUserRole(userId, roleIds); } /** * 淇敼鐢ㄦ埛鐘舵 - * + * * @param user 鐢ㄦ埛淇℃伅 * @return 缁撴灉 */ @Override - public int updateUserStatus(SysUser user) - { + public int updateUserStatus(SysUser user) { return userMapper.updateUser(user); } /** * 淇敼鐢ㄦ埛鍩烘湰淇℃伅 - * + * * @param user 鐢ㄦ埛淇℃伅 * @return 缁撴灉 */ @Override - public int updateUserProfile(SysUser user) - { + public int updateUserProfile(SysUser user) { return userMapper.updateUser(user); } /** * 淇敼鐢ㄦ埛澶村儚 - * + * * @param userName 鐢ㄦ埛鍚 - * @param avatar 澶村儚鍦板潃 + * @param avatar 澶村儚鍦板潃 * @return 缁撴灉 */ @Override - public boolean updateUserAvatar(String userName, String avatar) - { + public boolean updateUserAvatar(String userName, String avatar) { return userMapper.updateUserAvatar(userName, avatar) > 0; } /** * 閲嶇疆鐢ㄦ埛瀵嗙爜 - * + * * @param user 鐢ㄦ埛淇℃伅 * @return 缁撴灉 */ @Override - public int resetPwd(SysUser user) - { + public int resetPwd(SysUser user) { return userMapper.updateUser(user); } /** * 閲嶇疆鐢ㄦ埛瀵嗙爜 - * + * * @param userName 鐢ㄦ埛鍚 * @param password 瀵嗙爜 * @return 缁撴灉 */ @Override - public int resetUserPwd(String userName, String password) - { + public int resetUserPwd(String userName, String password) { return userMapper.resetUserPwd(userName, password); } /** * 鏂板鐢ㄦ埛瑙掕壊淇℃伅 - * + * * @param user 鐢ㄦ埛瀵硅薄 */ - public void insertUserRole(SysUser user) - { + public void insertUserRole(SysUser user) { Long[] roles = user.getRoleIds(); - if (StringUtils.isNotNull(roles)) - { + if (StringUtils.isNotNull(roles)) { // 鏂板鐢ㄦ埛涓庤鑹茬鐞 List list = new ArrayList(); - for (Long roleId : roles) - { + for (Long roleId : roles) { SysUserRole ur = new SysUserRole(); ur.setUserId(user.getUserId()); ur.setRoleId(roleId); list.add(ur); } - if (list.size() > 0) - { + if (list.size() > 0) { userRoleMapper.batchUserRole(list); } } @@ -399,25 +358,21 @@ public class SysUserServiceImpl implements ISysUserService /** * 鏂板鐢ㄦ埛宀椾綅淇℃伅 - * + * * @param user 鐢ㄦ埛瀵硅薄 */ - public void insertUserPost(SysUser user) - { + public void insertUserPost(SysUser user) { Long[] posts = user.getPostIds(); - if (StringUtils.isNotNull(posts)) - { + if (StringUtils.isNotNull(posts)) { // 鏂板鐢ㄦ埛涓庡矖浣嶇鐞 List list = new ArrayList(); - for (Long postId : posts) - { + for (Long postId : posts) { SysUserPost up = new SysUserPost(); up.setUserId(user.getUserId()); up.setPostId(postId); list.add(up); } - if (list.size() > 0) - { + if (list.size() > 0) { userPostMapper.batchUserPost(list); } } @@ -425,25 +380,21 @@ public class SysUserServiceImpl implements ISysUserService /** * 鏂板鐢ㄦ埛瑙掕壊淇℃伅 - * - * @param userId 鐢ㄦ埛ID + * + * @param userId 鐢ㄦ埛ID * @param roleIds 瑙掕壊缁 */ - public void insertUserRole(Long userId, Long[] roleIds) - { - if (StringUtils.isNotNull(roleIds)) - { + public void insertUserRole(Long userId, Long[] roleIds) { + if (StringUtils.isNotNull(roleIds)) { // 鏂板鐢ㄦ埛涓庤鑹茬鐞 List list = new ArrayList(); - for (Long roleId : roleIds) - { + for (Long roleId : roleIds) { SysUserRole ur = new SysUserRole(); ur.setUserId(userId); ur.setRoleId(roleId); list.add(ur); } - if (list.size() > 0) - { + if (list.size() > 0) { userRoleMapper.batchUserRole(list); } } @@ -451,14 +402,13 @@ public class SysUserServiceImpl implements ISysUserService /** * 閫氳繃鐢ㄦ埛ID鍒犻櫎鐢ㄦ埛 - * + * * @param userId 鐢ㄦ埛ID * @return 缁撴灉 */ @Override @Transactional(rollbackFor = Exception.class) - public int deleteUserById(Long userId) - { + public int deleteUserById(Long userId) { // 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱 userRoleMapper.deleteUserRoleByUserId(userId); // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶈〃 @@ -468,16 +418,14 @@ public class SysUserServiceImpl implements ISysUserService /** * 鎵归噺鍒犻櫎鐢ㄦ埛淇℃伅 - * + * * @param userIds 闇瑕佸垹闄ょ殑鐢ㄦ埛ID * @return 缁撴灉 */ @Override @Transactional(rollbackFor = Exception.class) - public int deleteUserByIds(Long[] userIds) - { - for (Long userId : userIds) - { + public int deleteUserByIds(Long[] userIds) { + for (Long userId : userIds) { checkUserAllowed(new SysUser(userId)); checkUserDataScope(userId); } @@ -490,17 +438,15 @@ public class SysUserServiceImpl implements ISysUserService /** * 瀵煎叆鐢ㄦ埛鏁版嵁 - * - * @param userList 鐢ㄦ埛鏁版嵁鍒楄〃 + * + * @param userList 鐢ㄦ埛鏁版嵁鍒楄〃 * @param isUpdateSupport 鏄惁鏇存柊鏀寔锛屽鏋滃凡瀛樺湪锛屽垯杩涜鏇存柊鏁版嵁 - * @param operName 鎿嶄綔鐢ㄦ埛 + * @param operName 鎿嶄綔鐢ㄦ埛 * @return 缁撴灉 */ @Override - public String importUser(List userList, Boolean isUpdateSupport, String operName) - { - if (StringUtils.isNull(userList) || userList.size() == 0) - { + public String importUser(List userList, Boolean isUpdateSupport, String operName) { + if (StringUtils.isNull(userList) || userList.size() == 0) { throw new ServiceException("瀵煎叆鐢ㄦ埛鏁版嵁涓嶈兘涓虹┖锛"); } int successNum = 0; @@ -508,50 +454,38 @@ public class SysUserServiceImpl implements ISysUserService StringBuilder successMsg = new StringBuilder(); StringBuilder failureMsg = new StringBuilder(); String password = configService.selectConfigByKey("sys.user.initPassword"); - for (SysUser user : userList) - { - try - { + for (SysUser user : userList) { + try { // 楠岃瘉鏄惁瀛樺湪杩欎釜鐢ㄦ埛 SysUser u = userMapper.selectUserByUserName(user.getUserName()); - if (StringUtils.isNull(u)) - { + if (StringUtils.isNull(u)) { BeanValidators.validateWithException(validator, user); user.setPassword(SecurityUtils.encryptPassword(password)); user.setCreateBy(operName); this.insertUser(user); successNum++; successMsg.append("
" + successNum + "銆佽处鍙 " + user.getUserName() + " 瀵煎叆鎴愬姛"); - } - else if (isUpdateSupport) - { + } else if (isUpdateSupport) { BeanValidators.validateWithException(validator, user); user.setUpdateBy(operName); this.updateUser(user); successNum++; successMsg.append("
" + successNum + "銆佽处鍙 " + user.getUserName() + " 鏇存柊鎴愬姛"); - } - else - { + } else { failureNum++; failureMsg.append("
" + failureNum + "銆佽处鍙 " + user.getUserName() + " 宸插瓨鍦"); } - } - catch (Exception e) - { + } catch (Exception e) { failureNum++; String msg = "
" + failureNum + "銆佽处鍙 " + user.getUserName() + " 瀵煎叆澶辫触锛"; failureMsg.append(msg + e.getMessage()); log.error(msg, e); } } - if (failureNum > 0) - { + if (failureNum > 0) { failureMsg.insert(0, "寰堟姳姝夛紝瀵煎叆澶辫触锛佸叡 " + failureNum + " 鏉℃暟鎹牸寮忎笉姝ｇ‘锛岄敊璇涓嬶細"); throw new ServiceException(failureMsg.toString()); - } - else - { + } else { successMsg.insert(0, "鎭枩鎮紝鏁版嵁宸插叏閮ㄥ鍏ユ垚鍔燂紒鍏 " + successNum + " 鏉★紝鏁版嵁濡備笅锛"); } return successMsg.toString(); diff --git a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java b/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java index d9dc9916..6d13cffb 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java +++ b/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java @@ -6,15 +6,13 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; /** * 鐩戞帶涓績 - * + * * @author ruoyi */ @EnableAdminServer @SpringBootApplication -public class RuoYiMonitorApplication -{ - public static void main(String[] args) - { +public class RuoYiMonitorApplication { + public static void main(String[] args) { SpringApplication.run(RuoYiMonitorApplication.class, args); System.out.println("(鈾モ棤鈥库棤)锞夛緸 鐩戞帶涓績鍚姩鎴愬姛 醿(麓凇`醿)锞 \n" + " .-------. ____ __ \n" + diff --git a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java b/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java index 0ba53647..d90c732f 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java +++ b/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java @@ -8,42 +8,39 @@ import org.springframework.security.web.authentication.SavedRequestAwareAuthenti /** * 鐩戞帶鏉冮檺閰嶇疆 - * + * * @author ruoyi */ @Configuration -public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter -{ +public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter { private final String adminContextPath; - public WebSecurityConfigurer(AdminServerProperties adminServerProperties) - { + public WebSecurityConfigurer(AdminServerProperties adminServerProperties) { this.adminContextPath = adminServerProperties.getContextPath(); } @Override - protected void configure(HttpSecurity http) throws Exception - { + protected void configure(HttpSecurity http) throws Exception { SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler(); successHandler.setTargetUrlParameter("redirectTo"); successHandler.setDefaultTargetUrl(adminContextPath + "/"); http - .headers().frameOptions().disable() - .and().authorizeRequests() - .antMatchers(adminContextPath + "/assets/**" - , adminContextPath + "/login" - , adminContextPath + "/actuator/**" - , adminContextPath + "/instances/**" - ).permitAll() - .anyRequest().authenticated() - .and() - .formLogin().loginPage(adminContextPath + "/login") - .successHandler(successHandler).and() - .logout().logoutUrl(adminContextPath + "/logout") - .and() - .httpBasic().and() - .csrf() - .disable(); + .headers().frameOptions().disable() + .and().authorizeRequests() + .antMatchers(adminContextPath + "/assets/**" + , adminContextPath + "/login" + , adminContextPath + "/actuator/**" + , adminContextPath + "/instances/**" + ).permitAll() + .anyRequest().authenticated() + .and() + .formLogin().loginPage(adminContextPath + "/login") + .successHandler(successHandler).and() + .logout().logoutUrl(adminContextPath + "/logout") + .and() + .httpBasic().and() + .csrf() + .disable(); } } From 7cb3f04883aa979b6be810f7d8c08ea72930b48c Mon Sep 17 00:00:00 2001 From: 1332987 <13329870472@163.com> Date: Wed, 20 Apr 2022 16:03:38 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8Didea=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/auth/service/SysLoginService.java | 7 ++++--- .../com/ruoyi/common/security/auth/AuthUtil.java | 2 +- .../gen/service/GenTableColumnServiceImpl.java | 4 ++-- .../ruoyi/gen/service/GenTableServiceImpl.java | 6 +++--- .../ruoyi/job/service/SysJobLogServiceImpl.java | 4 ++-- .../com/ruoyi/job/service/SysJobServiceImpl.java | 5 +++-- .../service/impl/SysConfigServiceImpl.java | 6 +++--- .../system/service/impl/SysDeptServiceImpl.java | 6 +++--- .../service/impl/SysDictDataServiceImpl.java | 4 ++-- .../service/impl/SysDictTypeServiceImpl.java | 6 +++--- .../service/impl/SysLogininforServiceImpl.java | 4 ++-- .../system/service/impl/SysMenuServiceImpl.java | 8 ++++---- .../service/impl/SysNoticeServiceImpl.java | 4 ++-- .../service/impl/SysOperLogServiceImpl.java | 4 ++-- .../system/service/impl/SysPostServiceImpl.java | 6 +++--- .../system/service/impl/SysRoleServiceImpl.java | 10 +++++----- .../system/service/impl/SysUserServiceImpl.java | 16 ++++++++-------- 17 files changed, 52 insertions(+), 50 deletions(-) diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java index 4062bd0f..171ac9c0 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java @@ -15,9 +15,10 @@ import com.ruoyi.system.api.RemoteUserService; import com.ruoyi.system.api.domain.SysLogininfor; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.model.LoginUser; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import javax.annotation.Resource; + /** * 鐧诲綍鏍￠獙鏂规硶 * @@ -25,10 +26,10 @@ import org.springframework.stereotype.Component; */ @Component public class SysLoginService { - @Autowired + @Resource private RemoteLogService remoteLogService; - @Autowired + @Resource private RemoteUserService remoteUserService; /** diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java index 0a2aa4aa..82a3d44e 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java @@ -25,7 +25,7 @@ public class AuthUtil { /** * 浼氳瘽娉ㄩ攢锛屾牴鎹寚瀹歍oken * - * @param tokenValue 鎸囧畾token + * @param token 鎸囧畾token */ public static void logoutByToken(String token) { authLogic.logoutByToken(token); diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java index ad96f7c9..fdffee75 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java @@ -3,9 +3,9 @@ package com.ruoyi.gen.service; import com.ruoyi.common.core.text.Convert; import com.ruoyi.gen.domain.GenTableColumn; import com.ruoyi.gen.mapper.GenTableColumnMapper; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; /** @@ -15,7 +15,7 @@ import java.util.List; */ @Service public class GenTableColumnServiceImpl implements IGenTableColumnService { - @Autowired + @Resource private GenTableColumnMapper genTableColumnMapper; /** diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java index ae2cb7f5..732d9af1 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java @@ -22,10 +22,10 @@ import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; @@ -47,10 +47,10 @@ import java.util.zip.ZipOutputStream; public class GenTableServiceImpl implements IGenTableService { private static final Logger log = LoggerFactory.getLogger(GenTableServiceImpl.class); - @Autowired + @Resource private GenTableMapper genTableMapper; - @Autowired + @Resource private GenTableColumnMapper genTableColumnMapper; /** diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java index 0b0b53bd..699f98cf 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java @@ -2,9 +2,9 @@ package com.ruoyi.job.service; import com.ruoyi.job.domain.SysJobLog; import com.ruoyi.job.mapper.SysJobLogMapper; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; /** @@ -14,7 +14,7 @@ import java.util.List; */ @Service public class SysJobLogServiceImpl implements ISysJobLogService { - @Autowired + @Resource private SysJobLogMapper jobLogMapper; /** diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java index 656a0f61..6f9723f2 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java @@ -15,6 +15,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.PostConstruct; +import javax.annotation.Resource; import java.util.List; /** @@ -24,10 +25,10 @@ import java.util.List; */ @Service public class SysJobServiceImpl implements ISysJobService { - @Autowired + @Resource private Scheduler scheduler; - @Autowired + @Resource private SysJobMapper jobMapper; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java index 50e635b0..7037f34d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java @@ -9,10 +9,10 @@ import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.mapper.SysConfigMapper; import com.ruoyi.system.service.ISysConfigService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; +import javax.annotation.Resource; import java.util.Collection; import java.util.List; @@ -23,10 +23,10 @@ import java.util.List; */ @Service public class SysConfigServiceImpl implements ISysConfigService { - @Autowired + @Resource private SysConfigMapper configMapper; - @Autowired + @Resource private RedisService redisService; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index 8fe4a496..95ac09ed 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -14,9 +14,9 @@ import com.ruoyi.system.domain.vo.TreeSelect; import com.ruoyi.system.mapper.SysDeptMapper; import com.ruoyi.system.mapper.SysRoleMapper; import com.ruoyi.system.service.ISysDeptService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -29,10 +29,10 @@ import java.util.stream.Collectors; */ @Service public class SysDeptServiceImpl implements ISysDeptService { - @Autowired + @Resource private SysDeptMapper deptMapper; - @Autowired + @Resource private SysRoleMapper roleMapper; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java index d4142c1c..a40761b3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java @@ -4,9 +4,9 @@ import com.ruoyi.common.security.utils.DictUtils; import com.ruoyi.system.api.domain.SysDictData; import com.ruoyi.system.mapper.SysDictDataMapper; import com.ruoyi.system.service.ISysDictDataService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; /** @@ -16,7 +16,7 @@ import java.util.List; */ @Service public class SysDictDataServiceImpl implements ISysDictDataService { - @Autowired + @Resource private SysDictDataMapper dictDataMapper; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java index 2a474c93..bd81e544 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java @@ -9,11 +9,11 @@ import com.ruoyi.system.api.domain.SysDictType; import com.ruoyi.system.mapper.SysDictDataMapper; import com.ruoyi.system.mapper.SysDictTypeMapper; import com.ruoyi.system.service.ISysDictTypeService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.PostConstruct; +import javax.annotation.Resource; import java.util.Comparator; import java.util.List; import java.util.Map; @@ -26,10 +26,10 @@ import java.util.stream.Collectors; */ @Service public class SysDictTypeServiceImpl implements ISysDictTypeService { - @Autowired + @Resource private SysDictTypeMapper dictTypeMapper; - @Autowired + @Resource private SysDictDataMapper dictDataMapper; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java index fc631bcb..57064d1a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java @@ -3,9 +3,9 @@ package com.ruoyi.system.service.impl; import com.ruoyi.system.api.domain.SysLogininfor; import com.ruoyi.system.mapper.SysLogininforMapper; import com.ruoyi.system.service.ISysLogininforService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; /** @@ -16,7 +16,7 @@ import java.util.List; @Service public class SysLogininforServiceImpl implements ISysLogininforService { - @Autowired + @Resource private SysLogininforMapper logininforMapper; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java index 8bee8ae4..5c65917e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java @@ -14,9 +14,9 @@ import com.ruoyi.system.mapper.SysMenuMapper; import com.ruoyi.system.mapper.SysRoleMapper; import com.ruoyi.system.mapper.SysRoleMenuMapper; import com.ruoyi.system.service.ISysMenuService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; @@ -29,13 +29,13 @@ import java.util.stream.Collectors; public class SysMenuServiceImpl implements ISysMenuService { public static final String PREMISSION_STRING = "perms[\"{0}\"]"; - @Autowired + @Resource private SysMenuMapper menuMapper; - @Autowired + @Resource private SysRoleMapper roleMapper; - @Autowired + @Resource private SysRoleMenuMapper roleMenuMapper; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java index 97071ccd..ac97f009 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java @@ -3,9 +3,9 @@ package com.ruoyi.system.service.impl; import com.ruoyi.system.domain.SysNotice; import com.ruoyi.system.mapper.SysNoticeMapper; import com.ruoyi.system.service.ISysNoticeService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; /** @@ -15,7 +15,7 @@ import java.util.List; */ @Service public class SysNoticeServiceImpl implements ISysNoticeService { - @Autowired + @Resource private SysNoticeMapper noticeMapper; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java index 7ad7400d..f146ee9e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java @@ -3,9 +3,9 @@ package com.ruoyi.system.service.impl; import com.ruoyi.system.api.domain.SysOperLog; import com.ruoyi.system.mapper.SysOperLogMapper; import com.ruoyi.system.service.ISysOperLogService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; /** @@ -15,7 +15,7 @@ import java.util.List; */ @Service public class SysOperLogServiceImpl implements ISysOperLogService { - @Autowired + @Resource private SysOperLogMapper operLogMapper; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java index c682c1aa..25887337 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java @@ -7,9 +7,9 @@ import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.mapper.SysPostMapper; import com.ruoyi.system.mapper.SysUserPostMapper; import com.ruoyi.system.service.ISysPostService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; /** @@ -19,10 +19,10 @@ import java.util.List; */ @Service public class SysPostServiceImpl implements ISysPostService { - @Autowired + @Resource private SysPostMapper postMapper; - @Autowired + @Resource private SysUserPostMapper userPostMapper; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index 8ea03ae5..7bc4a0df 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -16,10 +16,10 @@ import com.ruoyi.system.mapper.SysRoleMapper; import com.ruoyi.system.mapper.SysRoleMenuMapper; import com.ruoyi.system.mapper.SysUserRoleMapper; import com.ruoyi.system.service.ISysRoleService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.*; /** @@ -29,16 +29,16 @@ import java.util.*; */ @Service public class SysRoleServiceImpl implements ISysRoleService { - @Autowired + @Resource private SysRoleMapper roleMapper; - @Autowired + @Resource private SysRoleMenuMapper roleMenuMapper; - @Autowired + @Resource private SysUserRoleMapper userRoleMapper; - @Autowired + @Resource private SysRoleDeptMapper roleDeptMapper; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index dca27b8a..6a1b2f08 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -17,11 +17,11 @@ import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysUserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import javax.annotation.Resource; import javax.validation.Validator; import java.util.ArrayList; import java.util.List; @@ -35,19 +35,19 @@ import java.util.stream.Collectors; @Service public class SysUserServiceImpl implements ISysUserService { private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class); - @Autowired + @Resource protected Validator validator; - @Autowired + @Resource private SysUserMapper userMapper; - @Autowired + @Resource private SysRoleMapper roleMapper; - @Autowired + @Resource private SysPostMapper postMapper; - @Autowired + @Resource private SysUserRoleMapper userRoleMapper; - @Autowired + @Resource private SysUserPostMapper userPostMapper; - @Autowired + @Resource private ISysConfigService configService; /** From 0556dbd111d25bd531778075b71b9650323843d3 Mon Sep 17 00:00:00 2001 From: 1332987 <13329870472@163.com> Date: Wed, 20 Apr 2022 16:15:38 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8Didea=20=20=E4=B8=8D?= =?UTF-8?q?=E9=80=82=E5=BD=93=E7=9A=84=E9=98=BB=E5=A1=9E=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/gateway/handler/ValidateCodeHandler.java | 9 ++++----- .../com/ruoyi/gateway/service/ValidateCodeService.java | 2 +- .../gateway/service/impl/ValidateCodeServiceImpl.java | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java index 547b7145..5c43a647 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java @@ -3,7 +3,6 @@ package com.ruoyi.gateway.handler; import com.ruoyi.common.core.exception.CaptchaException; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.gateway.service.ValidateCodeService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Component; import org.springframework.web.reactive.function.BodyInserters; @@ -12,7 +11,7 @@ import org.springframework.web.reactive.function.server.ServerRequest; import org.springframework.web.reactive.function.server.ServerResponse; import reactor.core.publisher.Mono; -import java.io.IOException; +import javax.annotation.Resource; /** * 楠岃瘉鐮佽幏鍙 @@ -21,7 +20,7 @@ import java.io.IOException; */ @Component public class ValidateCodeHandler implements HandlerFunction { - @Autowired + @Resource private ValidateCodeService validateCodeService; @Override @@ -29,9 +28,9 @@ public class ValidateCodeHandler implements HandlerFunction { AjaxResult ajax; try { ajax = validateCodeService.createCaptcha(); - } catch (CaptchaException | IOException e) { + return ServerResponse.status(HttpStatus.OK).body(BodyInserters.fromValue(ajax)); + } catch (CaptchaException e) { return Mono.error(e); } - return ServerResponse.status(HttpStatus.OK).body(BodyInserters.fromValue(ajax)); } } diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java index 39afdda8..cd6a6a9f 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java @@ -18,7 +18,7 @@ public interface ValidateCodeService { * @throws IOException / * @throws CaptchaException / */ - public AjaxResult createCaptcha() throws IOException, CaptchaException; + public AjaxResult createCaptcha() throws CaptchaException; /** * 鏍￠獙楠岃瘉鐮 diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java index c6cdd359..04518cf9 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java @@ -43,7 +43,7 @@ public class ValidateCodeServiceImpl implements ValidateCodeService { * 鐢熸垚楠岃瘉鐮 */ @Override - public AjaxResult createCaptcha() throws IOException, CaptchaException { + public AjaxResult createCaptcha() throws CaptchaException { AjaxResult ajax = AjaxResult.success(); boolean captchaOnOff = captchaProperties.getEnabled(); ajax.put("captchaOnOff", captchaOnOff); From 79be99d3e1b233bcbd2f4a28e08b250f9e459ab8 Mon Sep 17 00:00:00 2001 From: 1332987 <13329870472@163.com> Date: Wed, 20 Apr 2022 17:21:54 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8Didea=20=20=E6=AD=A3?= =?UTF-8?q?=E5=88=99=E5=86=97=E4=BD=99=E5=92=8Csql=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/utils/file/FileUtils.java | 2 +- .../ruoyi/common/core/utils/sql/SqlUtil.java | 2 +- .../config/SwaggerAutoConfiguration.java | 1 - .../ruoyi/gen/controller/GenController.java | 2 +- .../mapper/generator/GenTableColumnMapper.xml | 2 +- .../job/controller/SysJobLogController.java | 4 +- .../resources/mapper/system/SysDeptMapper.xml | 307 ++++++++++-------- 7 files changed, 174 insertions(+), 146 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java index 1da01947..2d8bc00f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java @@ -25,7 +25,7 @@ public class FileUtils { */ public static final char BACKSLASH = '\\'; - public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+"; + public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-|.\\u4e00-\\u9fa5]+"; /** * 杈撳嚭鎸囧畾鏂囦欢鐨刡yte鏁扮粍 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java index 53bbfc67..54e9d131 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java @@ -17,7 +17,7 @@ public class SqlUtil { /** * 浠呮敮鎸佸瓧姣嶃佹暟瀛椼佷笅鍒掔嚎銆佺┖鏍笺侀楀彿銆佸皬鏁扮偣锛堟敮鎸佸涓瓧娈垫帓搴忥級 */ - public static String SQL_PATTERN = "[a-zA-Z0-9_\\ \\,\\.]+"; + public static String SQL_PATTERN = "[a-zA-Z0-9_ ,.]+"; /** * 妫鏌ュ瓧绗︼紝闃叉娉ㄥ叆缁曡繃 diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java index d8121b2f..40861559 100644 --- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java +++ b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java @@ -47,7 +47,6 @@ public class SwaggerAutoConfiguration { if (swaggerProperties.getBasePath().isEmpty()) { swaggerProperties.getBasePath().add(BASE_PATH); } - // noinspection unchecked List> basePath = new ArrayList>(); swaggerProperties.getBasePath().forEach(path -> basePath.add(PathSelectors.ant(path))); diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java index efd9ce28..aeecb950 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java @@ -78,7 +78,7 @@ public class GenController extends BaseController { * 鏌ヨ鏁版嵁琛ㄥ瓧娈靛垪琛 */ @GetMapping(value = "/column/{tableId}") - public TableDataInfo columnList(Long tableId) { + public TableDataInfo columnList(@PathVariable Long tableId) { TableDataInfo dataInfo = new TableDataInfo(); List list = genTableColumnService.selectGenTableColumnListByTableId(tableId); dataInfo.setRows(list); diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml index 83565467..cf19cfad 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java index d04c229d..7365324c 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java @@ -54,8 +54,8 @@ public class SysJobLogController extends BaseController { */ @RequiresPermissions("monitor:job:query") @GetMapping(value = "/{configId}") - public AjaxResult getInfo(@PathVariable Long jobLogId) { - return AjaxResult.success(jobLogService.selectJobLogById(jobLogId)); + public AjaxResult getInfo(@PathVariable Long configId) { + return AjaxResult.success(jobLogService.selectJobLogById(configId)); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index 3f40fb1b..be8382af 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -1,157 +1,186 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time + + + + + + + + + + + + + + + + + + + + select d.dept_id, + d.parent_id, + d.ancestors, + d.dept_name, + d.order_num, + d.leader, + d.phone, + d.email, + d.status, + d.del_flag, + d.create_by, + d.create_time from sys_dept d - - where d.del_flag = '0' - - AND dept_id = #{deptId} - + + AND dept_id = #{deptId} + - AND parent_id = #{parentId} - - - AND dept_name like concat('%', #{deptName}, '%') - - - AND status = #{status} - - - ${params.dataScope} - order by d.parent_id, d.order_num + AND parent_id = #{parentId} + + + AND dept_name like concat('%', #{deptName}, '%') + + + AND status = #{status} + + + ${params.dataScope} + order by d.parent_id, d.order_num - + - + + and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = + rd.dept_id and rd.role_id = #{roleId}) + + order by d.parent_id, d.order_num + + - + + where dept_id = #{deptId} + + - - - - - - - - - + select count(1) + from sys_user + where dept_id = #{deptId} + and del_flag = '0' + + + + + + + + + + - insert into sys_dept( - dept_id, - parent_id, - dept_name, - ancestors, - order_num, - leader, - phone, - email, - status, - create_by, - create_time - )values( - #{deptId}, - #{parentId}, - #{deptName}, - #{ancestors}, - #{orderNum}, - #{leader}, - #{phone}, - #{email}, - #{status}, - #{createBy}, - sysdate() - ) - - - - update sys_dept - - parent_id = #{parentId}, - dept_name = #{deptName}, - ancestors = #{ancestors}, - order_num = #{orderNum}, - leader = #{leader}, - phone = #{phone}, - email = #{email}, - status = #{status}, - update_by = #{updateBy}, - update_time = sysdate() - - where dept_id = #{deptId} - - - - update sys_dept set ancestors = - - when #{item.deptId} then #{item.ancestors} - - where dept_id in - - #{item.deptId} - - - - - update sys_dept set status = '0' where dept_id in - - #{deptId} + insert into sys_dept( + dept_id, + parent_id, + dept_name, + ancestors, + order_num, + leader, + phone, + email, + status, + create_by, + create_time + )values( + #{deptId}, + #{parentId}, + #{deptName}, + #{ancestors}, + #{orderNum}, + #{leader}, + #{phone}, + #{email}, + #{status}, + #{createBy}, + sysdate() + ) + + + + update sys_dept + + parent_id = #{parentId}, + dept_name = #{deptName}, + ancestors = #{ancestors}, + order_num = #{orderNum}, + leader = #{leader}, + phone = #{phone}, + email = #{email}, + status = #{status}, + update_by = #{updateBy}, + update_time = sysdate() + + where dept_id = #{deptId} + + + + update sys_dept + + ancestors = + + when #{item.deptId} then #{item.ancestors} + + + where dept_id in + + #{item.deptId} - - - - update sys_dept set del_flag = '2' where dept_id = #{deptId} - + + + + update sys_dept set status = '0' where dept_id in + + #{deptId} + + + + + update sys_dept + set del_flag = '2' + where dept_id = #{deptId} + \ No newline at end of file From b7db6f6686f639fa642b270a74d98d0175525015 Mon Sep 17 00:00:00 2001 From: 1332987 <13329870472@163.com> Date: Wed, 20 Apr 2022 18:03:45 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8Didea=20=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E8=AD=A6=E5=91=8A=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/common/core/text/Convert.java | 2 +- .../com/ruoyi/common/core/utils/file/FileUtils.java | 2 -- .../com/ruoyi/common/core/utils/file/ImageUtils.java | 6 +++--- .../com/ruoyi/common/core/utils/html/EscapeUtil.java | 2 +- .../java/com/ruoyi/common/core/utils/ip/IpUtils.java | 2 ++ .../com/ruoyi/common/core/utils/poi/ExcelUtil.java | 8 +++++--- .../java/com/ruoyi/common/core/utils/uuid/UUID.java | 4 +--- .../common/core/exception/ServiceExceptionTest.java | 8 +------- .../java/com/ruoyi/common/log/aspect/LogAspect.java | 1 + .../common/security/aspect/PreAuthorizeAspect.java | 10 +++------- .../ruoyi/common/security/service/TokenService.java | 1 + .../java/com/ruoyi/job/service/SysJobServiceImpl.java | 1 - 12 files changed, 19 insertions(+), 28 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java index 7dc1f0f3..7816cffb 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java @@ -609,7 +609,7 @@ public class Convert { return new BigDecimal((Long) value); } if (value instanceof Double) { - return new BigDecimal((Double) value); + return BigDecimal.valueOf((Double) value); } if (value instanceof Integer) { return new BigDecimal((Integer) value); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java index 2d8bc00f..c1c5d40a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java @@ -47,8 +47,6 @@ public class FileUtils { while ((length = fis.read(b)) > 0) { os.write(b, 0, length); } - } catch (IOException e) { - throw e; } finally { if (os != null) { try { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java index 26bc3e61..74ace6f4 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java @@ -23,7 +23,7 @@ public class ImageUtils { try { return IOUtils.toByteArray(is); } catch (Exception e) { - log.error("鍥剧墖鍔犺浇寮傚父 {}", e); + log.error("鍥剧墖鍔犺浇寮傚父 ", e); return null; } finally { IOUtils.closeQuietly(is); @@ -36,7 +36,7 @@ public class ImageUtils { result = Arrays.copyOf(result, result.length); return new ByteArrayInputStream(result); } catch (Exception e) { - log.error("鑾峰彇鍥剧墖寮傚父 {}", e); + log.error("鑾峰彇鍥剧墖寮傚父 ", e); } return null; } @@ -59,7 +59,7 @@ public class ImageUtils { in = urlConnection.getInputStream(); return IOUtils.toByteArray(in); } catch (Exception e) { - log.error("璁块棶鏂囦欢寮傚父 {}", e); + log.error("璁块棶鏂囦欢寮傚父 ", e); return null; } finally { IOUtils.closeQuietly(in); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java index bd246446..e891154d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java @@ -120,7 +120,7 @@ public class EscapeUtil { tmp.append(content.substring(lastPos)); lastPos = content.length(); } else { - tmp.append(content.substring(lastPos, pos)); + tmp.append(content, lastPos, pos); lastPos = pos; } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java index c7a9c650..3582eee7 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java @@ -189,6 +189,7 @@ public class IpUtils { try { return InetAddress.getLocalHost().getHostAddress(); } catch (UnknownHostException e) { + e.printStackTrace(); } return "127.0.0.1"; } @@ -202,6 +203,7 @@ public class IpUtils { try { return InetAddress.getLocalHost().getHostName(); } catch (UnknownHostException e) { + e.printStackTrace(); } return "鏈煡"; } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java index 617c3e3e..17d7ae56 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java @@ -657,7 +657,7 @@ public class ExcelUtil { addStatisticsData(column, Convert.toStr(value), attr); } } catch (Exception e) { - log.error("瀵煎嚭Excel澶辫触{}", e); + log.error("瀵煎嚭Excel澶辫触", e); } return cell; } @@ -704,10 +704,11 @@ public class ExcelUtil { public String dataFormatHandlerAdapter(Object value, Excel excel) { try { Object instance = excel.handler().newInstance(); - Method formatMethod = excel.handler().getMethod("format", new Class[]{Object.class, String[].class}); + Method formatMethod = excel.handler().getMethod("format", Object.class, String[].class); value = formatMethod.invoke(instance, value, excel.args()); } catch (Exception e) { - log.error("涓嶈兘鏍煎紡鍖栨暟鎹 " + excel.handler(), e.getMessage()); + log.info("涓嶈兘鏍煎紡鍖栨暟鎹 {}" ,excel.handler()); + log.error("涓嶈兘鏍煎紡鍖栨暟鎹 " , e); } return Convert.toStr(value); } @@ -724,6 +725,7 @@ public class ExcelUtil { try { temp = Double.valueOf(text); } catch (NumberFormatException e) { + log.error("NumberFormatException ",e); } statistics.put(index, statistics.get(index) + temp); } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java index 31894af5..494080b2 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java @@ -422,9 +422,7 @@ public final class UUID implements java.io.Serializable, Comparable { // can simply be numerically compared as two numbers return (this.mostSigBits < val.mostSigBits ? -1 : (this.mostSigBits > val.mostSigBits ? 1 : - (this.leastSigBits < val.leastSigBits ? -1 : - (this.leastSigBits > val.leastSigBits ? 1 : - 0)))); + (Long.compare(this.leastSigBits, val.leastSigBits)))); } /** diff --git a/ruoyi-common/ruoyi-common-core/src/main/test/java/com/ruoyi/common/core/exception/ServiceExceptionTest.java b/ruoyi-common/ruoyi-common-core/src/main/test/java/com/ruoyi/common/core/exception/ServiceExceptionTest.java index b8977659..76a6fd5b 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/test/java/com/ruoyi/common/core/exception/ServiceExceptionTest.java +++ b/ruoyi-common/ruoyi-common-core/src/main/test/java/com/ruoyi/common/core/exception/ServiceExceptionTest.java @@ -20,8 +20,6 @@ class ServiceExceptionTest { @Test void testThirdTest() { GlobalException globalException2 = new GlobalException(""); - globalException2.getMessage(); - globalException2.getDetailMessage(); globalException2.setDetailMessage(""); throw globalException2; } @@ -29,12 +27,8 @@ class ServiceExceptionTest { @Test void testThirdTest2() { GlobalException globalException2 = new GlobalException(); - globalException2.getMessage(); - globalException2.getDetailMessage(); System.out.println(globalException2.getMessage()); System.out.println(globalException2.getDetailMessage()); - System.out.println(globalException2.setDetailMessage("")); - globalException2.setDetailMessage(""); - throw globalException2; + throw globalException2.setDetailMessage(""); } } \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java index 78927c38..e5ccd3a6 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java @@ -147,6 +147,7 @@ public class LogAspect { Object jsonObj = JSON.toJSON(o); params += jsonObj.toString() + " "; } catch (Exception e) { + e.printStackTrace(); } } } diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java index cd02ca98..589eb6da 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java @@ -53,13 +53,9 @@ public class PreAuthorizeAspect { // 娉ㄨВ閴存潈 MethodSignature signature = (MethodSignature) joinPoint.getSignature(); checkMethodAnnotation(signature.getMethod()); - try { - // 鎵ц鍘熸湁閫昏緫 - Object obj = joinPoint.proceed(); - return obj; - } catch (Throwable e) { - throw e; - } + // 鎵ц鍘熸湁閫昏緫 + Object obj = joinPoint.proceed(); + return obj; } /** diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java index 7f5ef121..b5173179 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java @@ -103,6 +103,7 @@ public class TokenService { return user; } } catch (Exception e) { + e.printStackTrace(); } return user; } diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java index 6f9723f2..ddb7e236 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java @@ -10,7 +10,6 @@ import org.quartz.JobDataMap; import org.quartz.JobKey; import org.quartz.Scheduler; import org.quartz.SchedulerException; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional;