From 6848bf919648f78cc8d845b934b6df11a092916a Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Wed, 24 Jul 2024 15:07:56 +0800 Subject: [PATCH 01/82] =?UTF-8?q?[feat]=20=E5=8F=98=E6=9B=B4=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E4=B8=AD=E5=9F=BA=E7=A1=80=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=9C=B0=E5=9D=80=E6=8C=87=E5=90=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-auth/src/main/resources/bootstrap.yml | 4 ++-- ruoyi-gateway/src/main/resources/bootstrap.yml | 8 ++++---- .../ruoyi-file/src/main/resources/bootstrap.yml | 4 ++-- .../ruoyi-gen/src/main/resources/bootstrap.yml | 4 ++-- .../ruoyi-job/src/main/resources/bootstrap.yml | 4 ++-- .../ruoyi-system/src/main/resources/bootstrap.yml | 4 ++-- .../ruoyi-monitor/src/main/resources/bootstrap.yml | 4 ++-- sql/ry_config_20231204.sql | 10 +++++----- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index f456b03c0..8241b81ab 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: local.zkjiadi.cn:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: local.zkjiadi.cn:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index b6dc98ae6..e1ef7e986 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: local.zkjiadi.cn:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: local.zkjiadi.cn:8848 # 配置文件格式 file-extension: yml # 共享配置 @@ -28,12 +28,12 @@ spring: eager: true transport: # 控制台地址 - dashboard: 127.0.0.1:8718 + dashboard: local.zkjiadi.cn:8718 # nacos配置持久化 datasource: ds1: nacos: - server-addr: 127.0.0.1:8848 + server-addr: local.zkjiadi.cn:8848 dataId: sentinel-ruoyi-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml index 55ff41125..220265943 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: local.zkjiadi.cn:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: local.zkjiadi.cn:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml index 0ef5a4575..021e39aa9 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: local.zkjiadi.cn:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: local.zkjiadi.cn:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml index b86f8c9e1..368e9f6ef 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: local.zkjiadi.cn:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: local.zkjiadi.cn:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml index 40ab78165..ba778e8d4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: local.zkjiadi.cn:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: local.zkjiadi.cn:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml index 13d90cd72..e4bc41c0c 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: local.zkjiadi.cn:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: local.zkjiadi.cn:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sql/ry_config_20231204.sql b/sql/ry_config_20231204.sql index 1b423ed30..a8e6f8857 100644 --- a/sql/ry_config_20231204.sql +++ b/sql/ry_config_20231204.sql @@ -34,12 +34,12 @@ CREATE TABLE `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, encrypted_data_key) values (1,'application-dev.yml','DEFAULT_GROUP','spring:\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n mvc:\n pathmatch:\n matching-strategy: ant_path_matcher\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 min-request-size: 8192\n response:\n enabled: true\n\n# 暴露监控端点\nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'\n','58dde4e3760499d3bac2d77a3a1e9018','2020-05-20 12:00:00','2023-12-04 08:08:23','nacos','0:0:0:0:0:0:0:1','','','通用配置','null','null','yaml','',''), -(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','57cec5abd0e0a6b77d853750344a9dc0','2020-05-14 14:17:55','2022-09-29 02:48:32','nacos','0:0:0:0:0:0:0:1','','','网关模块','null','null','yaml','',''), -(3,'ruoyi-auth-dev.yml','DEFAULT_GROUP','spring:\n redis:\n host: localhost\n port: 6379\n password:\n','8bd9dada9a94822feeab40de55efced6','2020-11-20 00:00:00','2022-09-29 02:48:42','nacos','0:0:0:0:0:0:0:1','','','认证中心','null','null','yaml','',''), +(2,'ruoyi-gateway-dev.yml','DEFAULT_GROUP','spring:\n redis:\n host: local.zkjiadi.cn\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','57cec5abd0e0a6b77d853750344a9dc0','2020-05-14 14:17:55','2022-09-29 02:48:32','nacos','0:0:0:0:0:0:0:1','','','网关模块','null','null','yaml','',''), +(3,'ruoyi-auth-dev.yml','DEFAULT_GROUP','spring:\n redis:\n host: local.zkjiadi.cn\n port: 6379\n password:\n','8bd9dada9a94822feeab40de55efced6','2020-11-20 00:00:00','2022-09-29 02:48:42','nacos','0:0:0:0:0:0:0:1','','','认证中心','null','null','yaml','',''), (4,'ruoyi-monitor-dev.yml','DEFAULT_GROUP','# spring\nspring:\n security:\n user:\n name: ruoyi\n password: 123456\n boot:\n admin:\n ui:\n title: 若依服务状态监控\n','6f122fd2bfb8d45f858e7d6529a9cd44','2020-11-20 00:00:00','2022-09-29 02:48:54','nacos','0:0:0:0:0:0:0:1','','','监控中心','null','null','yaml','',''), -(5,'ruoyi-system-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n connectTimeout: 30000\n socketTimeout: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.system\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 系统模块接口文档\n license: Powered By ruoyi\n licenseUrl: https://ruoyi.vip','00678c89684ec0b825cb9b71e032db64','2020-11-20 00:00:00','2023-12-04 07:51:28','nacos','0:0:0:0:0:0:0:1','','','系统模块','null','null','yaml','',''), -(6,'ruoyi-gen-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password:\n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.gen.domain\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 代码生成接口文档\n license: Powered By ruoyi\n licenseUrl: https://ruoyi.vip\n\n# 代码生成\ngen:\n # 作者\n author: ruoyi\n # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool\n packageName: com.ruoyi.system\n # 自动去除表前缀，默认是false\n autoRemovePre: false\n # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）\n tablePrefix: sys_\n','eb592420b3fceae1402881887b8a6a0d','2020-11-20 00:00:00','2022-09-29 02:49:42','nacos','0:0:0:0:0:0:0:1','','','代码生成','null','null','yaml','',''), -(7,'ruoyi-job-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.job.domain\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 定时任务接口文档\n license: Powered By ruoyi\n licenseUrl: https://ruoyi.vip\n','edcf0e3fe13fea07b4ec08b1088f30b3','2020-11-20 00:00:00','2022-09-29 02:50:50','nacos','0:0:0:0:0:0:0:1','','','定时任务','null','null','yaml','',''), +(5,'ruoyi-system-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: local.zkjiadi.cn\n port: 6379\n password:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n connectTimeout: 30000\n socketTimeout: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.system\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 系统模块接口文档\n license: Powered By ruoyi\n licenseUrl: https://ruoyi.vip','00678c89684ec0b825cb9b71e032db64','2020-11-20 00:00:00','2023-12-04 07:51:28','nacos','0:0:0:0:0:0:0:1','','','系统模块','null','null','yaml','',''), +(6,'ruoyi-gen-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: local.zkjiadi.cn\n port: 6379\n password:\n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.gen.domain\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 代码生成接口文档\n license: Powered By ruoyi\n licenseUrl: https://ruoyi.vip\n\n# 代码生成\ngen:\n # 作者\n author: ruoyi\n # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool\n packageName: com.ruoyi.system\n # 自动去除表前缀，默认是false\n autoRemovePre: false\n # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）\n tablePrefix: sys_\n','eb592420b3fceae1402881887b8a6a0d','2020-11-20 00:00:00','2022-09-29 02:49:42','nacos','0:0:0:0:0:0:0:1','','','代码生成','null','null','yaml','',''), +(7,'ruoyi-job-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: local.zkjiadi.cn\n port: 6379\n password: \n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.job.domain\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 定时任务接口文档\n license: Powered By ruoyi\n licenseUrl: https://ruoyi.vip\n','edcf0e3fe13fea07b4ec08b1088f30b3','2020-11-20 00:00:00','2022-09-29 02:50:50','nacos','0:0:0:0:0:0:0:1','','','定时任务','null','null','yaml','',''), (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,''); From 6880fd38d77747bd346a03e1a5adcfd980fca2d6 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Wed, 24 Jul 2024 15:09:42 +0800 Subject: [PATCH 02/82] =?UTF-8?q?[fix]=20=E4=BF=AE=E6=94=B9.gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/.gitignore | 47 +++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/ruoyi-ui/.gitignore b/ruoyi-ui/.gitignore index 2c9b3a73f..aed792184 100644 --- a/ruoyi-ui/.gitignore +++ b/ruoyi-ui/.gitignore @@ -1,23 +1,24 @@ -.DS_Store -node_modules/ -dist/ -npm-debug.log* -yarn-debug.log* -yarn-error.log* -**/*.log - -tests/**/coverage/ -tests/e2e/reports -selenium-debug.log - -# Editor directories and files -.idea -.vscode -*.suo -*.ntvs* -*.njsproj -*.sln -*.local - -package-lock.json -yarn.lock +.DS_Store +node_modules/ +dist/ +npm-debug.log* +yarn-debug.log* +yarn-error.log* +**/*.log + +tests/**/coverage/ +tests/e2e/reports +selenium-debug.log + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.local + +package-lock.json +yarn.lock +pnpm-lock.yaml From ff22cd374ff6b19ba2fec671b725c954977976fa Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Thu, 25 Jul 2024 13:41:15 +0800 Subject: [PATCH 03/82] =?UTF-8?q?[feat]=20=E6=96=B0=E5=A2=9E=E8=B7=A8?= =?UTF-8?q?=E5=9F=9F=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-gateway/pom.xml | 308 +++++++++++------- .../com/ruoyi/gateway/config/CorsFilter.kt | 32 ++ 2 files changed, 230 insertions(+), 110 deletions(-) create mode 100644 ruoyi-gateway/src/main/kotlin/com/ruoyi/gateway/config/CorsFilter.kt diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index 771df7fd0..d698c0feb 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -1,110 +1,198 @@ - - - com.ruoyi - ruoyi - 3.6.4 - - 4.0.0 - - ruoyi-gateway - - - ruoyi-gateway网关模块 - - - - - - - org.springframework.cloud - spring-cloud-starter-gateway - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - com.alibaba.cloud - spring-cloud-alibaba-sentinel-gateway - - - - - com.alibaba.csp - sentinel-datasource-nacos - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - org.springframework.cloud - spring-cloud-loadbalancer - - - - - pro.fessional - kaptcha - - - - - com.ruoyi - ruoyi-common-redis - - - - - io.springfox - springfox-swagger-ui - ${swagger.fox.version} - - - io.springfox - springfox-swagger2 - ${swagger.fox.version} - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - - + + + com.ruoyi + ruoyi + 3.6.4 + + 4.0.0 + + ruoyi-gateway + + + ruoyi-gateway网关模块 + + + + 2.0.0 + + + + + + + org.springframework.cloud + spring-cloud-starter-gateway + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + com.alibaba.cloud + spring-cloud-alibaba-sentinel-gateway + + + + + com.alibaba.csp + sentinel-datasource-nacos + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + org.springframework.cloud + spring-cloud-loadbalancer + + + + + pro.fessional + kaptcha + + + + + com.ruoyi + ruoyi-common-redis + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + io.springfox + springfox-swagger2 + ${swagger.fox.version} + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-test + ${kotlin.version} + test + + + + + + ${project.artifactId} + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.8 + + + add-source + generate-sources + + add-source + + + + src/main/java + src/main/kotlin + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + org.jetbrains.kotlin + kotlin-maven-plugin + ${kotlin.version} + + + compile + compile + + compile + + + + test-compile + test-compile + + test-compile + + + + + 1.8 + + + + org.apache.maven.plugins + maven-compiler-plugin + + + default-compile + none + + + default-testCompile + none + + + compile + compile + + compile + + + + testCompile + test-compile + + testCompile + + + + + + + + diff --git a/ruoyi-gateway/src/main/kotlin/com/ruoyi/gateway/config/CorsFilter.kt b/ruoyi-gateway/src/main/kotlin/com/ruoyi/gateway/config/CorsFilter.kt new file mode 100644 index 000000000..aa4a04712 --- /dev/null +++ b/ruoyi-gateway/src/main/kotlin/com/ruoyi/gateway/config/CorsFilter.kt @@ -0,0 +1,32 @@ +package com.ruoyi.gateway.config + +import org.apache.commons.lang3.ObjectUtils +import org.springframework.beans.factory.annotation.Value +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration +import org.springframework.web.server.WebFilter + + +@Configuration +open class CorsConfig { + @Value("\${cors.orgins}") + private val corsOrgins: String? = null + + @Bean + open fun corsFilter(): WebFilter { + return WebFilter { exchange, chain -> + val response = exchange.response + val request = exchange.request + if (!ObjectUtils.isEmpty(corsOrgins)) { + response.headers["Access-Control-Allow-Origin"] = corsOrgins + } else { + response.headers["Access-Control-Allow-Origin"] = "*" + } + response.headers["Access-Control-Allow-Credentials"] = "true" + response.headers["Access-Control-Max-Age"] = "3600" + response.headers["Access-Control-Allow-Methods"] = "GET,POST,PUT,DELETE,OPTIONS,HEAD" + response.headers["Access-Control-Allow-Headers"] = "X-Requested-With, Content-Type, Authorization, credential, X-XSRF-TOKEN, token, Admin-Token, App-Token" + chain.filter(exchange.mutate().request(request.mutate().build()).build()) + } + } +} \ No newline at end of file From f4e95161e38591ee381999dcc37fba8fc41ac03f Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Fri, 26 Jul 2024 10:42:40 +0800 Subject: [PATCH 04/82] =?UTF-8?q?[feat]=20=E5=8F=98=E6=9B=B4=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=9C=8D=E5=8A=A1=E5=9C=B0=E5=9D=80=E8=B5=B0=E5=90=91?= =?UTF-8?q?nacos.zkjiadi.cc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-auth/src/main/resources/bootstrap.yml | 50 ++++++------ .../com/ruoyi/gateway/config/CorsFilter.kt | 10 ++- .../src/main/resources/bootstrap.yml | 80 +++++++++---------- .../src/main/resources/bootstrap.yml | 50 ++++++------ .../src/main/resources/bootstrap.yml | 50 ++++++------ .../src/main/resources/bootstrap.yml | 50 ++++++------ .../src/main/resources/bootstrap.yml | 50 ++++++------ .../src/main/resources/bootstrap.yml | 50 ++++++------ 8 files changed, 199 insertions(+), 191 deletions(-) diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index 8241b81ab..ef290f9f5 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -1,25 +1,25 @@ -# Tomcat -server: - port: 9200 - -# Spring -spring: - application: - # 应用名称 - name: ruoyi-auth - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: local.zkjiadi.cn:8848 - config: - # 配置中心地址 - server-addr: local.zkjiadi.cn:8848 - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +# Tomcat +server: + port: 9200 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-auth + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/ruoyi-gateway/src/main/kotlin/com/ruoyi/gateway/config/CorsFilter.kt b/ruoyi-gateway/src/main/kotlin/com/ruoyi/gateway/config/CorsFilter.kt index aa4a04712..e0a8b6d58 100644 --- a/ruoyi-gateway/src/main/kotlin/com/ruoyi/gateway/config/CorsFilter.kt +++ b/ruoyi-gateway/src/main/kotlin/com/ruoyi/gateway/config/CorsFilter.kt @@ -4,6 +4,8 @@ import org.apache.commons.lang3.ObjectUtils import org.springframework.beans.factory.annotation.Value import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration +import org.springframework.http.HttpMethod +import org.springframework.http.HttpStatus import org.springframework.web.server.WebFilter @@ -22,10 +24,16 @@ open class CorsConfig { } else { response.headers["Access-Control-Allow-Origin"] = "*" } + response.headers["Access-Control-Expose-Headers"] = "*" response.headers["Access-Control-Allow-Credentials"] = "true" response.headers["Access-Control-Max-Age"] = "3600" response.headers["Access-Control-Allow-Methods"] = "GET,POST,PUT,DELETE,OPTIONS,HEAD" - response.headers["Access-Control-Allow-Headers"] = "X-Requested-With, Content-Type, Authorization, credential, X-XSRF-TOKEN, token, Admin-Token, App-Token" + response.headers["Access-Control-Allow-Headers"] = + "X-Requested-With, Content-Type, Authorization, credential, X-XSRF-TOKEN, token, Admin-Token, App-Token" + if (HttpMethod.OPTIONS.equals(request.method)) { + response.statusCode = HttpStatus.OK + chain.filter(exchange) + } chain.filter(exchange.mutate().request(request.mutate().build()).build()) } } diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index e1ef7e986..85c2f2c0c 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -1,40 +1,40 @@ -# Tomcat -server: - port: 8080 - -# Spring -spring: - application: - # 应用名称 - name: ruoyi-gateway - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: local.zkjiadi.cn:8848 - config: - # 配置中心地址 - server-addr: local.zkjiadi.cn:8848 - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - sentinel: - # 取消控制台懒加载 - eager: true - transport: - # 控制台地址 - dashboard: local.zkjiadi.cn:8718 - # nacos配置持久化 - datasource: - ds1: - nacos: - server-addr: local.zkjiadi.cn:8848 - dataId: sentinel-ruoyi-gateway - groupId: DEFAULT_GROUP - data-type: json - rule-type: gw-flow +# Tomcat +server: + port: 8080 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-gateway + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + sentinel: + # 取消控制台懒加载 + eager: true + transport: + # 控制台地址 + dashboard: nacos.zkjiadi.cc:8718 + # nacos配置持久化 + datasource: + ds1: + nacos: + server-addr: nacos.zkjiadi.cc + dataId: sentinel-ruoyi-gateway + groupId: DEFAULT_GROUP + data-type: json + rule-type: gw-flow diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml index 220265943..0340a1255 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml @@ -1,25 +1,25 @@ -# Tomcat -server: - port: 9300 - -# Spring -spring: - application: - # 应用名称 - name: ruoyi-file - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: local.zkjiadi.cn:8848 - config: - # 配置中心地址 - server-addr: local.zkjiadi.cn:8848 - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +# Tomcat +server: + port: 9300 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-file + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml index 021e39aa9..e766c475e 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml @@ -1,25 +1,25 @@ -# Tomcat -server: - port: 9202 - -# Spring -spring: - application: - # 应用名称 - name: ruoyi-gen - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: local.zkjiadi.cn:8848 - config: - # 配置中心地址 - server-addr: local.zkjiadi.cn:8848 - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +# Tomcat +server: + port: 9202 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-gen + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml index 368e9f6ef..0de5aeec1 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml @@ -1,25 +1,25 @@ -# Tomcat -server: - port: 9203 - -# Spring -spring: - application: - # 应用名称 - name: ruoyi-job - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: local.zkjiadi.cn:8848 - config: - # 配置中心地址 - server-addr: local.zkjiadi.cn:8848 - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +# Tomcat +server: + port: 9203 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-job + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml index ba778e8d4..399f291d2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml @@ -1,25 +1,25 @@ -# Tomcat -server: - port: 9201 - -# Spring -spring: - application: - # 应用名称 - name: ruoyi-system - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: local.zkjiadi.cn:8848 - config: - # 配置中心地址 - server-addr: local.zkjiadi.cn:8848 - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +# Tomcat +server: + port: 9201 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-system + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml index e4bc41c0c..76d8d80e0 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml @@ -1,25 +1,25 @@ -# Tomcat -server: - port: 9100 - -# Spring -spring: - application: - # 应用名称 - name: ruoyi-monitor - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: local.zkjiadi.cn:8848 - config: - # 配置中心地址 - server-addr: local.zkjiadi.cn:8848 - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +# Tomcat +server: + port: 9100 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-monitor + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} From def5b1a35372e278fdd1b502e33fa874bc3e3d60 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Fri, 26 Jul 2024 11:07:55 +0800 Subject: [PATCH 05/82] =?UTF-8?q?[feat]=20=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=96=B0=E5=A2=9E=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-auth/src/main/resources/bootstrap.yml | 22 +++++++++++ .../src/main/resources/bootstrap.yml | 37 +++++++++++++++++++ .../src/main/resources/bootstrap.yml | 22 +++++++++++ .../src/main/resources/bootstrap.yml | 22 +++++++++++ .../src/main/resources/bootstrap.yml | 22 +++++++++++ .../src/main/resources/bootstrap.yml | 22 +++++++++++ .../src/main/resources/bootstrap.yml | 22 +++++++++++ 7 files changed, 169 insertions(+) diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index ef290f9f5..64561ae5b 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -23,3 +23,25 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +--- +#测试环境 +spring: + application: + # 应用名称 + name: ruoyi-auth + profiles: + # 环境配置 + active: test + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index 85c2f2c0c..afda6e88b 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -38,3 +38,40 @@ spring: groupId: DEFAULT_GROUP data-type: json rule-type: gw-flow +--- +#测试环境 +spring: + application: + # 应用名称 + name: ruoyi-gateway + profiles: + # 环境配置 + active: test + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + sentinel: + # 取消控制台懒加载 + eager: true + transport: + # 控制台地址 + dashboard: nacos.zkjiadi.cc:8718 + # nacos配置持久化 + datasource: + ds1: + nacos: + server-addr: nacos.zkjiadi.cc + dataId: sentinel-ruoyi-gateway + groupId: DEFAULT_GROUP + data-type: json + rule-type: gw-flow \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml index 0340a1255..0e2bb46c7 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml @@ -23,3 +23,25 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +--- +#测试环境 +spring: + application: + # 应用名称 + name: ruoyi-file + profiles: + # 环境配置 + active: test + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml index e766c475e..075b62ba4 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml @@ -23,3 +23,25 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +--- +#测试环境 +spring: + application: + # 应用名称 + name: ruoyi-gen + profiles: + # 环境配置 + active: test + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml index 0de5aeec1..562f1f4bc 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml @@ -23,3 +23,25 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +--- +#测试环境 +spring: + application: + # 应用名称 + name: ruoyi-job + profiles: + # 环境配置 + active: test + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml index 399f291d2..31a036e7a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml @@ -23,3 +23,25 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +--- +#测试环境 +spring: + application: + # 应用名称 + name: ruoyi-system + profiles: + # 环境配置 + active: test + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml index 76d8d80e0..40d6d6157 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml @@ -23,3 +23,25 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +--- +#测试环境 +spring: + application: + # 应用名称 + name: ruoyi-monitor + profiles: + # 环境配置 + active: test + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} From d9782e941cf37caf747bce3f5a94581bea81a1ed Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Fri, 26 Jul 2024 15:21:34 +0800 Subject: [PATCH 06/82] =?UTF-8?q?[feat]=20=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=8C=BA=E5=88=86=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=92=8C=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap-dev.yml | 24 ++++++ .../src/main/resources/bootstrap-test.yml | 24 ++++++ ruoyi-auth/src/main/resources/bootstrap.yml | 47 +---------- .../src/main/resources/bootstrap-dev.yml | 39 ++++++++++ .../src/main/resources/bootstrap-test.yml | 39 ++++++++++ .../src/main/resources/bootstrap.yml | 77 +------------------ .../src/main/resources/bootstrap-dev.yml | 24 ++++++ .../src/main/resources/bootstrap-test.yml | 24 ++++++ .../src/main/resources/bootstrap.yml | 47 +---------- .../src/main/resources/bootstrap-dev.yml | 24 ++++++ .../src/main/resources/bootstrap-test.yml | 24 ++++++ .../src/main/resources/bootstrap.yml | 47 +---------- .../src/main/resources/bootstrap-dev.yml | 24 ++++++ .../src/main/resources/bootstrap-test.yml | 24 ++++++ .../src/main/resources/bootstrap.yml | 47 +---------- .../src/main/resources/bootstrap-dev.yml | 24 ++++++ .../src/main/resources/bootstrap-test.yml | 23 ++++++ .../src/main/resources/bootstrap.yml | 47 +---------- .../src/main/resources/bootstrap-dev.yml | 24 ++++++ .../src/main/resources/bootstrap-test.yml | 24 ++++++ .../src/main/resources/bootstrap.yml | 47 +---------- 21 files changed, 379 insertions(+), 345 deletions(-) create mode 100644 ruoyi-auth/src/main/resources/bootstrap-dev.yml create mode 100644 ruoyi-auth/src/main/resources/bootstrap-test.yml create mode 100644 ruoyi-gateway/src/main/resources/bootstrap-dev.yml create mode 100644 ruoyi-gateway/src/main/resources/bootstrap-test.yml create mode 100644 ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-dev.yml create mode 100644 ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-test.yml create mode 100644 ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-dev.yml create mode 100644 ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-test.yml create mode 100644 ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-dev.yml create mode 100644 ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-test.yml create mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-dev.yml create mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-test.yml create mode 100644 ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-dev.yml create mode 100644 ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-test.yml diff --git a/ruoyi-auth/src/main/resources/bootstrap-dev.yml b/ruoyi-auth/src/main/resources/bootstrap-dev.yml new file mode 100644 index 000000000..40c5f5697 --- /dev/null +++ b/ruoyi-auth/src/main/resources/bootstrap-dev.yml @@ -0,0 +1,24 @@ +# Tomcat +server: + port: 9200 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-auth + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + namespace: 78a7f41e-46cc-437a-9716-735888227693 + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: 78a7f41e-46cc-437a-9716-735888227693 \ No newline at end of file diff --git a/ruoyi-auth/src/main/resources/bootstrap-test.yml b/ruoyi-auth/src/main/resources/bootstrap-test.yml new file mode 100644 index 000000000..e3609d0d9 --- /dev/null +++ b/ruoyi-auth/src/main/resources/bootstrap-test.yml @@ -0,0 +1,24 @@ +# Tomcat +server: + port: 9200 + +#测试环境 +spring: + application: + # 应用名称 + name: ruoyi-auth + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 \ No newline at end of file diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index 64561ae5b..03234a17e 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -1,47 +1,4 @@ -# Tomcat -server: - port: 9200 - -# Spring -spring: - application: - # 应用名称 - name: ruoyi-auth - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: nacos.zkjiadi.cc - config: - # 配置中心地址 - server-addr: nacos.zkjiadi.cc - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} ---- -#测试环境 +# Spring默认环境配置 spring: - application: - # 应用名称 - name: ruoyi-auth profiles: - # 环境配置 - active: test - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: nacos.zkjiadi.cc - config: - # 配置中心地址 - server-addr: nacos.zkjiadi.cc - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + active: dev \ No newline at end of file diff --git a/ruoyi-gateway/src/main/resources/bootstrap-dev.yml b/ruoyi-gateway/src/main/resources/bootstrap-dev.yml new file mode 100644 index 000000000..c39fa7321 --- /dev/null +++ b/ruoyi-gateway/src/main/resources/bootstrap-dev.yml @@ -0,0 +1,39 @@ +# Tomcat +server: + port: 8080 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-gateway + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + namespace: 78a7f41e-46cc-437a-9716-735888227693 + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: 78a7f41e-46cc-437a-9716-735888227693 + sentinel: + # 取消控制台懒加载 + eager: true + transport: + # 控制台地址 + dashboard: nacos.zkjiadi.cc:8718 + # nacos配置持久化 + datasource: + ds1: + nacos: + server-addr: nacos.zkjiadi.cc + dataId: sentinel-ruoyi-gateway + groupId: DEFAULT_GROUP + data-type: json + rule-type: gw-flow \ No newline at end of file diff --git a/ruoyi-gateway/src/main/resources/bootstrap-test.yml b/ruoyi-gateway/src/main/resources/bootstrap-test.yml new file mode 100644 index 000000000..5018fdf54 --- /dev/null +++ b/ruoyi-gateway/src/main/resources/bootstrap-test.yml @@ -0,0 +1,39 @@ +# Tomcat +server: + port: 8080 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-gateway + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 + sentinel: + # 取消控制台懒加载 + eager: true + transport: + # 控制台地址 + dashboard: nacos.zkjiadi.cc:8718 + # nacos配置持久化 + datasource: + ds1: + nacos: + server-addr: nacos.zkjiadi.cc + dataId: sentinel-ruoyi-gateway + groupId: DEFAULT_GROUP + data-type: json + rule-type: gw-flow \ No newline at end of file diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index afda6e88b..03234a17e 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -1,77 +1,4 @@ -# Tomcat -server: - port: 8080 - -# Spring -spring: - application: - # 应用名称 - name: ruoyi-gateway - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: nacos.zkjiadi.cc - config: - # 配置中心地址 - server-addr: nacos.zkjiadi.cc - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - sentinel: - # 取消控制台懒加载 - eager: true - transport: - # 控制台地址 - dashboard: nacos.zkjiadi.cc:8718 - # nacos配置持久化 - datasource: - ds1: - nacos: - server-addr: nacos.zkjiadi.cc - dataId: sentinel-ruoyi-gateway - groupId: DEFAULT_GROUP - data-type: json - rule-type: gw-flow ---- -#测试环境 +# Spring默认环境配置 spring: - application: - # 应用名称 - name: ruoyi-gateway profiles: - # 环境配置 - active: test - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: nacos.zkjiadi.cc - config: - # 配置中心地址 - server-addr: nacos.zkjiadi.cc - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - sentinel: - # 取消控制台懒加载 - eager: true - transport: - # 控制台地址 - dashboard: nacos.zkjiadi.cc:8718 - # nacos配置持久化 - datasource: - ds1: - nacos: - server-addr: nacos.zkjiadi.cc - dataId: sentinel-ruoyi-gateway - groupId: DEFAULT_GROUP - data-type: json - rule-type: gw-flow \ No newline at end of file + active: dev \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-dev.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-dev.yml new file mode 100644 index 000000000..f00525d61 --- /dev/null +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-dev.yml @@ -0,0 +1,24 @@ +# Tomcat +server: + port: 9300 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-file + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + namespace: 78a7f41e-46cc-437a-9716-735888227693 + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: 78a7f41e-46cc-437a-9716-735888227693 \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-test.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-test.yml new file mode 100644 index 000000000..aeaea49cc --- /dev/null +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-test.yml @@ -0,0 +1,24 @@ +# Tomcat +server: + port: 9300 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-file + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml index 0e2bb46c7..03234a17e 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml @@ -1,47 +1,4 @@ -# Tomcat -server: - port: 9300 - -# Spring -spring: - application: - # 应用名称 - name: ruoyi-file - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: nacos.zkjiadi.cc - config: - # 配置中心地址 - server-addr: nacos.zkjiadi.cc - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} ---- -#测试环境 +# Spring默认环境配置 spring: - application: - # 应用名称 - name: ruoyi-file profiles: - # 环境配置 - active: test - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: nacos.zkjiadi.cc - config: - # 配置中心地址 - server-addr: nacos.zkjiadi.cc - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + active: dev \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-dev.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-dev.yml new file mode 100644 index 000000000..e88328efa --- /dev/null +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-dev.yml @@ -0,0 +1,24 @@ +# Tomcat +server: + port: 9202 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-gen + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + namespace: 78a7f41e-46cc-437a-9716-735888227693 + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: 78a7f41e-46cc-437a-9716-735888227693 \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-test.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-test.yml new file mode 100644 index 000000000..906c94961 --- /dev/null +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-test.yml @@ -0,0 +1,24 @@ +# Tomcat +server: + port: 9202 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-gen + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml index 075b62ba4..03234a17e 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml @@ -1,47 +1,4 @@ -# Tomcat -server: - port: 9202 - -# Spring -spring: - application: - # 应用名称 - name: ruoyi-gen - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: nacos.zkjiadi.cc - config: - # 配置中心地址 - server-addr: nacos.zkjiadi.cc - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} ---- -#测试环境 +# Spring默认环境配置 spring: - application: - # 应用名称 - name: ruoyi-gen profiles: - # 环境配置 - active: test - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: nacos.zkjiadi.cc - config: - # 配置中心地址 - server-addr: nacos.zkjiadi.cc - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + active: dev \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-dev.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-dev.yml new file mode 100644 index 000000000..6081c2d52 --- /dev/null +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-dev.yml @@ -0,0 +1,24 @@ +# Tomcat +server: + port: 9203 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-job + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + namespace: 78a7f41e-46cc-437a-9716-735888227693 + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: 78a7f41e-46cc-437a-9716-735888227693 \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-test.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-test.yml new file mode 100644 index 000000000..419103a27 --- /dev/null +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-test.yml @@ -0,0 +1,24 @@ +# Tomcat +server: + port: 9203 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-job + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml index 562f1f4bc..03234a17e 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml @@ -1,47 +1,4 @@ -# Tomcat -server: - port: 9203 - -# Spring -spring: - application: - # 应用名称 - name: ruoyi-job - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: nacos.zkjiadi.cc - config: - # 配置中心地址 - server-addr: nacos.zkjiadi.cc - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} ---- -#测试环境 +# Spring默认环境配置 spring: - application: - # 应用名称 - name: ruoyi-job profiles: - # 环境配置 - active: test - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: nacos.zkjiadi.cc - config: - # 配置中心地址 - server-addr: nacos.zkjiadi.cc - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + active: dev \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-dev.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-dev.yml new file mode 100644 index 000000000..5f5b5a75a --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-dev.yml @@ -0,0 +1,24 @@ +# Tomcat +server: + port: 9201 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-system + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + namespace: 78a7f41e-46cc-437a-9716-735888227693 + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: 78a7f41e-46cc-437a-9716-735888227693 \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-test.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-test.yml new file mode 100644 index 000000000..bc95cdae3 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-test.yml @@ -0,0 +1,23 @@ +# Tomcat +server: + port: 9201 +#测试环境 +spring: + application: + # 应用名称 + name: ruoyi-system + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml index 31a036e7a..03234a17e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml @@ -1,47 +1,4 @@ -# Tomcat -server: - port: 9201 - -# Spring -spring: - application: - # 应用名称 - name: ruoyi-system - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: nacos.zkjiadi.cc - config: - # 配置中心地址 - server-addr: nacos.zkjiadi.cc - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} ---- -#测试环境 +# Spring默认环境配置 spring: - application: - # 应用名称 - name: ruoyi-system profiles: - # 环境配置 - active: test - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: nacos.zkjiadi.cc - config: - # 配置中心地址 - server-addr: nacos.zkjiadi.cc - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + active: dev \ No newline at end of file diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-dev.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-dev.yml new file mode 100644 index 000000000..eb0fc7773 --- /dev/null +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-dev.yml @@ -0,0 +1,24 @@ +# Tomcat +server: + port: 9100 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-monitor + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + namespace: 78a7f41e-46cc-437a-9716-735888227693 + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: 78a7f41e-46cc-437a-9716-735888227693 \ No newline at end of file diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-test.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-test.yml new file mode 100644 index 000000000..b693ad45d --- /dev/null +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-test.yml @@ -0,0 +1,24 @@ +# Tomcat +server: + port: 9100 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-monitor + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 \ No newline at end of file diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml index 40d6d6157..03234a17e 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml @@ -1,47 +1,4 @@ -# Tomcat -server: - port: 9100 - -# Spring -spring: - application: - # 应用名称 - name: ruoyi-monitor - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: nacos.zkjiadi.cc - config: - # 配置中心地址 - server-addr: nacos.zkjiadi.cc - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} ---- -#测试环境 +# Spring默认环境配置 spring: - application: - # 应用名称 - name: ruoyi-monitor profiles: - # 环境配置 - active: test - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: nacos.zkjiadi.cc - config: - # 配置中心地址 - server-addr: nacos.zkjiadi.cc - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + active: dev \ No newline at end of file From b2d2602d5f738eba7910f1929de2381676462a1a Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Wed, 31 Jul 2024 15:10:13 +0800 Subject: [PATCH 07/82] =?UTF-8?q?[feat]=20=E5=BC=80=E5=8F=91=E7=8E=AF?= =?UTF-8?q?=E5=A2=83nacos=E6=8C=87=E5=90=91local-nacos.zkjiadi.cc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-auth/src/main/resources/bootstrap-dev.yml | 4 ++-- ruoyi-gateway/src/main/resources/bootstrap-dev.yml | 6 +++--- .../ruoyi-system/src/main/resources/bootstrap-dev.yml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ruoyi-auth/src/main/resources/bootstrap-dev.yml b/ruoyi-auth/src/main/resources/bootstrap-dev.yml index 40c5f5697..f41ddc8bb 100644 --- a/ruoyi-auth/src/main/resources/bootstrap-dev.yml +++ b/ruoyi-auth/src/main/resources/bootstrap-dev.yml @@ -11,11 +11,11 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: nacos.zkjiadi.cc + server-addr: local-nacos.zkjiadi.cc namespace: 78a7f41e-46cc-437a-9716-735888227693 config: # 配置中心地址 - server-addr: nacos.zkjiadi.cc + server-addr: local-nacos.zkjiadi.cc # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-gateway/src/main/resources/bootstrap-dev.yml b/ruoyi-gateway/src/main/resources/bootstrap-dev.yml index c39fa7321..f29b393a1 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap-dev.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap-dev.yml @@ -11,11 +11,11 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: nacos.zkjiadi.cc + server-addr: local-nacos.zkjiadi.cc namespace: 78a7f41e-46cc-437a-9716-735888227693 config: # 配置中心地址 - server-addr: nacos.zkjiadi.cc + server-addr: local-nacos.zkjiadi.cc # 配置文件格式 file-extension: yml # 共享配置 @@ -27,7 +27,7 @@ spring: eager: true transport: # 控制台地址 - dashboard: nacos.zkjiadi.cc:8718 + dashboard: local-nacos.zkjiadi.cc:8718 # nacos配置持久化 datasource: ds1: diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-dev.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-dev.yml index 5f5b5a75a..45b23bdbd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-dev.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-dev.yml @@ -11,11 +11,11 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: nacos.zkjiadi.cc + server-addr: local-nacos.zkjiadi.cc namespace: 78a7f41e-46cc-437a-9716-735888227693 config: # 配置中心地址 - server-addr: nacos.zkjiadi.cc + server-addr: local-nacos.zkjiadi.cc # 配置文件格式 file-extension: yml # 共享配置 From 622e8fff4941782c847e20845a3fe3eee6f55385 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Mon, 5 Aug 2024 15:50:52 +0800 Subject: [PATCH 08/82] =?UTF-8?q?[feat]=20nacos=E5=90=AF=E7=94=A8=E9=89=B4?= =?UTF-8?q?=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-auth/src/main/resources/bootstrap-dev.yml | 6 +++++- ruoyi-auth/src/main/resources/bootstrap-test.yml | 6 +++++- ruoyi-gateway/src/main/resources/bootstrap-dev.yml | 4 ++++ ruoyi-gateway/src/main/resources/bootstrap-test.yml | 4 ++++ .../ruoyi-file/src/main/resources/bootstrap-dev.yml | 6 +++++- .../ruoyi-file/src/main/resources/bootstrap-test.yml | 6 +++++- .../ruoyi-gen/src/main/resources/bootstrap-dev.yml | 6 +++++- .../ruoyi-gen/src/main/resources/bootstrap-test.yml | 6 +++++- .../ruoyi-job/src/main/resources/bootstrap-dev.yml | 6 +++++- .../ruoyi-job/src/main/resources/bootstrap-test.yml | 6 +++++- .../ruoyi-system/src/main/resources/bootstrap-dev.yml | 6 +++++- .../ruoyi-system/src/main/resources/bootstrap-test.yml | 6 +++++- .../ruoyi-monitor/src/main/resources/bootstrap-dev.yml | 6 +++++- .../ruoyi-monitor/src/main/resources/bootstrap-test.yml | 6 +++++- 14 files changed, 68 insertions(+), 12 deletions(-) diff --git a/ruoyi-auth/src/main/resources/bootstrap-dev.yml b/ruoyi-auth/src/main/resources/bootstrap-dev.yml index f41ddc8bb..970350439 100644 --- a/ruoyi-auth/src/main/resources/bootstrap-dev.yml +++ b/ruoyi-auth/src/main/resources/bootstrap-dev.yml @@ -13,6 +13,8 @@ spring: # 服务注册地址 server-addr: local-nacos.zkjiadi.cc namespace: 78a7f41e-46cc-437a-9716-735888227693 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA config: # 配置中心地址 server-addr: local-nacos.zkjiadi.cc @@ -21,4 +23,6 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: 78a7f41e-46cc-437a-9716-735888227693 \ No newline at end of file + namespace: 78a7f41e-46cc-437a-9716-735888227693 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA \ No newline at end of file diff --git a/ruoyi-auth/src/main/resources/bootstrap-test.yml b/ruoyi-auth/src/main/resources/bootstrap-test.yml index e3609d0d9..cad09fd51 100644 --- a/ruoyi-auth/src/main/resources/bootstrap-test.yml +++ b/ruoyi-auth/src/main/resources/bootstrap-test.yml @@ -13,6 +13,8 @@ spring: # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA config: # 配置中心地址 server-addr: nacos.zkjiadi.cc @@ -21,4 +23,6 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 \ No newline at end of file + namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA \ No newline at end of file diff --git a/ruoyi-gateway/src/main/resources/bootstrap-dev.yml b/ruoyi-gateway/src/main/resources/bootstrap-dev.yml index f29b393a1..1a758a76b 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap-dev.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap-dev.yml @@ -13,6 +13,8 @@ spring: # 服务注册地址 server-addr: local-nacos.zkjiadi.cc namespace: 78a7f41e-46cc-437a-9716-735888227693 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA config: # 配置中心地址 server-addr: local-nacos.zkjiadi.cc @@ -22,6 +24,8 @@ spring: shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} namespace: 78a7f41e-46cc-437a-9716-735888227693 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA sentinel: # 取消控制台懒加载 eager: true diff --git a/ruoyi-gateway/src/main/resources/bootstrap-test.yml b/ruoyi-gateway/src/main/resources/bootstrap-test.yml index 5018fdf54..f654dafd5 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap-test.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap-test.yml @@ -13,6 +13,8 @@ spring: # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA config: # 配置中心地址 server-addr: nacos.zkjiadi.cc @@ -22,6 +24,8 @@ spring: shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA sentinel: # 取消控制台懒加载 eager: true diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-dev.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-dev.yml index f00525d61..d3fc5df26 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-dev.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-dev.yml @@ -13,6 +13,8 @@ spring: # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: 78a7f41e-46cc-437a-9716-735888227693 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA config: # 配置中心地址 server-addr: nacos.zkjiadi.cc @@ -21,4 +23,6 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: 78a7f41e-46cc-437a-9716-735888227693 \ No newline at end of file + namespace: 78a7f41e-46cc-437a-9716-735888227693 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-test.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-test.yml index aeaea49cc..923ea5e53 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-test.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-test.yml @@ -13,6 +13,8 @@ spring: # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA config: # 配置中心地址 server-addr: nacos.zkjiadi.cc @@ -21,4 +23,6 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 \ No newline at end of file + namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-dev.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-dev.yml index e88328efa..5624ff40a 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-dev.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-dev.yml @@ -13,6 +13,8 @@ spring: # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: 78a7f41e-46cc-437a-9716-735888227693 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA config: # 配置中心地址 server-addr: nacos.zkjiadi.cc @@ -21,4 +23,6 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: 78a7f41e-46cc-437a-9716-735888227693 \ No newline at end of file + namespace: 78a7f41e-46cc-437a-9716-735888227693 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-test.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-test.yml index 906c94961..619e5fe51 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-test.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-test.yml @@ -13,6 +13,8 @@ spring: # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA config: # 配置中心地址 server-addr: nacos.zkjiadi.cc @@ -21,4 +23,6 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 \ No newline at end of file + namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-dev.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-dev.yml index 6081c2d52..4626dd46b 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-dev.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-dev.yml @@ -13,6 +13,8 @@ spring: # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: 78a7f41e-46cc-437a-9716-735888227693 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA config: # 配置中心地址 server-addr: nacos.zkjiadi.cc @@ -21,4 +23,6 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: 78a7f41e-46cc-437a-9716-735888227693 \ No newline at end of file + namespace: 78a7f41e-46cc-437a-9716-735888227693 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-test.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-test.yml index 419103a27..64630122c 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-test.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-test.yml @@ -13,6 +13,8 @@ spring: # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA config: # 配置中心地址 server-addr: nacos.zkjiadi.cc @@ -21,4 +23,6 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 \ No newline at end of file + namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-dev.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-dev.yml index 45b23bdbd..baa5c174a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-dev.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-dev.yml @@ -13,6 +13,8 @@ spring: # 服务注册地址 server-addr: local-nacos.zkjiadi.cc namespace: 78a7f41e-46cc-437a-9716-735888227693 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA config: # 配置中心地址 server-addr: local-nacos.zkjiadi.cc @@ -21,4 +23,6 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: 78a7f41e-46cc-437a-9716-735888227693 \ No newline at end of file + namespace: 78a7f41e-46cc-437a-9716-735888227693 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-test.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-test.yml index bc95cdae3..55020a44c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-test.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-test.yml @@ -12,6 +12,8 @@ spring: # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA config: # 配置中心地址 server-addr: nacos.zkjiadi.cc @@ -20,4 +22,6 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 \ No newline at end of file + namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA \ No newline at end of file diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-dev.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-dev.yml index eb0fc7773..d3d850f79 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-dev.yml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-dev.yml @@ -13,6 +13,8 @@ spring: # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: 78a7f41e-46cc-437a-9716-735888227693 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA config: # 配置中心地址 server-addr: nacos.zkjiadi.cc @@ -21,4 +23,6 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: 78a7f41e-46cc-437a-9716-735888227693 \ No newline at end of file + namespace: 78a7f41e-46cc-437a-9716-735888227693 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA \ No newline at end of file diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-test.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-test.yml index b693ad45d..629da202d 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-test.yml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-test.yml @@ -13,6 +13,8 @@ spring: # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA config: # 配置中心地址 server-addr: nacos.zkjiadi.cc @@ -21,4 +23,6 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 \ No newline at end of file + namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA \ No newline at end of file From 3c804db4f039f78ef78587cbe3663ca5e6add161 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Tue, 6 Aug 2024 16:15:35 +0800 Subject: [PATCH 09/82] =?UTF-8?q?[feat]=20=E6=95=B0=E5=AD=97=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-gateway/pom.xml | 34 ++++ .../ruoyi/gateway/config/CaptchaConfig.java | 192 ++++++++++-------- .../gateway/config/KaptchaNumberCreator.java | 17 ++ 3 files changed, 161 insertions(+), 82 deletions(-) create mode 100644 ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaNumberCreator.java diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index d698c0feb..8dc7634aa 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -80,6 +80,22 @@ ruoyi-common-redis + + com.ujcms + ujcms-commons + 9.6.0 + + + org.springframework + spring-core + + + org.springframework + spring-web + + + + io.springfox @@ -102,6 +118,11 @@ ${kotlin.version} test + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${kotlin.version} + @@ -151,6 +172,13 @@ compile + + + src/main/java + src/main/kotlin + target/generated-sources/annotations + + test-compile @@ -158,6 +186,12 @@ test-compile + + + src/test/kotlin + target/generated-test-sources/test-annotations + + 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 963425e6c..47a3a8afc 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,83 +1,111 @@ -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 static com.google.code.kaptcha.Constants.*; - -/** - * 验证码配置 - * - * @author ruoyi - */ -@Configuration -public class CaptchaConfig -{ - @Bean(name = "captchaProducer") - public DefaultKaptcha getKaptchaBean() - { - DefaultKaptcha defaultKaptcha = new DefaultKaptcha(); - Properties properties = new Properties(); - // 是否有边框 默认为true 我们可以自己设置yes，no - properties.setProperty(KAPTCHA_BORDER, "yes"); - // 验证码文本字符颜色 默认为Color.BLACK - properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_COLOR, "black"); - // 验证码图片宽度 默认为200 - properties.setProperty(KAPTCHA_IMAGE_WIDTH, "160"); - // 验证码图片高度 默认为50 - properties.setProperty(KAPTCHA_IMAGE_HEIGHT, "60"); - // 验证码文本字符大小 默认为40 - properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_SIZE, "38"); - // KAPTCHA_SESSION_KEY - properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCode"); - // 验证码文本字符长度 默认为5 - properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "4"); - // 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize) - properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier"); - // 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy 阴影com.google.code.kaptcha.impl.ShadowGimpy - properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy"); - Config config = new Config(properties); - defaultKaptcha.setConfig(config); - return defaultKaptcha; - } - - @Bean(name = "captchaProducerMath") - public DefaultKaptcha getKaptchaBeanMath() - { - DefaultKaptcha defaultKaptcha = new DefaultKaptcha(); - Properties properties = new Properties(); - // 是否有边框 默认为true 我们可以自己设置yes，no - properties.setProperty(KAPTCHA_BORDER, "yes"); - // 边框颜色 默认为Color.BLACK - properties.setProperty(KAPTCHA_BORDER_COLOR, "105,179,90"); - // 验证码文本字符颜色 默认为Color.BLACK - properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_COLOR, "blue"); - // 验证码图片宽度 默认为200 - properties.setProperty(KAPTCHA_IMAGE_WIDTH, "160"); - // 验证码图片高度 默认为50 - properties.setProperty(KAPTCHA_IMAGE_HEIGHT, "60"); - // 验证码文本字符大小 默认为40 - properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_SIZE, "35"); - // KAPTCHA_SESSION_KEY - properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCodeMath"); - // 验证码文本生成器 - properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.ruoyi.gateway.config.KaptchaTextCreator"); - // 验证码文本字符间距 默认为2 - properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_SPACE, "3"); - // 验证码文本字符长度 默认为5 - properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "6"); - // 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize) - properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier"); - // 验证码噪点颜色 默认为Color.BLACK - properties.setProperty(KAPTCHA_NOISE_COLOR, "white"); - // 干扰实现类 - properties.setProperty(KAPTCHA_NOISE_IMPL, "com.google.code.kaptcha.impl.NoNoise"); - // 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy 阴影com.google.code.kaptcha.impl.ShadowGimpy - properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy"); - Config config = new Config(properties); - defaultKaptcha.setConfig(config); - return defaultKaptcha; - } +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 static com.google.code.kaptcha.Constants.*; + +/** + * 验证码配置 + * + * @author ruoyi + */ +@Configuration +public class CaptchaConfig { + @Bean(name = "captchaProducer") + public DefaultKaptcha getKaptchaBean() { + DefaultKaptcha defaultKaptcha = new DefaultKaptcha(); + Properties properties = new Properties(); + // 是否有边框 默认为true 我们可以自己设置yes，no + properties.setProperty(KAPTCHA_BORDER, "yes"); + // 验证码文本字符颜色 默认为Color.BLACK + properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_COLOR, "black"); + // 验证码图片宽度 默认为200 + properties.setProperty(KAPTCHA_IMAGE_WIDTH, "160"); + // 验证码图片高度 默认为50 + properties.setProperty(KAPTCHA_IMAGE_HEIGHT, "60"); + // 验证码文本字符大小 默认为40 + properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_SIZE, "38"); + // KAPTCHA_SESSION_KEY + properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCode"); + // 验证码文本字符长度 默认为5 + properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "4"); + // 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize) + properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier"); + // 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy 阴影com.google.code.kaptcha.impl.ShadowGimpy + properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, com.google.code.kaptcha.impl.ShadowGimpy.class.getName()); + Config config = new Config(properties); + defaultKaptcha.setConfig(config); + return defaultKaptcha; + } + + @Bean(name = "captchaProducerMath") + public DefaultKaptcha getKaptchaBeanMath() { + DefaultKaptcha defaultKaptcha = new DefaultKaptcha(); + Properties properties = new Properties(); + // 是否有边框 默认为true 我们可以自己设置yes，no + properties.setProperty(KAPTCHA_BORDER, "yes"); + // 边框颜色 默认为Color.BLACK + properties.setProperty(KAPTCHA_BORDER_COLOR, "105,179,90"); + // 验证码文本字符颜色 默认为Color.BLACK + properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_COLOR, "blue"); + // 验证码图片宽度 默认为200 + properties.setProperty(KAPTCHA_IMAGE_WIDTH, "160"); + // 验证码图片高度 默认为50 + properties.setProperty(KAPTCHA_IMAGE_HEIGHT, "60"); + // 验证码文本字符大小 默认为40 + properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_SIZE, "35"); + // KAPTCHA_SESSION_KEY + properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCodeMath"); + // 验证码文本生成器 + properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, com.ruoyi.gateway.config.KaptchaTextCreator.class.getName()); + // 验证码文本字符间距 默认为2 + properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_SPACE, "3"); + // 验证码文本字符长度 默认为5 + properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "6"); + // 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize) + properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier"); + // 验证码噪点颜色 默认为Color.BLACK + properties.setProperty(KAPTCHA_NOISE_COLOR, "white"); + // 干扰实现类 + properties.setProperty(KAPTCHA_NOISE_IMPL, com.google.code.kaptcha.impl.NoNoise.class.getName()); + // 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy 阴影com.google.code.kaptcha.impl.ShadowGimpy + properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, com.google.code.kaptcha.impl.ShadowGimpy.class.getName()); + Config config = new Config(properties); + defaultKaptcha.setConfig(config); + return defaultKaptcha; + } + + @Bean(name = "captchaProducerNumber") + public DefaultKaptcha getKaptchaBeanNumber() { + DefaultKaptcha defaultKaptcha = new DefaultKaptcha(); + Properties properties = new Properties(); + // 是否有边框 默认为true 我们可以自己设置yes，no + properties.setProperty(KAPTCHA_BORDER, "yes"); + // 验证码文本字符颜色 默认为Color.BLACK + properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_COLOR, "black"); + // 验证码图片宽度 默认为200 + properties.setProperty(KAPTCHA_IMAGE_WIDTH, "160"); + // 验证码图片高度 默认为50 + properties.setProperty(KAPTCHA_IMAGE_HEIGHT, "60"); + // 验证码文本字符大小 默认为40 + properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_SIZE, "38"); + // KAPTCHA_SESSION_KEY + properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCode"); + // 验证码文本生成器 + properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, com.ruoyi.gateway.config.KaptchaNumberCreator.class.getName()); + // 验证码文本字符长度 默认为5 + properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "4"); + // 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize) + properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier"); + // 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy 阴影com.google.code.kaptcha.impl.ShadowGimpy + properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, com.google.code.kaptcha.impl.ShadowGimpy.class.getName()); + Config config = new Config(properties); + defaultKaptcha.setConfig(config); + return defaultKaptcha; + } } \ No newline at end of file diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaNumberCreator.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaNumberCreator.java new file mode 100644 index 000000000..140e754f9 --- /dev/null +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaNumberCreator.java @@ -0,0 +1,17 @@ +package com.ruoyi.gateway.config; + +import com.google.code.kaptcha.text.impl.DefaultTextCreator; +import com.ujcms.commons.security.Secures; + +/** + * 验证码数字生成器 + * + * @author hsdllcw + */ +public class KaptchaNumberCreator extends DefaultTextCreator { + + @Override + public String getText() { + return Secures.randomNumeric(getConfig().getTextProducerCharLength()); + } +} \ No newline at end of file From e700a7dca0d3c82b2a45f654b12d3d960625306a Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Tue, 6 Aug 2024 16:19:32 +0800 Subject: [PATCH 10/82] =?UTF-8?q?[feat]=20=E6=A0=B9=E6=8D=AE=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81=E7=B1=BB=E5=9E=8B=E7=94=9F=E6=88=90=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81(=E6=96=B0=E5=A2=9E=E6=95=B0=E5=AD=97)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ValidateCodeServiceImpl.java | 246 +++++++++--------- 1 file changed, 128 insertions(+), 118 deletions(-) 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 f45010266..24f8274d0 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,118 +1,128 @@ -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.CacheConstants; -import com.ruoyi.common.core.constant.Constants; -import com.ruoyi.common.core.exception.CaptchaException; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.sign.Base64; -import com.ruoyi.common.core.utils.uuid.IdUtils; -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; - -/** - * 验证码实现处理 - * - * @author ruoyi - */ -@Service -public class ValidateCodeServiceImpl implements ValidateCodeService -{ - @Resource(name = "captchaProducer") - private Producer captchaProducer; - - @Resource(name = "captchaProducerMath") - private Producer captchaProducerMath; - - @Autowired - private RedisService redisService; - - @Autowired - private CaptchaProperties captchaProperties; - - /** - * 生成验证码 - */ - @Override - public AjaxResult createCaptcha() throws IOException, CaptchaException - { - AjaxResult ajax = AjaxResult.success(); - boolean captchaEnabled = captchaProperties.getEnabled(); - ajax.put("captchaEnabled", captchaEnabled); - if (!captchaEnabled) - { - return ajax; - } - - // 保存验证码信息 - String uuid = IdUtils.simpleUUID(); - String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid; - - String capStr = null, code = null; - BufferedImage image = null; - - String captchaType = captchaProperties.getType(); - // 生成验证码 - if ("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 ("char".equals(captchaType)) - { - capStr = code = captchaProducer.createText(); - image = captchaProducer.createImage(capStr); - } - - redisService.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES); - // 转换流信息写出 - FastByteArrayOutputStream os = new FastByteArrayOutputStream(); - try - { - ImageIO.write(image, "jpg", os); - } - catch (IOException e) - { - return AjaxResult.error(e.getMessage()); - } - - ajax.put("uuid", uuid); - ajax.put("img", Base64.encode(os.toByteArray())); - return ajax; - } - - /** - * 校验验证码 - */ - @Override - public void checkCaptcha(String code, String uuid) throws CaptchaException - { - if (StringUtils.isEmpty(code)) - { - throw new CaptchaException("验证码不能为空"); - } - String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, ""); - String captcha = redisService.getCacheObject(verifyKey); - if (captcha == null) - { - throw new CaptchaException("验证码已失效"); - } - redisService.deleteObject(verifyKey); - if (!code.equalsIgnoreCase(captcha)) - { - throw new CaptchaException("验证码错误"); - } - } -} +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.CacheConstants; +import com.ruoyi.common.core.constant.Constants; +import com.ruoyi.common.core.exception.CaptchaException; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.core.utils.sign.Base64; +import com.ruoyi.common.core.utils.uuid.IdUtils; +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; + +/** + * 验证码实现处理 + * + * @author ruoyi + */ +@Service +public class ValidateCodeServiceImpl implements ValidateCodeService +{ + @Resource(name = "captchaProducer") + private Producer captchaProducer; + + @Resource(name = "captchaProducerMath") + private Producer captchaProducerMath; + + @Resource(name = "captchaProducerNumber") + private Producer captchaProducerNumber; + + @Autowired + private RedisService redisService; + + @Autowired + private CaptchaProperties captchaProperties; + + /** + * 生成验证码 + */ + @Override + public AjaxResult createCaptcha() throws IOException, CaptchaException + { + AjaxResult ajax = AjaxResult.success(); + boolean captchaEnabled = captchaProperties.getEnabled(); + ajax.put("captchaEnabled", captchaEnabled); + if (!captchaEnabled) + { + return ajax; + } + + // 保存验证码信息 + String uuid = IdUtils.simpleUUID(); + String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid; + + String capStr = null, code = null; + BufferedImage image = null; + + String captchaType = captchaProperties.getType(); + // 生成验证码 + switch (captchaType) { + case "number": { + capStr = code = captchaProducerNumber.createText(); + image = captchaProducerNumber.createImage(capStr); + } + break; + case "math": { + String capText = captchaProducerMath.createText(); + capStr = capText.substring(0, capText.lastIndexOf("@")); + code = capText.substring(capText.lastIndexOf("@") + 1); + image = captchaProducerMath.createImage(capStr); + } + break; + default: { + capStr = code = captchaProducer.createText(); + image = captchaProducer.createImage(capStr); + } + break; + } + + redisService.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES); + // 转换流信息写出 + FastByteArrayOutputStream os = new FastByteArrayOutputStream(); + try + { + ImageIO.write(image, "jpg", os); + } + catch (IOException e) + { + return AjaxResult.error(e.getMessage()); + } + + ajax.put("uuid", uuid); + ajax.put("img", Base64.encode(os.toByteArray())); + return ajax; + } + + /** + * 校验验证码 + */ + @Override + public void checkCaptcha(String code, String uuid) throws CaptchaException + { + if (StringUtils.isEmpty(code)) + { + throw new CaptchaException("验证码不能为空"); + } + String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, ""); + String captcha = redisService.getCacheObject(verifyKey); + if (captcha == null) + { + throw new CaptchaException("验证码已失效"); + } + redisService.deleteObject(verifyKey); + if (!code.equalsIgnoreCase(captcha)) + { + throw new CaptchaException("验证码错误"); + } + } +} From 25613442a425f5541639093043e0b3da396ecde2 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Wed, 7 Aug 2024 10:56:50 +0800 Subject: [PATCH 11/82] =?UTF-8?q?[feat]=20=E7=9F=AD=E4=BF=A1=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81=E8=8E=B7=E5=8F=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-gateway/pom.xml | 5 - .../gateway/handler/ValidateCodeHandler.java | 92 ++++++++++--------- .../gateway/service/ValidateCodeService.java | 51 +++++----- .../service/impl/ValidateCodeServiceImpl.java | 19 ++++ .../config/{CorsFilter.kt => CorsConfig.kt} | 0 5 files changed, 98 insertions(+), 69 deletions(-) rename ruoyi-gateway/src/main/kotlin/com/ruoyi/gateway/config/{CorsFilter.kt => CorsConfig.kt} (100%) diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index 8dc7634aa..8fb644c23 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -118,11 +118,6 @@ ${kotlin.version} test - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - ${kotlin.version} - 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 ef197deb5..5544c2456 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,41 +1,51 @@ -package com.ruoyi.gateway.handler; - -import java.io.IOException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.stereotype.Component; -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; - -/** - * 验证码获取 - * - * @author ruoyi - */ -@Component -public class ValidateCodeHandler implements HandlerFunction -{ - @Autowired - private ValidateCodeService validateCodeService; - - @Override - public Mono handle(ServerRequest serverRequest) - { - AjaxResult ajax; - try - { - ajax = validateCodeService.createCaptcha(); - } - catch (CaptchaException | IOException e) - { - return Mono.error(e); - } - return ServerResponse.status(HttpStatus.OK).body(BodyInserters.fromValue(ajax)); - } -} +package com.ruoyi.gateway.handler; + +import java.io.IOException; +import java.util.Objects; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Component; +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; + +/** + * 验证码获取 + * + * @author ruoyi + */ +@Component +public class ValidateCodeHandler implements HandlerFunction +{ + @Autowired + private ValidateCodeService validateCodeService; + + @Override + public Mono handle(ServerRequest serverRequest) + { + AjaxResult ajax; + try + { + switch (serverRequest.queryParam("type").orElse("image")) { + case "sms": + if (Objects.nonNull(serverRequest.queryParam("receiver").orElse(null))) { + ajax = validateCodeService.createSMSCaptcha(serverRequest.queryParam("receiver").orElse(null)); + break; + } + default: + ajax = validateCodeService.createCaptcha(); + } + } + 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 615fb07bb..051631a0a 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,23 +1,28 @@ -package com.ruoyi.gateway.service; - -import java.io.IOException; -import com.ruoyi.common.core.exception.CaptchaException; -import com.ruoyi.common.core.web.domain.AjaxResult; - -/** - * 验证码处理 - * - * @author ruoyi - */ -public interface ValidateCodeService -{ - /** - * 生成验证码 - */ - public AjaxResult createCaptcha() throws IOException, CaptchaException; - - /** - * 校验验证码 - */ - public void checkCaptcha(String key, String value) throws CaptchaException; -} +package com.ruoyi.gateway.service; + +import java.io.IOException; +import com.ruoyi.common.core.exception.CaptchaException; +import com.ruoyi.common.core.web.domain.AjaxResult; + +/** + * 验证码处理 + * + * @author ruoyi + */ +public interface ValidateCodeService +{ + /** + * 生成图片验证码 + */ + public AjaxResult createCaptcha() throws IOException, CaptchaException; + + /** + * 生成短信验证码 + */ + public AjaxResult createSMSCaptcha(String receiver) throws IOException, CaptchaException; + + /** + * 校验验证码 + */ + public void checkCaptcha(String key, String 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 24f8274d0..e7367344b 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 @@ -103,6 +103,25 @@ public class ValidateCodeServiceImpl implements ValidateCodeService return ajax; } + @Override + public AjaxResult createSMSCaptcha(String receiver) throws IOException, CaptchaException { + AjaxResult ajax = AjaxResult.success(); + boolean captchaEnabled = captchaProperties.getEnabled(); + ajax.put("captchaEnabled", captchaEnabled); + if (!captchaEnabled) + { + return ajax; + } + // 保存验证码信息 + String uuid = IdUtils.simpleUUID(); + String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid; + String code = captchaProducerNumber.createText(); + redisService.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES); + ajax.put("code", code); + ajax.put("uuid", uuid); + return ajax; + } + /** * 校验验证码 */ diff --git a/ruoyi-gateway/src/main/kotlin/com/ruoyi/gateway/config/CorsFilter.kt b/ruoyi-gateway/src/main/kotlin/com/ruoyi/gateway/config/CorsConfig.kt similarity index 100% rename from ruoyi-gateway/src/main/kotlin/com/ruoyi/gateway/config/CorsFilter.kt rename to ruoyi-gateway/src/main/kotlin/com/ruoyi/gateway/config/CorsConfig.kt From 26184e1592a547a2518e0b5be163c9d0010d3efa Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Fri, 9 Aug 2024 11:20:57 +0800 Subject: [PATCH 12/82] =?UTF-8?q?[feat]=20=E6=96=B0=E5=A2=9E=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=8F=B7+=E5=AF=86=E7=A0=81=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/api/RemoteUserService.java | 117 +- .../factory/RemoteUserFallbackFactory.java | 99 +- .../system/controller/SysUserController.java | 705 ++++++----- .../ruoyi/system/mapper/SysUserMapper.java | 262 ++-- .../ruoyi/system/service/ISysUserService.java | 420 ++++--- .../service/impl/SysUserServiceImpl.java | 1113 +++++++++-------- .../resources/mapper/system/SysUserMapper.xml | 445 +++---- 7 files changed, 1615 insertions(+), 1546 deletions(-) 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 c1a94b3d5..4ef609a55 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,54 +1,63 @@ -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.PutMapping; -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.system.api.domain.SysUser; -import com.ruoyi.system.api.factory.RemoteUserFallbackFactory; -import com.ruoyi.system.api.model.LoginUser; - -/** - * 用户服务 - * - * @author ruoyi - */ -@FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class) -public interface RemoteUserService -{ - /** - * 通过用户名查询用户信息 - * - * @param username 用户名 - * @param source 请求来源 - * @return 结果 - */ - @GetMapping("/user/info/{username}") - public R getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); - - /** - * 注册用户信息 - * - * @param sysUser 用户信息 - * @param source 请求来源 - * @return 结果 - */ - @PostMapping("/user/register") - public R registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); - - /** - * 记录用户登录IP地址和登录时间 - * - * @param sysUser 用户信息 - * @param source 请求来源 - * @return 结果 - */ - @PutMapping("/user/recordlogin") - public R recordUserLogin(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); -} +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.PutMapping; +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.system.api.domain.SysUser; +import com.ruoyi.system.api.factory.RemoteUserFallbackFactory; +import com.ruoyi.system.api.model.LoginUser; + +/** + * 用户服务 + * + * @author ruoyi + */ +@FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class) +public interface RemoteUserService +{ + /** + * 通过用户名查询用户信息 + * + * @param username 用户名 + * @param source 请求来源 + * @return 结果 + */ + @GetMapping("/user/info/{username}") + public R getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + /** + * 通过手机号查询用户信息 + * + * @param phoneNumber 用户名 + * @param source 请求来源 + * @return 结果 + */ + @GetMapping("/user/info/phoneNumber/{phoneNumber:\\d+}") + public R getUserInfoByPhoneNumber(@PathVariable("phoneNumber") String phoneNumber, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + /** + * 注册用户信息 + * + * @param sysUser 用户信息 + * @param source 请求来源 + * @return 结果 + */ + @PostMapping("/user/register") + public R registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + /** + * 记录用户登录IP地址和登录时间 + * + * @param sysUser 用户信息 + * @param source 请求来源 + * @return 结果 + */ + @PutMapping("/user/recordlogin") + public R recordUserLogin(@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/RemoteUserFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java index d0ae76a61..0e5ed5f4e 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,47 +1,52 @@ -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.R; -import com.ruoyi.system.api.RemoteUserService; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.api.model.LoginUser; - -/** - * 用户服务降级处理 - * - * @author ruoyi - */ -@Component -public class RemoteUserFallbackFactory implements FallbackFactory -{ - private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class); - - @Override - public RemoteUserService create(Throwable throwable) - { - log.error("用户服务调用失败:{}", throwable.getMessage()); - return new RemoteUserService() - { - @Override - public R getUserInfo(String username, String source) - { - return R.fail("获取用户失败:" + throwable.getMessage()); - } - - @Override - public R registerUserInfo(SysUser sysUser, String source) - { - return R.fail("注册用户失败:" + throwable.getMessage()); - } - - @Override - public R recordUserLogin(SysUser sysUser, String source) - { - return R.fail("记录用户登录信息失败:" + throwable.getMessage()); - } - }; - } -} +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.R; +import com.ruoyi.system.api.RemoteUserService; +import com.ruoyi.system.api.domain.SysUser; +import com.ruoyi.system.api.model.LoginUser; + +/** + * 用户服务降级处理 + * + * @author ruoyi + */ +@Component +public class RemoteUserFallbackFactory implements FallbackFactory +{ + private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class); + + @Override + public RemoteUserService create(Throwable throwable) + { + log.error("用户服务调用失败:{}", throwable.getMessage()); + return new RemoteUserService() + { + @Override + public R getUserInfo(String username, String source) + { + return R.fail("获取用户失败:" + throwable.getMessage()); + } + + @Override + public R getUserInfoByPhoneNumber(String phoneNumber, String source) { + return R.fail("获取用户失败:" + throwable.getMessage()); + } + + @Override + public R registerUserInfo(SysUser sysUser, String source) + { + return R.fail("注册用户失败:" + throwable.getMessage()); + } + + @Override + public R recordUserLogin(SysUser sysUser, String source) + { + return R.fail("记录用户登录信息失败:" + throwable.getMessage()); + } + }; + } +} 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 d8b60fbc7..cc0acf033 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,341 +1,364 @@ -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.domain.R; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.InnerAuth; -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.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.ISysDeptService; -import com.ruoyi.system.service.ISysPermissionService; -import com.ruoyi.system.service.ISysPostService; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysUserService; - -/** - * 用户信息 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/user") -public class SysUserController extends BaseController -{ - @Autowired - private ISysUserService userService; - - @Autowired - private ISysRoleService roleService; - - @Autowired - private ISysDeptService deptService; - - @Autowired - private ISysPostService postService; - - @Autowired - private ISysPermissionService permissionService; - - @Autowired - private ISysConfigService configService; - - /** - * 获取用户列表 - */ - @RequiresPermissions("system:user:list") - @GetMapping("/list") - public TableDataInfo list(SysUser user) - { - startPage(); - List list = userService.selectUserList(user); - return getDataTable(list); - } - - @Log(title = "用户管理", businessType = BusinessType.EXPORT) - @RequiresPermissions("system:user:export") - @PostMapping("/export") - public void export(HttpServletResponse response, SysUser user) - { - List list = userService.selectUserList(user); - ExcelUtil util = new ExcelUtil(SysUser.class); - util.exportExcel(response, list, "用户数据"); - } - - @Log(title = "用户管理", businessType = BusinessType.IMPORT) - @RequiresPermissions("system:user:import") - @PostMapping("/importData") - 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(); - String message = userService.importUser(userList, updateSupport, operName); - return success(message); - } - - @PostMapping("/importTemplate") - public void importTemplate(HttpServletResponse response) throws IOException - { - ExcelUtil util = new ExcelUtil(SysUser.class); - util.importTemplateExcel(response, "用户数据"); - } - - /** - * 获取当前用户信息 - */ - @InnerAuth - @GetMapping("/info/{username}") - public R info(@PathVariable("username") String username) - { - SysUser sysUser = userService.selectUserByUserName(username); - if (StringUtils.isNull(sysUser)) - { - return R.fail("用户名或密码错误"); - } - // 角色集合 - Set roles = permissionService.getRolePermission(sysUser); - // 权限集合 - Set permissions = permissionService.getMenuPermission(sysUser); - LoginUser sysUserVo = new LoginUser(); - sysUserVo.setSysUser(sysUser); - sysUserVo.setRoles(roles); - sysUserVo.setPermissions(permissions); - return R.ok(sysUserVo); - } - - /** - * 注册用户信息 - */ - @InnerAuth - @PostMapping("/register") - public R register(@RequestBody SysUser sysUser) - { - String username = sysUser.getUserName(); - if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) - { - return R.fail("当前系统没有开启注册功能！"); - } - if (!userService.checkUserNameUnique(sysUser)) - { - return R.fail("保存用户'" + username + "'失败，注册账号已存在"); - } - return R.ok(userService.registerUser(sysUser)); - } - - /** - *记录用户登录IP地址和登录时间 - */ - @InnerAuth - @PutMapping("/recordlogin") - public R recordlogin(@RequestBody SysUser sysUser) - { - return R.ok(userService.updateUserProfile(sysUser)); - } - - /** - * 获取用户信息 - * - * @return 用户信息 - */ - @GetMapping("getInfo") - public AjaxResult getInfo() - { - SysUser user = userService.selectUserById(SecurityUtils.getUserId()); - // 角色集合 - Set roles = permissionService.getRolePermission(user); - // 权限集合 - Set permissions = permissionService.getMenuPermission(user); - AjaxResult ajax = AjaxResult.success(); - ajax.put("user", user); - ajax.put("roles", roles); - ajax.put("permissions", permissions); - return ajax; - } - - /** - * 根据用户编号获取详细信息 - */ - @RequiresPermissions("system:user:query") - @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)) - { - SysUser sysUser = userService.selectUserById(userId); - ajax.put(AjaxResult.DATA_TAG, sysUser); - ajax.put("postIds", postService.selectPostListByUserId(userId)); - ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList())); - } - return ajax; - } - - /** - * 新增用户 - */ - @RequiresPermissions("system:user:add") - @Log(title = "用户管理", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@Validated @RequestBody SysUser user) - { - deptService.checkDeptDataScope(user.getDeptId()); - roleService.checkRoleDataScope(user.getRoleIds()); - if (!userService.checkUserNameUnique(user)) - { - return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在"); - } - else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) - { - return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在"); - } - else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) - { - return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在"); - } - user.setCreateBy(SecurityUtils.getUsername()); - user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); - return toAjax(userService.insertUser(user)); - } - - /** - * 修改用户 - */ - @RequiresPermissions("system:user:edit") - @Log(title = "用户管理", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@Validated @RequestBody SysUser user) - { - userService.checkUserAllowed(user); - userService.checkUserDataScope(user.getUserId()); - deptService.checkDeptDataScope(user.getDeptId()); - roleService.checkRoleDataScope(user.getRoleIds()); - if (!userService.checkUserNameUnique(user)) - { - return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在"); - } - else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) - { - return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在"); - } - else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) - { - return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); - } - user.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(userService.updateUser(user)); - } - - /** - * 删除用户 - */ - @RequiresPermissions("system:user:remove") - @Log(title = "用户管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{userIds}") - public AjaxResult remove(@PathVariable Long[] userIds) - { - if (ArrayUtils.contains(userIds, SecurityUtils.getUserId())) - { - return error("当前用户不能删除"); - } - return toAjax(userService.deleteUserByIds(userIds)); - } - - /** - * 重置密码 - */ - @RequiresPermissions("system:user:edit") - @Log(title = "用户管理", businessType = BusinessType.UPDATE) - @PutMapping("/resetPwd") - public AjaxResult resetPwd(@RequestBody SysUser user) - { - userService.checkUserAllowed(user); - userService.checkUserDataScope(user.getUserId()); - user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); - user.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(userService.resetPwd(user)); - } - - /** - * 状态修改 - */ - @RequiresPermissions("system:user:edit") - @Log(title = "用户管理", businessType = BusinessType.UPDATE) - @PutMapping("/changeStatus") - public AjaxResult changeStatus(@RequestBody SysUser user) - { - userService.checkUserAllowed(user); - userService.checkUserDataScope(user.getUserId()); - user.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(userService.updateUserStatus(user)); - } - - /** - * 根据用户编号获取授权角色 - */ - @RequiresPermissions("system:user:query") - @GetMapping("/authRole/{userId}") - public AjaxResult authRole(@PathVariable("userId") Long userId) - { - AjaxResult ajax = AjaxResult.success(); - SysUser user = userService.selectUserById(userId); - List roles = roleService.selectRolesByUserId(userId); - ajax.put("user", user); - ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); - return ajax; - } - - /** - * 用户授权角色 - */ - @RequiresPermissions("system:user:edit") - @Log(title = "用户管理", businessType = BusinessType.GRANT) - @PutMapping("/authRole") - public AjaxResult insertAuthRole(Long userId, Long[] roleIds) - { - userService.checkUserDataScope(userId); - roleService.checkRoleDataScope(roleIds); - userService.insertUserAuth(userId, roleIds); - return success(); - } - - /** - * 获取部门树列表 - */ - @RequiresPermissions("system:user:list") - @GetMapping("/deptTree") - public AjaxResult deptTree(SysDept dept) - { - return success(deptService.selectDeptTreeList(dept)); - } -} +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.domain.R; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.page.TableDataInfo; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.InnerAuth; +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.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.ISysDeptService; +import com.ruoyi.system.service.ISysPermissionService; +import com.ruoyi.system.service.ISysPostService; +import com.ruoyi.system.service.ISysRoleService; +import com.ruoyi.system.service.ISysUserService; + +/** + * 用户信息 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/user") +public class SysUserController extends BaseController +{ + @Autowired + private ISysUserService userService; + + @Autowired + private ISysRoleService roleService; + + @Autowired + private ISysDeptService deptService; + + @Autowired + private ISysPostService postService; + + @Autowired + private ISysPermissionService permissionService; + + @Autowired + private ISysConfigService configService; + + /** + * 获取用户列表 + */ + @RequiresPermissions("system:user:list") + @GetMapping("/list") + public TableDataInfo list(SysUser user) + { + startPage(); + List list = userService.selectUserList(user); + return getDataTable(list); + } + + @Log(title = "用户管理", businessType = BusinessType.EXPORT) + @RequiresPermissions("system:user:export") + @PostMapping("/export") + public void export(HttpServletResponse response, SysUser user) + { + List list = userService.selectUserList(user); + ExcelUtil util = new ExcelUtil(SysUser.class); + util.exportExcel(response, list, "用户数据"); + } + + @Log(title = "用户管理", businessType = BusinessType.IMPORT) + @RequiresPermissions("system:user:import") + @PostMapping("/importData") + 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(); + String message = userService.importUser(userList, updateSupport, operName); + return success(message); + } + + @PostMapping("/importTemplate") + public void importTemplate(HttpServletResponse response) throws IOException + { + ExcelUtil util = new ExcelUtil(SysUser.class); + util.importTemplateExcel(response, "用户数据"); + } + + /** + * 获取当前用户信息 + */ + @InnerAuth + @GetMapping("/info/{username}") + public R info(@PathVariable("username") String username) + { + SysUser sysUser = userService.selectUserByUserName(username); + if (StringUtils.isNull(sysUser)) + { + return R.fail("用户名或密码错误"); + } + // 角色集合 + Set roles = permissionService.getRolePermission(sysUser); + // 权限集合 + Set permissions = permissionService.getMenuPermission(sysUser); + LoginUser sysUserVo = new LoginUser(); + sysUserVo.setSysUser(sysUser); + sysUserVo.setRoles(roles); + sysUserVo.setPermissions(permissions); + return R.ok(sysUserVo); + } + + /** + * 获取当前用户信息 + */ + @InnerAuth + @GetMapping("/info/phoneNumber/{phoneNumber:\\d+}") + public R infoByPhone(@PathVariable("phoneNumber") String phoneNumber) + { + SysUser sysUser = userService.selectUserByPhoneNumber(phoneNumber); + if (StringUtils.isNull(sysUser)) + { + return R.fail("用户名或密码错误"); + } + // 角色集合 + Set roles = permissionService.getRolePermission(sysUser); + // 权限集合 + Set permissions = permissionService.getMenuPermission(sysUser); + LoginUser sysUserVo = new LoginUser(); + sysUserVo.setSysUser(sysUser); + sysUserVo.setRoles(roles); + sysUserVo.setPermissions(permissions); + return R.ok(sysUserVo); + } + + /** + * 注册用户信息 + */ + @InnerAuth + @PostMapping("/register") + public R register(@RequestBody SysUser sysUser) + { + String username = sysUser.getUserName(); + if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) + { + return R.fail("当前系统没有开启注册功能！"); + } + if (!userService.checkUserNameUnique(sysUser)) + { + return R.fail("保存用户'" + username + "'失败，注册账号已存在"); + } + return R.ok(userService.registerUser(sysUser)); + } + + /** + *记录用户登录IP地址和登录时间 + */ + @InnerAuth + @PutMapping("/recordlogin") + public R recordlogin(@RequestBody SysUser sysUser) + { + return R.ok(userService.updateUserProfile(sysUser)); + } + + /** + * 获取用户信息 + * + * @return 用户信息 + */ + @GetMapping("getInfo") + public AjaxResult getInfo() + { + SysUser user = userService.selectUserById(SecurityUtils.getUserId()); + // 角色集合 + Set roles = permissionService.getRolePermission(user); + // 权限集合 + Set permissions = permissionService.getMenuPermission(user); + AjaxResult ajax = AjaxResult.success(); + ajax.put("user", user); + ajax.put("roles", roles); + ajax.put("permissions", permissions); + return ajax; + } + + /** + * 根据用户编号获取详细信息 + */ + @RequiresPermissions("system:user:query") + @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)) + { + SysUser sysUser = userService.selectUserById(userId); + ajax.put(AjaxResult.DATA_TAG, sysUser); + ajax.put("postIds", postService.selectPostListByUserId(userId)); + ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList())); + } + return ajax; + } + + /** + * 新增用户 + */ + @RequiresPermissions("system:user:add") + @Log(title = "用户管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysUser user) + { + deptService.checkDeptDataScope(user.getDeptId()); + roleService.checkRoleDataScope(user.getRoleIds()); + if (!userService.checkUserNameUnique(user)) + { + return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在"); + } + else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) + { + return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在"); + } + else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) + { + return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在"); + } + user.setCreateBy(SecurityUtils.getUsername()); + user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); + return toAjax(userService.insertUser(user)); + } + + /** + * 修改用户 + */ + @RequiresPermissions("system:user:edit") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysUser user) + { + userService.checkUserAllowed(user); + userService.checkUserDataScope(user.getUserId()); + deptService.checkDeptDataScope(user.getDeptId()); + roleService.checkRoleDataScope(user.getRoleIds()); + if (!userService.checkUserNameUnique(user)) + { + return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在"); + } + else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) + { + return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在"); + } + else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) + { + return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); + } + user.setUpdateBy(SecurityUtils.getUsername()); + return toAjax(userService.updateUser(user)); + } + + /** + * 删除用户 + */ + @RequiresPermissions("system:user:remove") + @Log(title = "用户管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{userIds}") + public AjaxResult remove(@PathVariable Long[] userIds) + { + if (ArrayUtils.contains(userIds, SecurityUtils.getUserId())) + { + return error("当前用户不能删除"); + } + return toAjax(userService.deleteUserByIds(userIds)); + } + + /** + * 重置密码 + */ + @RequiresPermissions("system:user:edit") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) + @PutMapping("/resetPwd") + public AjaxResult resetPwd(@RequestBody SysUser user) + { + userService.checkUserAllowed(user); + userService.checkUserDataScope(user.getUserId()); + user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); + user.setUpdateBy(SecurityUtils.getUsername()); + return toAjax(userService.resetPwd(user)); + } + + /** + * 状态修改 + */ + @RequiresPermissions("system:user:edit") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) + @PutMapping("/changeStatus") + public AjaxResult changeStatus(@RequestBody SysUser user) + { + userService.checkUserAllowed(user); + userService.checkUserDataScope(user.getUserId()); + user.setUpdateBy(SecurityUtils.getUsername()); + return toAjax(userService.updateUserStatus(user)); + } + + /** + * 根据用户编号获取授权角色 + */ + @RequiresPermissions("system:user:query") + @GetMapping("/authRole/{userId}") + public AjaxResult authRole(@PathVariable("userId") Long userId) + { + AjaxResult ajax = AjaxResult.success(); + SysUser user = userService.selectUserById(userId); + List roles = roleService.selectRolesByUserId(userId); + ajax.put("user", user); + ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); + return ajax; + } + + /** + * 用户授权角色 + */ + @RequiresPermissions("system:user:edit") + @Log(title = "用户管理", businessType = BusinessType.GRANT) + @PutMapping("/authRole") + public AjaxResult insertAuthRole(Long userId, Long[] roleIds) + { + userService.checkUserDataScope(userId); + roleService.checkRoleDataScope(roleIds); + userService.insertUserAuth(userId, roleIds); + return success(); + } + + /** + * 获取部门树列表 + */ + @RequiresPermissions("system:user:list") + @GetMapping("/deptTree") + public AjaxResult deptTree(SysDept dept) + { + return success(deptService.selectDeptTreeList(dept)); + } +} 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 9535ab8cc..96220194a 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,127 +1,135 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import org.apache.ibatis.annotations.Param; -import com.ruoyi.system.api.domain.SysUser; - -/** - * 用户表 数据层 - * - * @author ruoyi - */ -public interface SysUserMapper -{ - /** - * 根据条件分页查询用户列表 - * - * @param sysUser 用户信息 - * @return 用户信息集合信息 - */ - public List selectUserList(SysUser sysUser); - - /** - * 根据条件分页查询已配用户角色列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - public List selectAllocatedList(SysUser user); - - /** - * 根据条件分页查询未分配用户角色列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - public List selectUnallocatedList(SysUser user); - - /** - * 通过用户名查询用户 - * - * @param userName 用户名 - * @return 用户对象信息 - */ - public SysUser selectUserByUserName(String userName); - - /** - * 通过用户ID查询用户 - * - * @param userId 用户ID - * @return 用户对象信息 - */ - public SysUser selectUserById(Long userId); - - /** - * 新增用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - public int insertUser(SysUser user); - - /** - * 修改用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - public int updateUser(SysUser user); - - /** - * 修改用户头像 - * - * @param userName 用户名 - * @param avatar 头像地址 - * @return 结果 - */ - public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar); - - /** - * 重置用户密码 - * - * @param userName 用户名 - * @param password 密码 - * @return 结果 - */ - public int resetUserPwd(@Param("userName") String userName, @Param("password") String password); - - /** - * 通过用户ID删除用户 - * - * @param userId 用户ID - * @return 结果 - */ - public int deleteUserById(Long userId); - - /** - * 批量删除用户信息 - * - * @param userIds 需要删除的用户ID - * @return 结果 - */ - public int deleteUserByIds(Long[] userIds); - - /** - * 校验用户名称是否唯一 - * - * @param userName 用户名称 - * @return 结果 - */ - public SysUser checkUserNameUnique(String userName); - - /** - * 校验手机号码是否唯一 - * - * @param phonenumber 手机号码 - * @return 结果 - */ - public SysUser checkPhoneUnique(String phonenumber); - - /** - * 校验email是否唯一 - * - * @param email 用户邮箱 - * @return 结果 - */ - public SysUser checkEmailUnique(String email); -} +package com.ruoyi.system.mapper; + +import java.util.List; +import org.apache.ibatis.annotations.Param; +import com.ruoyi.system.api.domain.SysUser; + +/** + * 用户表 数据层 + * + * @author ruoyi + */ +public interface SysUserMapper +{ + /** + * 根据条件分页查询用户列表 + * + * @param sysUser 用户信息 + * @return 用户信息集合信息 + */ + public List selectUserList(SysUser sysUser); + + /** + * 根据条件分页查询已配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + public List selectAllocatedList(SysUser user); + + /** + * 根据条件分页查询未分配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + public List selectUnallocatedList(SysUser user); + + /** + * 通过用户名查询用户 + * + * @param userName 用户名 + * @return 用户对象信息 + */ + public SysUser selectUserByUserName(String userName); + + /** + * 通过手机号查询用户 + * + * @param phoneNumber 手机号 + * @return 用户对象信息 + */ + public SysUser selectUserByPhoneNumber(String phoneNumber); + + /** + * 通过用户ID查询用户 + * + * @param userId 用户ID + * @return 用户对象信息 + */ + public SysUser selectUserById(Long userId); + + /** + * 新增用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + public int insertUser(SysUser user); + + /** + * 修改用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + public int updateUser(SysUser user); + + /** + * 修改用户头像 + * + * @param userName 用户名 + * @param avatar 头像地址 + * @return 结果 + */ + public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar); + + /** + * 重置用户密码 + * + * @param userName 用户名 + * @param password 密码 + * @return 结果 + */ + public int resetUserPwd(@Param("userName") String userName, @Param("password") String password); + + /** + * 通过用户ID删除用户 + * + * @param userId 用户ID + * @return 结果 + */ + public int deleteUserById(Long userId); + + /** + * 批量删除用户信息 + * + * @param userIds 需要删除的用户ID + * @return 结果 + */ + public int deleteUserByIds(Long[] userIds); + + /** + * 校验用户名称是否唯一 + * + * @param userName 用户名称 + * @return 结果 + */ + public SysUser checkUserNameUnique(String userName); + + /** + * 校验手机号码是否唯一 + * + * @param phonenumber 手机号码 + * @return 结果 + */ + public SysUser checkPhoneUnique(String phonenumber); + + /** + * 校验email是否唯一 + * + * @param email 用户邮箱 + * @return 结果 + */ + public SysUser checkEmailUnique(String email); +} 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 83208dc82..222f49213 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,206 +1,214 @@ -package com.ruoyi.system.service; - -import java.util.List; -import com.ruoyi.system.api.domain.SysUser; - -/** - * 用户 业务层 - * - * @author ruoyi - */ -public interface ISysUserService -{ - /** - * 根据条件分页查询用户列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - public List selectUserList(SysUser user); - - /** - * 根据条件分页查询已分配用户角色列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - public List selectAllocatedList(SysUser user); - - /** - * 根据条件分页查询未分配用户角色列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - public List selectUnallocatedList(SysUser user); - - /** - * 通过用户名查询用户 - * - * @param userName 用户名 - * @return 用户对象信息 - */ - public SysUser selectUserByUserName(String userName); - - /** - * 通过用户ID查询用户 - * - * @param userId 用户ID - * @return 用户对象信息 - */ - public SysUser selectUserById(Long userId); - - /** - * 根据用户ID查询用户所属角色组 - * - * @param userName 用户名 - * @return 结果 - */ - public String selectUserRoleGroup(String userName); - - /** - * 根据用户ID查询用户所属岗位组 - * - * @param userName 用户名 - * @return 结果 - */ - public String selectUserPostGroup(String userName); - - /** - * 校验用户名称是否唯一 - * - * @param user 用户信息 - * @return 结果 - */ - public boolean checkUserNameUnique(SysUser user); - - /** - * 校验手机号码是否唯一 - * - * @param user 用户信息 - * @return 结果 - */ - public boolean checkPhoneUnique(SysUser user); - - /** - * 校验email是否唯一 - * - * @param user 用户信息 - * @return 结果 - */ - public boolean checkEmailUnique(SysUser user); - - /** - * 校验用户是否允许操作 - * - * @param user 用户信息 - */ - public void checkUserAllowed(SysUser user); - - /** - * 校验用户是否有数据权限 - * - * @param userId 用户id - */ - public void checkUserDataScope(Long userId); - - /** - * 新增用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - public int insertUser(SysUser user); - - /** - * 注册用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - public boolean registerUser(SysUser user); - - /** - * 修改用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - public int updateUser(SysUser user); - - /** - * 用户授权角色 - * - * @param userId 用户ID - * @param roleIds 角色组 - */ - public void insertUserAuth(Long userId, Long[] roleIds); - - /** - * 修改用户状态 - * - * @param user 用户信息 - * @return 结果 - */ - public int updateUserStatus(SysUser user); - - /** - * 修改用户基本信息 - * - * @param user 用户信息 - * @return 结果 - */ - public boolean updateUserProfile(SysUser user); - - /** - * 修改用户头像 - * - * @param userName 用户名 - * @param avatar 头像地址 - * @return 结果 - */ - public boolean updateUserAvatar(String userName, String avatar); - - /** - * 重置用户密码 - * - * @param user 用户信息 - * @return 结果 - */ - public int resetPwd(SysUser user); - - /** - * 重置用户密码 - * - * @param userName 用户名 - * @param password 密码 - * @return 结果 - */ - public int resetUserPwd(String userName, String password); - - /** - * 通过用户ID删除用户 - * - * @param userId 用户ID - * @return 结果 - */ - public int deleteUserById(Long userId); - - /** - * 批量删除用户信息 - * - * @param userIds 需要删除的用户ID - * @return 结果 - */ - public int deleteUserByIds(Long[] userIds); - - /** - * 导入用户数据 - * - * @param userList 用户数据列表 - * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据 - * @param operName 操作用户 - * @return 结果 - */ - public String importUser(List userList, Boolean isUpdateSupport, String operName); -} +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.api.domain.SysUser; + +/** + * 用户 业务层 + * + * @author ruoyi + */ +public interface ISysUserService +{ + /** + * 根据条件分页查询用户列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + public List selectUserList(SysUser user); + + /** + * 根据条件分页查询已分配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + public List selectAllocatedList(SysUser user); + + /** + * 根据条件分页查询未分配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + public List selectUnallocatedList(SysUser user); + + /** + * 通过用户名查询用户 + * + * @param userName 用户名 + * @return 用户对象信息 + */ + public SysUser selectUserByUserName(String userName); + + /** + * 通过手机号查询用户 + * + * @param phoneNumber 用户名 + * @return 用户对象信息 + */ + public SysUser selectUserByPhoneNumber(String phoneNumber); + + /** + * 通过用户ID查询用户 + * + * @param userId 用户ID + * @return 用户对象信息 + */ + public SysUser selectUserById(Long userId); + + /** + * 根据用户ID查询用户所属角色组 + * + * @param userName 用户名 + * @return 结果 + */ + public String selectUserRoleGroup(String userName); + + /** + * 根据用户ID查询用户所属岗位组 + * + * @param userName 用户名 + * @return 结果 + */ + public String selectUserPostGroup(String userName); + + /** + * 校验用户名称是否唯一 + * + * @param user 用户信息 + * @return 结果 + */ + public boolean checkUserNameUnique(SysUser user); + + /** + * 校验手机号码是否唯一 + * + * @param user 用户信息 + * @return 结果 + */ + public boolean checkPhoneUnique(SysUser user); + + /** + * 校验email是否唯一 + * + * @param user 用户信息 + * @return 结果 + */ + public boolean checkEmailUnique(SysUser user); + + /** + * 校验用户是否允许操作 + * + * @param user 用户信息 + */ + public void checkUserAllowed(SysUser user); + + /** + * 校验用户是否有数据权限 + * + * @param userId 用户id + */ + public void checkUserDataScope(Long userId); + + /** + * 新增用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + public int insertUser(SysUser user); + + /** + * 注册用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + public boolean registerUser(SysUser user); + + /** + * 修改用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + public int updateUser(SysUser user); + + /** + * 用户授权角色 + * + * @param userId 用户ID + * @param roleIds 角色组 + */ + public void insertUserAuth(Long userId, Long[] roleIds); + + /** + * 修改用户状态 + * + * @param user 用户信息 + * @return 结果 + */ + public int updateUserStatus(SysUser user); + + /** + * 修改用户基本信息 + * + * @param user 用户信息 + * @return 结果 + */ + public boolean updateUserProfile(SysUser user); + + /** + * 修改用户头像 + * + * @param userName 用户名 + * @param avatar 头像地址 + * @return 结果 + */ + public boolean updateUserAvatar(String userName, String avatar); + + /** + * 重置用户密码 + * + * @param user 用户信息 + * @return 结果 + */ + public int resetPwd(SysUser user); + + /** + * 重置用户密码 + * + * @param userName 用户名 + * @param password 密码 + * @return 结果 + */ + public int resetUserPwd(String userName, String password); + + /** + * 通过用户ID删除用户 + * + * @param userId 用户ID + * @return 结果 + */ + public int deleteUserById(Long userId); + + /** + * 批量删除用户信息 + * + * @param userIds 需要删除的用户ID + * @return 结果 + */ + public int deleteUserByIds(Long[] userIds); + + /** + * 导入用户数据 + * + * @param userList 用户数据列表 + * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据 + * @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/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 99fbb358b..6f60ef879 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,551 +1,562 @@ -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; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.bean.BeanValidators; -import com.ruoyi.common.datascope.annotation.DataScope; -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.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.service.ISysConfigService; -import com.ruoyi.system.service.ISysDeptService; -import com.ruoyi.system.service.ISysUserService; - -/** - * 用户 业务层处理 - * - * @author ruoyi - */ -@Service -public class SysUserServiceImpl implements ISysUserService -{ - private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class); - - @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 - private ISysDeptService deptService; - - @Autowired - protected Validator validator; - - /** - * 根据条件分页查询用户列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - @Override - @DataScope(deptAlias = "d", userAlias = "u") - public List selectUserList(SysUser user) - { - return userMapper.selectUserList(user); - } - - /** - * 根据条件分页查询已分配用户角色列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - @Override - @DataScope(deptAlias = "d", userAlias = "u") - public List selectAllocatedList(SysUser user) - { - return userMapper.selectAllocatedList(user); - } - - /** - * 根据条件分页查询未分配用户角色列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - @Override - @DataScope(deptAlias = "d", userAlias = "u") - public List selectUnallocatedList(SysUser user) - { - return userMapper.selectUnallocatedList(user); - } - - /** - * 通过用户名查询用户 - * - * @param userName 用户名 - * @return 用户对象信息 - */ - @Override - public SysUser selectUserByUserName(String userName) - { - return userMapper.selectUserByUserName(userName); - } - - /** - * 通过用户ID查询用户 - * - * @param userId 用户ID - * @return 用户对象信息 - */ - @Override - public SysUser selectUserById(Long userId) - { - return userMapper.selectUserById(userId); - } - - /** - * 查询用户所属角色组 - * - * @param userName 用户名 - * @return 结果 - */ - @Override - public String selectUserRoleGroup(String userName) - { - List list = roleMapper.selectRolesByUserName(userName); - if (CollectionUtils.isEmpty(list)) - { - return StringUtils.EMPTY; - } - return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(",")); - } - - /** - * 查询用户所属岗位组 - * - * @param userName 用户名 - * @return 结果 - */ - @Override - public String selectUserPostGroup(String userName) - { - List list = postMapper.selectPostsByUserName(userName); - if (CollectionUtils.isEmpty(list)) - { - return StringUtils.EMPTY; - } - return list.stream().map(SysPost::getPostName).collect(Collectors.joining(",")); - } - - /** - * 校验用户名称是否唯一 - * - * @param user 用户信息 - * @return 结果 - */ - @Override - public boolean checkUserNameUnique(SysUser user) - { - Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); - SysUser info = userMapper.checkUserNameUnique(user.getUserName()); - if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) - { - return UserConstants.NOT_UNIQUE; - } - return UserConstants.UNIQUE; - } - - /** - * 校验手机号码是否唯一 - * - * @param user 用户信息 - * @return - */ - @Override - public boolean 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()) - { - return UserConstants.NOT_UNIQUE; - } - return UserConstants.UNIQUE; - } - - /** - * 校验email是否唯一 - * - * @param user 用户信息 - * @return - */ - @Override - public boolean 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()) - { - return UserConstants.NOT_UNIQUE; - } - return UserConstants.UNIQUE; - } - - /** - * 校验用户是否允许操作 - * - * @param user 用户信息 - */ - @Override - 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())) - { - SysUser user = new SysUser(); - user.setUserId(userId); - List users = SpringUtils.getAopProxy(this).selectUserList(user); - if (StringUtils.isEmpty(users)) - { - throw new ServiceException("没有权限访问用户数据！"); - } - } - } - - /** - * 新增保存用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public int insertUser(SysUser user) - { - // 新增用户信息 - int rows = userMapper.insertUser(user); - // 新增用户岗位关联 - insertUserPost(user); - // 新增用户与角色管理 - insertUserRole(user); - return rows; - } - - /** - * 注册用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - @Override - public boolean registerUser(SysUser user) - { - return userMapper.insertUser(user) > 0; - } - - /** - * 修改保存用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public int updateUser(SysUser user) - { - Long userId = user.getUserId(); - // 删除用户与角色关联 - userRoleMapper.deleteUserRoleByUserId(userId); - // 新增用户与角色管理 - insertUserRole(user); - // 删除用户与岗位关联 - userPostMapper.deleteUserPostByUserId(userId); - // 新增用户与岗位管理 - insertUserPost(user); - return userMapper.updateUser(user); - } - - /** - * 用户授权角色 - * - * @param userId 用户ID - * @param roleIds 角色组 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public void insertUserAuth(Long userId, Long[] roleIds) - { - userRoleMapper.deleteUserRoleByUserId(userId); - insertUserRole(userId, roleIds); - } - - /** - * 修改用户状态 - * - * @param user 用户信息 - * @return 结果 - */ - @Override - public int updateUserStatus(SysUser user) - { - return userMapper.updateUser(user); - } - - /** - * 修改用户基本信息 - * - * @param user 用户信息 - * @return 结果 - */ - @Override - public boolean updateUserProfile(SysUser user) - { - return userMapper.updateUser(user) > 0; - } - - /** - * 修改用户头像 - * - * @param userName 用户名 - * @param avatar 头像地址 - * @return 结果 - */ - @Override - public boolean updateUserAvatar(String userName, String avatar) - { - return userMapper.updateUserAvatar(userName, avatar) > 0; - } - - /** - * 重置用户密码 - * - * @param user 用户信息 - * @return 结果 - */ - @Override - public int resetPwd(SysUser user) - { - return userMapper.updateUser(user); - } - - /** - * 重置用户密码 - * - * @param userName 用户名 - * @param password 密码 - * @return 结果 - */ - @Override - public int resetUserPwd(String userName, String password) - { - return userMapper.resetUserPwd(userName, password); - } - - /** - * 新增用户角色信息 - * - * @param user 用户对象 - */ - public void insertUserRole(SysUser user) - { - this.insertUserRole(user.getUserId(), user.getRoleIds()); - } - - /** - * 新增用户岗位信息 - * - * @param user 用户对象 - */ - public void insertUserPost(SysUser user) - { - Long[] posts = user.getPostIds(); - if (StringUtils.isNotEmpty(posts)) - { - // 新增用户与岗位管理 - List list = new ArrayList(); - for (Long postId : posts) - { - SysUserPost up = new SysUserPost(); - up.setUserId(user.getUserId()); - up.setPostId(postId); - list.add(up); - } - userPostMapper.batchUserPost(list); - } - } - - /** - * 新增用户角色信息 - * - * @param userId 用户ID - * @param roleIds 角色组 - */ - public void insertUserRole(Long userId, Long[] roleIds) - { - if (StringUtils.isNotEmpty(roleIds)) - { - // 新增用户与角色管理 - List list = new ArrayList(); - for (Long roleId : roleIds) - { - SysUserRole ur = new SysUserRole(); - ur.setUserId(userId); - ur.setRoleId(roleId); - list.add(ur); - } - userRoleMapper.batchUserRole(list); - } - } - - /** - * 通过用户ID删除用户 - * - * @param userId 用户ID - * @return 结果 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public int deleteUserById(Long userId) - { - // 删除用户与角色关联 - userRoleMapper.deleteUserRoleByUserId(userId); - // 删除用户与岗位表 - userPostMapper.deleteUserPostByUserId(userId); - return userMapper.deleteUserById(userId); - } - - /** - * 批量删除用户信息 - * - * @param userIds 需要删除的用户ID - * @return 结果 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public int deleteUserByIds(Long[] userIds) - { - for (Long userId : userIds) - { - checkUserAllowed(new SysUser(userId)); - checkUserDataScope(userId); - } - // 删除用户与角色关联 - userRoleMapper.deleteUserRole(userIds); - // 删除用户与岗位关联 - userPostMapper.deleteUserPost(userIds); - return userMapper.deleteUserByIds(userIds); - } - - /** - * 导入用户数据 - * - * @param userList 用户数据列表 - * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据 - * @param operName 操作用户 - * @return 结果 - */ - @Override - public String importUser(List userList, Boolean isUpdateSupport, String operName) - { - if (StringUtils.isNull(userList) || userList.size() == 0) - { - throw new ServiceException("导入用户数据不能为空！"); - } - int successNum = 0; - int failureNum = 0; - StringBuilder successMsg = new StringBuilder(); - StringBuilder failureMsg = new StringBuilder(); - for (SysUser user : userList) - { - try - { - // 验证是否存在这个用户 - SysUser u = userMapper.selectUserByUserName(user.getUserName()); - if (StringUtils.isNull(u)) - { - BeanValidators.validateWithException(validator, user); - deptService.checkDeptDataScope(user.getDeptId()); - String password = configService.selectConfigByKey("sys.user.initPassword"); - user.setPassword(SecurityUtils.encryptPassword(password)); - user.setCreateBy(operName); - userMapper.insertUser(user); - successNum++; - successMsg.append("
" + successNum + "、账号 " + user.getUserName() + " 导入成功"); - } - else if (isUpdateSupport) - { - BeanValidators.validateWithException(validator, user); - checkUserAllowed(u); - checkUserDataScope(u.getUserId()); - deptService.checkDeptDataScope(user.getDeptId()); - user.setUserId(u.getUserId()); - user.setUpdateBy(operName); - userMapper.updateUser(user); - successNum++; - successMsg.append("
" + successNum + "、账号 " + user.getUserName() + " 更新成功"); - } - else - { - failureNum++; - failureMsg.append("
" + failureNum + "、账号 " + user.getUserName() + " 已存在"); - } - } - catch (Exception e) - { - failureNum++; - String msg = "
" + failureNum + "、账号 " + user.getUserName() + " 导入失败："; - failureMsg.append(msg + e.getMessage()); - log.error(msg, e); - } - } - if (failureNum > 0) - { - failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下："); - throw new ServiceException(failureMsg.toString()); - } - else - { - successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); - } - return successMsg.toString(); - } - -} +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; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.core.utils.bean.BeanValidators; +import com.ruoyi.common.datascope.annotation.DataScope; +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.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.service.ISysConfigService; +import com.ruoyi.system.service.ISysDeptService; +import com.ruoyi.system.service.ISysUserService; + +/** + * 用户 业务层处理 + * + * @author ruoyi + */ +@Service +public class SysUserServiceImpl implements ISysUserService +{ + private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class); + + @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 + private ISysDeptService deptService; + + @Autowired + protected Validator validator; + + /** + * 根据条件分页查询用户列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + @Override + @DataScope(deptAlias = "d", userAlias = "u") + public List selectUserList(SysUser user) + { + return userMapper.selectUserList(user); + } + + /** + * 根据条件分页查询已分配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + @Override + @DataScope(deptAlias = "d", userAlias = "u") + public List selectAllocatedList(SysUser user) + { + return userMapper.selectAllocatedList(user); + } + + /** + * 根据条件分页查询未分配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + @Override + @DataScope(deptAlias = "d", userAlias = "u") + public List selectUnallocatedList(SysUser user) + { + return userMapper.selectUnallocatedList(user); + } + + /** + * 通过用户名查询用户 + * + * @param userName 用户名 + * @return 用户对象信息 + */ + @Override + public SysUser selectUserByUserName(String userName) + { + return userMapper.selectUserByUserName(userName); + } + + /** + * 通过手机号查询用户 + * + * @param phoneNumber 手机号 + * @return 用户对象信息 + */ + @Override + public SysUser selectUserByPhoneNumber(String phoneNumber) { + return userMapper.selectUserByPhoneNumber(phoneNumber); + } + + /** + * 通过用户ID查询用户 + * + * @param userId 用户ID + * @return 用户对象信息 + */ + @Override + public SysUser selectUserById(Long userId) + { + return userMapper.selectUserById(userId); + } + + /** + * 查询用户所属角色组 + * + * @param userName 用户名 + * @return 结果 + */ + @Override + public String selectUserRoleGroup(String userName) + { + List list = roleMapper.selectRolesByUserName(userName); + if (CollectionUtils.isEmpty(list)) + { + return StringUtils.EMPTY; + } + return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(",")); + } + + /** + * 查询用户所属岗位组 + * + * @param userName 用户名 + * @return 结果 + */ + @Override + public String selectUserPostGroup(String userName) + { + List list = postMapper.selectPostsByUserName(userName); + if (CollectionUtils.isEmpty(list)) + { + return StringUtils.EMPTY; + } + return list.stream().map(SysPost::getPostName).collect(Collectors.joining(",")); + } + + /** + * 校验用户名称是否唯一 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public boolean checkUserNameUnique(SysUser user) + { + Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); + SysUser info = userMapper.checkUserNameUnique(user.getUserName()); + if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验手机号码是否唯一 + * + * @param user 用户信息 + * @return + */ + @Override + public boolean 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()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验email是否唯一 + * + * @param user 用户信息 + * @return + */ + @Override + public boolean 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()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验用户是否允许操作 + * + * @param user 用户信息 + */ + @Override + 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())) + { + SysUser user = new SysUser(); + user.setUserId(userId); + List users = SpringUtils.getAopProxy(this).selectUserList(user); + if (StringUtils.isEmpty(users)) + { + throw new ServiceException("没有权限访问用户数据！"); + } + } + } + + /** + * 新增保存用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int insertUser(SysUser user) + { + // 新增用户信息 + int rows = userMapper.insertUser(user); + // 新增用户岗位关联 + insertUserPost(user); + // 新增用户与角色管理 + insertUserRole(user); + return rows; + } + + /** + * 注册用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public boolean registerUser(SysUser user) + { + return userMapper.insertUser(user) > 0; + } + + /** + * 修改保存用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateUser(SysUser user) + { + Long userId = user.getUserId(); + // 删除用户与角色关联 + userRoleMapper.deleteUserRoleByUserId(userId); + // 新增用户与角色管理 + insertUserRole(user); + // 删除用户与岗位关联 + userPostMapper.deleteUserPostByUserId(userId); + // 新增用户与岗位管理 + insertUserPost(user); + return userMapper.updateUser(user); + } + + /** + * 用户授权角色 + * + * @param userId 用户ID + * @param roleIds 角色组 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void insertUserAuth(Long userId, Long[] roleIds) + { + userRoleMapper.deleteUserRoleByUserId(userId); + insertUserRole(userId, roleIds); + } + + /** + * 修改用户状态 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public int updateUserStatus(SysUser user) + { + return userMapper.updateUser(user); + } + + /** + * 修改用户基本信息 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public boolean updateUserProfile(SysUser user) + { + return userMapper.updateUser(user) > 0; + } + + /** + * 修改用户头像 + * + * @param userName 用户名 + * @param avatar 头像地址 + * @return 结果 + */ + @Override + public boolean updateUserAvatar(String userName, String avatar) + { + return userMapper.updateUserAvatar(userName, avatar) > 0; + } + + /** + * 重置用户密码 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public int resetPwd(SysUser user) + { + return userMapper.updateUser(user); + } + + /** + * 重置用户密码 + * + * @param userName 用户名 + * @param password 密码 + * @return 结果 + */ + @Override + public int resetUserPwd(String userName, String password) + { + return userMapper.resetUserPwd(userName, password); + } + + /** + * 新增用户角色信息 + * + * @param user 用户对象 + */ + public void insertUserRole(SysUser user) + { + this.insertUserRole(user.getUserId(), user.getRoleIds()); + } + + /** + * 新增用户岗位信息 + * + * @param user 用户对象 + */ + public void insertUserPost(SysUser user) + { + Long[] posts = user.getPostIds(); + if (StringUtils.isNotEmpty(posts)) + { + // 新增用户与岗位管理 + List list = new ArrayList(); + for (Long postId : posts) + { + SysUserPost up = new SysUserPost(); + up.setUserId(user.getUserId()); + up.setPostId(postId); + list.add(up); + } + userPostMapper.batchUserPost(list); + } + } + + /** + * 新增用户角色信息 + * + * @param userId 用户ID + * @param roleIds 角色组 + */ + public void insertUserRole(Long userId, Long[] roleIds) + { + if (StringUtils.isNotEmpty(roleIds)) + { + // 新增用户与角色管理 + List list = new ArrayList(); + for (Long roleId : roleIds) + { + SysUserRole ur = new SysUserRole(); + ur.setUserId(userId); + ur.setRoleId(roleId); + list.add(ur); + } + userRoleMapper.batchUserRole(list); + } + } + + /** + * 通过用户ID删除用户 + * + * @param userId 用户ID + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int deleteUserById(Long userId) + { + // 删除用户与角色关联 + userRoleMapper.deleteUserRoleByUserId(userId); + // 删除用户与岗位表 + userPostMapper.deleteUserPostByUserId(userId); + return userMapper.deleteUserById(userId); + } + + /** + * 批量删除用户信息 + * + * @param userIds 需要删除的用户ID + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int deleteUserByIds(Long[] userIds) + { + for (Long userId : userIds) + { + checkUserAllowed(new SysUser(userId)); + checkUserDataScope(userId); + } + // 删除用户与角色关联 + userRoleMapper.deleteUserRole(userIds); + // 删除用户与岗位关联 + userPostMapper.deleteUserPost(userIds); + return userMapper.deleteUserByIds(userIds); + } + + /** + * 导入用户数据 + * + * @param userList 用户数据列表 + * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据 + * @param operName 操作用户 + * @return 结果 + */ + @Override + public String importUser(List userList, Boolean isUpdateSupport, String operName) + { + if (StringUtils.isNull(userList) || userList.size() == 0) + { + throw new ServiceException("导入用户数据不能为空！"); + } + int successNum = 0; + int failureNum = 0; + StringBuilder successMsg = new StringBuilder(); + StringBuilder failureMsg = new StringBuilder(); + for (SysUser user : userList) + { + try + { + // 验证是否存在这个用户 + SysUser u = userMapper.selectUserByUserName(user.getUserName()); + if (StringUtils.isNull(u)) + { + BeanValidators.validateWithException(validator, user); + deptService.checkDeptDataScope(user.getDeptId()); + String password = configService.selectConfigByKey("sys.user.initPassword"); + user.setPassword(SecurityUtils.encryptPassword(password)); + user.setCreateBy(operName); + userMapper.insertUser(user); + successNum++; + successMsg.append("
" + successNum + "、账号 " + user.getUserName() + " 导入成功"); + } + else if (isUpdateSupport) + { + BeanValidators.validateWithException(validator, user); + checkUserAllowed(u); + checkUserDataScope(u.getUserId()); + deptService.checkDeptDataScope(user.getDeptId()); + user.setUserId(u.getUserId()); + user.setUpdateBy(operName); + userMapper.updateUser(user); + successNum++; + successMsg.append("
" + successNum + "、账号 " + user.getUserName() + " 更新成功"); + } + else + { + failureNum++; + failureMsg.append("
" + failureNum + "、账号 " + user.getUserName() + " 已存在"); + } + } + catch (Exception e) + { + failureNum++; + String msg = "
" + failureNum + "、账号 " + user.getUserName() + " 导入失败："; + failureMsg.append(msg + e.getMessage()); + log.error(msg, e); + } + } + if (failureNum > 0) + { + failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下："); + throw new ServiceException(failureMsg.toString()); + } + else + { + successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); + } + return successMsg.toString(); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 5814cd357..789ad9669 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -1,221 +1,226 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, - d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, - r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status - from sys_user u - left join sys_dept d on u.dept_id = d.dept_id - left join sys_user_role ur on u.user_id = ur.user_id - left join sys_role r on r.role_id = ur.role_id - - - - - - - - - - - - - - - - - - - - insert into sys_user( - user_id, - dept_id, - user_name, - nick_name, - email, - avatar, - phonenumber, - sex, - password, - status, - create_by, - remark, - create_time - )values( - #{userId}, - #{deptId}, - #{userName}, - #{nickName}, - #{email}, - #{avatar}, - #{phonenumber}, - #{sex}, - #{password}, - #{status}, - #{createBy}, - #{remark}, - sysdate() - ) - - - - update sys_user - - dept_id = #{deptId}, - user_name = #{userName}, - nick_name = #{nickName}, - email = #{email}, - phonenumber = #{phonenumber}, - sex = #{sex}, - avatar = #{avatar}, - password = #{password}, - status = #{status}, - login_ip = #{loginIp}, - login_date = #{loginDate}, - update_by = #{updateBy}, - remark = #{remark}, - update_time = sysdate() - - where user_id = #{userId} - - - - update sys_user set status = #{status} where user_id = #{userId} - - - - update sys_user set avatar = #{avatar} where user_name = #{userName} - - - - update sys_user set password = #{password} where user_name = #{userName} - - - - update sys_user set del_flag = '2' where user_id = #{userId} - - - - update sys_user set del_flag = '2' where user_id in - - #{userId} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, + d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, + r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status + from sys_user u + left join sys_dept d on u.dept_id = d.dept_id + left join sys_user_role ur on u.user_id = ur.user_id + left join sys_role r on r.role_id = ur.role_id + + + + + + + + + + + + + + + + + + + + + + insert into sys_user( + user_id, + dept_id, + user_name, + nick_name, + email, + avatar, + phonenumber, + sex, + password, + status, + create_by, + remark, + create_time + )values( + #{userId}, + #{deptId}, + #{userName}, + #{nickName}, + #{email}, + #{avatar}, + #{phonenumber}, + #{sex}, + #{password}, + #{status}, + #{createBy}, + #{remark}, + sysdate() + ) + + + + update sys_user + + dept_id = #{deptId}, + user_name = #{userName}, + nick_name = #{nickName}, + email = #{email}, + phonenumber = #{phonenumber}, + sex = #{sex}, + avatar = #{avatar}, + password = #{password}, + status = #{status}, + login_ip = #{loginIp}, + login_date = #{loginDate}, + update_by = #{updateBy}, + remark = #{remark}, + update_time = sysdate() + + where user_id = #{userId} + + + + update sys_user set status = #{status} where user_id = #{userId} + + + + update sys_user set avatar = #{avatar} where user_name = #{userName} + + + + update sys_user set password = #{password} where user_name = #{userName} + + + + update sys_user set del_flag = '2' where user_id = #{userId} + + + + update sys_user set del_flag = '2' where user_id in + + #{userId} + + + \ No newline at end of file From 273811480fe6201211288d7fd1eaaa205f90ecb4 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Fri, 9 Aug 2024 16:17:54 +0800 Subject: [PATCH 13/82] =?UTF-8?q?[fix]=20=E9=81=BF=E5=85=8Dokhttp=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E9=94=99=E8=AF=AF=E5=AF=BC=E8=87=B4=E7=9A=84=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-gateway/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index 8fb644c23..ec77a29a9 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -93,6 +93,10 @@ org.springframework spring-web + + com.squareup.okhttp3 + okhttp + From f29198fb66540b78263927cd3d93426947c10c11 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Sat, 10 Aug 2024 09:07:51 +0800 Subject: [PATCH 14/82] =?UTF-8?q?[fix]=20=E8=BF=81=E7=A7=BBkotlin=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=88=B0=E6=A0=B9=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 667 +++++++++++++++++++++++------------------- ruoyi-gateway/pom.xml | 73 ----- 2 files changed, 366 insertions(+), 374 deletions(-) diff --git a/pom.xml b/pom.xml index 509b51212..710942db4 100644 --- a/pom.xml +++ b/pom.xml @@ -1,302 +1,367 @@ - - - 4.0.0 - - com.ruoyi - ruoyi - 3.6.4 - - ruoyi - http://www.ruoyi.vip - 若依微服务系统 - - - 3.6.4 - UTF-8 - UTF-8 - 1.8 - 2.7.18 - 2021.0.8 - 2021.0.5.0 - 5.3.33 - 2.7.15 - 3.0.0 - 1.6.2 - 1.27.2 - 2.3.3 - 2.0.0 - 1.2.23 - 4.2.0 - 2.13.0 - 2.3 - 2.0.43 - 0.9.1 - 8.2.2 - 4.1.2 - 2.14.4 - - - - - - - - - org.springframework - spring-framework-bom - ${spring-framework.version} - pom - import - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${spring-cloud-alibaba.version} - pom - import - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - - com.github.tobato - fastdfs-client - ${tobato.version} - - - - - io.swagger - swagger-models - ${swagger.core.version} - - - io.swagger - swagger-annotations - ${swagger.core.version} - - - - - pro.fessional - kaptcha - ${kaptcha.version} - - - - - com.github.pagehelper - pagehelper-spring-boot-starter - ${pagehelper.boot.version} - - - - - commons-io - commons-io - ${commons.io.version} - - - - - org.apache.poi - poi-ooxml - ${poi.version} - - - - - org.apache.velocity - velocity-engine-core - ${velocity.version} - - - - - com.alibaba.fastjson2 - fastjson2 - ${fastjson.version} - - - - - io.jsonwebtoken - jjwt - ${jjwt.version} - - - - - com.alibaba - transmittable-thread-local - ${transmittable-thread-local.version} - - - - - com.ruoyi - ruoyi-common-core - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-common-swagger - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-common-security - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-common-sensitive - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-common-datascope - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-common-datasource - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-common-seata - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-common-log - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-common-redis - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-api-system - ${ruoyi.version} - - - - - - - ruoyi-auth - ruoyi-gateway - ruoyi-visual - ruoyi-modules - ruoyi-api - ruoyi-common - - pom - - - - - org.springframework.cloud - spring-cloud-starter-bootstrap - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - ${project.build.sourceEncoding} - - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - - - - repackage - - - - - - - - - - - public - aliyun nexus - https://maven.aliyun.com/repository/public - - true - - - - - - - public - aliyun nexus - https://maven.aliyun.com/repository/public - - true - - - false - - - - + + + 4.0.0 + + com.ruoyi + ruoyi + 3.6.4 + + ruoyi + http://www.ruoyi.vip + 若依微服务系统 + + + 3.6.4 + UTF-8 + UTF-8 + 1.8 + 2.7.18 + 2021.0.8 + 2021.0.5.0 + 5.3.33 + 2.7.15 + 3.0.0 + 1.6.2 + 1.27.2 + 2.3.3 + 2.0.0 + 1.2.23 + 4.2.0 + 2.13.0 + 2.3 + 2.0.43 + 0.9.1 + 8.2.2 + 4.1.2 + 2.14.4 + 2.0.0 + + + + + + + + + org.springframework + spring-framework-bom + ${spring-framework.version} + pom + import + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring-cloud-alibaba.version} + pom + import + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + + com.github.tobato + fastdfs-client + ${tobato.version} + + + + + io.swagger + swagger-models + ${swagger.core.version} + + + io.swagger + swagger-annotations + ${swagger.core.version} + + + + + pro.fessional + kaptcha + ${kaptcha.version} + + + + + com.github.pagehelper + pagehelper-spring-boot-starter + ${pagehelper.boot.version} + + + + + commons-io + commons-io + ${commons.io.version} + + + + + org.apache.poi + poi-ooxml + ${poi.version} + + + + + org.apache.velocity + velocity-engine-core + ${velocity.version} + + + + + com.alibaba.fastjson2 + fastjson2 + ${fastjson.version} + + + + + io.jsonwebtoken + jjwt + ${jjwt.version} + + + + + com.alibaba + transmittable-thread-local + ${transmittable-thread-local.version} + + + + + com.ruoyi + ruoyi-common-core + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-common-swagger + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-common-security + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-common-sensitive + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-common-datascope + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-common-datasource + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-common-seata + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-common-log + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-common-redis + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-api-system + ${ruoyi.version} + + + + + + + ruoyi-auth + ruoyi-gateway + ruoyi-visual + ruoyi-modules + ruoyi-api + ruoyi-common + + pom + + + + + org.springframework.cloud + spring-cloud-starter-bootstrap + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-test + ${kotlin.version} + test + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.8 + + + add-source + generate-sources + + add-source + + + + src/main/java + src/main/kotlin + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.jetbrains.kotlin + kotlin-maven-plugin + ${kotlin.version} + + + compile + compile + + compile + + + + src/main/java + src/main/kotlin + target/generated-sources/annotations + + + + + test-compile + test-compile + + test-compile + + + + src/test/kotlin + target/generated-test-sources/test-annotations + + + + + + 1.8 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + + + repackage + + + + + + + + + + + public + aliyun nexus + https://maven.aliyun.com/repository/public + + true + + + + + + + public + aliyun nexus + https://maven.aliyun.com/repository/public + + true + + + false + + + + \ No newline at end of file diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index ec77a29a9..7cbcdbcde 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -14,10 +14,6 @@ ruoyi-gateway网关模块 - - 2.0.0 - - @@ -111,44 +107,12 @@ springfox-swagger2 ${swagger.fox.version} - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-test - ${kotlin.version} - test - ${project.artifactId} - - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - add-source - generate-sources - - add-source - - - - src/main/java - src/main/kotlin - - - - - org.springframework.boot spring-boot-maven-plugin @@ -160,43 +124,6 @@ - - org.jetbrains.kotlin - kotlin-maven-plugin - ${kotlin.version} - - - compile - compile - - compile - - - - src/main/java - src/main/kotlin - target/generated-sources/annotations - - - - - test-compile - test-compile - - test-compile - - - - src/test/kotlin - target/generated-test-sources/test-annotations - - - - - - 1.8 - - org.apache.maven.plugins maven-compiler-plugin From f9cab79ead774fe888e2285bf329ebe18c0b53b2 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Mon, 12 Aug 2024 15:41:30 +0800 Subject: [PATCH 15/82] =?UTF-8?q?[feat]=20=E9=99=90=E5=88=B6=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E9=AA=8C=E8=AF=81=E7=A0=81=E8=8E=B7=E5=8F=96=E9=A2=91?= =?UTF-8?q?=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gateway/handler/ValidateCodeHandler.java | 6 +++++- .../gateway/service/ValidateCodeService.java | 2 +- .../service/impl/ValidateCodeServiceImpl.java | 17 ++++++++++------- 3 files changed, 16 insertions(+), 9 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 5544c2456..f3168bccc 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,6 +3,7 @@ package com.ruoyi.gateway.handler; import java.io.IOException; import java.util.Objects; +import com.ruoyi.common.core.utils.uuid.IdUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Component; @@ -35,7 +36,10 @@ public class ValidateCodeHandler implements HandlerFunction switch (serverRequest.queryParam("type").orElse("image")) { case "sms": if (Objects.nonNull(serverRequest.queryParam("receiver").orElse(null))) { - ajax = validateCodeService.createSMSCaptcha(serverRequest.queryParam("receiver").orElse(null)); + ajax = validateCodeService.createSMSCaptcha( + serverRequest.queryParam("receiver").orElse(null), + serverRequest.queryParam("uuid").orElse(IdUtils.simpleUUID()) + ); break; } default: 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 051631a0a..c1e0d5c7e 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 @@ -19,7 +19,7 @@ public interface ValidateCodeService /** * 生成短信验证码 */ - public AjaxResult createSMSCaptcha(String receiver) throws IOException, CaptchaException; + public AjaxResult createSMSCaptcha(String receiver,String uuid) throws IOException, 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 e7367344b..d2d169429 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 @@ -104,20 +104,23 @@ public class ValidateCodeServiceImpl implements ValidateCodeService } @Override - public AjaxResult createSMSCaptcha(String receiver) throws IOException, CaptchaException { + public AjaxResult createSMSCaptcha(String receiver, String uuid) throws IOException, CaptchaException { AjaxResult ajax = AjaxResult.success(); boolean captchaEnabled = captchaProperties.getEnabled(); ajax.put("captchaEnabled", captchaEnabled); - if (!captchaEnabled) - { + if (!captchaEnabled) { return ajax; } // 保存验证码信息 - String uuid = IdUtils.simpleUUID(); String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid; - String code = captchaProducerNumber.createText(); - redisService.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES); - ajax.put("code", code); + long expire = redisService.getExpire(verifyKey); + if (expire <= 0) { + String code = captchaProducerNumber.createText(); + redisService.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES); + ajax.put("code", code); + expire = redisService.getExpire(verifyKey); + } + ajax.put("expire", expire); ajax.put("uuid", uuid); return ajax; } From 94fa483dd3737987ef3955e82a30b1ab4f8f72e5 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Tue, 13 Aug 2024 14:39:07 +0800 Subject: [PATCH 16/82] =?UTF-8?q?[feat]=20=E6=96=B0=E5=A2=9E=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E9=AA=8C=E8=AF=81=E7=A0=81=E4=B8=8B=E5=8F=91=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-gateway/pom.xml | 13 +- .../config/properties/CaptchaProperties.java | 130 +++++++++++------- .../service/impl/ValidateCodeServiceImpl.java | 16 ++- 3 files changed, 108 insertions(+), 51 deletions(-) diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index 7cbcdbcde..8839061e7 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -76,6 +76,11 @@ ruoyi-common-redis + + com.squareup.okhttp3 + okhttp + 3.12.13 + com.ujcms ujcms-commons @@ -89,10 +94,6 @@ org.springframework spring-web - - com.squareup.okhttp3 - okhttp - @@ -151,6 +152,10 @@ + + 16 + 16 + 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 dea2e1685..0b15361c2 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 @@ -1,46 +1,84 @@ -package com.ruoyi.gateway.config.properties; - -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.cloud.context.config.annotation.RefreshScope; -import org.springframework.context.annotation.Configuration; - -/** - * 验证码配置 - * - * @author ruoyi - */ -@Configuration -@RefreshScope -@ConfigurationProperties(prefix = "security.captcha") -public class CaptchaProperties -{ - /** - * 验证码开关 - */ - private Boolean enabled; - - /** - * 验证码类型（math 数组计算 char 字符） - */ - private String type; - - public Boolean getEnabled() - { - return enabled; - } - - public void setEnabled(Boolean enabled) - { - this.enabled = enabled; - } - - public String getType() - { - return type; - } - - public void setType(String type) - { - this.type = type; - } -} +package com.ruoyi.gateway.config.properties; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.context.annotation.Configuration; + +/** + * 验证码配置 + * + * @author ruoyi + */ +@Configuration +@RefreshScope +@ConfigurationProperties(prefix = "security.captcha") +public class CaptchaProperties +{ + /** + * 验证码开关 + */ + private Boolean enabled; + + /** + * 验证码类型（math 数组计算 char 字符） + */ + private String type; + + public Boolean getEnabled() + { + return enabled; + } + + public void setEnabled(Boolean enabled) + { + this.enabled = enabled; + } + + public String getType() + { + return type; + } + + public void setType(String type) + { + this.type = type; + } + + public static class SMS { + @RefreshScope + @Configuration + @ConfigurationProperties(prefix = "security.captcha.sms.aliyuncs") + public static class Aliyuncs { + private String accessKeyId; + private String accessKeySecret; + private String signName; + private String templateCode; + public String getAccessKeyId() { + return accessKeyId; + } + public void setAccessKeyId(String accessKeyId) { + this.accessKeyId = accessKeyId; + } + public String getAccessKeySecret() { + return accessKeySecret; + } + + public void setAccessKeySecret(String accessKeySecret) { + this.accessKeySecret = accessKeySecret; + } + + public String getSignName() { + return signName; + } + public void setSignName(String signName) { + this.signName = signName; + } + public String getTemplateCode() { + return templateCode; + } + public void setTemplateCode(String templateCode) { + this.templateCode = templateCode; + } + } + } +} 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 d2d169429..60a5da521 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 @@ -5,6 +5,9 @@ import java.io.IOException; import java.util.concurrent.TimeUnit; import javax.annotation.Resource; import javax.imageio.ImageIO; + +import com.alibaba.fastjson2.JSONObject; +import com.ujcms.commons.sms.AliyunUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.FastByteArrayOutputStream; @@ -43,6 +46,9 @@ public class ValidateCodeServiceImpl implements ValidateCodeService @Autowired private CaptchaProperties captchaProperties; + @Autowired + private CaptchaProperties.SMS.Aliyuncs smsAliyuncs; + /** * 生成验证码 */ @@ -112,13 +118,21 @@ public class ValidateCodeServiceImpl implements ValidateCodeService return ajax; } // 保存验证码信息 - String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid; + String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + receiver + ":" + uuid; long expire = redisService.getExpire(verifyKey); if (expire <= 0) { String code = captchaProducerNumber.createText(); redisService.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES); ajax.put("code", code); expire = redisService.getExpire(verifyKey); + AliyunUtils.sendSms( + smsAliyuncs.getAccessKeyId(), + smsAliyuncs.getAccessKeySecret(), + smsAliyuncs.getSignName(), + smsAliyuncs.getTemplateCode(), + JSONObject.of("code", code), + receiver + ); } ajax.put("expire", expire); ajax.put("uuid", uuid); From 450f3b56fa910b06f553bea13b815de91c531514 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Tue, 13 Aug 2024 14:42:46 +0800 Subject: [PATCH 17/82] =?UTF-8?q?[feat]=20=E5=89=8D=E5=8F=B0=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E5=9B=9E=E6=98=BE=E9=AA=8C=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java | 1 - 1 file changed, 1 deletion(-) 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 60a5da521..bef128b90 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 @@ -123,7 +123,6 @@ public class ValidateCodeServiceImpl implements ValidateCodeService if (expire <= 0) { String code = captchaProducerNumber.createText(); redisService.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES); - ajax.put("code", code); expire = redisService.getExpire(verifyKey); AliyunUtils.sendSms( smsAliyuncs.getAccessKeyId(), From de924c7ee0de3e99491c502d6b6107ca800820fe Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Wed, 14 Aug 2024 09:42:44 +0800 Subject: [PATCH 18/82] =?UTF-8?q?[feat]=20=E5=8D=87=E7=BA=A7=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 +- ruoyi-api/pom.xml | 44 +- ruoyi-api/ruoyi-api-system/pom.xml | 54 +- ruoyi-auth/pom.xml | 148 +- ruoyi-common/pom.xml | 60 +- ruoyi-common/ruoyi-common-core/pom.xml | 236 +-- ruoyi-common/ruoyi-common-datascope/pom.xml | 52 +- ruoyi-common/ruoyi-common-datasource/pom.xml | 68 +- ruoyi-common/ruoyi-common-log/pom.xml | 52 +- ruoyi-common/ruoyi-common-redis/pom.xml | 64 +- ruoyi-common/ruoyi-common-seata/pom.xml | 52 +- ruoyi-common/ruoyi-common-security/pom.xml | 78 +- ruoyi-common/ruoyi-common-sensitive/pom.xml | 2 +- ruoyi-common/ruoyi-common-swagger/pom.xml | 68 +- ruoyi-gateway/pom.xml | 2 +- ruoyi-modules/pom.xml | 50 +- ruoyi-modules/ruoyi-file/pom.xml | 174 +- ruoyi-modules/ruoyi-gen/pom.xml | 186 +- ruoyi-modules/ruoyi-job/pom.xml | 198 +- ruoyi-modules/ruoyi-system/pom.xml | 198 +- ruoyi-ui/src/views/index.vue | 1982 +++++++++--------- ruoyi-visual/pom.xml | 44 +- ruoyi-visual/ruoyi-monitor/pom.xml | 148 +- 23 files changed, 1985 insertions(+), 1982 deletions(-) diff --git a/pom.xml b/pom.xml index 710942db4..9d8ca0a46 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,17 @@ com.ruoyi ruoyi - 3.6.4 + 3.6.41 ruoyi http://www.ruoyi.vip 若依微服务系统 - 3.6.4 + UTF-8 + 11 + 11 + 3.6.41 UTF-8 UTF-8 1.8 diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml index 91db126d8..d9b1ac68d 100644 --- a/ruoyi-api/pom.xml +++ b/ruoyi-api/pom.xml @@ -1,22 +1,22 @@ - - - - com.ruoyi - ruoyi - 3.6.4 - - 4.0.0 - - - ruoyi-api-system - - - ruoyi-api - pom - - - ruoyi-api系统接口 - - - + + + + com.ruoyi + ruoyi + 3.6.41 + + 4.0.0 + + + ruoyi-api-system + + + ruoyi-api + pom + + + ruoyi-api系统接口 + + + diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml index d137489d1..b689042eb 100644 --- a/ruoyi-api/ruoyi-api-system/pom.xml +++ b/ruoyi-api/ruoyi-api-system/pom.xml @@ -1,28 +1,28 @@ - - - - com.ruoyi - ruoyi-api - 3.6.4 - - 4.0.0 - - ruoyi-api-system - - - ruoyi-api-system系统接口模块 - - - - - - - com.ruoyi - ruoyi-common-core - - - - + + + + com.ruoyi + ruoyi-api + 3.6.41 + + 4.0.0 + + ruoyi-api-system + + + ruoyi-api-system系统接口模块 + + + + + + + com.ruoyi + ruoyi-common-core + + + + \ No newline at end of file diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index e71d641c8..5ab447793 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -1,74 +1,74 @@ - - - com.ruoyi - ruoyi - 3.6.4 - - 4.0.0 - - ruoyi-auth - - - ruoyi-auth认证授权中心 - - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-web - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - com.ruoyi - ruoyi-common-security - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - - + + + com.ruoyi + ruoyi + 3.6.41 + + 4.0.0 + + ruoyi-auth + + + ruoyi-auth认证授权中心 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + com.ruoyi + ruoyi-common-security + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 3129e2d6c..c54647167 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -1,30 +1,30 @@ - - - - com.ruoyi - ruoyi - 3.6.4 - - 4.0.0 - - - ruoyi-common-log - ruoyi-common-core - ruoyi-common-redis - ruoyi-common-seata - ruoyi-common-swagger - ruoyi-common-security - ruoyi-common-sensitive - ruoyi-common-datascope - ruoyi-common-datasource - - - ruoyi-common - pom - - - ruoyi-common通用模块 - - - + + + + com.ruoyi + ruoyi + 3.6.41 + + 4.0.0 + + + ruoyi-common-log + ruoyi-common-core + ruoyi-common-redis + ruoyi-common-seata + ruoyi-common-swagger + ruoyi-common-security + ruoyi-common-sensitive + ruoyi-common-datascope + ruoyi-common-datasource + + + ruoyi-common + pom + + + ruoyi-common通用模块 + + + diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index 149a4cf3d..8c1675713 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -1,118 +1,118 @@ - - - - com.ruoyi - ruoyi-common - 3.6.4 - - 4.0.0 - - ruoyi-common-core - - - ruoyi-common-core核心模块 - - - - - - - org.springframework.cloud - spring-cloud-starter-openfeign - - - - - org.springframework.cloud - spring-cloud-starter-loadbalancer - - - - - org.springframework - spring-context-support - - - - - org.springframework - spring-web - - - - - com.alibaba - transmittable-thread-local - - - - - com.github.pagehelper - pagehelper-spring-boot-starter - - - - - org.springframework.boot - spring-boot-starter-validation - - - - - com.fasterxml.jackson.core - jackson-databind - - - - - com.alibaba.fastjson2 - fastjson2 - - - - - io.jsonwebtoken - jjwt - - - - - javax.xml.bind - jaxb-api - - - - - org.apache.commons - commons-lang3 - - - - - commons-io - commons-io - - - - - org.apache.poi - poi-ooxml - - - - - javax.servlet - javax.servlet-api - - - - - io.swagger - swagger-annotations - - - - - + + + + com.ruoyi + ruoyi-common + 3.6.41 + + 4.0.0 + + ruoyi-common-core + + + ruoyi-common-core核心模块 + + + + + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + + + org.springframework.cloud + spring-cloud-starter-loadbalancer + + + + + org.springframework + spring-context-support + + + + + org.springframework + spring-web + + + + + com.alibaba + transmittable-thread-local + + + + + com.github.pagehelper + pagehelper-spring-boot-starter + + + + + org.springframework.boot + spring-boot-starter-validation + + + + + com.fasterxml.jackson.core + jackson-databind + + + + + com.alibaba.fastjson2 + fastjson2 + + + + + io.jsonwebtoken + jjwt + + + + + javax.xml.bind + jaxb-api + + + + + org.apache.commons + commons-lang3 + + + + + commons-io + commons-io + + + + + org.apache.poi + poi-ooxml + + + + + javax.servlet + javax.servlet-api + + + + + io.swagger + swagger-annotations + + + + + diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/ruoyi-common/ruoyi-common-datascope/pom.xml index 252ee01ca..58fdd0947 100644 --- a/ruoyi-common/ruoyi-common-datascope/pom.xml +++ b/ruoyi-common/ruoyi-common-datascope/pom.xml @@ -1,27 +1,27 @@ - - - - com.ruoyi - ruoyi-common - 3.6.4 - - 4.0.0 - - ruoyi-common-datascope - - - ruoyi-common-datascope权限范围 - - - - - - - com.ruoyi - ruoyi-common-security - - - + + + + com.ruoyi + ruoyi-common + 3.6.41 + + 4.0.0 + + ruoyi-common-datascope + + + ruoyi-common-datascope权限范围 + + + + + + + com.ruoyi + ruoyi-common-security + + + \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml index 56e46ff19..6d35b6e3f 100644 --- a/ruoyi-common/ruoyi-common-datasource/pom.xml +++ b/ruoyi-common/ruoyi-common-datasource/pom.xml @@ -1,35 +1,35 @@ - - - - com.ruoyi - ruoyi-common - 3.6.4 - - 4.0.0 - - ruoyi-common-datasource - - - ruoyi-common-datasource多数据源 - - - - - - - com.alibaba - druid-spring-boot-starter - ${druid.version} - - - - - com.baomidou - dynamic-datasource-spring-boot-starter - ${dynamic-ds.version} - - - + + + + com.ruoyi + ruoyi-common + 3.6.41 + + 4.0.0 + + ruoyi-common-datasource + + + ruoyi-common-datasource多数据源 + + + + + + + com.alibaba + druid-spring-boot-starter + ${druid.version} + + + + + com.baomidou + dynamic-datasource-spring-boot-starter + ${dynamic-ds.version} + + + \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml index 818679254..239d0a883 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/ruoyi-common/ruoyi-common-log/pom.xml @@ -1,27 +1,27 @@ - - - - com.ruoyi - ruoyi-common - 3.6.4 - - 4.0.0 - - ruoyi-common-log - - - ruoyi-common-log日志记录 - - - - - - - com.ruoyi - ruoyi-common-security - - - + + + + com.ruoyi + ruoyi-common + 3.6.41 + + 4.0.0 + + ruoyi-common-log + + + ruoyi-common-log日志记录 + + + + + + + com.ruoyi + ruoyi-common-security + + + \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml index e9892a0bd..61187c75b 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/ruoyi-common/ruoyi-common-redis/pom.xml @@ -1,33 +1,33 @@ - - - - com.ruoyi - ruoyi-common - 3.6.4 - - 4.0.0 - - ruoyi-common-redis - - - ruoyi-common-redis缓存服务 - - - - - - - org.springframework.boot - spring-boot-starter-data-redis - - - - - com.ruoyi - ruoyi-common-core - - - + + + + com.ruoyi + ruoyi-common + 3.6.41 + + 4.0.0 + + ruoyi-common-redis + + + ruoyi-common-redis缓存服务 + + + + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + com.ruoyi + ruoyi-common-core + + + \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml index 62a66cc42..a3ed35144 100644 --- a/ruoyi-common/ruoyi-common-seata/pom.xml +++ b/ruoyi-common/ruoyi-common-seata/pom.xml @@ -1,27 +1,27 @@ - - - - com.ruoyi - ruoyi-common - 3.6.4 - - 4.0.0 - - ruoyi-common-seata - - - ruoyi-common-seata分布式事务 - - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-seata - - - + + + + com.ruoyi + ruoyi-common + 3.6.41 + + 4.0.0 + + ruoyi-common-seata + + + ruoyi-common-seata分布式事务 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-seata + + + \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml index 9504fe38c..e41e317d7 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/ruoyi-common/ruoyi-common-security/pom.xml @@ -1,39 +1,39 @@ - - - - com.ruoyi - ruoyi-common - 3.6.4 - - 4.0.0 - - ruoyi-common-security - - - ruoyi-common-security安全模块 - - - - - - - org.springframework - spring-webmvc - - - - - com.ruoyi - ruoyi-api-system - - - - - com.ruoyi - ruoyi-common-redis - - - - - + + + + com.ruoyi + ruoyi-common + 3.6.41 + + 4.0.0 + + ruoyi-common-security + + + ruoyi-common-security安全模块 + + + + + + + org.springframework + spring-webmvc + + + + + com.ruoyi + ruoyi-api-system + + + + + com.ruoyi + ruoyi-common-redis + + + + + diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/ruoyi-common/ruoyi-common-sensitive/pom.xml index f5f5c1d3a..cfd492b0f 100644 --- a/ruoyi-common/ruoyi-common-sensitive/pom.xml +++ b/ruoyi-common/ruoyi-common-sensitive/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.4 + 3.6.41 4.0.0 diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml index a31d0975e..7261ed4c8 100644 --- a/ruoyi-common/ruoyi-common-swagger/pom.xml +++ b/ruoyi-common/ruoyi-common-swagger/pom.xml @@ -1,34 +1,34 @@ - - - - com.ruoyi - ruoyi-common - 3.6.4 - - 4.0.0 - - ruoyi-common-swagger - - - ruoyi-common-swagger系统接口 - - - - - - - org.springframework.boot - spring-boot-starter-web - - - - - io.springfox - springfox-swagger2 - ${swagger.fox.version} - - - - + + + + com.ruoyi + ruoyi-common + 3.6.41 + + 4.0.0 + + ruoyi-common-swagger + + + ruoyi-common-swagger系统接口 + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + io.springfox + springfox-swagger2 + ${swagger.fox.version} + + + + diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index 8839061e7..d4bea88a1 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.4 + 3.6.41 4.0.0 diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index 22c84bdd4..d93e248a6 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -1,25 +1,25 @@ - - - - com.ruoyi - ruoyi - 3.6.4 - - 4.0.0 - - - ruoyi-system - ruoyi-gen - ruoyi-job - ruoyi-file - - - ruoyi-modules - pom - - - ruoyi-modules业务模块 - - - + + + + com.ruoyi + ruoyi + 3.6.41 + + 4.0.0 + + + ruoyi-system + ruoyi-gen + ruoyi-job + ruoyi-file + + + ruoyi-modules + pom + + + ruoyi-modules业务模块 + + + diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index 3d868c4d2..77e415321 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/ruoyi-modules/ruoyi-file/pom.xml @@ -1,88 +1,88 @@ - - - - com.ruoyi - ruoyi-modules - 3.6.4 - - 4.0.0 - - ruoyi-modules-file - - - ruoyi-modules-file文件服务 - - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - com.github.tobato - fastdfs-client - - - - - io.minio - minio - ${minio.version} - - - - - com.ruoyi - ruoyi-api-system - - - - - com.ruoyi - ruoyi-common-swagger - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - + + + + com.ruoyi + ruoyi-modules + 3.6.41 + + 4.0.0 + + ruoyi-modules-file + + + ruoyi-modules-file文件服务 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + com.github.tobato + fastdfs-client + + + + + io.minio + minio + ${minio.version} + + + + + com.ruoyi + ruoyi-api-system + + + + + com.ruoyi + ruoyi-common-swagger + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index be14431fa..a5ccefed6 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -1,94 +1,94 @@ - - - - com.ruoyi - ruoyi-modules - 3.6.4 - - 4.0.0 - - ruoyi-modules-gen - - - ruoyi-modules-gen代码生成 - - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - io.springfox - springfox-swagger-ui - ${swagger.fox.version} - - - - - org.apache.velocity - velocity-engine-core - - - - - com.mysql - mysql-connector-j - - - - - com.ruoyi - ruoyi-common-log - - - - - com.ruoyi - ruoyi-common-swagger - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - + + + + com.ruoyi + ruoyi-modules + 3.6.41 + + 4.0.0 + + ruoyi-modules-gen + + + ruoyi-modules-gen代码生成 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + org.apache.velocity + velocity-engine-core + + + + + com.mysql + mysql-connector-j + + + + + com.ruoyi + ruoyi-common-log + + + + + com.ruoyi + ruoyi-common-swagger + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index 88b44f275..358258795 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -1,100 +1,100 @@ - - - - com.ruoyi - ruoyi-modules - 3.6.4 - - 4.0.0 - - ruoyi-modules-job - - - ruoyi-modules-job定时任务 - - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - io.springfox - springfox-swagger-ui - ${swagger.fox.version} - - - - - org.quartz-scheduler - quartz - - - com.mchange - c3p0 - - - - - - - com.mysql - mysql-connector-j - - - - - com.ruoyi - ruoyi-common-log - - - - - com.ruoyi - ruoyi-common-swagger - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - + + + + com.ruoyi + ruoyi-modules + 3.6.41 + + 4.0.0 + + ruoyi-modules-job + + + ruoyi-modules-job定时任务 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + org.quartz-scheduler + quartz + + + com.mchange + c3p0 + + + + + + + com.mysql + mysql-connector-j + + + + + com.ruoyi + ruoyi-common-log + + + + + com.ruoyi + ruoyi-common-swagger + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index 1e14f6d52..741ed0c18 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -1,100 +1,100 @@ - - - - com.ruoyi - ruoyi-modules - 3.6.4 - - 4.0.0 - - ruoyi-modules-system - - - ruoyi-modules-system系统模块 - - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - io.springfox - springfox-swagger-ui - ${swagger.fox.version} - - - - - com.mysql - mysql-connector-j - - - - - com.ruoyi - ruoyi-common-datasource - - - - - com.ruoyi - ruoyi-common-datascope - - - - - com.ruoyi - ruoyi-common-log - - - - - com.ruoyi - ruoyi-common-swagger - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - + + + + com.ruoyi + ruoyi-modules + 3.6.41 + + 4.0.0 + + ruoyi-modules-system + + + ruoyi-modules-system系统模块 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.ruoyi + ruoyi-common-datasource + + + + + com.ruoyi + ruoyi-common-datascope + + + + + com.ruoyi + ruoyi-common-log + + + + + com.ruoyi + ruoyi-common-swagger + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 610d6c311..02c8abbed 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -1,991 +1,991 @@ - - - - - - + + + + + + diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml index 7011fdc58..c8c53a367 100644 --- a/ruoyi-visual/pom.xml +++ b/ruoyi-visual/pom.xml @@ -1,22 +1,22 @@ - - - - com.ruoyi - ruoyi - 3.6.4 - - 4.0.0 - - - ruoyi-monitor - - - ruoyi-visual - pom - - - ruoyi-visual图形化管理模块 - - - + + + + com.ruoyi + ruoyi + 3.6.41 + + 4.0.0 + + + ruoyi-monitor + + + ruoyi-visual + pom + + + ruoyi-visual图形化管理模块 + + + diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index 3f0c871b1..2215d56a5 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/ruoyi-visual/ruoyi-monitor/pom.xml @@ -1,75 +1,75 @@ - - - com.ruoyi - ruoyi-visual - 3.6.4 - - 4.0.0 - - ruoyi-visual-monitor - - - ruoyi-visual-monitor监控中心 - - - - - - - de.codecentric - spring-boot-admin-starter-server - ${spring-boot-admin.version} - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-web - - - - - org.springframework.boot - spring-boot-starter-security - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - + + + com.ruoyi + ruoyi-visual + 3.6.41 + + 4.0.0 + + ruoyi-visual-monitor + + + ruoyi-visual-monitor监控中心 + + + + + + + de.codecentric + spring-boot-admin-starter-server + ${spring-boot-admin.version} + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.boot + spring-boot-starter-security + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + \ No newline at end of file From 04adbe7d46fe4945cc36cf6b74a62f5bcb9be619 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Thu, 15 Aug 2024 17:21:05 +0800 Subject: [PATCH 19/82] =?UTF-8?q?[feat]=20=E9=9D=9E=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=B8=8D=E5=86=8D=E5=AE=9E=E9=99=85=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=E7=9F=AD=E4=BF=A1=E9=AA=8C=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ValidateCodeServiceImpl.java | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) 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 bef128b90..620727ce8 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 @@ -2,6 +2,7 @@ package com.ruoyi.gateway.service.impl; import java.awt.image.BufferedImage; import java.io.IOException; +import java.util.Arrays; import java.util.concurrent.TimeUnit; import javax.annotation.Resource; import javax.imageio.ImageIO; @@ -9,6 +10,7 @@ import javax.imageio.ImageIO; import com.alibaba.fastjson2.JSONObject; import com.ujcms.commons.sms.AliyunUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; import org.springframework.stereotype.Service; import org.springframework.util.FastByteArrayOutputStream; import com.google.code.kaptcha.Producer; @@ -49,6 +51,9 @@ public class ValidateCodeServiceImpl implements ValidateCodeService @Autowired private CaptchaProperties.SMS.Aliyuncs smsAliyuncs; + @Autowired + private Environment environment; + /** * 生成验证码 */ @@ -124,14 +129,18 @@ public class ValidateCodeServiceImpl implements ValidateCodeService String code = captchaProducerNumber.createText(); redisService.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES); expire = redisService.getExpire(verifyKey); - AliyunUtils.sendSms( - smsAliyuncs.getAccessKeyId(), - smsAliyuncs.getAccessKeySecret(), - smsAliyuncs.getSignName(), - smsAliyuncs.getTemplateCode(), - JSONObject.of("code", code), - receiver - ); + if (Arrays.stream(environment.getActiveProfiles()).toList().contains("prod")) { + AliyunUtils.sendSms( + smsAliyuncs.getAccessKeyId(), + smsAliyuncs.getAccessKeySecret(), + smsAliyuncs.getSignName(), + smsAliyuncs.getTemplateCode(), + JSONObject.of("code", code), + receiver + ); + } else { + ajax.put("captchaCode",code); + } } ajax.put("expire", expire); ajax.put("uuid", uuid); From 84570cb6cf86626fb58b7169ea0d6927f597aeef Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Fri, 23 Aug 2024 09:49:35 +0800 Subject: [PATCH 20/82] =?UTF-8?q?[feat]=20=E9=80=9A=E8=BF=87=E7=94=A8?= =?UTF-8?q?=E6=88=B7ID=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- ruoyi-api/pom.xml | 2 +- ruoyi-api/ruoyi-api-system/pom.xml | 2 +- .../java/com/ruoyi/system/api/RemoteUserService.java | 9 +++++++++ .../system/api/factory/RemoteUserFallbackFactory.java | 6 ++++++ ruoyi-auth/pom.xml | 2 +- ruoyi-common/pom.xml | 2 +- ruoyi-common/ruoyi-common-core/pom.xml | 2 +- ruoyi-common/ruoyi-common-datascope/pom.xml | 2 +- ruoyi-common/ruoyi-common-datasource/pom.xml | 2 +- ruoyi-common/ruoyi-common-log/pom.xml | 2 +- ruoyi-common/ruoyi-common-redis/pom.xml | 2 +- ruoyi-common/ruoyi-common-seata/pom.xml | 2 +- ruoyi-common/ruoyi-common-security/pom.xml | 2 +- ruoyi-common/ruoyi-common-sensitive/pom.xml | 2 +- ruoyi-common/ruoyi-common-swagger/pom.xml | 2 +- ruoyi-gateway/pom.xml | 2 +- ruoyi-modules/pom.xml | 2 +- ruoyi-modules/ruoyi-file/pom.xml | 2 +- ruoyi-modules/ruoyi-gen/pom.xml | 2 +- ruoyi-modules/ruoyi-job/pom.xml | 2 +- ruoyi-modules/ruoyi-system/pom.xml | 2 +- ruoyi-ui/src/views/index.vue | 2 +- ruoyi-visual/pom.xml | 2 +- ruoyi-visual/ruoyi-monitor/pom.xml | 2 +- 25 files changed, 39 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 9d8ca0a46..7e8c40742 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.ruoyi ruoyi - 3.6.41 + 3.6.41.0.1 ruoyi http://www.ruoyi.vip @@ -16,7 +16,7 @@ UTF-8 11 11 - 3.6.41 + 3.6.41.0.1 UTF-8 UTF-8 1.8 diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml index d9b1ac68d..060a070eb 100644 --- a/ruoyi-api/pom.xml +++ b/ruoyi-api/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41 + 3.6.41.0.1 4.0.0 diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml index b689042eb..d961f4e9c 100644 --- a/ruoyi-api/ruoyi-api-system/pom.xml +++ b/ruoyi-api/ruoyi-api-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-api - 3.6.41 + 3.6.41.0.1 4.0.0 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 4ef609a55..715cb203a 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 @@ -22,6 +22,15 @@ import com.ruoyi.system.api.model.LoginUser; @FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class) public interface RemoteUserService { + /** + * 通过用户ID查询用户信息 + * + * @param userId 用户ID + * @param source 请求来源 + * @return 结果 + */ + @GetMapping({"/user/", "/user/{userId}"}) + public R getInfo(@PathVariable("userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 通过用户名查询用户信息 * 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 0e5ed5f4e..0034e5929 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 @@ -25,6 +25,12 @@ public class RemoteUserFallbackFactory implements FallbackFactory getInfo(Long userId, String source) + { + return R.fail("获取用户失败:" + throwable.getMessage()); + } + @Override public R getUserInfo(String username, String source) { diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index 5ab447793..e72d5fd82 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41 + 3.6.41.0.1 4.0.0 diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index c54647167..384b60346 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41 + 3.6.41.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index 8c1675713..0b107aeb2 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41 + 3.6.41.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/ruoyi-common/ruoyi-common-datascope/pom.xml index 58fdd0947..9e8295945 100644 --- a/ruoyi-common/ruoyi-common-datascope/pom.xml +++ b/ruoyi-common/ruoyi-common-datascope/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41 + 3.6.41.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml index 6d35b6e3f..e41248a0c 100644 --- a/ruoyi-common/ruoyi-common-datasource/pom.xml +++ b/ruoyi-common/ruoyi-common-datasource/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41 + 3.6.41.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml index 239d0a883..114898ce1 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/ruoyi-common/ruoyi-common-log/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41 + 3.6.41.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml index 61187c75b..5c0264594 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/ruoyi-common/ruoyi-common-redis/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41 + 3.6.41.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml index a3ed35144..2653e6f00 100644 --- a/ruoyi-common/ruoyi-common-seata/pom.xml +++ b/ruoyi-common/ruoyi-common-seata/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41 + 3.6.41.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml index e41e317d7..3b10333b2 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/ruoyi-common/ruoyi-common-security/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-common - 3.6.41 + 3.6.41.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/ruoyi-common/ruoyi-common-sensitive/pom.xml index cfd492b0f..a5855cc9d 100644 --- a/ruoyi-common/ruoyi-common-sensitive/pom.xml +++ b/ruoyi-common/ruoyi-common-sensitive/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41 + 3.6.41.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml index 7261ed4c8..cd5d3b0a8 100644 --- a/ruoyi-common/ruoyi-common-swagger/pom.xml +++ b/ruoyi-common/ruoyi-common-swagger/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41 + 3.6.41.0.1 4.0.0 diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index d4bea88a1..1d80b8c9e 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41 + 3.6.41.0.1 4.0.0 diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index d93e248a6..c19304cab 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41 + 3.6.41.0.1 4.0.0 diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index 77e415321..138ca0a4f 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/ruoyi-modules/ruoyi-file/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.41 + 3.6.41.0.1 4.0.0 diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index a5ccefed6..6ce49f520 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.41 + 3.6.41.0.1 4.0.0 diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index 358258795..47f294f61 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.41 + 3.6.41.0.1 4.0.0 diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index 741ed0c18..3e3640097 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.41 + 3.6.41.0.1 4.0.0 diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 02c8abbed..b98c8c966 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -914,7 +914,7 @@ export default { data() { return { // 版本号 - version: "3.6.41", + version: "3.6.41.0.1", }; }, methods: { diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml index c8c53a367..e38b088f7 100644 --- a/ruoyi-visual/pom.xml +++ b/ruoyi-visual/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41 + 3.6.41.0.1 4.0.0 diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index 2215d56a5..b8f0eddb3 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/ruoyi-visual/ruoyi-monitor/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-visual - 3.6.41 + 3.6.41.0.1 4.0.0 From dcbb745d59d661acb3721910493651db6160f7d8 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Fri, 23 Aug 2024 10:01:20 +0800 Subject: [PATCH 21/82] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E8=BF=9C?= =?UTF-8?q?=E7=A8=8B=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/system/api/RemoteUserService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 715cb203a..f709b7664 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 @@ -29,7 +29,7 @@ public interface RemoteUserService * @param source 请求来源 * @return 结果 */ - @GetMapping({"/user/", "/user/{userId}"}) + @GetMapping("/user/{userId}") public R getInfo(@PathVariable("userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 通过用户名查询用户信息 From 1204c39917fb5e6eddd6b85536e83f450e538a18 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Fri, 23 Aug 2024 10:14:34 +0800 Subject: [PATCH 22/82] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E5=A4=96=E5=BC=80=E6=94=BE=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E5=BC=95=E8=B5=B7=E7=9A=84=E5=BE=AA=E7=8E=AF=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/api/RemoteUserService.java | 4 ++-- .../factory/RemoteUserFallbackFactory.java | 2 +- .../system/controller/SysUserController.java | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) 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 f709b7664..9967489cf 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 @@ -29,8 +29,8 @@ public interface RemoteUserService * @param source 请求来源 * @return 结果 */ - @GetMapping("/user/{userId}") - public R getInfo(@PathVariable("userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + @GetMapping("/detail/{userId}") + public R infoById(@PathVariable("userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 通过用户名查询用户信息 * 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 0034e5929..175c4f87c 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 @@ -26,7 +26,7 @@ public class RemoteUserFallbackFactory implements FallbackFactory getInfo(Long userId, String source) + public R infoById(Long userId, String source) { return R.fail("获取用户失败:" + throwable.getMessage()); } 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 cc0acf033..cd66fd2e3 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 @@ -153,6 +153,25 @@ public class SysUserController extends BaseController return R.ok(sysUserVo); } + /** + * 根据ID获取用户信息 + */ + @InnerAuth + @GetMapping("/detail/{userId}") + public R infoById(@PathVariable("userId") Long userId) + { + SysUser sysUser = userService.selectUserById(userId); + // 角色集合 + Set roles = permissionService.getRolePermission(sysUser); + // 权限集合 + Set permissions = permissionService.getMenuPermission(sysUser); + LoginUser sysUserVo = new LoginUser(); + sysUserVo.setSysUser(sysUser); + sysUserVo.setRoles(roles); + sysUserVo.setPermissions(permissions); + return R.ok(sysUserVo); + } + /** * 注册用户信息 */ From db1f8a49e3a5a67e1cadbbb3ea139ef56a7794b5 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Sat, 24 Aug 2024 16:04:57 +0800 Subject: [PATCH 23/82] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E8=BF=9C?= =?UTF-8?q?=E7=A8=8B=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=9A=84=E5=89=8D=E7=BC=80=E7=BC=BA=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/system/api/RemoteUserService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9967489cf..f33ae5ddd 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 @@ -29,7 +29,7 @@ public interface RemoteUserService * @param source 请求来源 * @return 结果 */ - @GetMapping("/detail/{userId}") + @GetMapping("/user/detail/{userId}") public R infoById(@PathVariable("userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 通过用户名查询用户信息 From c8c704226926e3658295c15793050c0663ba0532 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Tue, 10 Sep 2024 11:32:53 +0800 Subject: [PATCH 24/82] =?UTF-8?q?[feat]=20=E5=8D=87=E7=BA=A7=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/kotlin/com/ruoyi/gateway/config/CorsConfig.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ruoyi-gateway/src/main/kotlin/com/ruoyi/gateway/config/CorsConfig.kt b/ruoyi-gateway/src/main/kotlin/com/ruoyi/gateway/config/CorsConfig.kt index e0a8b6d58..15a9271fe 100644 --- a/ruoyi-gateway/src/main/kotlin/com/ruoyi/gateway/config/CorsConfig.kt +++ b/ruoyi-gateway/src/main/kotlin/com/ruoyi/gateway/config/CorsConfig.kt @@ -2,8 +2,11 @@ package com.ruoyi.gateway.config import org.apache.commons.lang3.ObjectUtils import org.springframework.beans.factory.annotation.Value +import org.springframework.cloud.gateway.filter.NettyWriteResponseFilter import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration +import org.springframework.core.Ordered +import org.springframework.core.annotation.Order import org.springframework.http.HttpMethod import org.springframework.http.HttpStatus import org.springframework.web.server.WebFilter @@ -15,6 +18,7 @@ open class CorsConfig { private val corsOrgins: String? = null @Bean + @Order(NettyWriteResponseFilter.WRITE_RESPONSE_FILTER_ORDER + 1) open fun corsFilter(): WebFilter { return WebFilter { exchange, chain -> val response = exchange.response @@ -28,8 +32,7 @@ open class CorsConfig { response.headers["Access-Control-Allow-Credentials"] = "true" response.headers["Access-Control-Max-Age"] = "3600" response.headers["Access-Control-Allow-Methods"] = "GET,POST,PUT,DELETE,OPTIONS,HEAD" - response.headers["Access-Control-Allow-Headers"] = - "X-Requested-With, Content-Type, Authorization, credential, X-XSRF-TOKEN, token, Admin-Token, App-Token" + response.headers["Access-Control-Allow-Headers"] = "*" if (HttpMethod.OPTIONS.equals(request.method)) { response.statusCode = HttpStatus.OK chain.filter(exchange) From f622222943aea94fffab1c9ecf53263213c1ba2c Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Tue, 10 Sep 2024 11:36:38 +0800 Subject: [PATCH 25/82] =?UTF-8?q?[feat]=20=E4=BF=AE=E5=A4=8D=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=AF=B7=E6=B1=82=E5=A4=B4=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E8=B7=A8=E5=9F=9F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/kotlin/com/ruoyi/gateway/config/CorsConfig.kt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ruoyi-gateway/src/main/kotlin/com/ruoyi/gateway/config/CorsConfig.kt b/ruoyi-gateway/src/main/kotlin/com/ruoyi/gateway/config/CorsConfig.kt index 15a9271fe..902c4573c 100644 --- a/ruoyi-gateway/src/main/kotlin/com/ruoyi/gateway/config/CorsConfig.kt +++ b/ruoyi-gateway/src/main/kotlin/com/ruoyi/gateway/config/CorsConfig.kt @@ -2,11 +2,8 @@ package com.ruoyi.gateway.config import org.apache.commons.lang3.ObjectUtils import org.springframework.beans.factory.annotation.Value -import org.springframework.cloud.gateway.filter.NettyWriteResponseFilter import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration -import org.springframework.core.Ordered -import org.springframework.core.annotation.Order import org.springframework.http.HttpMethod import org.springframework.http.HttpStatus import org.springframework.web.server.WebFilter @@ -18,7 +15,6 @@ open class CorsConfig { private val corsOrgins: String? = null @Bean - @Order(NettyWriteResponseFilter.WRITE_RESPONSE_FILTER_ORDER + 1) open fun corsFilter(): WebFilter { return WebFilter { exchange, chain -> val response = exchange.response From bd30599bbedaf02f736606b3e76dd217c1f4b278 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Mon, 23 Sep 2024 17:25:50 +0800 Subject: [PATCH 26/82] =?UTF-8?q?[feat]=20=E6=96=B0=E5=A2=9E=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap-prod.yml | 28 ++++++++++++ .../src/main/resources/bootstrap-prod.yml | 43 +++++++++++++++++++ .../src/main/resources/bootstrap-prod.yml | 28 ++++++++++++ .../src/main/resources/bootstrap-prod.yml | 28 ++++++++++++ .../src/main/resources/bootstrap-prod.yml | 28 ++++++++++++ .../src/main/resources/bootstrap-prod.yml | 27 ++++++++++++ .../src/main/resources/bootstrap-prod.yml | 28 ++++++++++++ 7 files changed, 210 insertions(+) create mode 100644 ruoyi-auth/src/main/resources/bootstrap-prod.yml create mode 100644 ruoyi-gateway/src/main/resources/bootstrap-prod.yml create mode 100644 ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-prod.yml create mode 100644 ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-prod.yml create mode 100644 ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-prod.yml create mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-prod.yml create mode 100644 ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-prod.yml diff --git a/ruoyi-auth/src/main/resources/bootstrap-prod.yml b/ruoyi-auth/src/main/resources/bootstrap-prod.yml new file mode 100644 index 000000000..dc1e21bbc --- /dev/null +++ b/ruoyi-auth/src/main/resources/bootstrap-prod.yml @@ -0,0 +1,28 @@ +# Tomcat +server: + port: 9200 + +#测试环境 +spring: + application: + # 应用名称 + name: ruoyi-auth + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + namespace: e2708b29-ca15-4f63-a919-d33932ebdfda + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: e2708b29-ca15-4f63-a919-d33932ebdfda + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA \ No newline at end of file diff --git a/ruoyi-gateway/src/main/resources/bootstrap-prod.yml b/ruoyi-gateway/src/main/resources/bootstrap-prod.yml new file mode 100644 index 000000000..98347e691 --- /dev/null +++ b/ruoyi-gateway/src/main/resources/bootstrap-prod.yml @@ -0,0 +1,43 @@ +# Tomcat +server: + port: 8080 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-gateway + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + namespace: e2708b29-ca15-4f63-a919-d33932ebdfda + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: e2708b29-ca15-4f63-a919-d33932ebdfda + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA + sentinel: + # 取消控制台懒加载 + eager: true + transport: + # 控制台地址 + dashboard: nacos.zkjiadi.cc:8718 + # nacos配置持久化 + datasource: + ds1: + nacos: + server-addr: nacos.zkjiadi.cc + dataId: sentinel-ruoyi-gateway + groupId: DEFAULT_GROUP + data-type: json + rule-type: gw-flow \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-prod.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-prod.yml new file mode 100644 index 000000000..fc6a9ba2a --- /dev/null +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-prod.yml @@ -0,0 +1,28 @@ +# Tomcat +server: + port: 9300 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-file + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + namespace: e2708b29-ca15-4f63-a919-d33932ebdfda + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: e2708b29-ca15-4f63-a919-d33932ebdfda + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-prod.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-prod.yml new file mode 100644 index 000000000..fd366ea3a --- /dev/null +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-prod.yml @@ -0,0 +1,28 @@ +# Tomcat +server: + port: 9202 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-gen + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + namespace: e2708b29-ca15-4f63-a919-d33932ebdfda + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: e2708b29-ca15-4f63-a919-d33932ebdfda + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-prod.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-prod.yml new file mode 100644 index 000000000..4116c5e9f --- /dev/null +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-prod.yml @@ -0,0 +1,28 @@ +# Tomcat +server: + port: 9203 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-job + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + namespace: e2708b29-ca15-4f63-a919-d33932ebdfda + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: e2708b29-ca15-4f63-a919-d33932ebdfda + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-prod.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-prod.yml new file mode 100644 index 000000000..c602c03b2 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-prod.yml @@ -0,0 +1,27 @@ +# Tomcat +server: + port: 9201 +#测试环境 +spring: + application: + # 应用名称 + name: ruoyi-system + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + namespace: e2708b29-ca15-4f63-a919-d33932ebdfda + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: e2708b29-ca15-4f63-a919-d33932ebdfda + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA \ No newline at end of file diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-prod.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-prod.yml new file mode 100644 index 000000000..584da1004 --- /dev/null +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-prod.yml @@ -0,0 +1,28 @@ +# Tomcat +server: + port: 9100 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-monitor + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + namespace: e2708b29-ca15-4f63-a919-d33932ebdfda + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: e2708b29-ca15-4f63-a919-d33932ebdfda + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA \ No newline at end of file From 8f0dbe9fc5b3c6b0a7576c64c410f75cc7289ef7 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Sun, 29 Sep 2024 10:42:22 +0800 Subject: [PATCH 27/82] =?UTF-8?q?[feat]=20=E6=96=B0=E5=A2=9EWebSocket?= =?UTF-8?q?=E9=89=B4=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/common/core/constant/TokenConstants.java | 2 ++ .../src/main/java/com/ruoyi/gateway/filter/AuthFilter.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) 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 f6c6b8d45..ddbc28bfe 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 @@ -22,4 +22,6 @@ public class TokenConstants */ public final static String SECRET = "abcdefghijklmnopqrstuvwxyz"; + public final static String WEBSOCKET_HEADER = "Sec-WebSocket-Key"; + } 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 9582f8af0..854490b48 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,5 +1,6 @@ package com.ruoyi.gateway.filter; +import org.apache.commons.lang3.ObjectUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -118,7 +119,7 @@ public class AuthFilter implements GlobalFilter, Ordered */ private String getToken(ServerHttpRequest request) { - String token = request.getHeaders().getFirst(TokenConstants.AUTHENTICATION); + String token = ObjectUtils.isNotEmpty(request.getHeaders().getFirst(TokenConstants.WEBSOCKET_HEADER)) ? request.getQueryParams().getFirst(TokenConstants.AUTHENTICATION) : request.getHeaders().getFirst(TokenConstants.AUTHENTICATION); // 如果前端设置了令牌前缀，则裁剪掉前缀 if (StringUtils.isNotEmpty(token) && token.startsWith(TokenConstants.PREFIX)) { From 84366307872e500143357d25f3fae28e14dacfa8 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Sun, 29 Sep 2024 14:04:49 +0800 Subject: [PATCH 28/82] =?UTF-8?q?[feat]=20=E6=9B=B4=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- ruoyi-api/pom.xml | 2 +- ruoyi-api/ruoyi-api-system/pom.xml | 2 +- ruoyi-auth/pom.xml | 2 +- ruoyi-common/pom.xml | 2 +- ruoyi-common/ruoyi-common-core/pom.xml | 2 +- ruoyi-common/ruoyi-common-datascope/pom.xml | 2 +- ruoyi-common/ruoyi-common-datasource/pom.xml | 2 +- ruoyi-common/ruoyi-common-log/pom.xml | 2 +- ruoyi-common/ruoyi-common-redis/pom.xml | 2 +- ruoyi-common/ruoyi-common-seata/pom.xml | 2 +- ruoyi-common/ruoyi-common-security/pom.xml | 2 +- ruoyi-common/ruoyi-common-sensitive/pom.xml | 2 +- ruoyi-common/ruoyi-common-swagger/pom.xml | 2 +- ruoyi-gateway/pom.xml | 2 +- ruoyi-modules/pom.xml | 2 +- ruoyi-modules/ruoyi-file/pom.xml | 2 +- ruoyi-modules/ruoyi-gen/pom.xml | 2 +- ruoyi-modules/ruoyi-job/pom.xml | 2 +- ruoyi-modules/ruoyi-system/pom.xml | 2 +- ruoyi-ui/src/views/index.vue | 2 +- ruoyi-visual/pom.xml | 2 +- ruoyi-visual/ruoyi-monitor/pom.xml | 2 +- 23 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 92cf0ef3d..95ec750c5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.ruoyi ruoyi - 3.6.41.0.1 + 3.6.41.0.2 ruoyi http://www.ruoyi.vip @@ -16,7 +16,7 @@ UTF-8 11 11 - 3.6.41.0.1 + 3.6.41.0.2 UTF-8 UTF-8 1.8 diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml index 060a070eb..fe86c9dcc 100644 --- a/ruoyi-api/pom.xml +++ b/ruoyi-api/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41.0.1 + 3.6.41.0.2 4.0.0 diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml index d961f4e9c..8f1cfafeb 100644 --- a/ruoyi-api/ruoyi-api-system/pom.xml +++ b/ruoyi-api/ruoyi-api-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-api - 3.6.41.0.1 + 3.6.41.0.2 4.0.0 diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index e72d5fd82..30fd6f071 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41.0.1 + 3.6.41.0.2 4.0.0 diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 384b60346..a0ff62751 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41.0.1 + 3.6.41.0.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index 045ef35f7..783349d84 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.1 + 3.6.41.0.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/ruoyi-common/ruoyi-common-datascope/pom.xml index 9e8295945..b99329be8 100644 --- a/ruoyi-common/ruoyi-common-datascope/pom.xml +++ b/ruoyi-common/ruoyi-common-datascope/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.1 + 3.6.41.0.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml index e41248a0c..d90aa8645 100644 --- a/ruoyi-common/ruoyi-common-datasource/pom.xml +++ b/ruoyi-common/ruoyi-common-datasource/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.1 + 3.6.41.0.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml index 114898ce1..e2f59ecd2 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/ruoyi-common/ruoyi-common-log/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.1 + 3.6.41.0.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml index 5c0264594..e1602ecaf 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/ruoyi-common/ruoyi-common-redis/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.1 + 3.6.41.0.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml index 2653e6f00..152f6f16c 100644 --- a/ruoyi-common/ruoyi-common-seata/pom.xml +++ b/ruoyi-common/ruoyi-common-seata/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.1 + 3.6.41.0.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml index 3b10333b2..4c6fb56b1 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/ruoyi-common/ruoyi-common-security/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.1 + 3.6.41.0.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/ruoyi-common/ruoyi-common-sensitive/pom.xml index a5855cc9d..7e5e6f43c 100644 --- a/ruoyi-common/ruoyi-common-sensitive/pom.xml +++ b/ruoyi-common/ruoyi-common-sensitive/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.1 + 3.6.41.0.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml index 29106a2f5..f64414d1d 100644 --- a/ruoyi-common/ruoyi-common-swagger/pom.xml +++ b/ruoyi-common/ruoyi-common-swagger/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.1 + 3.6.41.0.2 4.0.0 diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index 398484f0d..3f7d7d0b7 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41.0.1 + 3.6.41.0.2 4.0.0 diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index c19304cab..7b88caded 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41.0.1 + 3.6.41.0.2 4.0.0 diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index c93f9efe5..e6c085c68 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/ruoyi-modules/ruoyi-file/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.41.0.1 + 3.6.41.0.2 4.0.0 diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index 095120d9c..c4eb39cce 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.41.0.1 + 3.6.41.0.2 4.0.0 diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index 9d0af295d..54809426f 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.41.0.1 + 3.6.41.0.2 4.0.0 diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index b558f4a72..b87bff363 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.41.0.1 + 3.6.41.0.2 4.0.0 diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index b98c8c966..77da250b2 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -914,7 +914,7 @@ export default { data() { return { // 版本号 - version: "3.6.41.0.1", + version: "3.6.41.0.2", }; }, methods: { diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml index e38b088f7..246732cb5 100644 --- a/ruoyi-visual/pom.xml +++ b/ruoyi-visual/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41.0.1 + 3.6.41.0.2 4.0.0 diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index b8f0eddb3..b0389af73 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/ruoyi-visual/ruoyi-monitor/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-visual - 3.6.41.0.1 + 3.6.41.0.2 4.0.0 From 5e5aa4bf81b0cf47ba9e31a0d24bac25ea8238c6 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Tue, 8 Oct 2024 10:15:44 +0800 Subject: [PATCH 29/82] =?UTF-8?q?[feat]=20=E7=BB=9F=E4=B8=80nacos=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-auth/src/main/resources/bootstrap-dev.yml | 4 ++-- ruoyi-gateway/src/main/resources/bootstrap-dev.yml | 6 +++--- .../ruoyi-system/src/main/resources/bootstrap-dev.yml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ruoyi-auth/src/main/resources/bootstrap-dev.yml b/ruoyi-auth/src/main/resources/bootstrap-dev.yml index 970350439..079c1cdc4 100644 --- a/ruoyi-auth/src/main/resources/bootstrap-dev.yml +++ b/ruoyi-auth/src/main/resources/bootstrap-dev.yml @@ -11,13 +11,13 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: local-nacos.zkjiadi.cc + server-addr: nacos.zkjiadi.cc namespace: 78a7f41e-46cc-437a-9716-735888227693 username: nacos password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA config: # 配置中心地址 - server-addr: local-nacos.zkjiadi.cc + server-addr: nacos.zkjiadi.cc # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-gateway/src/main/resources/bootstrap-dev.yml b/ruoyi-gateway/src/main/resources/bootstrap-dev.yml index 1a758a76b..e544aafe6 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap-dev.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap-dev.yml @@ -11,13 +11,13 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: local-nacos.zkjiadi.cc + server-addr: nacos.zkjiadi.cc namespace: 78a7f41e-46cc-437a-9716-735888227693 username: nacos password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA config: # 配置中心地址 - server-addr: local-nacos.zkjiadi.cc + server-addr: nacos.zkjiadi.cc # 配置文件格式 file-extension: yml # 共享配置 @@ -31,7 +31,7 @@ spring: eager: true transport: # 控制台地址 - dashboard: local-nacos.zkjiadi.cc:8718 + dashboard: nacos.zkjiadi.cc:8718 # nacos配置持久化 datasource: ds1: diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-dev.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-dev.yml index baa5c174a..cdeab24e6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-dev.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-dev.yml @@ -11,13 +11,13 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: local-nacos.zkjiadi.cc + server-addr: nacos.zkjiadi.cc namespace: 78a7f41e-46cc-437a-9716-735888227693 username: nacos password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA config: # 配置中心地址 - server-addr: local-nacos.zkjiadi.cc + server-addr: nacos.zkjiadi.cc # 配置文件格式 file-extension: yml # 共享配置 From 7073282232893f930addfbaea0a06cfd59f317ac Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Fri, 11 Oct 2024 15:46:54 +0800 Subject: [PATCH 30/82] =?UTF-8?q?[feat]=20=E6=AD=A3=E5=BC=8F=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E6=B3=A8=E5=86=8Cip=E9=87=8D=E5=AE=9A=E5=90=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-auth/src/main/resources/bootstrap-prod.yml | 1 + ruoyi-gateway/src/main/resources/bootstrap-prod.yml | 1 + ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-prod.yml | 1 + ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-prod.yml | 1 + ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-prod.yml | 1 + ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-prod.yml | 1 + ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-prod.yml | 1 + 7 files changed, 7 insertions(+) diff --git a/ruoyi-auth/src/main/resources/bootstrap-prod.yml b/ruoyi-auth/src/main/resources/bootstrap-prod.yml index dc1e21bbc..e897d8bed 100644 --- a/ruoyi-auth/src/main/resources/bootstrap-prod.yml +++ b/ruoyi-auth/src/main/resources/bootstrap-prod.yml @@ -10,6 +10,7 @@ spring: cloud: nacos: discovery: + ip: 47.121.114.255 # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: e2708b29-ca15-4f63-a919-d33932ebdfda diff --git a/ruoyi-gateway/src/main/resources/bootstrap-prod.yml b/ruoyi-gateway/src/main/resources/bootstrap-prod.yml index 98347e691..63c81d5bb 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap-prod.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap-prod.yml @@ -10,6 +10,7 @@ spring: cloud: nacos: discovery: + ip: 47.121.114.255 # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: e2708b29-ca15-4f63-a919-d33932ebdfda diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-prod.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-prod.yml index fc6a9ba2a..562403b1e 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-prod.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-prod.yml @@ -10,6 +10,7 @@ spring: cloud: nacos: discovery: + ip: 47.121.114.255 # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: e2708b29-ca15-4f63-a919-d33932ebdfda diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-prod.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-prod.yml index fd366ea3a..0fc32c6c4 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-prod.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-prod.yml @@ -10,6 +10,7 @@ spring: cloud: nacos: discovery: + ip: 47.121.114.255 # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: e2708b29-ca15-4f63-a919-d33932ebdfda diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-prod.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-prod.yml index 4116c5e9f..4a0c2d0aa 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-prod.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-prod.yml @@ -10,6 +10,7 @@ spring: cloud: nacos: discovery: + ip: 47.121.114.255 # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: e2708b29-ca15-4f63-a919-d33932ebdfda diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-prod.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-prod.yml index c602c03b2..8309af025 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-prod.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-prod.yml @@ -9,6 +9,7 @@ spring: cloud: nacos: discovery: + ip: 47.121.114.255 # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: e2708b29-ca15-4f63-a919-d33932ebdfda diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-prod.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-prod.yml index 584da1004..4cf3fd934 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-prod.yml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-prod.yml @@ -10,6 +10,7 @@ spring: cloud: nacos: discovery: + ip: 47.121.114.255 # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: e2708b29-ca15-4f63-a919-d33932ebdfda From 08299ccd0911ab6621f9903f0e3797869278605d Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Fri, 25 Oct 2024 16:53:27 +0800 Subject: [PATCH 31/82] =?UTF-8?q?[feat]=20=E6=96=B0=E5=A2=9E=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E7=9A=84=E5=86=85?= =?UTF-8?q?=E9=83=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 +- ruoyi-api/pom.xml | 2 +- ruoyi-api/ruoyi-api-system/pom.xml | 2 +- .../ruoyi/system/api/RemoteUserService.java | 21 +--- .../factory/RemoteUserFallbackFactory.java | 16 ++- .../api/inner/InnerRemoteUserService.java | 32 ++++++ ruoyi-auth/pom.xml | 2 +- ruoyi-common/pom.xml | 2 +- ruoyi-common/ruoyi-common-core/pom.xml | 2 +- ruoyi-common/ruoyi-common-datascope/pom.xml | 2 +- ruoyi-common/ruoyi-common-datasource/pom.xml | 2 +- ruoyi-common/ruoyi-common-log/pom.xml | 2 +- ruoyi-common/ruoyi-common-redis/pom.xml | 2 +- ruoyi-common/ruoyi-common-seata/pom.xml | 2 +- ruoyi-common/ruoyi-common-security/pom.xml | 2 +- ruoyi-common/ruoyi-common-sensitive/pom.xml | 2 +- ruoyi-common/ruoyi-common-swagger/pom.xml | 2 +- ruoyi-gateway/pom.xml | 2 +- ruoyi-modules/pom.xml | 2 +- ruoyi-modules/ruoyi-file/pom.xml | 2 +- ruoyi-modules/ruoyi-gen/pom.xml | 2 +- ruoyi-modules/ruoyi-job/pom.xml | 2 +- ruoyi-modules/ruoyi-system/pom.xml | 2 +- .../system/controller/SysUserController.java | 42 ------- .../inner/InnerSysUserController.kt | 107 ++++++++++++++++++ ruoyi-ui/src/views/index.vue | 2 +- ruoyi-visual/pom.xml | 2 +- ruoyi-visual/ruoyi-monitor/pom.xml | 2 +- 28 files changed, 177 insertions(+), 89 deletions(-) create mode 100644 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt diff --git a/pom.xml b/pom.xml index 95ec750c5..25cb10d63 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.ruoyi ruoyi - 3.6.41.0.2 + 3.6.41.0.3 ruoyi http://www.ruoyi.vip @@ -16,7 +16,7 @@ UTF-8 11 11 - 3.6.41.0.2 + 3.6.41.0.3 UTF-8 UTF-8 1.8 diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml index fe86c9dcc..b9d8b07ee 100644 --- a/ruoyi-api/pom.xml +++ b/ruoyi-api/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml index 8f1cfafeb..157d61d98 100644 --- a/ruoyi-api/ruoyi-api-system/pom.xml +++ b/ruoyi-api/ruoyi-api-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-api - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 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 f33ae5ddd..e7885f5a4 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,5 +1,6 @@ package com.ruoyi.system.api; +import com.ruoyi.system.api.inner.InnerRemoteUserService; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -20,17 +21,8 @@ import com.ruoyi.system.api.model.LoginUser; * @author ruoyi */ @FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class) -public interface RemoteUserService +public interface RemoteUserService extends InnerRemoteUserService { - /** - * 通过用户ID查询用户信息 - * - * @param userId 用户ID - * @param source 请求来源 - * @return 结果 - */ - @GetMapping("/user/detail/{userId}") - public R infoById(@PathVariable("userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 通过用户名查询用户信息 * @@ -41,15 +33,6 @@ public interface RemoteUserService @GetMapping("/user/info/{username}") public R getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); - /** - * 通过手机号查询用户信息 - * - * @param phoneNumber 用户名 - * @param source 请求来源 - * @return 结果 - */ - @GetMapping("/user/info/phoneNumber/{phoneNumber:\\d+}") - public R getUserInfoByPhoneNumber(@PathVariable("phoneNumber") String phoneNumber, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 注册用户信息 * 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 175c4f87c..1df3178a7 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,5 +1,6 @@ package com.ruoyi.system.api.factory; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; @@ -11,7 +12,7 @@ import com.ruoyi.system.api.model.LoginUser; /** * 用户服务降级处理 - * + * * @author ruoyi */ @Component @@ -25,9 +26,9 @@ public class RemoteUserFallbackFactory implements FallbackFactory infoById(Long userId, String source) - { + public R infoById_Inner(Long userId, @NotNull String source) { return R.fail("获取用户失败:" + throwable.getMessage()); } @@ -37,8 +38,9 @@ public class RemoteUserFallbackFactory implements FallbackFactory getUserInfoByPhoneNumber(String phoneNumber, String source) { + public R getUserInfoByPhoneNumber_Inner(@NotNull String phoneNumber, @NotNull String source) { return R.fail("获取用户失败:" + throwable.getMessage()); } @@ -53,6 +55,12 @@ public class RemoteUserFallbackFactory implements FallbackFactory edit_Inner(@NotNull LoginUser user, @NotNull String source) { + return R.fail("修改用户信息失败:" + throwable.getMessage()); + } }; } } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java new file mode 100644 index 000000000..fb1f670e9 --- /dev/null +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java @@ -0,0 +1,32 @@ +package com.ruoyi.system.api.inner; + +import com.ruoyi.common.core.constant.SecurityConstants; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.system.api.model.LoginUser; +import org.springframework.web.bind.annotation.*; + +public interface InnerRemoteUserService { + /** + * 通过用户ID查询用户信息 + * + * @param userId 用户ID + * @param source 请求来源 + * @return 结果 + */ + @GetMapping("/inner/user/detail/{userId}") + R infoById_Inner(@PathVariable("userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + + /** + * 通过手机号查询用户信息 + * + * @param phoneNumber 用户名 + * @param source 请求来源 + * @return 结果 + */ + @GetMapping("/inner/user/info/phoneNumber/{phoneNumber:\\d+}") + R getUserInfoByPhoneNumber_Inner(@PathVariable("phoneNumber") String phoneNumber, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + @PutMapping("/inner/user") + R edit_Inner(@RequestBody LoginUser user, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); +} \ No newline at end of file diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index 30fd6f071..13ba8f49e 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index a0ff62751..0297c9ec4 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index 783349d84..1f1f42537 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/ruoyi-common/ruoyi-common-datascope/pom.xml index b99329be8..fa814fd73 100644 --- a/ruoyi-common/ruoyi-common-datascope/pom.xml +++ b/ruoyi-common/ruoyi-common-datascope/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml index d90aa8645..252e8c8b3 100644 --- a/ruoyi-common/ruoyi-common-datasource/pom.xml +++ b/ruoyi-common/ruoyi-common-datasource/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml index e2f59ecd2..2bbcb2f24 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/ruoyi-common/ruoyi-common-log/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml index e1602ecaf..d87fbf718 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/ruoyi-common/ruoyi-common-redis/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml index 152f6f16c..a60ee02a5 100644 --- a/ruoyi-common/ruoyi-common-seata/pom.xml +++ b/ruoyi-common/ruoyi-common-seata/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml index 4c6fb56b1..523aeba05 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/ruoyi-common/ruoyi-common-security/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/ruoyi-common/ruoyi-common-sensitive/pom.xml index 7e5e6f43c..c73abba0b 100644 --- a/ruoyi-common/ruoyi-common-sensitive/pom.xml +++ b/ruoyi-common/ruoyi-common-sensitive/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml index f64414d1d..667b4f57e 100644 --- a/ruoyi-common/ruoyi-common-swagger/pom.xml +++ b/ruoyi-common/ruoyi-common-swagger/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index 3f7d7d0b7..3f9dc5802 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index 7b88caded..895b774ba 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index e6c085c68..aa2cf9e60 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/ruoyi-modules/ruoyi-file/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index c4eb39cce..ddb0e8517 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index 54809426f..66a9151a9 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index b87bff363..6e7e55330 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 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 6aa046b4c..32d2f170c 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,48 +134,6 @@ public class SysUserController extends BaseController return R.ok(sysUserVo); } - /** - * 获取当前用户信息 - */ - @InnerAuth - @GetMapping("/info/phoneNumber/{phoneNumber:\\d+}") - public R infoByPhone(@PathVariable("phoneNumber") String phoneNumber) - { - SysUser sysUser = userService.selectUserByPhoneNumber(phoneNumber); - if (StringUtils.isNull(sysUser)) - { - return R.fail("用户名或密码错误"); - } - // 角色集合 - Set roles = permissionService.getRolePermission(sysUser); - // 权限集合 - Set permissions = permissionService.getMenuPermission(sysUser); - LoginUser sysUserVo = new LoginUser(); - sysUserVo.setSysUser(sysUser); - sysUserVo.setRoles(roles); - sysUserVo.setPermissions(permissions); - return R.ok(sysUserVo); - } - - /** - * 根据ID获取用户信息 - */ - @InnerAuth - @GetMapping("/detail/{userId}") - public R infoById(@PathVariable("userId") Long userId) - { - SysUser sysUser = userService.selectUserById(userId); - // 角色集合 - Set roles = permissionService.getRolePermission(sysUser); - // 权限集合 - Set permissions = permissionService.getMenuPermission(sysUser); - LoginUser sysUserVo = new LoginUser(); - sysUserVo.setSysUser(sysUser); - sysUserVo.setRoles(roles); - sysUserVo.setPermissions(permissions); - return R.ok(sysUserVo); - } - /** * 注册用户信息 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt new file mode 100644 index 000000000..e9e2ea31b --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt @@ -0,0 +1,107 @@ +package com.ruoyi.system.controller.inner + +import com.ruoyi.common.core.domain.R +import com.ruoyi.common.core.utils.StringUtils +import com.ruoyi.common.log.annotation.Log +import com.ruoyi.common.log.enums.BusinessType +import com.ruoyi.common.security.annotation.InnerAuth +import com.ruoyi.system.api.domain.SysUser +import com.ruoyi.system.api.model.LoginUser +import com.ruoyi.system.service.ISysDeptService +import com.ruoyi.system.service.ISysPermissionService +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.* + +/** + * 用户信息 + * + * @author hsdllcw + */ +@RestController +@RequestMapping("/inner/user") +class InnerSysUserController { + + @Autowired + lateinit var userService: ISysUserService + + @Autowired + lateinit var permissionService: ISysPermissionService + + @Autowired + lateinit var deptService: ISysDeptService + + @Autowired + lateinit var roleService: ISysRoleService + + + /** + * 获取当前用户信息 + */ + @InnerAuth + @GetMapping("/info/phoneNumber/{phoneNumber:\\d+}") + fun infoByPhone(@PathVariable("phoneNumber") phoneNumber: String?): R { + val sysUser: SysUser = userService.selectUserByPhoneNumber(phoneNumber) + if (StringUtils.isNull(sysUser)) { + return R.fail("用户名或密码错误") + } + // 角色集合 + val roles: Set = permissionService.getRolePermission(sysUser) + // 权限集合 + val permissions: Set = permissionService.getMenuPermission(sysUser) + val sysUserVo = LoginUser() + sysUserVo.sysUser = sysUser + sysUserVo.roles = roles + sysUserVo.permissions = permissions + return R.ok(sysUserVo) + } + + /** + * 根据ID获取用户信息 + */ + @InnerAuth + @GetMapping("/detail/{userId}") + fun infoById(@PathVariable("userId") userId: Long?): R { + val sysUser: SysUser = userService.selectUserById(userId) + // 角色集合 + val roles: Set = permissionService.getRolePermission(sysUser) + // 权限集合 + val permissions: Set = permissionService.getMenuPermission(sysUser) + val sysUserVo = LoginUser() + sysUserVo.sysUser = sysUser + sysUserVo.roles = roles + sysUserVo.permissions = permissions + return R.ok(sysUserVo) + } + + /** + * 修改用户 + */ + @InnerAuth + @PutMapping + @Log(title = "用户修改本人信息", businessType = BusinessType.UPDATE) + fun edit(@Validated @RequestBody loginUser: LoginUser): R { + val originUser = userService.selectUserById(loginUser.userid) + val targetUser = loginUser.sysUser + userService.checkUserAllowed(originUser) + userService.checkUserDataScope(originUser.userId) + deptService.checkDeptDataScope(originUser.deptId) + roleService.checkRoleDataScope(*originUser.roleIds) + if (!userService.checkUserNameUnique(targetUser)) { + return error("修改用户'" + targetUser.userName + "'失败，登录账号已存在") + } else if (StringUtils.isNotEmpty(targetUser.phonenumber) && !userService.checkPhoneUnique(targetUser)) { + return error("修改用户'" + targetUser.userName + "'失败，手机号码已存在") + } else if (StringUtils.isNotEmpty(targetUser.email) && !userService.checkEmailUnique(targetUser)) { + return error("修改用户'" + targetUser.userName + "'失败，邮箱账号已存在") + } + originUser.userName = targetUser.userName ?: originUser.userName + originUser.phonenumber = targetUser.phonenumber ?: originUser.phonenumber + originUser.email = targetUser.email ?: originUser.email + originUser.avatar = targetUser.avatar ?: originUser.avatar + originUser.updateBy = originUser.userName + userService.updateUser(originUser) + return R.ok(loginUser) + } +} \ No newline at end of file diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 77da250b2..c88e4d1a7 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -914,7 +914,7 @@ export default { data() { return { // 版本号 - version: "3.6.41.0.2", + version: "3.6.41.0.3", }; }, methods: { diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml index 246732cb5..f26ffda80 100644 --- a/ruoyi-visual/pom.xml +++ b/ruoyi-visual/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index b0389af73..4c1e03c31 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/ruoyi-visual/ruoyi-monitor/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-visual - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 From 6a5fe799ad90ea08609ec35576ddec678513e81c Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Fri, 25 Oct 2024 17:01:39 +0800 Subject: [PATCH 32/82] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=A0=87=E8=AE=B0open=E5=AF=BC=E8=87=B4=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/system/controller/inner/InnerSysUserController.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt index e9e2ea31b..c3a112177 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.* */ @RestController @RequestMapping("/inner/user") -class InnerSysUserController { +open class InnerSysUserController { @Autowired lateinit var userService: ISysUserService From 6e0278927489f6affe158d2191ac9419ccb7c7bc Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Fri, 25 Oct 2024 17:10:29 +0800 Subject: [PATCH 33/82] =?UTF-8?q?[feat]=20=E5=85=81=E8=AE=B8=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BF=AE=E6=94=B9=E8=87=AA=E5=B7=B1=E7=9A=84=E6=98=B5?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/system/controller/inner/InnerSysUserController.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt index c3a112177..a3117385a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt @@ -97,6 +97,7 @@ open class InnerSysUserController { return error("修改用户'" + targetUser.userName + "'失败，邮箱账号已存在") } originUser.userName = targetUser.userName ?: originUser.userName + originUser.nickName = targetUser.nickName ?: originUser.nickName originUser.phonenumber = targetUser.phonenumber ?: originUser.phonenumber originUser.email = targetUser.email ?: originUser.email originUser.avatar = targetUser.avatar ?: originUser.avatar From df74143e716d64868394bf88a5c467f34f518d70 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Sat, 26 Oct 2024 11:07:25 +0800 Subject: [PATCH 34/82] =?UTF-8?q?[feat]=20=E8=B0=83=E6=95=B4InnerSysUserCo?= =?UTF-8?q?ntroller=E7=9A=84=E7=BB=A7=E6=89=BF=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/inner/InnerSysUserController.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt index a3117385a..ebeeac50c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt @@ -2,6 +2,8 @@ package com.ruoyi.system.controller.inner import com.ruoyi.common.core.domain.R import com.ruoyi.common.core.utils.StringUtils +import com.ruoyi.common.core.web.controller.BaseController +import com.ruoyi.common.core.web.domain.AjaxResult import com.ruoyi.common.log.annotation.Log import com.ruoyi.common.log.enums.BusinessType import com.ruoyi.common.security.annotation.InnerAuth @@ -22,7 +24,7 @@ import org.springframework.web.bind.annotation.* */ @RestController @RequestMapping("/inner/user") -open class InnerSysUserController { +open class InnerSysUserController : BaseController() { @Autowired lateinit var userService: ISysUserService @@ -82,7 +84,7 @@ open class InnerSysUserController { @InnerAuth @PutMapping @Log(title = "用户修改本人信息", businessType = BusinessType.UPDATE) - fun edit(@Validated @RequestBody loginUser: LoginUser): R { + fun edit(@Validated @RequestBody loginUser: LoginUser): AjaxResult { val originUser = userService.selectUserById(loginUser.userid) val targetUser = loginUser.sysUser userService.checkUserAllowed(originUser) @@ -103,6 +105,6 @@ open class InnerSysUserController { originUser.avatar = targetUser.avatar ?: originUser.avatar originUser.updateBy = originUser.userName userService.updateUser(originUser) - return R.ok(loginUser) + return success(loginUser) } } \ No newline at end of file From 3e436ddd432e032a7c10be76e467a68e08f7bfa8 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Sat, 26 Oct 2024 11:28:16 +0800 Subject: [PATCH 35/82] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inner/InnerSysUserController.kt | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt index ebeeac50c..174d4e196 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt @@ -27,16 +27,16 @@ import org.springframework.web.bind.annotation.* open class InnerSysUserController : BaseController() { @Autowired - lateinit var userService: ISysUserService + open lateinit var userService: ISysUserService @Autowired - lateinit var permissionService: ISysPermissionService + open lateinit var permissionService: ISysPermissionService @Autowired - lateinit var deptService: ISysDeptService + open lateinit var deptService: ISysDeptService @Autowired - lateinit var roleService: ISysRoleService + open lateinit var roleService: ISysRoleService /** @@ -87,10 +87,6 @@ open class InnerSysUserController : BaseController() { fun edit(@Validated @RequestBody loginUser: LoginUser): AjaxResult { val originUser = userService.selectUserById(loginUser.userid) val targetUser = loginUser.sysUser - userService.checkUserAllowed(originUser) - userService.checkUserDataScope(originUser.userId) - deptService.checkDeptDataScope(originUser.deptId) - roleService.checkRoleDataScope(*originUser.roleIds) if (!userService.checkUserNameUnique(targetUser)) { return error("修改用户'" + targetUser.userName + "'失败，登录账号已存在") } else if (StringUtils.isNotEmpty(targetUser.phonenumber) && !userService.checkPhoneUnique(targetUser)) { From b53c71389da3d056b0cb06eb6d6437ea5f063f96 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Mon, 28 Oct 2024 14:48:30 +0800 Subject: [PATCH 36/82] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=9B=B4=E6=96=B0=E7=BC=93=E5=AD=98=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/inner/InnerSysUserController.kt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt index 174d4e196..e694ad75c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt @@ -7,11 +7,10 @@ import com.ruoyi.common.core.web.domain.AjaxResult import com.ruoyi.common.log.annotation.Log import com.ruoyi.common.log.enums.BusinessType import com.ruoyi.common.security.annotation.InnerAuth +import com.ruoyi.common.security.service.TokenService import com.ruoyi.system.api.domain.SysUser import com.ruoyi.system.api.model.LoginUser -import com.ruoyi.system.service.ISysDeptService import com.ruoyi.system.service.ISysPermissionService -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 @@ -33,10 +32,7 @@ open class InnerSysUserController : BaseController() { open lateinit var permissionService: ISysPermissionService @Autowired - open lateinit var deptService: ISysDeptService - - @Autowired - open lateinit var roleService: ISysRoleService + open lateinit var tokenService: TokenService /** @@ -99,8 +95,11 @@ open class InnerSysUserController : BaseController() { originUser.phonenumber = targetUser.phonenumber ?: originUser.phonenumber originUser.email = targetUser.email ?: originUser.email originUser.avatar = targetUser.avatar ?: originUser.avatar + originUser.sex = targetUser.sex ?: originUser.sex originUser.updateBy = originUser.userName userService.updateUser(originUser) + // 更新缓存用户信息 + tokenService.setLoginUser(loginUser) return success(loginUser) } } \ No newline at end of file From d5219d6d15fcffde651e1a603956ff45b2dc03ce Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Mon, 28 Oct 2024 17:14:12 +0800 Subject: [PATCH 37/82] =?UTF-8?q?[feat]=20=E5=8F=AF=E4=BB=A5=E4=BB=8E?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=B8=AD=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E7=9A=84=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/gateway/config/CaptchaConfig.java | 8 ++++++-- .../gateway/service/impl/ValidateCodeServiceImpl.java | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) 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 47a3a8afc..db51775c4 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 @@ -2,6 +2,7 @@ package com.ruoyi.gateway.config; import java.util.Properties; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import com.google.code.kaptcha.impl.DefaultKaptcha; @@ -16,6 +17,9 @@ import static com.google.code.kaptcha.Constants.*; */ @Configuration public class CaptchaConfig { + @Value("${" + KAPTCHA_TEXTPRODUCER_CHAR_LENGTH + "}") + private String textProducerCharLength; + @Bean(name = "captchaProducer") public DefaultKaptcha getKaptchaBean() { DefaultKaptcha defaultKaptcha = new DefaultKaptcha(); @@ -33,7 +37,7 @@ public class CaptchaConfig { // KAPTCHA_SESSION_KEY properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCode"); // 验证码文本字符长度 默认为5 - properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "4"); + properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, textProducerCharLength); // 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize) properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier"); // 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy 阴影com.google.code.kaptcha.impl.ShadowGimpy @@ -99,7 +103,7 @@ public class CaptchaConfig { // 验证码文本生成器 properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, com.ruoyi.gateway.config.KaptchaNumberCreator.class.getName()); // 验证码文本字符长度 默认为5 - properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "4"); + properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, textProducerCharLength); // 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize) properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier"); // 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy 阴影com.google.code.kaptcha.impl.ShadowGimpy 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 620727ce8..3d1073766 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 @@ -141,6 +141,7 @@ public class ValidateCodeServiceImpl implements ValidateCodeService } else { ajax.put("captchaCode",code); } + ajax.put("codeLength", code.length()); } ajax.put("expire", expire); ajax.put("uuid", uuid); From e07bbf122d1ed0d730d133a78a35835454109a09 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Thu, 7 Nov 2024 12:05:39 +0800 Subject: [PATCH 38/82] =?UTF-8?q?[feat]=20=E6=96=B0=E5=A2=9E=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=A8=A1=E7=B3=8A=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=94=A8=E6=88=B7=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- ruoyi-api/pom.xml | 2 +- ruoyi-api/ruoyi-api-system/pom.xml | 2 +- .../system/api/inner/InnerRemoteUserService.java | 12 ++++++++++++ ruoyi-auth/pom.xml | 2 +- ruoyi-common/pom.xml | 2 +- ruoyi-common/ruoyi-common-core/pom.xml | 2 +- .../common/core/constant/SecurityConstants.java | 5 +++++ .../ruoyi/common/core/constant/TokenConstants.java | 3 --- ruoyi-common/ruoyi-common-datascope/pom.xml | 2 +- ruoyi-common/ruoyi-common-datasource/pom.xml | 2 +- ruoyi-common/ruoyi-common-log/pom.xml | 2 +- ruoyi-common/ruoyi-common-redis/pom.xml | 2 +- ruoyi-common/ruoyi-common-seata/pom.xml | 2 +- ruoyi-common/ruoyi-common-security/pom.xml | 2 +- ruoyi-common/ruoyi-common-sensitive/pom.xml | 2 +- ruoyi-common/ruoyi-common-swagger/pom.xml | 2 +- ruoyi-gateway/pom.xml | 2 +- .../java/com/ruoyi/gateway/filter/AuthFilter.java | 1 - ruoyi-modules/pom.xml | 2 +- ruoyi-modules/ruoyi-file/pom.xml | 2 +- ruoyi-modules/ruoyi-gen/pom.xml | 2 +- ruoyi-modules/ruoyi-job/pom.xml | 2 +- ruoyi-modules/ruoyi-system/pom.xml | 2 +- .../java/com/ruoyi/system/mapper/SysUserMapper.java | 10 ++++++++++ .../com/ruoyi/system/service/ISysUserService.java | 10 ++++++++++ .../system/service/impl/SysUserServiceImpl.java | 13 +++++++++++++ .../controller/inner/InnerSysUserController.kt | 10 ++++++++++ .../main/resources/mapper/system/SysUserMapper.xml | 4 ++++ ruoyi-ui/src/views/index.vue | 2 +- ruoyi-visual/pom.xml | 2 +- ruoyi-visual/ruoyi-monitor/pom.xml | 2 +- 32 files changed, 88 insertions(+), 28 deletions(-) diff --git a/pom.xml b/pom.xml index 25cb10d63..278695596 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.ruoyi ruoyi - 3.6.41.0.3 + 3.6.41.0.4 ruoyi http://www.ruoyi.vip @@ -16,7 +16,7 @@ UTF-8 11 11 - 3.6.41.0.3 + 3.6.41.0.4 UTF-8 UTF-8 1.8 diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml index b9d8b07ee..9fc0567e8 100644 --- a/ruoyi-api/pom.xml +++ b/ruoyi-api/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41.0.3 + 3.6.41.0.4 4.0.0 diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml index 157d61d98..5a4d27509 100644 --- a/ruoyi-api/ruoyi-api-system/pom.xml +++ b/ruoyi-api/ruoyi-api-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-api - 3.6.41.0.3 + 3.6.41.0.4 4.0.0 diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java index fb1f670e9..f1856d682 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java @@ -1,7 +1,9 @@ package com.ruoyi.system.api.inner; +import com.github.pagehelper.Page; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.domain.R; +import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.model.LoginUser; import org.springframework.web.bind.annotation.*; @@ -27,6 +29,16 @@ public interface InnerRemoteUserService { @GetMapping("/inner/user/info/phoneNumber/{phoneNumber:\\d+}") R getUserInfoByPhoneNumber_Inner(@PathVariable("phoneNumber") String phoneNumber, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + /** + * 通过手机号查询用户信息 + * + * @param phoneNumber 用户名 + * @param source 请求来源 + * @return 结果 + */ + @GetMapping("/inner/user/list/phoneNumber/{phoneNumber:\\d+}") + R> findByPhoneNumberStartingWith_Inner(@PathVariable("phoneNumber") String phoneNumber, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + @PutMapping("/inner/user") R edit_Inner(@RequestBody LoginUser user, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } \ No newline at end of file diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index 13ba8f49e..ed433c51c 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41.0.3 + 3.6.41.0.4 4.0.0 diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 0297c9ec4..eea9b7a07 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41.0.3 + 3.6.41.0.4 4.0.0 diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index 1f1f42537..5291cf87f 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.3 + 3.6.41.0.4 4.0.0 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 7e790ff96..73cae223a 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 @@ -22,6 +22,11 @@ public class SecurityConstants */ public static final String AUTHORIZATION_HEADER = "Authorization"; + /** + * WEBSOCKET头字段 + */ + public final static String WEBSOCKET_HEADER = "Sec-WebSocket-Key"; + /** * 请求来源 */ 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 ac766578e..2de45edd0 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 @@ -16,7 +16,4 @@ public class TokenConstants * 令牌秘钥 */ public final static String SECRET = "abcdefghijklmnopqrstuvwxyz"; - - public final static String WEBSOCKET_HEADER = "Sec-WebSocket-Key"; - } diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/ruoyi-common/ruoyi-common-datascope/pom.xml index fa814fd73..d872dd31e 100644 --- a/ruoyi-common/ruoyi-common-datascope/pom.xml +++ b/ruoyi-common/ruoyi-common-datascope/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.3 + 3.6.41.0.4 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml index 252e8c8b3..b96205ae3 100644 --- a/ruoyi-common/ruoyi-common-datasource/pom.xml +++ b/ruoyi-common/ruoyi-common-datasource/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.3 + 3.6.41.0.4 4.0.0 diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml index 2bbcb2f24..453162921 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/ruoyi-common/ruoyi-common-log/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.3 + 3.6.41.0.4 4.0.0 diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml index d87fbf718..b134880d1 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/ruoyi-common/ruoyi-common-redis/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.3 + 3.6.41.0.4 4.0.0 diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml index a60ee02a5..f6d5c5dad 100644 --- a/ruoyi-common/ruoyi-common-seata/pom.xml +++ b/ruoyi-common/ruoyi-common-seata/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.3 + 3.6.41.0.4 4.0.0 diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml index 523aeba05..a5dd210de 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/ruoyi-common/ruoyi-common-security/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.3 + 3.6.41.0.4 4.0.0 diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/ruoyi-common/ruoyi-common-sensitive/pom.xml index c73abba0b..50ac8518e 100644 --- a/ruoyi-common/ruoyi-common-sensitive/pom.xml +++ b/ruoyi-common/ruoyi-common-sensitive/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.3 + 3.6.41.0.4 4.0.0 diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml index 667b4f57e..c304232a4 100644 --- a/ruoyi-common/ruoyi-common-swagger/pom.xml +++ b/ruoyi-common/ruoyi-common-swagger/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.3 + 3.6.41.0.4 4.0.0 diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index 3f9dc5802..102c6512c 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41.0.3 + 3.6.41.0.4 4.0.0 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 78e98803e..51d39ef9f 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,6 +1,5 @@ package com.ruoyi.gateway.filter; -import org.apache.commons.lang3.ObjectUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index 895b774ba..0d97a8ab9 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41.0.3 + 3.6.41.0.4 4.0.0 diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index aa2cf9e60..1d5544ae5 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/ruoyi-modules/ruoyi-file/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.41.0.3 + 3.6.41.0.4 4.0.0 diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index ddb0e8517..1a3611f64 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.41.0.3 + 3.6.41.0.4 4.0.0 diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index 66a9151a9..30f2a1b59 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.41.0.3 + 3.6.41.0.4 4.0.0 diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index 6e7e55330..ebdd47c03 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.41.0.3 + 3.6.41.0.4 4.0.0 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 96220194a..71bfc7d63 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,6 +1,8 @@ package com.ruoyi.system.mapper; import java.util.List; + +import com.github.pagehelper.Page; import org.apache.ibatis.annotations.Param; import com.ruoyi.system.api.domain.SysUser; @@ -51,6 +53,14 @@ public interface SysUserMapper */ public SysUser selectUserByPhoneNumber(String phoneNumber); + /** + * 通过手机号查询用户 + * + * @param phoneNumber 手机号 + * @return 用户对象信息 + */ + public Page findByPhoneNumberStartingWith(String phoneNumber); + /** * 通过用户ID查询用户 * 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 222f49213..8d6e2b2b4 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,6 +1,8 @@ package com.ruoyi.system.service; import java.util.List; + +import com.github.pagehelper.Page; import com.ruoyi.system.api.domain.SysUser; /** @@ -58,6 +60,14 @@ public interface ISysUserService */ public SysUser selectUserById(Long userId); + /** + * 通过手机号查询用户 + * + * @param phoneNumber 用户名 + * @return 用户对象信息 + */ + public Page findByPhoneNumberStartingWith(String phoneNumber); + /** * 根据用户ID查询用户所属角色组 * 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 6f60ef879..1ed1cc65f 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 @@ -4,6 +4,8 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; import javax.validation.Validator; + +import com.github.pagehelper.Page; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -127,6 +129,17 @@ public class SysUserServiceImpl implements ISysUserService return userMapper.selectUserByPhoneNumber(phoneNumber); } + /** + * 通过手机号查询用户 + * + * @param phoneNumber 手机号 + * @return 用户对象信息 + */ + @Override + public Page findByPhoneNumberStartingWith(String phoneNumber) { + return userMapper.findByPhoneNumberStartingWith(phoneNumber); + } + /** * 通过用户ID查询用户 * diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt index e694ad75c..f0b9088bb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt @@ -1,5 +1,6 @@ package com.ruoyi.system.controller.inner +import com.github.pagehelper.Page import com.ruoyi.common.core.domain.R import com.ruoyi.common.core.utils.StringUtils import com.ruoyi.common.core.web.controller.BaseController @@ -56,6 +57,15 @@ open class InnerSysUserController : BaseController() { return R.ok(sysUserVo) } + /** + * 获取当前用户信息 + */ + @InnerAuth + @GetMapping("/list/phoneNumber/{phoneNumber:\\d+}") + fun findByPhoneNumberStartingWith(@PathVariable("phoneNumber") phoneNumber: String?): R> { + return R.ok(userService.findByPhoneNumberStartingWith(phoneNumber)) + } + /** * 根据ID获取用户信息 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 789ad9669..db4f5a8a4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -146,6 +146,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where u.phonenumber = #{phoneNumber} and u.del_flag = '0' + insert into sys_user( diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index c88e4d1a7..23c2c6040 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -914,7 +914,7 @@ export default { data() { return { // 版本号 - version: "3.6.41.0.3", + version: "3.6.41.0.4", }; }, methods: { diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml index f26ffda80..a3088b91a 100644 --- a/ruoyi-visual/pom.xml +++ b/ruoyi-visual/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41.0.3 + 3.6.41.0.4 4.0.0 diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index 4c1e03c31..da6d7ca3a 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/ruoyi-visual/ruoyi-monitor/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-visual - 3.6.41.0.3 + 3.6.41.0.4 4.0.0 From 9c94e2cd0fbf7abd6e5377b7c8620cde99ad9a2a Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Thu, 7 Nov 2024 12:07:40 +0800 Subject: [PATCH 39/82] =?UTF-8?q?[fix]=20=E8=A1=A5=E5=85=85=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/api/factory/RemoteUserFallbackFactory.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 1df3178a7..594b7da64 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,5 +1,6 @@ package com.ruoyi.system.api.factory; +import com.github.pagehelper.Page; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,6 +45,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory> findByPhoneNumberStartingWith_Inner(String phoneNumber, String source) { + return R.fail("获取用户失败:" + throwable.getMessage()); + } + @Override public R registerUserInfo(SysUser sysUser, String source) { From 8c3e52a0c53dec70bb6c444616fdc45336f2929b Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Thu, 7 Nov 2024 14:43:40 +0800 Subject: [PATCH 40/82] =?UTF-8?q?[test]=20=E6=96=B0=E5=A2=9E=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=A0=B9=E6=8D=AE=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E7=9A=84=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 ++++++- .../resources/mapper/system/SysUserMapper.xml | 4 ++-- .../system/service/ISysUserServiceTest.kt | 21 +++++++++++++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 ruoyi-modules/ruoyi-system/src/test/kotlin/com/ruoyi/system/service/ISysUserServiceTest.kt diff --git a/pom.xml b/pom.xml index 278695596..0dd30ccbf 100644 --- a/pom.xml +++ b/pom.xml @@ -240,6 +240,11 @@ org.springframework.cloud spring-cloud-starter-bootstrap + + org.springframework.boot + spring-boot-starter-test + test + org.jetbrains.kotlin kotlin-stdlib-jdk8 @@ -247,7 +252,7 @@ org.jetbrains.kotlin - kotlin-test + kotlin-test-junit ${kotlin.version} test diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index db4f5a8a4..59643e18c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status from sys_user u @@ -148,7 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-modules/ruoyi-system/src/test/kotlin/com/ruoyi/system/service/ISysUserServiceTest.kt b/ruoyi-modules/ruoyi-system/src/test/kotlin/com/ruoyi/system/service/ISysUserServiceTest.kt new file mode 100644 index 000000000..513c65204 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/test/kotlin/com/ruoyi/system/service/ISysUserServiceTest.kt @@ -0,0 +1,21 @@ +package com.ruoyi.system.service + +import com.alibaba.fastjson.JSONObject +import com.ruoyi.system.RuoYiSystemApplication +import org.junit.runner.RunWith +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner +import kotlin.test.Test + +@RunWith(SpringJUnit4ClassRunner::class) +@SpringBootTest(classes = [RuoYiSystemApplication::class], webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +class ISysUserServiceTest { + @Autowired + lateinit var iSysUserService: ISysUserService + + @Test + fun findByPhoneNumberStartingWithTest() { + println(JSONObject.toJSONString(iSysUserService.findByPhoneNumberStartingWith("1"))) + } +} \ No newline at end of file From 21495202ffdbb7c7078bf0f738f0736c56220b1d Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Wed, 20 Nov 2024 17:51:00 +0800 Subject: [PATCH 41/82] =?UTF-8?q?[feat]=20=E6=96=B0=E5=A2=9E=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E5=BE=AE=E4=BF=A1unionId=E6=B3=A8=E5=86=8C=E7=9A=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +- pom.xml | 4 +- ruoyi-api/pom.xml | 2 +- ruoyi-api/ruoyi-api-system/pom.xml | 2 +- .../factory/RemoteUserFallbackFactory.java | 16 ++++- .../api/inner/InnerRemoteUserService.java | 25 ++++++- ruoyi-auth/pom.xml | 20 +++--- ruoyi-common/pom.xml | 2 +- ruoyi-common/ruoyi-common-core/pom.xml | 2 +- ruoyi-common/ruoyi-common-datascope/pom.xml | 2 +- ruoyi-common/ruoyi-common-datasource/pom.xml | 2 +- ruoyi-common/ruoyi-common-log/pom.xml | 2 +- ruoyi-common/ruoyi-common-redis/pom.xml | 2 +- ruoyi-common/ruoyi-common-seata/pom.xml | 2 +- ruoyi-common/ruoyi-common-security/pom.xml | 2 +- ruoyi-common/ruoyi-common-sensitive/pom.xml | 2 +- ruoyi-common/ruoyi-common-swagger/pom.xml | 2 +- ruoyi-gateway/pom.xml | 2 +- ruoyi-modules/pom.xml | 2 +- ruoyi-modules/ruoyi-file/pom.xml | 2 +- ruoyi-modules/ruoyi-gen/pom.xml | 2 +- ruoyi-modules/ruoyi-job/pom.xml | 2 +- ruoyi-modules/ruoyi-system/pom.xml | 2 +- .../inner/InnerSysUserController.kt | 47 ++++++++++++ .../com/ruoyi/system/mapper/KSysUserMapper.kt | 28 ++++++++ .../ruoyi/system/service/IKSysUserService.kt | 31 ++++++++ .../service/impl/KSysUserServiceImpl.kt | 46 ++++++++++++ .../mapper/system/KSysUserMapper.xml | 72 +++++++++++++++++++ ruoyi-ui/package.json | 2 +- ruoyi-ui/src/views/index.vue | 4 +- ruoyi-visual/pom.xml | 2 +- ruoyi-visual/ruoyi-monitor/pom.xml | 2 +- 32 files changed, 298 insertions(+), 41 deletions(-) create mode 100644 ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt create mode 100644 ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt create mode 100644 ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt create mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml diff --git a/README.md b/README.md index b7169d7b2..89c5a679a 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@

logo

-

RuoYi v3.6.5

+

RuoYi v3.6.5.0.1

基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的分布式微服务架构

- +

diff --git a/pom.xml b/pom.xml index 4ebfd012c..3ebc33615 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ com.ruoyi ruoyi - 3.6.5 + 3.6.5.0.1 ruoyi http://www.ruoyi.vip 若依微服务系统 - 3.6.5 + 3.6.5.0.1 UTF-8 UTF-8 1.8 diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml index d60796c12..225a00d3d 100644 --- a/ruoyi-api/pom.xml +++ b/ruoyi-api/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml index b9e91238e..c03710ff1 100644 --- a/ruoyi-api/ruoyi-api-system/pom.xml +++ b/ruoyi-api/ruoyi-api-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-api - 3.6.5 + 3.6.5.0.1 4.0.0 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 594b7da64..7f16c270f 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,6 +11,8 @@ import com.ruoyi.system.api.RemoteUserService; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.model.LoginUser; +import java.util.Map; + /** * 用户服务降级处理 * @@ -29,7 +31,12 @@ public class RemoteUserFallbackFactory implements FallbackFactory infoById_Inner(Long userId, @NotNull String source) { + public R getById_Inner(Long userId, @NotNull String source) { + return R.fail("获取用户失败:" + throwable.getMessage()); + } + + @Override + public R getByWxUnionId_Inner(String unionid, String source) { return R.fail("获取用户失败:" + throwable.getMessage()); } @@ -41,7 +48,7 @@ public class RemoteUserFallbackFactory implements FallbackFactory getUserInfoByPhoneNumber_Inner(@NotNull String phoneNumber, @NotNull String source) { + public R getByPhoneNumber_Inner(@NotNull String phoneNumber, @NotNull String source) { return R.fail("获取用户失败:" + throwable.getMessage()); } @@ -67,6 +74,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory edit_Inner(@NotNull LoginUser user, @NotNull String source) { return R.fail("修改用户信息失败:" + throwable.getMessage()); } + + @Override + public R registerUserByWxUnionId_Inner(Map params, String source) { + return R.fail("注册用户失败:" + throwable.getMessage()); + } }; } } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java index f1856d682..64b9b75ef 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java @@ -7,6 +7,8 @@ import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.model.LoginUser; import org.springframework.web.bind.annotation.*; +import java.util.Map; + public interface InnerRemoteUserService { /** * 通过用户ID查询用户信息 @@ -16,8 +18,17 @@ public interface InnerRemoteUserService { * @return 结果 */ @GetMapping("/inner/user/detail/{userId}") - R infoById_Inner(@PathVariable("userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + R getById_Inner(@PathVariable("userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + /** + * 通过用户ID查询用户信息 + * + * @param unionid 用户微信unionid + * @param source 请求来源 + * @return 结果 + */ + @GetMapping("/inner/user/detail/wx/unionid/{unionid}") + R getByWxUnionId_Inner(@PathVariable("unionid") String unionid, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 通过手机号查询用户信息 @@ -27,7 +38,7 @@ public interface InnerRemoteUserService { * @return 结果 */ @GetMapping("/inner/user/info/phoneNumber/{phoneNumber:\\d+}") - R getUserInfoByPhoneNumber_Inner(@PathVariable("phoneNumber") String phoneNumber, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + R getByPhoneNumber_Inner(@PathVariable("phoneNumber") String phoneNumber, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 通过手机号查询用户信息 @@ -41,4 +52,14 @@ public interface InnerRemoteUserService { @PutMapping("/inner/user") R edit_Inner(@RequestBody LoginUser user, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + /** + * 注册用户信息 + * + * @param params 包含微信unionId和deptId + * @param source 请求来源 + * @return 结果 + */ + @PostMapping("/inner/user/register/wx/unionid") + public R registerUserByWxUnionId_Inner(@RequestBody Map params, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } \ No newline at end of file diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index 912b1c8ed..689bbeb2f 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5 + 3.6.5.0.1 4.0.0 @@ -15,45 +15,45 @@ - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config - + com.alibaba.cloud spring-cloud-starter-alibaba-sentinel - + org.springframework.boot spring-boot-starter-web - + org.springframework.boot spring-boot-starter-actuator - + com.ruoyi ruoyi-common-security - + - + ${project.artifactId} @@ -70,5 +70,5 @@ - + diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 5ce394cbf..8f5c6ecb2 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index 811b69c6c..069fd60ee 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/ruoyi-common/ruoyi-common-datascope/pom.xml index d11529688..486f7e672 100644 --- a/ruoyi-common/ruoyi-common-datascope/pom.xml +++ b/ruoyi-common/ruoyi-common-datascope/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml index f75526c16..5b33800ab 100644 --- a/ruoyi-common/ruoyi-common-datasource/pom.xml +++ b/ruoyi-common/ruoyi-common-datasource/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml index f954fc501..b4300ab6c 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/ruoyi-common/ruoyi-common-log/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml index 3c45b6083..385246698 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/ruoyi-common/ruoyi-common-redis/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml index 0fcf19a69..f4c25c212 100644 --- a/ruoyi-common/ruoyi-common-seata/pom.xml +++ b/ruoyi-common/ruoyi-common-seata/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml index 487a130fb..d54ee21fb 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/ruoyi-common/ruoyi-common-security/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-common - 3.6.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/ruoyi-common/ruoyi-common-sensitive/pom.xml index 82ce3cff8..7e0b95126 100644 --- a/ruoyi-common/ruoyi-common-sensitive/pom.xml +++ b/ruoyi-common/ruoyi-common-sensitive/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml index dd1190712..632196719 100644 --- a/ruoyi-common/ruoyi-common-swagger/pom.xml +++ b/ruoyi-common/ruoyi-common-swagger/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index 0b5fb3f66..8de0895bd 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index 6e6b96d6d..f19d771b0 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index b4d5c62f8..197718ac1 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/ruoyi-modules/ruoyi-file/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index c6c0bf4f4..deb0d0459 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index a6f1a1b79..6a8f8b5f3 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index d4bffdc6b..426bf0b6a 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt index f0b9088bb..2da4cca09 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt @@ -11,6 +11,8 @@ import com.ruoyi.common.security.annotation.InnerAuth import com.ruoyi.common.security.service.TokenService import com.ruoyi.system.api.domain.SysUser import com.ruoyi.system.api.model.LoginUser +import com.ruoyi.system.service.IKSysUserService +import com.ruoyi.system.service.ISysConfigService import com.ruoyi.system.service.ISysPermissionService import com.ruoyi.system.service.ISysUserService import org.springframework.beans.factory.annotation.Autowired @@ -29,12 +31,18 @@ open class InnerSysUserController : BaseController() { @Autowired open lateinit var userService: ISysUserService + @Autowired + open lateinit var kSysUserService: IKSysUserService + @Autowired open lateinit var permissionService: ISysPermissionService @Autowired open lateinit var tokenService: TokenService + @Autowired + open lateinit var configService: ISysConfigService + /** * 获取当前用户信息 @@ -84,6 +92,27 @@ open class InnerSysUserController : BaseController() { return R.ok(sysUserVo) } + /** + * 根据微信unionid获取用户信息 + */ + @InnerAuth + @GetMapping("/detail/wx/unionid/{unionid}") + fun infoByWxUnionId(@PathVariable("unionid") unionid: String): R { + val sysUser = kSysUserService.selectUserByWxUnionId(unionid) + if (StringUtils.isNull(sysUser)) { + return R.fail("wx_unionid错误") + } + // 角色集合 + val roles: Set = permissionService.getRolePermission(sysUser) + // 权限集合 + val permissions: Set = permissionService.getMenuPermission(sysUser) + val sysUserVo = LoginUser() + sysUserVo.sysUser = sysUser + sysUserVo.roles = roles + sysUserVo.permissions = permissions + return R.ok(sysUserVo) + } + /** * 修改用户 */ @@ -112,4 +141,22 @@ open class InnerSysUserController : BaseController() { tokenService.setLoginUser(loginUser) return success(loginUser) } + + /** + * 注册用户信息 + */ + @InnerAuth + @PostMapping("/register/wx/unionid") + fun registerUserByWxUnionId(@RequestBody params: Map): R { + if (!("true" == configService.selectConfigByKey("sys.account.registerUser"))) { + return R.fail("当前系统没有开启注册功能！") + } + val unionid = params.get("unionId") + val deptId = params.get("deptId")?.toLong() + if (unionid == null) return R.fail("微信unionid不存在无法注册") + if (!kSysUserService.checkWxUnionIdUnique(unionid)) { + return R.fail("保存用户'$unionid'失败，注册账号已存在") + } + return R.ok(kSysUserService.registerUserByWxUnionId(unionid, deptId)) + } } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt new file mode 100644 index 000000000..e784b2d00 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt @@ -0,0 +1,28 @@ +package com.ruoyi.system.mapper + +import com.ruoyi.system.api.domain.SysUser + +/** + * 用户表 数据层 + * + * @author hsdllcw + */ +interface KSysUserMapper { + /** + * 通过用户名查询用户 + * + * @param wxUnionId 微信unionid + * @return 用户对象信息 + */ + fun selectUserByWxUnionId(wxUnionId: String): SysUser? + + /** + * 校验微信unionid是否唯一 + * + * @param wxUnionId 微信unionid + * @return 结果 + */ + fun checkWxUnionIdUnique(wxUnionId: String): SysUser? + + fun insert(params: Map): Int +} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt new file mode 100644 index 000000000..9e5d20c74 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt @@ -0,0 +1,31 @@ +package com.ruoyi.system.service + +import com.ruoyi.system.api.domain.SysUser + +interface IKSysUserService { + fun getISysUserService(): ISysUserService + + /** + * 通过微信unionid查询用户 + * + * @param wxUnionId 微信unionid + * @return 用户对象信息 + */ + fun selectUserByWxUnionId(wxUnionId: String): SysUser? + + /** + * 校验微信unionid是否唯一 + * + * @param wxUnionId 微信unionid + * @return 用户对象信息 + */ + fun checkWxUnionIdUnique(wxUnionId: String): Boolean + + /** + * 注册用户信息 + * + * @param wxUnionId 微信unionId + * @return 结果 + */ + fun registerUserByWxUnionId(wxUnionId: String, deptId: Long?): Boolean +} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt new file mode 100644 index 000000000..6ecefb287 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt @@ -0,0 +1,46 @@ +package com.ruoyi.system.service.impl + +import com.ruoyi.common.core.constant.UserConstants +import com.ruoyi.common.core.utils.uuid.IdUtils +import com.ruoyi.common.security.utils.SecurityUtils +import com.ruoyi.system.api.domain.SysUser +import com.ruoyi.system.mapper.KSysUserMapper +import com.ruoyi.system.service.IKSysUserService +import com.ruoyi.system.service.ISysUserService +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.stereotype.Service + +@Service +open class KSysUserServiceImpl : IKSysUserService { + @Autowired + lateinit var sysUserService: ISysUserService + + @Autowired + lateinit var kSysUserMapper: KSysUserMapper + override fun getISysUserService() = sysUserService + override fun selectUserByWxUnionId(wxUnionId: String) = kSysUserMapper.selectUserByWxUnionId(wxUnionId) + override fun checkWxUnionIdUnique(wxUnionId: String) = + kSysUserMapper.checkWxUnionIdUnique(wxUnionId)?.run { UserConstants.NOT_UNIQUE } ?: UserConstants.UNIQUE + + /** + * 注册用户信息 + * + * @param wxUnionId 微信unionId + * @return 结果 + */ + override fun registerUserByWxUnionId(wxUnionId: String, deptId: Long?): Boolean { + val user = SysUser().apply { + userName = IdUtils.randomUUID().replace("-".toRegex(), "").substring(0, 30) + nickName = "嘉迪微信用户" + password = SecurityUtils.encryptPassword(IdUtils.randomUUID()) + this.deptId = deptId + } + return sysUserService.registerUser(user).apply { + sysUserService.selectUserByUserName(user.userName) + kSysUserMapper.insert(mapOf( + "userId" to user.userId, + "wxUnionId" to wxUnionId, + )) + } + } +} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml new file mode 100644 index 000000000..9444eed27 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, + d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, + r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status + from sys_user u + left join sys_user_account ua on ua.user_id=u.user_id + left join sys_dept d on u.dept_id = d.dept_id + left join sys_user_role ur on u.user_id = ur.user_id + left join sys_role r on r.role_id = ur.role_id + + + + + + + + insert into sys_user_account(user_id, wx_unionid) values (#{userId},#{wxUnionId}) + + \ No newline at end of file diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index afcba4909..8df9c8dd8 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "3.6.5", + "version": "3.6.5.0.1", "description": "若依管理系统", "author": "若依", "license": "MIT", diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 8038d09f5..146df04b5 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -145,7 +145,7 @@ 更新日志 - +
  1. 使用SpringDoc代替Swagger
  2. 菜单管理新增路由名称
    3. @@ -946,7 +946,7 @@ export default { data() { return { // 版本号 - version: "3.6.5", + version: "3.6.5.0.1", }; }, methods: { diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml index a927b0d95..f5b61dfeb 100644 --- a/ruoyi-visual/pom.xml +++ b/ruoyi-visual/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index 22cbead5a..9bc245f74 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/ruoyi-visual/ruoyi-monitor/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-visual - 3.6.5 + 3.6.5.0.1 4.0.0 From e6634b7eb426c2d9bf3783cdc32cd9d0d2176655 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Sat, 30 Nov 2024 10:35:06 +0800 Subject: [PATCH 42/82] =?UTF-8?q?[feat]=20SysUser=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0id=E7=94=A8?= =?UTF-8?q?=E4=BB=A5=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- pom.xml | 4 ++-- ruoyi-api/pom.xml | 2 +- ruoyi-api/ruoyi-api-system/pom.xml | 2 +- .../java/com/ruoyi/system/api/domain/SysUser.java | 15 +++++++++++++++ .../ruoyi/system/api/domain/KSysUserAccount.kt | 9 +++++++++ ruoyi-auth/pom.xml | 2 +- ruoyi-common/pom.xml | 2 +- ruoyi-common/ruoyi-common-core/pom.xml | 2 +- ruoyi-common/ruoyi-common-datascope/pom.xml | 2 +- ruoyi-common/ruoyi-common-datasource/pom.xml | 2 +- ruoyi-common/ruoyi-common-log/pom.xml | 2 +- ruoyi-common/ruoyi-common-redis/pom.xml | 2 +- ruoyi-common/ruoyi-common-seata/pom.xml | 2 +- ruoyi-common/ruoyi-common-security/pom.xml | 2 +- ruoyi-common/ruoyi-common-sensitive/pom.xml | 2 +- ruoyi-common/ruoyi-common-swagger/pom.xml | 2 +- ruoyi-gateway/pom.xml | 2 +- ruoyi-modules/pom.xml | 2 +- ruoyi-modules/ruoyi-file/pom.xml | 2 +- ruoyi-modules/ruoyi-gen/pom.xml | 2 +- ruoyi-modules/ruoyi-job/pom.xml | 2 +- ruoyi-modules/ruoyi-system/pom.xml | 2 +- .../resources/mapper/system/KSysUserMapper.xml | 11 ++++++++--- .../resources/mapper/system/SysUserMapper.xml | 10 +++++++++- ruoyi-ui/package.json | 2 +- ruoyi-ui/src/views/index.vue | 4 ++-- ruoyi-visual/pom.xml | 2 +- ruoyi-visual/ruoyi-monitor/pom.xml | 2 +- 29 files changed, 69 insertions(+), 32 deletions(-) create mode 100644 ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/domain/KSysUserAccount.kt diff --git a/README.md b/README.md index 89c5a679a..bf2ecaa48 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@

    logo

    -

    RuoYi v3.6.5.0.1

    +

    RuoYi v3.6.5.0.2

    基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的分布式微服务架构

    - +

    diff --git a/pom.xml b/pom.xml index 3ebc33615..51b4c3434 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ com.ruoyi ruoyi - 3.6.5.0.1 + 3.6.5.0.2 ruoyi http://www.ruoyi.vip 若依微服务系统 - 3.6.5.0.1 + 3.6.5.0.2 UTF-8 UTF-8 1.8 diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml index 225a00d3d..9a9a23840 100644 --- a/ruoyi-api/pom.xml +++ b/ruoyi-api/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.1 + 3.6.5.0.2 4.0.0 diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml index c03710ff1..aa7634ea9 100644 --- a/ruoyi-api/ruoyi-api-system/pom.xml +++ b/ruoyi-api/ruoyi-api-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-api - 3.6.5.0.1 + 3.6.5.0.2 4.0.0 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 e0c38d01c..1676e89b4 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 @@ -77,6 +77,12 @@ public class SysUser extends BaseEntity }) private SysDept dept; + /** 部门对象 */ + @Excels({ + @Excel(name = "微信UnionId", targetAttr = "wxUnionId", type = Type.EXPORT) + }) + private KSysUserAccount sysUserAccount; + /** 角色对象 */ private List roles; @@ -257,6 +263,14 @@ public class SysUser extends BaseEntity this.dept = dept; } + public KSysUserAccount getSysUserAccount() { + return sysUserAccount; + } + + public void setSysUserAccount(KSysUserAccount sysUserAccount) { + this.sysUserAccount = sysUserAccount; + } + public List getRoles() { return roles; @@ -318,6 +332,7 @@ public class SysUser extends BaseEntity .append("updateTime", getUpdateTime()) .append("remark", getRemark()) .append("dept", getDept()) + .append("userAccount", getSysUserAccount()) .toString(); } } diff --git a/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/domain/KSysUserAccount.kt b/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/domain/KSysUserAccount.kt new file mode 100644 index 000000000..e96b447aa --- /dev/null +++ b/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/domain/KSysUserAccount.kt @@ -0,0 +1,9 @@ +package com.ruoyi.system.api.domain + +class KSysUserAccount { + /** 用户ID */ + var userId: Long? = null + + /** 微信UnionId */ + var wxUnionId: String? = null +} \ No newline at end of file diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index 689bbeb2f..94f0deb28 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.1 + 3.6.5.0.2 4.0.0 diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 8f5c6ecb2..10b3d8835 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.1 + 3.6.5.0.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index 069fd60ee..230f893d6 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.1 + 3.6.5.0.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/ruoyi-common/ruoyi-common-datascope/pom.xml index 486f7e672..47e05e6a3 100644 --- a/ruoyi-common/ruoyi-common-datascope/pom.xml +++ b/ruoyi-common/ruoyi-common-datascope/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.1 + 3.6.5.0.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml index 5b33800ab..9c20f3177 100644 --- a/ruoyi-common/ruoyi-common-datasource/pom.xml +++ b/ruoyi-common/ruoyi-common-datasource/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.1 + 3.6.5.0.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml index b4300ab6c..206b9c5ad 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/ruoyi-common/ruoyi-common-log/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.1 + 3.6.5.0.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml index 385246698..6cea12fad 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/ruoyi-common/ruoyi-common-redis/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.1 + 3.6.5.0.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml index f4c25c212..b8c7cf27d 100644 --- a/ruoyi-common/ruoyi-common-seata/pom.xml +++ b/ruoyi-common/ruoyi-common-seata/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.1 + 3.6.5.0.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml index d54ee21fb..f693051b6 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/ruoyi-common/ruoyi-common-security/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.1 + 3.6.5.0.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/ruoyi-common/ruoyi-common-sensitive/pom.xml index 7e0b95126..abd667f35 100644 --- a/ruoyi-common/ruoyi-common-sensitive/pom.xml +++ b/ruoyi-common/ruoyi-common-sensitive/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.1 + 3.6.5.0.2 4.0.0 diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml index 632196719..f34c36613 100644 --- a/ruoyi-common/ruoyi-common-swagger/pom.xml +++ b/ruoyi-common/ruoyi-common-swagger/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.1 + 3.6.5.0.2 4.0.0 diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index 8de0895bd..9552d8b1a 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.1 + 3.6.5.0.2 4.0.0 diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index f19d771b0..6f01645f3 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.1 + 3.6.5.0.2 4.0.0 diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index 197718ac1..a496c05cf 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/ruoyi-modules/ruoyi-file/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5.0.1 + 3.6.5.0.2 4.0.0 diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index deb0d0459..c5c2d9c8f 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5.0.1 + 3.6.5.0.2 4.0.0 diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index 6a8f8b5f3..df42d27ed 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5.0.1 + 3.6.5.0.2 4.0.0 diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index 426bf0b6a..f7b0a05cc 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5.0.1 + 3.6.5.0.2 4.0.0 diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml index 9444eed27..e0a87bee3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml @@ -23,10 +23,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - + + + + @@ -49,9 +53,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, - r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status + r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status, + ua.wx_unionid from sys_user u - left join sys_user_account ua on ua.user_id=u.user_id + left join sys_user_account ua on ua.user_id = u.user_id left join sys_dept d on u.dept_id = d.dept_id left join sys_user_role ur on u.user_id = ur.user_id left join sys_role r on r.role_id = ur.role_id diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 59643e18c..0a1e1fa6e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -45,12 +46,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, - r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status + r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status, + ua.wx_unionid from sys_user u + left join sys_user_account ua on ua.user_id = u.user_id left join sys_dept d on u.dept_id = d.dept_id left join sys_user_role ur on u.user_id = ur.user_id left join sys_role r on r.role_id = ur.role_id diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index ff861ec34..b20538be8 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "3.6.5.0.1", + "version": "3.6.5.0.2", "description": "若依管理系统", "author": "若依", "license": "MIT", diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 146df04b5..900563067 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -145,7 +145,7 @@ 更新日志 - +
    1. 使用SpringDoc代替Swagger
    2. 菜单管理新增路由名称
      3. @@ -946,7 +946,7 @@ export default { data() { return { // 版本号 - version: "3.6.5.0.1", + version: "3.6.5.0.2", }; }, methods: { diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml index f5b61dfeb..2cb6f040c 100644 --- a/ruoyi-visual/pom.xml +++ b/ruoyi-visual/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.1 + 3.6.5.0.2 4.0.0 diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index 9bc245f74..b1c58497b 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/ruoyi-visual/ruoyi-monitor/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-visual - 3.6.5.0.1 + 3.6.5.0.2 4.0.0 From a753d1c619414c41be6090d093d63ea592293c03 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Sat, 30 Nov 2024 11:20:56 +0800 Subject: [PATCH 43/82] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8Dkotlin=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E9=A1=BA=E5=BA=8F=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 51b4c3434..039e606ff 100644 --- a/pom.xml +++ b/pom.xml @@ -325,17 +325,10 @@ compile - compile + process-sources compile - - - src/main/java - src/main/kotlin - target/generated-sources/annotations - - test-compile @@ -343,16 +336,10 @@ test-compile - - - src/test/kotlin - target/generated-test-sources/test-annotations - - - 1.8 + 21 From 17938ebdb1b663aeb91aceaf4078d35a951087d1 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Sat, 30 Nov 2024 14:32:02 +0800 Subject: [PATCH 44/82] =?UTF-8?q?[feat]=20=E5=BE=AE=E4=BF=A1=E7=9A=84?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=92=8C=E8=A7=A3=E7=BB=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 +-- .../service/impl/SysUserServiceImpl.java | 10 ++++++ .../com/ruoyi/system/mapper/KSysUserMapper.kt | 4 ++- .../ruoyi/system/service/IKSysUserService.kt | 8 +++++ .../service/impl/KSysUserServiceImpl.kt | 36 ++++++++++++++++--- .../mapper/system/KSysUserMapper.xml | 5 ++- 6 files changed, 59 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 039e606ff..4010f0890 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ com.ruoyi ruoyi - 3.6.5.0.2 + 3.6.5.0.3 ruoyi http://www.ruoyi.vip 若依微服务系统 - 3.6.5.0.2 + 3.6.5.0.3 UTF-8 UTF-8 1.8 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 1ed1cc65f..37a715a26 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 @@ -2,10 +2,12 @@ package com.ruoyi.system.service.impl; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; import javax.validation.Validator; import com.github.pagehelper.Page; +import com.ruoyi.system.service.IKSysUserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -46,6 +48,9 @@ public class SysUserServiceImpl implements ISysUserService @Autowired private SysUserMapper userMapper; + @Autowired + private IKSysUserService kSysUserService; + @Autowired private SysRoleMapper roleMapper; @@ -324,6 +329,11 @@ public class SysUserServiceImpl implements ISysUserService userPostMapper.deleteUserPostByUserId(userId); // 新增用户与岗位管理 insertUserPost(user); + // 重绑定微信信息 + if (Objects.nonNull(user.getSysUserAccount()) && Objects.nonNull(user.getSysUserAccount().getWxUnionId())) { + kSysUserService.unBindWxUnionIdByUserId(userId); + kSysUserService.bindWxUnionIdByUserId(userId, user.getSysUserAccount().getWxUnionId()); + } return userMapper.updateUser(user); } diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt index e784b2d00..dfcdef099 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt @@ -24,5 +24,7 @@ interface KSysUserMapper { */ fun checkWxUnionIdUnique(wxUnionId: String): SysUser? - fun insert(params: Map): Int + fun insertSysUserAccount(params: Map): Int + + fun updateSysUserAccount(params: Map): Int } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt index 9e5d20c74..b8e0cd485 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt @@ -28,4 +28,12 @@ interface IKSysUserService { * @return 结果 */ fun registerUserByWxUnionId(wxUnionId: String, deptId: Long?): Boolean + /** + * 绑定微信 + */ + fun bindWxUnionIdByUserId(userId: Long,wxUnionId: String): Int + /** + * 解绑微信 + */ + fun unBindWxUnionIdByUserId(userId: Long): Int } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt index 6ecefb287..a6a267d3e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt @@ -37,10 +37,38 @@ open class KSysUserServiceImpl : IKSysUserService { } return sysUserService.registerUser(user).apply { sysUserService.selectUserByUserName(user.userName) - kSysUserMapper.insert(mapOf( - "userId" to user.userId, - "wxUnionId" to wxUnionId, - )) + kSysUserMapper.insertSysUserAccount( + mapOf( + "userId" to user.userId, + "wxUnionId" to wxUnionId, + ) + ) } } + + override fun bindWxUnionIdByUserId(userId: Long, wxUnionId: String): Int { + if (sysUserService.selectUserById(userId).sysUserAccount != null) + return kSysUserMapper.updateSysUserAccount( + mapOf( + "userId" to userId, + "wxUnionId" to wxUnionId, + ) + ) + else + return kSysUserMapper.insertSysUserAccount( + mapOf( + "userId" to userId, + "wxUnionId" to wxUnionId, + ) + ) + } + + override fun unBindWxUnionIdByUserId(userId: Long): Int { + return kSysUserMapper.updateSysUserAccount( + mapOf( + "userId" to userId, + "wxUnionId" to null, + ) + ) + } } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml index e0a87bee3..b788e0304 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml @@ -71,7 +71,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select u.user_id, u.user_name from sys_user u left join sys_user_account ua on ua.user_id=u.user_id where ua.wx_unionid = #{wxUnionId} and u.del_flag = '0' limit 1 - + insert into sys_user_account(user_id, wx_unionid) values (#{userId},#{wxUnionId}) + + update sys_user_account set wx_unionid = #{wxUnionId} where user_id = #{userId} + \ No newline at end of file From 9a6556adc7eaf9e3353b1a4deb9b97196253be2e Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Sat, 30 Nov 2024 14:52:52 +0800 Subject: [PATCH 45/82] =?UTF-8?q?[fix]=20=E4=B8=AA=E5=88=AB=E5=AD=90?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=87=8D=E6=96=B0=E6=8C=87=E5=AE=9Akotlin?= =?UTF-8?q?=E7=9A=84=E7=BC=96=E8=AF=91=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-api/ruoyi-api-system/pom.xml | 29 ++++++++++++++++++++++++++++- ruoyi-modules/ruoyi-system/pom.xml | 24 ++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml index aa7634ea9..743e2ee64 100644 --- a/ruoyi-api/ruoyi-api-system/pom.xml +++ b/ruoyi-api/ruoyi-api-system/pom.xml @@ -24,5 +24,32 @@ - + + + + org.jetbrains.kotlin + kotlin-maven-plugin + ${kotlin.version} + + + compile + process-sources + + compile + + + + test-compile + test-compile + + test-compile + + + + + 21 + + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index f7b0a05cc..741d59aca 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -76,6 +76,30 @@ ${project.artifactId} + + org.jetbrains.kotlin + kotlin-maven-plugin + ${kotlin.version} + + + compile + process-sources + + compile + + + + test-compile + test-compile + + test-compile + + + + + 21 + + org.springframework.boot spring-boot-maven-plugin From 67413e3c122bce58cd89cc75dec19ad955b40a6c Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Sat, 30 Nov 2024 14:55:25 +0800 Subject: [PATCH 46/82] =?UTF-8?q?[feat]=20=E7=89=88=E6=9C=AC=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- ruoyi-api/pom.xml | 2 +- ruoyi-api/ruoyi-api-system/pom.xml | 2 +- ruoyi-auth/pom.xml | 2 +- ruoyi-common/pom.xml | 2 +- ruoyi-common/ruoyi-common-core/pom.xml | 2 +- ruoyi-common/ruoyi-common-datascope/pom.xml | 2 +- ruoyi-common/ruoyi-common-datasource/pom.xml | 2 +- ruoyi-common/ruoyi-common-log/pom.xml | 2 +- ruoyi-common/ruoyi-common-redis/pom.xml | 2 +- ruoyi-common/ruoyi-common-seata/pom.xml | 2 +- ruoyi-common/ruoyi-common-security/pom.xml | 2 +- ruoyi-common/ruoyi-common-sensitive/pom.xml | 2 +- ruoyi-common/ruoyi-common-swagger/pom.xml | 2 +- ruoyi-gateway/pom.xml | 2 +- ruoyi-modules/pom.xml | 2 +- ruoyi-modules/ruoyi-file/pom.xml | 2 +- ruoyi-modules/ruoyi-gen/pom.xml | 2 +- ruoyi-modules/ruoyi-job/pom.xml | 2 +- ruoyi-modules/ruoyi-system/pom.xml | 2 +- ruoyi-ui/package.json | 2 +- ruoyi-ui/src/views/index.vue | 4 ++-- ruoyi-visual/pom.xml | 2 +- ruoyi-visual/ruoyi-monitor/pom.xml | 2 +- 24 files changed, 26 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index bf2ecaa48..734f23739 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@

      logo

      -

      RuoYi v3.6.5.0.2

      +

      RuoYi v3.6.5.0.3

      基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的分布式微服务架构

      - +

      diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml index 9a9a23840..7429dbaa2 100644 --- a/ruoyi-api/pom.xml +++ b/ruoyi-api/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.2 + 3.6.5.0.3 4.0.0 diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml index 743e2ee64..50e790fab 100644 --- a/ruoyi-api/ruoyi-api-system/pom.xml +++ b/ruoyi-api/ruoyi-api-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-api - 3.6.5.0.2 + 3.6.5.0.3 4.0.0 diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index 94f0deb28..e7a88a5ed 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.2 + 3.6.5.0.3 4.0.0 diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 10b3d8835..fdc05e698 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.2 + 3.6.5.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index 230f893d6..765fc2bc4 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.2 + 3.6.5.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/ruoyi-common/ruoyi-common-datascope/pom.xml index 47e05e6a3..57a91a365 100644 --- a/ruoyi-common/ruoyi-common-datascope/pom.xml +++ b/ruoyi-common/ruoyi-common-datascope/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.2 + 3.6.5.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml index 9c20f3177..277ac57f2 100644 --- a/ruoyi-common/ruoyi-common-datasource/pom.xml +++ b/ruoyi-common/ruoyi-common-datasource/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.2 + 3.6.5.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml index 206b9c5ad..a462f58a4 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/ruoyi-common/ruoyi-common-log/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.2 + 3.6.5.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml index 6cea12fad..115c2b9b0 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/ruoyi-common/ruoyi-common-redis/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.2 + 3.6.5.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml index b8c7cf27d..0bf5a6f39 100644 --- a/ruoyi-common/ruoyi-common-seata/pom.xml +++ b/ruoyi-common/ruoyi-common-seata/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.2 + 3.6.5.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml index f693051b6..31b073aff 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/ruoyi-common/ruoyi-common-security/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.2 + 3.6.5.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/ruoyi-common/ruoyi-common-sensitive/pom.xml index abd667f35..a9bbef222 100644 --- a/ruoyi-common/ruoyi-common-sensitive/pom.xml +++ b/ruoyi-common/ruoyi-common-sensitive/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.2 + 3.6.5.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml index f34c36613..a6968e919 100644 --- a/ruoyi-common/ruoyi-common-swagger/pom.xml +++ b/ruoyi-common/ruoyi-common-swagger/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.2 + 3.6.5.0.3 4.0.0 diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index 9552d8b1a..c4041ef6f 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.2 + 3.6.5.0.3 4.0.0 diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index 6f01645f3..947a06244 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.2 + 3.6.5.0.3 4.0.0 diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index a496c05cf..459ab0b01 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/ruoyi-modules/ruoyi-file/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5.0.2 + 3.6.5.0.3 4.0.0 diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index c5c2d9c8f..4246bc803 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5.0.2 + 3.6.5.0.3 4.0.0 diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index df42d27ed..f918ebe53 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5.0.2 + 3.6.5.0.3 4.0.0 diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index 741d59aca..130323bc6 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5.0.2 + 3.6.5.0.3 4.0.0 diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index b20538be8..731766049 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "3.6.5.0.2", + "version": "3.6.5.0.3", "description": "若依管理系统", "author": "若依", "license": "MIT", diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 900563067..081400843 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -145,7 +145,7 @@ 更新日志 - +
      1. 使用SpringDoc代替Swagger
      2. 菜单管理新增路由名称
        3. @@ -946,7 +946,7 @@ export default { data() { return { // 版本号 - version: "3.6.5.0.2", + version: "3.6.5.0.3", }; }, methods: { diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml index 2cb6f040c..22b3055d1 100644 --- a/ruoyi-visual/pom.xml +++ b/ruoyi-visual/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.2 + 3.6.5.0.3 4.0.0 diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index b1c58497b..323074d6d 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/ruoyi-visual/ruoyi-monitor/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-visual - 3.6.5.0.2 + 3.6.5.0.3 4.0.0 From 36893ec5accb73ed6cee6bb879832d5688d588ed Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Sat, 30 Nov 2024 15:12:47 +0800 Subject: [PATCH 47/82] =?UTF-8?q?[fix]=20=E7=A7=BB=E9=99=A4jvmTarget?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 3 --- ruoyi-api/ruoyi-api-system/pom.xml | 3 --- ruoyi-modules/ruoyi-system/pom.xml | 3 --- 3 files changed, 9 deletions(-) diff --git a/pom.xml b/pom.xml index 4010f0890..5279b10fd 100644 --- a/pom.xml +++ b/pom.xml @@ -338,9 +338,6 @@ - - 21 - diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml index 50e790fab..6a72c67c9 100644 --- a/ruoyi-api/ruoyi-api-system/pom.xml +++ b/ruoyi-api/ruoyi-api-system/pom.xml @@ -46,9 +46,6 @@ - - 21 - diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index 130323bc6..04546a082 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -96,9 +96,6 @@ - - 21 - org.springframework.boot From e0368a0392dd3f18ea840f33ac291298d2b8feda Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Sat, 30 Nov 2024 15:17:11 +0800 Subject: [PATCH 48/82] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8DIKSysUserServic?= =?UTF-8?q?e=E7=9A=84=E5=BE=AA=E7=8E=AF=E4=BE=9D=E8=B5=96=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt index a6a267d3e..3853e6a1d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt @@ -8,10 +8,12 @@ import com.ruoyi.system.mapper.KSysUserMapper import com.ruoyi.system.service.IKSysUserService import com.ruoyi.system.service.ISysUserService import org.springframework.beans.factory.annotation.Autowired +import org.springframework.context.annotation.Lazy import org.springframework.stereotype.Service @Service open class KSysUserServiceImpl : IKSysUserService { + @Lazy @Autowired lateinit var sysUserService: ISysUserService From 3abe8976436b36117fd223733d5973fa4c7f919e Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Sat, 30 Nov 2024 17:27:45 +0800 Subject: [PATCH 49/82] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E5=BE=AE=E4=BF=A1=E6=B2=A1=E6=9C=89=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=BF=9B=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/service/impl/SysUserServiceImpl.java | 6 ++++-- .../system/controller/inner/InnerSysUserController.kt | 1 + .../kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt | 8 ++++++++ .../kotlin/com/ruoyi/system/service/IKSysUserService.kt | 9 +++++++++ .../com/ruoyi/system/service/impl/KSysUserServiceImpl.kt | 3 ++- .../src/main/resources/mapper/system/KSysUserMapper.xml | 8 ++++++-- 6 files changed, 30 insertions(+), 5 deletions(-) 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 37a715a26..06105b4c9 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 @@ -330,9 +330,11 @@ public class SysUserServiceImpl implements ISysUserService // 新增用户与岗位管理 insertUserPost(user); // 重绑定微信信息 - if (Objects.nonNull(user.getSysUserAccount()) && Objects.nonNull(user.getSysUserAccount().getWxUnionId())) { + if (Objects.nonNull(user.getSysUserAccount())) { kSysUserService.unBindWxUnionIdByUserId(userId); - kSysUserService.bindWxUnionIdByUserId(userId, user.getSysUserAccount().getWxUnionId()); + if (Objects.nonNull(user.getSysUserAccount().getWxUnionId())) { + kSysUserService.bindWxUnionIdByUserId(userId, user.getSysUserAccount().getWxUnionId()); + } } return userMapper.updateUser(user); } diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt index 2da4cca09..60005b906 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt @@ -136,6 +136,7 @@ open class InnerSysUserController : BaseController() { originUser.avatar = targetUser.avatar ?: originUser.avatar originUser.sex = targetUser.sex ?: originUser.sex originUser.updateBy = originUser.userName + originUser.sysUserAccount = loginUser.sysUser.sysUserAccount userService.updateUser(originUser) // 更新缓存用户信息 tokenService.setLoginUser(loginUser) diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt index dfcdef099..4636c3591 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt @@ -1,5 +1,6 @@ package com.ruoyi.system.mapper +import com.ruoyi.system.api.domain.KSysUserAccount import com.ruoyi.system.api.domain.SysUser /** @@ -8,6 +9,13 @@ import com.ruoyi.system.api.domain.SysUser * @author hsdllcw */ interface KSysUserMapper { + /** + * 通过id查询用户 + * + * @param userId + * @return 用户对象信息 + */ + fun selectUserById(userId: Long): KSysUserAccount? /** * 通过用户名查询用户 * diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt index b8e0cd485..262bf29e0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt @@ -1,10 +1,19 @@ package com.ruoyi.system.service +import com.ruoyi.system.api.domain.KSysUserAccount import com.ruoyi.system.api.domain.SysUser interface IKSysUserService { fun getISysUserService(): ISysUserService + /** + * 通过id查询用户 + * + * @param userId + * @return 用户对象信息 + */ + fun selectUserById(userId: Long): KSysUserAccount? + /** * 通过微信unionid查询用户 * diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt index 3853e6a1d..6df0d2d6b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt @@ -20,6 +20,7 @@ open class KSysUserServiceImpl : IKSysUserService { @Autowired lateinit var kSysUserMapper: KSysUserMapper override fun getISysUserService() = sysUserService + override fun selectUserById(userId: Long) = kSysUserMapper.selectUserById(userId) override fun selectUserByWxUnionId(wxUnionId: String) = kSysUserMapper.selectUserByWxUnionId(wxUnionId) override fun checkWxUnionIdUnique(wxUnionId: String) = kSysUserMapper.checkWxUnionIdUnique(wxUnionId)?.run { UserConstants.NOT_UNIQUE } ?: UserConstants.UNIQUE @@ -49,7 +50,7 @@ open class KSysUserServiceImpl : IKSysUserService { } override fun bindWxUnionIdByUserId(userId: Long, wxUnionId: String): Int { - if (sysUserService.selectUserById(userId).sysUserAccount != null) + if (this.selectUserById(userId) != null) return kSysUserMapper.updateSysUserAccount( mapOf( "userId" to userId, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml index b788e0304..6dca1e3e0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml @@ -23,11 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -61,6 +61,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_user_role ur on u.user_id = ur.user_id left join sys_role r on r.role_id = ur.role_id + + - select ua.user_id, ua.wx_unionid from sys_user_account ua where ua.user_id = #{userId} limit 1 + select umw.member_id, umw.unionid from ums_member_wechat umw where umw.member_id = #{userId} limit 1 - insert into sys_user_account(user_id, wx_unionid) values (#{userId},#{wxUnionId}) + insert into ums_member_wechat(member_id, unionid) values (#{userId},#{wxUnionId}) - update sys_user_account set wx_unionid = #{wxUnionId} where user_id = #{userId} + update ums_member_wechat set unionid = #{wxUnionId} where member_id = #{userId} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index a421594af..67ce240e0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -48,17 +48,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status, - ua.wx_unionid + umw.unionid from sys_user u - left join sys_user_account ua on ua.user_id = u.user_id + left join ums_member_wechat umw on umw.member_id = u.user_id left join sys_dept d on u.dept_id = d.dept_id left join sys_user_role ur on u.user_id = ur.user_id left join sys_role r on r.role_id = ur.role_id From 0d379583040fc668529cde165f97ffe0a7a53e9b Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Fri, 23 May 2025 14:28:47 +0800 Subject: [PATCH 64/82] =?UTF-8?q?[feat]=20=E9=87=8D=E6=9E=84KSysUserAccoun?= =?UTF-8?q?t=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +- pom.xml | 4 +- ruoyi-api/pom.xml | 2 +- ruoyi-api/ruoyi-api-system/pom.xml | 14 +- .../factory/RemoteUserFallbackFactory.java | 5 +- .../api/inner/InnerRemoteUserService.java | 14 +- .../system/api/domain/KSysUserAccount.kt | 18 +- ruoyi-auth/pom.xml | 2 +- ruoyi-common/pom.xml | 2 +- ruoyi-common/ruoyi-common-core/pom.xml | 2 +- ruoyi-common/ruoyi-common-datascope/pom.xml | 2 +- ruoyi-common/ruoyi-common-datasource/pom.xml | 2 +- ruoyi-common/ruoyi-common-log/pom.xml | 2 +- ruoyi-common/ruoyi-common-redis/pom.xml | 2 +- ruoyi-common/ruoyi-common-seata/pom.xml | 2 +- ruoyi-common/ruoyi-common-security/pom.xml | 2 +- ruoyi-common/ruoyi-common-sensitive/pom.xml | 2 +- ruoyi-common/ruoyi-common-swagger/pom.xml | 2 +- ruoyi-gateway/pom.xml | 2 +- ruoyi-modules/pom.xml | 2 +- ruoyi-modules/ruoyi-file/pom.xml | 2 +- ruoyi-modules/ruoyi-gen/pom.xml | 2 +- ruoyi-modules/ruoyi-job/pom.xml | 2 +- ruoyi-modules/ruoyi-system/pom.xml | 2 +- .../service/impl/SysUserServiceImpl.java | 62 +++--- .../inner/InnerSysUserController.kt | 17 +- .../com/ruoyi/system/mapper/KSysUserMapper.kt | 6 +- .../ruoyi/system/service/IKSysUserService.kt | 6 +- .../service/impl/KSysUserServiceImpl.kt | 32 +-- .../mapper/system/KSysUserMapper.xml | 190 ++++++++++++------ ruoyi-ui/src/views/index.vue | 4 +- ruoyi-visual/pom.xml | 2 +- ruoyi-visual/ruoyi-monitor/pom.xml | 2 +- 33 files changed, 247 insertions(+), 169 deletions(-) diff --git a/README.md b/README.md index b9af7750e..a307fd679 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@

        logo

        -

        RuoYi v3.6.5.0.6

        +

        RuoYi v3.6.5.0.7

        基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的分布式微服务架构

        - +

        diff --git a/pom.xml b/pom.xml index 77b588e2e..9ca9cad36 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ com.ruoyi ruoyi - 3.6.5.0.6 + 3.6.5.0.7 ruoyi http://www.ruoyi.vip 若依微服务系统 - 3.6.5.0.6 + 3.6.5.0.7 UTF-8 UTF-8 1.8 diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml index eb706cb6c..7b8c5a3b6 100644 --- a/ruoyi-api/pom.xml +++ b/ruoyi-api/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml index 3686d75a8..6b999b656 100644 --- a/ruoyi-api/ruoyi-api-system/pom.xml +++ b/ruoyi-api/ruoyi-api-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-api - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 @@ -22,7 +22,17 @@ com.ruoyi ruoyi-common-core - + + com.zkjiadi + zkjiadi-mall-api + 1.0.6 + + + com.squareup.okhttp3 + okhttp + + + 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 7f16c270f..b0f78812f 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,6 +1,7 @@ package com.ruoyi.system.api.factory; import com.github.pagehelper.Page; +import com.ruoyi.system.api.domain.KSysUserAccount; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,8 +12,6 @@ import com.ruoyi.system.api.RemoteUserService; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.model.LoginUser; -import java.util.Map; - /** * 用户服务降级处理 * @@ -76,7 +75,7 @@ public class RemoteUserFallbackFactory implements FallbackFactory registerUserByWxUnionId_Inner(Map params, String source) { + public R registerUserBySysUserAccount_Inner(KSysUserAccount sysUserAccount, Long deptId, String source) { return R.fail("注册用户失败:" + throwable.getMessage()); } }; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java index 64b9b75ef..e6f0d6f02 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java @@ -3,6 +3,7 @@ package com.ruoyi.system.api.inner; import com.github.pagehelper.Page; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.domain.R; +import com.ruoyi.system.api.domain.KSysUserAccount; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.model.LoginUser; import org.springframework.web.bind.annotation.*; @@ -18,17 +19,17 @@ public interface InnerRemoteUserService { * @return 结果 */ @GetMapping("/inner/user/detail/{userId}") - R getById_Inner(@PathVariable("userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + R getById_Inner(@PathVariable("userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 通过用户ID查询用户信息 * * @param unionid 用户微信unionid - * @param source 请求来源 + * @param source 请求来源 * @return 结果 */ @GetMapping("/inner/user/detail/wx/unionid/{unionid}") - R getByWxUnionId_Inner(@PathVariable("unionid") String unionid, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + R getByWxUnionId_Inner(@PathVariable("unionid") String unionid, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 通过手机号查询用户信息 @@ -56,10 +57,11 @@ public interface InnerRemoteUserService { /** * 注册用户信息 * - * @param params 包含微信unionId和deptId + * @param sysUserAccount 包含微信unionId + * @param deptId 包含部门ID * @param source 请求来源 * @return 结果 */ - @PostMapping("/inner/user/register/wx/unionid") - public R registerUserByWxUnionId_Inner(@RequestBody Map params, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + @PostMapping("/inner/user/register/dept/{deptId}/wx/unionid") + public R registerUserBySysUserAccount_Inner(@RequestBody KSysUserAccount sysUserAccount,@PathVariable Long deptId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } \ No newline at end of file diff --git a/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/domain/KSysUserAccount.kt b/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/domain/KSysUserAccount.kt index e96b447aa..7da28c373 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/domain/KSysUserAccount.kt +++ b/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/domain/KSysUserAccount.kt @@ -1,9 +1,21 @@ package com.ruoyi.system.api.domain -class KSysUserAccount { +import com.cyl.manager.ums.domain.entity.MemberWechat + +open class KSysUserAccount : MemberWechat() { /** 用户ID */ - var userId: Long? = null + open var userId: Long? = null + set(value) { + memberId = value + field = value + } + get() = memberId /** 微信UnionId */ - var wxUnionId: String? = null + open var wxUnionId: String? = null + set(value) { + unionid = value + field = value + } + get() = unionid } \ No newline at end of file diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index c8d82173b..dd45508a7 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 50ea1ab4f..63885a052 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index c7c62fa22..fd038fe38 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/ruoyi-common/ruoyi-common-datascope/pom.xml index 695d6f8fd..1778e91c9 100644 --- a/ruoyi-common/ruoyi-common-datascope/pom.xml +++ b/ruoyi-common/ruoyi-common-datascope/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml index 5fba98f43..a98ebbc83 100644 --- a/ruoyi-common/ruoyi-common-datasource/pom.xml +++ b/ruoyi-common/ruoyi-common-datasource/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml index 05c885e4a..cef3064fd 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/ruoyi-common/ruoyi-common-log/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml index db637f8ce..e5f803291 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/ruoyi-common/ruoyi-common-redis/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml index 358bb694a..7e18a1a20 100644 --- a/ruoyi-common/ruoyi-common-seata/pom.xml +++ b/ruoyi-common/ruoyi-common-seata/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml index 07701b78b..95987a444 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/ruoyi-common/ruoyi-common-security/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/ruoyi-common/ruoyi-common-sensitive/pom.xml index 555045b59..7f1969ba5 100644 --- a/ruoyi-common/ruoyi-common-sensitive/pom.xml +++ b/ruoyi-common/ruoyi-common-sensitive/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml index 50370fa98..5ab310fa2 100644 --- a/ruoyi-common/ruoyi-common-swagger/pom.xml +++ b/ruoyi-common/ruoyi-common-swagger/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index bd3c15cef..88d448f48 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index 736a77870..cb7865309 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index da42c57e8..d4146a624 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/ruoyi-modules/ruoyi-file/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index 750565011..483abb6fa 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index e1ff46dc1..ca538b373 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index c354f8f31..f8bec3915 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 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 06105b4c9..a85101f9a 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 @@ -7,6 +7,7 @@ import java.util.stream.Collectors; import javax.validation.Validator; import com.github.pagehelper.Page; +import com.ruoyi.system.api.domain.KSysUserAccount; import com.ruoyi.system.service.IKSysUserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +38,7 @@ import com.ruoyi.system.service.ISysUserService; /** * 用户 业务层处理 - * + * * @author ruoyi */ @Service @@ -74,7 +75,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 根据条件分页查询用户列表 - * + * * @param user 用户信息 * @return 用户信息集合信息 */ @@ -87,7 +88,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 根据条件分页查询已分配用户角色列表 - * + * * @param user 用户信息 * @return 用户信息集合信息 */ @@ -100,7 +101,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 根据条件分页查询未分配用户角色列表 - * + * * @param user 用户信息 * @return 用户信息集合信息 */ @@ -113,7 +114,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 通过用户名查询用户 - * + * * @param userName 用户名 * @return 用户对象信息 */ @@ -147,7 +148,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 通过用户ID查询用户 - * + * * @param userId 用户ID * @return 用户对象信息 */ @@ -159,7 +160,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 查询用户所属角色组 - * + * * @param userName 用户名 * @return 结果 */ @@ -176,7 +177,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 查询用户所属岗位组 - * + * * @param userName 用户名 * @return 结果 */ @@ -193,7 +194,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 校验用户名称是否唯一 - * + * * @param user 用户信息 * @return 结果 */ @@ -247,7 +248,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 校验用户是否允许操作 - * + * * @param user 用户信息 */ @Override @@ -261,7 +262,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 校验用户是否有数据权限 - * + * * @param userId 用户id */ @Override @@ -281,7 +282,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 新增保存用户信息 - * + * * @param user 用户信息 * @return 结果 */ @@ -300,7 +301,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 注册用户信息 - * + * * @param user 用户信息 * @return 结果 */ @@ -312,14 +313,13 @@ public class SysUserServiceImpl implements ISysUserService /** * 修改保存用户信息 - * + * * @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); @@ -331,9 +331,11 @@ public class SysUserServiceImpl implements ISysUserService insertUserPost(user); // 重绑定微信信息 if (Objects.nonNull(user.getSysUserAccount())) { - kSysUserService.unBindWxUnionIdByUserId(userId); + KSysUserAccount sysUserAccount = new KSysUserAccount(); + sysUserAccount.setUserId(userId); + kSysUserService.updateSysUserAccount(sysUserAccount); if (Objects.nonNull(user.getSysUserAccount().getWxUnionId())) { - kSysUserService.bindWxUnionIdByUserId(userId, user.getSysUserAccount().getWxUnionId()); + kSysUserService.updateSysUserAccount(user.getSysUserAccount()); } } return userMapper.updateUser(user); @@ -341,7 +343,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 用户授权角色 - * + * * @param userId 用户ID * @param roleIds 角色组 */ @@ -355,7 +357,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 修改用户状态 - * + * * @param user 用户信息 * @return 结果 */ @@ -367,7 +369,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 修改用户基本信息 - * + * * @param user 用户信息 * @return 结果 */ @@ -379,7 +381,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 修改用户头像 - * + * * @param userName 用户名 * @param avatar 头像地址 * @return 结果 @@ -392,7 +394,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 重置用户密码 - * + * * @param user 用户信息 * @return 结果 */ @@ -404,7 +406,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 重置用户密码 - * + * * @param userName 用户名 * @param password 密码 * @return 结果 @@ -417,7 +419,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 新增用户角色信息 - * + * * @param user 用户对象 */ public void insertUserRole(SysUser user) @@ -427,7 +429,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 新增用户岗位信息 - * + * * @param user 用户对象 */ public void insertUserPost(SysUser user) @@ -450,7 +452,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 新增用户角色信息 - * + * * @param userId 用户ID * @param roleIds 角色组 */ @@ -473,7 +475,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 通过用户ID删除用户 - * + * * @param userId 用户ID * @return 结果 */ @@ -490,7 +492,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 批量删除用户信息 - * + * * @param userIds 需要删除的用户ID * @return 结果 */ @@ -512,7 +514,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 导入用户数据 - * + * * @param userList 用户数据列表 * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据 * @param operName 操作用户 diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt index 6e53b6e57..d3be5411c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt @@ -10,6 +10,7 @@ import com.ruoyi.common.log.annotation.Log import com.ruoyi.common.log.enums.BusinessType import com.ruoyi.common.security.annotation.InnerAuth import com.ruoyi.common.security.service.TokenService +import com.ruoyi.system.api.domain.KSysUserAccount import com.ruoyi.system.api.domain.SysUser import com.ruoyi.system.api.model.LoginUser import com.ruoyi.system.service.IKSysUserService @@ -150,17 +151,15 @@ open class InnerSysUserController : BaseController() { * 注册用户信息 */ @InnerAuth - @PostMapping("/register/wx/unionid") - fun registerUserByWxUnionId(@RequestBody params: Map): R { - if (!("true" == configService.selectConfigByKey("sys.account.registerUser"))) { + @PostMapping("/register/dept/{deptId}/wx/unionid") + fun registerUserBySysUserAccount(@RequestBody sysUserAccount: KSysUserAccount, @PathVariable deptId: Long): R { + if ("true" != configService.selectConfigByKey("sys.account.registerUser")) { return R.fail("当前系统没有开启注册功能！") } - val unionid = params.get("unionId") - val deptId = params.get("deptId")?.toLong() - if (unionid == null) return R.fail("微信unionid不存在无法注册") - if (!kSysUserService.checkWxUnionIdUnique(unionid)) { - return R.fail("保存用户'$unionid'失败，注册账号已存在") + if (sysUserAccount.wxUnionId == null) return R.fail("微信unionid不存在无法注册") + if (!kSysUserService.checkWxUnionIdUnique(sysUserAccount.wxUnionId!!)) { + return R.fail("保存用户'$sysUserAccount.wxUnionId'失败，注册账号已存在") } - return R.ok(kSysUserService.registerUserByWxUnionId(unionid, deptId)) + return R.ok(kSysUserService.registerUserBySysUserAccount(sysUserAccount, deptId)) } } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt index 4636c3591..fd57b87cb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt @@ -32,7 +32,9 @@ interface KSysUserMapper { */ fun checkWxUnionIdUnique(wxUnionId: String): SysUser? - fun insertSysUserAccount(params: Map): Int + fun insertSysUserAccount(sysUserAccount: KSysUserAccount): Int - fun updateSysUserAccount(params: Map): Int + fun updateSysUserAccount(sysUserAccount: KSysUserAccount): Int + + fun unBindWxUnionIdByUserId(params: Map): Int } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt index 262bf29e0..7c1c77b49 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt @@ -33,14 +33,14 @@ interface IKSysUserService { /** * 注册用户信息 * - * @param wxUnionId 微信unionId + * @param sysUserAccount 包含微信unionId * @return 结果 */ - fun registerUserByWxUnionId(wxUnionId: String, deptId: Long?): Boolean + fun registerUserBySysUserAccount(sysUserAccount: KSysUserAccount, deptId: Long): Boolean /** * 绑定微信 */ - fun bindWxUnionIdByUserId(userId: Long,wxUnionId: String): Int + fun updateSysUserAccount(sysUserAccount: KSysUserAccount): Int /** * 解绑微信 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt index 6df0d2d6b..c33c39c88 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt @@ -3,6 +3,7 @@ package com.ruoyi.system.service.impl import com.ruoyi.common.core.constant.UserConstants import com.ruoyi.common.core.utils.uuid.IdUtils import com.ruoyi.common.security.utils.SecurityUtils +import com.ruoyi.system.api.domain.KSysUserAccount import com.ruoyi.system.api.domain.SysUser import com.ruoyi.system.mapper.KSysUserMapper import com.ruoyi.system.service.IKSysUserService @@ -28,10 +29,11 @@ open class KSysUserServiceImpl : IKSysUserService { /** * 注册用户信息 * - * @param wxUnionId 微信unionId + * @param sysUserAccount 包含微信unionId + * @param deptId 部门ID * @return 结果 */ - override fun registerUserByWxUnionId(wxUnionId: String, deptId: Long?): Boolean { + override fun registerUserBySysUserAccount(sysUserAccount: KSysUserAccount, deptId: Long): Boolean { val user = SysUser().apply { userName = IdUtils.randomUUID().replace("-".toRegex(), "").substring(0, 30) nickName = "嘉迪微信用户" @@ -40,34 +42,16 @@ open class KSysUserServiceImpl : IKSysUserService { } return sysUserService.registerUser(user).apply { sysUserService.selectUserByUserName(user.userName) - kSysUserMapper.insertSysUserAccount( - mapOf( - "userId" to user.userId, - "wxUnionId" to wxUnionId, - ) - ) + kSysUserMapper.insertSysUserAccount(sysUserAccount) } } - override fun bindWxUnionIdByUserId(userId: Long, wxUnionId: String): Int { - if (this.selectUserById(userId) != null) - return kSysUserMapper.updateSysUserAccount( - mapOf( - "userId" to userId, - "wxUnionId" to wxUnionId, - ) - ) - else - return kSysUserMapper.insertSysUserAccount( - mapOf( - "userId" to userId, - "wxUnionId" to wxUnionId, - ) - ) + override fun updateSysUserAccount(sysUserAccount: KSysUserAccount): Int { + return kSysUserMapper.updateSysUserAccount(sysUserAccount) } override fun unBindWxUnionIdByUserId(userId: Long): Int { - return kSysUserMapper.updateSysUserAccount( + return kSysUserMapper.unBindWxUnionIdByUserId( mapOf( "userId" to userId, "wxUnionId" to null, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml index fa7a75e10..c6db0301b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml @@ -1,84 +1,152 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - + - - - - - - + + + + + + - - - select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, - d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, - r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status, - umw.unionid + + + select u.user_id, + u.dept_id, + u.user_name, + u.nick_name, + u.email, + u.avatar, + u.phonenumber, + u.password, + u.sex, + u.status, + u.del_flag, + u.login_ip, + u.login_date, + u.create_by, + u.create_time, + u.remark, + d.dept_id, + d.parent_id, + d.ancestors, + d.dept_name, + d.order_num, + d.leader, + d.status as dept_status, + r.role_id, + r.role_name, + r.role_key, + r.role_sort, + r.data_scope, + r.status as role_status, + umw.unionid from sys_user u - left join ums_member_wechat umw on umw.member_id = u.user_id - left join sys_dept d on u.dept_id = d.dept_id - left join sys_user_role ur on u.user_id = ur.user_id - left join sys_role r on r.role_id = ur.role_id + left join ums_member_wechat umw on umw.member_id = u.user_id + left join sys_dept d on u.dept_id = d.dept_id + left join sys_user_role ur on u.user_id = ur.user_id + left join sys_role r on r.role_id = ur.role_id - + - + - - insert into ums_member_wechat(member_id, unionid) values (#{userId},#{wxUnionId}) + + insert into ums_member_wechat(member_id, unionid, openid, routine_openid, groupid, tagid_list, subscribe, + subscribe_time, session_key, access_token, expires_in, refresh_token, expire_time) + values (#{userId}, #{wxUnionId}, #{openid}, #{routineOpenid}, #{groupid}, #{tagidList}, #{subscribe}, + #{subscribeTime}, #{sessionKey}, #{accessToken}, #{expiresIn}, #{refreshToken}, #{expireTime}) - - update ums_member_wechat set unionid = #{wxUnionId} where member_id = #{userId} + + update ums_member_wechat + set unionid = #{wxUnionId}, + openid = #{openid}, + routine_openid = #{routineOpenid}, + groupid = #{groupid}, + tagid_list = #{tagidList}, + subscribe = #{subscribe}, + subscribe_time = #{subscribeTime}, + session_key = #{sessionKey}, + access_token = #{accessToken}, + expires_in = #{expiresIn}, + refresh_token = #{refreshToken}, + expire_time = #{expireTime} + where member_id = #{userId} + + + update ums_member_wechat + set unionid = #{wxUnionId} + where member_id = #{userId} \ No newline at end of file diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 93081e3ae..50383328b 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -108,7 +108,7 @@ 更新日志 - +
        1. 使用SpringDoc代替Swagger
        2. 菜单管理新增路由名称
          3. @@ -909,7 +909,7 @@ export default { data() { return { // 版本号 - version: "3.6.5.0.6", + version: "3.6.5.0.7", }; }, methods: { diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml index 287a9bf14..cabc16a20 100644 --- a/ruoyi-visual/pom.xml +++ b/ruoyi-visual/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index 4df90d0b5..9f982940e 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/ruoyi-visual/ruoyi-monitor/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-visual - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 From a08d2a2ab87071fae8c9f415a54746a7effbe368 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Fri, 23 May 2025 14:55:06 +0800 Subject: [PATCH 65/82] [fix] PathVariable annotation was empty on param 1 --- .../java/com/ruoyi/system/api/inner/InnerRemoteUserService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java index e6f0d6f02..98f8078a1 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java @@ -63,5 +63,5 @@ public interface InnerRemoteUserService { * @return 结果 */ @PostMapping("/inner/user/register/dept/{deptId}/wx/unionid") - public R registerUserBySysUserAccount_Inner(@RequestBody KSysUserAccount sysUserAccount,@PathVariable Long deptId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + public R registerUserBySysUserAccount_Inner(@RequestBody KSysUserAccount sysUserAccount,@PathVariable("deptId") Long deptId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } \ No newline at end of file From bea7a6efd32d4853069746c6e026d9814b31c1a2 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Tue, 27 May 2025 09:20:10 +0800 Subject: [PATCH 66/82] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8Dums=5Fmember=5F?= =?UTF-8?q?wechat=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE=E6=97=B6=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E4=BF=9D=E5=AD=98member=5Fid=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt index c33c39c88..481260936 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt @@ -41,7 +41,7 @@ open class KSysUserServiceImpl : IKSysUserService { this.deptId = deptId } return sysUserService.registerUser(user).apply { - sysUserService.selectUserByUserName(user.userName) + sysUserAccount.memberId = sysUserService.selectUserByUserName(user.userName).userId kSysUserMapper.insertSysUserAccount(sysUserAccount) } } From 585d83d00705308382d97412f1cb49f93d9f8036 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Tue, 27 May 2025 15:12:23 +0800 Subject: [PATCH 67/82] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E7=99=BB=E5=BD=95=E5=90=8Eunionid=E5=92=8Copenid?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=A2=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysUserServiceImpl.java | 4 +-- .../inner/InnerSysUserController.kt | 2 +- .../com/ruoyi/system/mapper/KSysUserMapper.kt | 4 ++- .../ruoyi/system/service/IKSysUserService.kt | 2 +- .../service/impl/KSysUserServiceImpl.kt | 9 ++--- .../mapper/system/KSysUserMapper.xml | 33 +++++++++++-------- 6 files changed, 27 insertions(+), 27 deletions(-) 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 a85101f9a..4fb547586 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 @@ -331,10 +331,8 @@ public class SysUserServiceImpl implements ISysUserService insertUserPost(user); // 重绑定微信信息 if (Objects.nonNull(user.getSysUserAccount())) { - KSysUserAccount sysUserAccount = new KSysUserAccount(); - sysUserAccount.setUserId(userId); - kSysUserService.updateSysUserAccount(sysUserAccount); if (Objects.nonNull(user.getSysUserAccount().getWxUnionId())) { + kSysUserService.unBindWxByUserId(userId); kSysUserService.updateSysUserAccount(user.getSysUserAccount()); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt index d3be5411c..0aeedc9a9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt @@ -140,7 +140,7 @@ open class InnerSysUserController : BaseController() { originUser.avatar = targetUser.avatar ?: originUser.avatar originUser.sex = targetUser.sex ?: originUser.sex originUser.updateBy = originUser.userName - originUser.sysUserAccount = loginUser.sysUser.sysUserAccount + originUser.sysUserAccount = loginUser.sysUser.sysUserAccount.apply { this.userId = originUser.userId } userService.updateUser(originUser) // 更新缓存用户信息 tokenService.setLoginUser(loginUser) diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt index fd57b87cb..2ddf46e67 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt @@ -2,6 +2,7 @@ package com.ruoyi.system.mapper import com.ruoyi.system.api.domain.KSysUserAccount import com.ruoyi.system.api.domain.SysUser +import org.apache.ibatis.annotations.Param /** * 用户表 数据层 @@ -16,6 +17,7 @@ interface KSysUserMapper { * @return 用户对象信息 */ fun selectUserById(userId: Long): KSysUserAccount? + /** * 通过用户名查询用户 * @@ -36,5 +38,5 @@ interface KSysUserMapper { fun updateSysUserAccount(sysUserAccount: KSysUserAccount): Int - fun unBindWxUnionIdByUserId(params: Map): Int + fun unBindWxByUserId(@Param("userId") userId: Long): Int } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt index 7c1c77b49..968b58603 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt @@ -44,5 +44,5 @@ interface IKSysUserService { /** * 解绑微信 */ - fun unBindWxUnionIdByUserId(userId: Long): Int + fun unBindWxByUserId(userId: Long): Int } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt index 481260936..6e00e32b6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt @@ -50,12 +50,7 @@ open class KSysUserServiceImpl : IKSysUserService { return kSysUserMapper.updateSysUserAccount(sysUserAccount) } - override fun unBindWxUnionIdByUserId(userId: Long): Int { - return kSysUserMapper.unBindWxUnionIdByUserId( - mapOf( - "userId" to userId, - "wxUnionId" to null, - ) - ) + override fun unBindWxByUserId(userId: Long): Int { + return kSysUserMapper.unBindWxByUserId(userId) } } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml index c6db0301b..50511d346 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml @@ -130,23 +130,28 @@ update ums_member_wechat - set unionid = #{wxUnionId}, - openid = #{openid}, - routine_openid = #{routineOpenid}, - groupid = #{groupid}, - tagid_list = #{tagidList}, - subscribe = #{subscribe}, - subscribe_time = #{subscribeTime}, - session_key = #{sessionKey}, - access_token = #{accessToken}, - expires_in = #{expiresIn}, - refresh_token = #{refreshToken}, - expire_time = #{expireTime} + + unionid = #{unionid}, + openid = #{openid}, + routine_openid = #{routineOpenid}, + groupid = #{groupid}, + tagid_list = #{tagidList}, + subscribe = #{subscribe}, + subscribe_time = #{subscribeTime}, + session_key = #{sessionKey}, + access_token = #{accessToken}, + expires_in = #{expiresIn}, + refresh_token = #{refreshToken}, + expire_time = #{expireTime}, + update_time = sysdate() + where member_id = #{userId} - + update ums_member_wechat - set unionid = #{wxUnionId} + set unionid = null, + openid = null, + routine_openid = null where member_id = #{userId} \ No newline at end of file From 26ec9c7423c1284569b661aee1ae612d34084a1f Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Tue, 27 May 2025 15:49:10 +0800 Subject: [PATCH 68/82] =?UTF-8?q?[feat]=20=E6=96=B0=E5=A2=9E=E8=A7=A3?= =?UTF-8?q?=E7=BB=91=E5=BE=AE=E4=BF=A1api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- pom.xml | 4 ++-- ruoyi-api/pom.xml | 2 +- ruoyi-api/ruoyi-api-system/pom.xml | 2 +- .../api/factory/RemoteUserFallbackFactory.java | 5 +++++ .../system/api/inner/InnerRemoteUserService.java | 12 +++++++++++- ruoyi-auth/pom.xml | 2 +- ruoyi-common/pom.xml | 2 +- ruoyi-common/ruoyi-common-core/pom.xml | 2 +- ruoyi-common/ruoyi-common-datascope/pom.xml | 2 +- ruoyi-common/ruoyi-common-datasource/pom.xml | 2 +- ruoyi-common/ruoyi-common-log/pom.xml | 2 +- ruoyi-common/ruoyi-common-redis/pom.xml | 2 +- ruoyi-common/ruoyi-common-seata/pom.xml | 2 +- ruoyi-common/ruoyi-common-security/pom.xml | 2 +- ruoyi-common/ruoyi-common-sensitive/pom.xml | 2 +- ruoyi-common/ruoyi-common-swagger/pom.xml | 2 +- ruoyi-gateway/pom.xml | 2 +- ruoyi-modules/pom.xml | 2 +- ruoyi-modules/ruoyi-file/pom.xml | 2 +- ruoyi-modules/ruoyi-gen/pom.xml | 2 +- ruoyi-modules/ruoyi-job/pom.xml | 2 +- ruoyi-modules/ruoyi-system/pom.xml | 2 +- .../system/service/impl/SysUserServiceImpl.java | 3 +-- .../controller/inner/InnerSysUserController.kt | 13 ++++++++++++- ruoyi-ui/src/views/index.vue | 4 ++-- ruoyi-visual/pom.xml | 2 +- ruoyi-visual/ruoyi-monitor/pom.xml | 2 +- 28 files changed, 56 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index a307fd679..ca87f510e 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@

          logo

          -

          RuoYi v3.6.5.0.7

          +

          RuoYi v3.6.5.0.8

          基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的分布式微服务架构

          - +

          diff --git a/pom.xml b/pom.xml index 742f13f99..b89229197 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ com.ruoyi ruoyi - 3.6.5.0.7 + 3.6.5.0.8 ruoyi http://www.ruoyi.vip 若依微服务系统 - 3.6.5.0.7 + 3.6.5.0.8 UTF-8 UTF-8 1.8 diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml index 7b8c5a3b6..a0952ae56 100644 --- a/ruoyi-api/pom.xml +++ b/ruoyi-api/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.7 + 3.6.5.0.8 4.0.0 diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml index 6b999b656..07182762c 100644 --- a/ruoyi-api/ruoyi-api-system/pom.xml +++ b/ruoyi-api/ruoyi-api-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-api - 3.6.5.0.7 + 3.6.5.0.8 4.0.0 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 b0f78812f..88b20845a 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 @@ -78,6 +78,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory registerUserBySysUserAccount_Inner(KSysUserAccount sysUserAccount, Long deptId, String source) { return R.fail("注册用户失败:" + throwable.getMessage()); } + + @Override + public R unbindWeixin_Inner(Long userId, String source) { + return R.fail("解绑微信失败:" + throwable.getMessage()); + } }; } } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java index 98f8078a1..f2d038087 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java @@ -63,5 +63,15 @@ public interface InnerRemoteUserService { * @return 结果 */ @PostMapping("/inner/user/register/dept/{deptId}/wx/unionid") - public R registerUserBySysUserAccount_Inner(@RequestBody KSysUserAccount sysUserAccount,@PathVariable("deptId") Long deptId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + R registerUserBySysUserAccount_Inner(@RequestBody KSysUserAccount sysUserAccount, @PathVariable("deptId") Long deptId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + /** + * 解绑微信 + * + * @param userId 用户ID + * @param source 请求来源 + * @return 结果 + */ + @PutMapping("/inner/user/{userId}/unbind/weixin") + R unbindWeixin_Inner(@PathVariable("userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } \ No newline at end of file diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index dd45508a7..59094a488 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.7 + 3.6.5.0.8 4.0.0 diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 63885a052..ce988cb68 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.7 + 3.6.5.0.8 4.0.0 diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index fd038fe38..7d86a7695 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.7 + 3.6.5.0.8 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/ruoyi-common/ruoyi-common-datascope/pom.xml index 1778e91c9..417dc4ab5 100644 --- a/ruoyi-common/ruoyi-common-datascope/pom.xml +++ b/ruoyi-common/ruoyi-common-datascope/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.7 + 3.6.5.0.8 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml index a98ebbc83..25d4eb8b1 100644 --- a/ruoyi-common/ruoyi-common-datasource/pom.xml +++ b/ruoyi-common/ruoyi-common-datasource/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.7 + 3.6.5.0.8 4.0.0 diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml index cef3064fd..7d6f7be77 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/ruoyi-common/ruoyi-common-log/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.7 + 3.6.5.0.8 4.0.0 diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml index e5f803291..63de4bbae 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/ruoyi-common/ruoyi-common-redis/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.7 + 3.6.5.0.8 4.0.0 diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml index 7e18a1a20..94de8affa 100644 --- a/ruoyi-common/ruoyi-common-seata/pom.xml +++ b/ruoyi-common/ruoyi-common-seata/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.7 + 3.6.5.0.8 4.0.0 diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml index 95987a444..7154ec52a 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/ruoyi-common/ruoyi-common-security/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.7 + 3.6.5.0.8 4.0.0 diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/ruoyi-common/ruoyi-common-sensitive/pom.xml index 7f1969ba5..898a7c4ca 100644 --- a/ruoyi-common/ruoyi-common-sensitive/pom.xml +++ b/ruoyi-common/ruoyi-common-sensitive/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.7 + 3.6.5.0.8 4.0.0 diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml index 5ab310fa2..f01a42810 100644 --- a/ruoyi-common/ruoyi-common-swagger/pom.xml +++ b/ruoyi-common/ruoyi-common-swagger/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.7 + 3.6.5.0.8 4.0.0 diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index 88d448f48..745feb983 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.7 + 3.6.5.0.8 4.0.0 diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index cb7865309..943a768ac 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.7 + 3.6.5.0.8 4.0.0 diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index d4146a624..3050adfaa 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/ruoyi-modules/ruoyi-file/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5.0.7 + 3.6.5.0.8 4.0.0 diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index 483abb6fa..0c93f077b 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5.0.7 + 3.6.5.0.8 4.0.0 diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index ca538b373..bde3ab1e5 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5.0.7 + 3.6.5.0.8 4.0.0 diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index f8bec3915..4cde9e928 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5.0.7 + 3.6.5.0.8 4.0.0 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 4fb547586..fa5d7c0b7 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 @@ -329,10 +329,9 @@ public class SysUserServiceImpl implements ISysUserService userPostMapper.deleteUserPostByUserId(userId); // 新增用户与岗位管理 insertUserPost(user); - // 重绑定微信信息 + // 更新微信信息 if (Objects.nonNull(user.getSysUserAccount())) { if (Objects.nonNull(user.getSysUserAccount().getWxUnionId())) { - kSysUserService.unBindWxByUserId(userId); kSysUserService.updateSysUserAccount(user.getSysUserAccount()); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt index 0aeedc9a9..18d47c165 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt @@ -10,6 +10,7 @@ import com.ruoyi.common.log.annotation.Log import com.ruoyi.common.log.enums.BusinessType import com.ruoyi.common.security.annotation.InnerAuth import com.ruoyi.common.security.service.TokenService +import com.ruoyi.common.security.utils.SecurityUtils import com.ruoyi.system.api.domain.KSysUserAccount import com.ruoyi.system.api.domain.SysUser import com.ruoyi.system.api.model.LoginUser @@ -81,7 +82,7 @@ open class InnerSysUserController : BaseController() { */ @InnerAuth @GetMapping("/detail/{userId}") - fun infoById(@PathVariable("userId") userId: Long?): R { + fun infoById(@PathVariable("userId") userId: Long): R { val sysUser: SysUser = userService.selectUserById(userId) // 角色集合 val roles: Set = permissionService.getRolePermission(sysUser) @@ -162,4 +163,14 @@ open class InnerSysUserController : BaseController() { } return R.ok(kSysUserService.registerUserBySysUserAccount(sysUserAccount, deptId)) } + @InnerAuth + @PutMapping("/{userId}/unbind/weixin") + @Log(title = "解绑微信", businessType = BusinessType.UPDATE) + fun unbindWeChat(@PathVariable("userId") userId: Long): AjaxResult { + val loginUser = SecurityUtils.getLoginUser() + kSysUserService.unBindWxByUserId(userId) + // 更新缓存用户信息 + tokenService.loginUser = loginUser + return success(loginUser) + } } \ No newline at end of file diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 50383328b..4b5a72a00 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -108,7 +108,7 @@ 更新日志 - +
          1. 使用SpringDoc代替Swagger
          2. 菜单管理新增路由名称
            3. @@ -909,7 +909,7 @@ export default { data() { return { // 版本号 - version: "3.6.5.0.7", + version: "3.6.5.0.8", }; }, methods: { diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml index cabc16a20..34ccb695e 100644 --- a/ruoyi-visual/pom.xml +++ b/ruoyi-visual/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.7 + 3.6.5.0.8 4.0.0 diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index 9f982940e..6f490074f 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/ruoyi-visual/ruoyi-monitor/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-visual - 3.6.5.0.7 + 3.6.5.0.8 4.0.0 From da3416821e6c2a13b70133d444ccfb4752e8ea64 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Tue, 17 Jun 2025 17:22:49 +0800 Subject: [PATCH 69/82] =?UTF-8?q?[feat]=20=E6=9C=8D=E5=8A=A1=E8=BF=81?= =?UTF-8?q?=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap-dev-prod.yml | 33 +++++++++++++++++++ .../src/main/resources/bootstrap-prod.yml | 2 +- .../src/main/resources/bootstrap-prod.yml | 2 +- .../src/main/resources/bootstrap-prod.yml | 2 +- .../src/main/resources/bootstrap-prod.yml | 2 +- .../src/main/resources/bootstrap-prod.yml | 2 +- .../src/main/resources/bootstrap-prod.yml | 2 +- .../src/main/resources/bootstrap-prod.yml | 2 +- 8 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 ruoyi-auth/src/main/resources/bootstrap-dev-prod.yml diff --git a/ruoyi-auth/src/main/resources/bootstrap-dev-prod.yml b/ruoyi-auth/src/main/resources/bootstrap-dev-prod.yml new file mode 100644 index 000000000..98e5063a3 --- /dev/null +++ b/ruoyi-auth/src/main/resources/bootstrap-dev-prod.yml @@ -0,0 +1,33 @@ +# Tomcat +server: + port: 9200 + +#测试环境 +spring: + application: + # 应用名称 + name: ruoyi-auth + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.zkjiadi.cc + namespace: 78a7f41e-46cc-437a-9716-735888227693 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA + config: + # 配置中心地址 + server-addr: nacos.zkjiadi.cc + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: 78a7f41e-46cc-437a-9716-735888227693 + username: nacos + password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA +logging: + file: + name: prod-ruoyi-auth.log + pattern: + file: "%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(${PID}){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wEx" \ No newline at end of file diff --git a/ruoyi-auth/src/main/resources/bootstrap-prod.yml b/ruoyi-auth/src/main/resources/bootstrap-prod.yml index 90c88f768..fb65d54a8 100644 --- a/ruoyi-auth/src/main/resources/bootstrap-prod.yml +++ b/ruoyi-auth/src/main/resources/bootstrap-prod.yml @@ -10,7 +10,7 @@ spring: cloud: nacos: discovery: - ip: 47.121.114.255 + ip: 8.155.60.167 # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: e2708b29-ca15-4f63-a919-d33932ebdfda diff --git a/ruoyi-gateway/src/main/resources/bootstrap-prod.yml b/ruoyi-gateway/src/main/resources/bootstrap-prod.yml index ba774ef13..67cc209b4 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap-prod.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap-prod.yml @@ -10,7 +10,7 @@ spring: cloud: nacos: discovery: - ip: 47.121.114.255 + ip: 8.155.60.167 # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: e2708b29-ca15-4f63-a919-d33932ebdfda diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-prod.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-prod.yml index 562403b1e..00059ada4 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-prod.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-prod.yml @@ -10,7 +10,7 @@ spring: cloud: nacos: discovery: - ip: 47.121.114.255 + ip: 8.155.60.167 # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: e2708b29-ca15-4f63-a919-d33932ebdfda diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-prod.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-prod.yml index 0fc32c6c4..f9e2a0bf0 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-prod.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-prod.yml @@ -10,7 +10,7 @@ spring: cloud: nacos: discovery: - ip: 47.121.114.255 + ip: 8.155.60.167 # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: e2708b29-ca15-4f63-a919-d33932ebdfda diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-prod.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-prod.yml index 4a0c2d0aa..5ef2f6f5c 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-prod.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-prod.yml @@ -10,7 +10,7 @@ spring: cloud: nacos: discovery: - ip: 47.121.114.255 + ip: 8.155.60.167 # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: e2708b29-ca15-4f63-a919-d33932ebdfda diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-prod.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-prod.yml index 6281072f6..ac0785514 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-prod.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-prod.yml @@ -9,7 +9,7 @@ spring: cloud: nacos: discovery: - ip: 47.121.114.255 + ip: 8.155.60.167 # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: e2708b29-ca15-4f63-a919-d33932ebdfda diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-prod.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-prod.yml index 4cf3fd934..106133ab2 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-prod.yml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-prod.yml @@ -10,7 +10,7 @@ spring: cloud: nacos: discovery: - ip: 47.121.114.255 + ip: 8.155.60.167 # 服务注册地址 server-addr: nacos.zkjiadi.cc namespace: e2708b29-ca15-4f63-a919-d33932ebdfda From d27aacf7e767a87abda7d7ad1e59bf725a71ee1e Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Wed, 25 Jun 2025 16:08:20 +0800 Subject: [PATCH 70/82] =?UTF-8?q?[feat]=20=E6=96=B0=E5=A2=9E=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=85=AC=E5=91=8A=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/controller/SysNoticeController.java | 9 +++++++++ .../java/com/ruoyi/system/mapper/SysNoticeMapper.java | 8 ++++++++ .../com/ruoyi/system/service/ISysNoticeService.java | 8 ++++++++ .../system/service/impl/SysNoticeServiceImpl.java | 11 +++++++++++ .../main/resources/mapper/system/SysNoticeMapper.xml | 8 +++++++- 5 files changed, 43 insertions(+), 1 deletion(-) 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 eb9061129..7429c6fe1 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 @@ -89,4 +89,13 @@ public class SysNoticeController extends BaseController { return toAjax(noticeService.deleteNoticeByIds(noticeIds)); } + + /** + * 根据标题查询通知公告 + */ + @GetMapping("/no-login/{noticeTitle}") + public AjaxResult getInfo(@PathVariable String noticeTitle) + { + return success(noticeService.selectNoticeByNoticeTitle(noticeTitle)); + } } 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 ec8700d68..cabbbf89e 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 @@ -57,4 +57,12 @@ public interface SysNoticeMapper * @return 结果 */ public int deleteNoticeByIds(Long[] noticeIds); + + /** + * 查询公告信息 + * + * @param noticeTitle 公告标题 + * @return 公告信息 + */ + public SysNotice selectNoticeByNoticeTitle(String noticeTitle); } \ No newline at end of file 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 fb1e420fd..d9d9c02a7 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 @@ -57,4 +57,12 @@ public interface ISysNoticeService * @return 结果 */ public int deleteNoticeByIds(Long[] noticeIds); + + /** + * 查询公告信息 + * + * @param noticeTitle 公告标题 + * @return 公告信息 + */ + public SysNotice selectNoticeByNoticeTitle(String noticeTitle); } 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 8bebd9c69..beb6e295f 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 @@ -89,4 +89,15 @@ public class SysNoticeServiceImpl implements ISysNoticeService { return noticeMapper.deleteNoticeByIds(noticeIds); } + + /** + * 查询公告信息 + * + * @param noticeTitle 公告标题 + * @return 公告信息 + */ + @Override + public SysNotice selectNoticeByNoticeTitle(String noticeTitle) { + return noticeMapper.selectNoticeByNoticeTitle(noticeTitle); + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml index 6915a1482..299080ed8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -41,7 +41,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + insert into sys_notice ( notice_title, From c1f62bfb0d360508ee3e19f7577a759f5e2e2c58 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Thu, 26 Jun 2025 14:56:45 +0800 Subject: [PATCH 71/82] =?UTF-8?q?[feat]=20=E7=89=88=E6=9C=AC=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- pom.xml | 4 ++-- ruoyi-api/pom.xml | 2 +- ruoyi-api/ruoyi-api-system/pom.xml | 4 ++-- ruoyi-auth/pom.xml | 2 +- ruoyi-common/pom.xml | 2 +- ruoyi-common/ruoyi-common-core/pom.xml | 2 +- ruoyi-common/ruoyi-common-datascope/pom.xml | 2 +- ruoyi-common/ruoyi-common-datasource/pom.xml | 2 +- ruoyi-common/ruoyi-common-log/pom.xml | 2 +- ruoyi-common/ruoyi-common-redis/pom.xml | 2 +- ruoyi-common/ruoyi-common-seata/pom.xml | 2 +- ruoyi-common/ruoyi-common-security/pom.xml | 2 +- ruoyi-common/ruoyi-common-sensitive/pom.xml | 2 +- ruoyi-common/ruoyi-common-swagger/pom.xml | 2 +- ruoyi-gateway/pom.xml | 2 +- ruoyi-modules/pom.xml | 2 +- ruoyi-modules/ruoyi-file/pom.xml | 2 +- ruoyi-modules/ruoyi-gen/pom.xml | 2 +- ruoyi-modules/ruoyi-job/pom.xml | 2 +- ruoyi-modules/ruoyi-system/pom.xml | 2 +- ruoyi-ui/src/views/index.vue | 4 ++-- ruoyi-visual/pom.xml | 2 +- ruoyi-visual/ruoyi-monitor/pom.xml | 2 +- 24 files changed, 28 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index ca87f510e..4814ec753 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@

            logo

            -

            RuoYi v3.6.5.0.8

            +

            RuoYi v3.6.5.0.9

            基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的分布式微服务架构

            - +

            diff --git a/pom.xml b/pom.xml index b89229197..e07cd0ec0 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ com.ruoyi ruoyi - 3.6.5.0.8 + 3.6.5.0.9 ruoyi http://www.ruoyi.vip 若依微服务系统 - 3.6.5.0.8 + 3.6.5.0.9 UTF-8 UTF-8 1.8 diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml index a0952ae56..04ff21f4a 100644 --- a/ruoyi-api/pom.xml +++ b/ruoyi-api/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.8 + 3.6.5.0.9 4.0.0 diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml index 07182762c..d0a42dc13 100644 --- a/ruoyi-api/ruoyi-api-system/pom.xml +++ b/ruoyi-api/ruoyi-api-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-api - 3.6.5.0.8 + 3.6.5.0.9 4.0.0 @@ -25,7 +25,7 @@ com.zkjiadi zkjiadi-mall-api - 1.0.6 + 1.0.7 com.squareup.okhttp3 diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index 59094a488..827294415 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.8 + 3.6.5.0.9 4.0.0 diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index ce988cb68..34d7d3e07 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.8 + 3.6.5.0.9 4.0.0 diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index 7d86a7695..4dadeb1c3 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.8 + 3.6.5.0.9 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/ruoyi-common/ruoyi-common-datascope/pom.xml index 417dc4ab5..9d2e3f7e7 100644 --- a/ruoyi-common/ruoyi-common-datascope/pom.xml +++ b/ruoyi-common/ruoyi-common-datascope/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.8 + 3.6.5.0.9 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml index 25d4eb8b1..2b473a07b 100644 --- a/ruoyi-common/ruoyi-common-datasource/pom.xml +++ b/ruoyi-common/ruoyi-common-datasource/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.8 + 3.6.5.0.9 4.0.0 diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml index 7d6f7be77..2b015834a 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/ruoyi-common/ruoyi-common-log/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.8 + 3.6.5.0.9 4.0.0 diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml index 63de4bbae..9b5611dd8 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/ruoyi-common/ruoyi-common-redis/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.8 + 3.6.5.0.9 4.0.0 diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml index 94de8affa..e4e65fcd4 100644 --- a/ruoyi-common/ruoyi-common-seata/pom.xml +++ b/ruoyi-common/ruoyi-common-seata/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.8 + 3.6.5.0.9 4.0.0 diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml index 7154ec52a..b9ec03f55 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/ruoyi-common/ruoyi-common-security/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.8 + 3.6.5.0.9 4.0.0 diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/ruoyi-common/ruoyi-common-sensitive/pom.xml index 898a7c4ca..8bd4be024 100644 --- a/ruoyi-common/ruoyi-common-sensitive/pom.xml +++ b/ruoyi-common/ruoyi-common-sensitive/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.8 + 3.6.5.0.9 4.0.0 diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml index f01a42810..1c1d4469e 100644 --- a/ruoyi-common/ruoyi-common-swagger/pom.xml +++ b/ruoyi-common/ruoyi-common-swagger/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.5.0.8 + 3.6.5.0.9 4.0.0 diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index 745feb983..439b21cdc 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.8 + 3.6.5.0.9 4.0.0 diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index 943a768ac..edc138aa5 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.8 + 3.6.5.0.9 4.0.0 diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index 3050adfaa..6e42fbf95 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/ruoyi-modules/ruoyi-file/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5.0.8 + 3.6.5.0.9 4.0.0 diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index 0c93f077b..808700eb5 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5.0.8 + 3.6.5.0.9 4.0.0 diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index bde3ab1e5..492628f4b 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5.0.8 + 3.6.5.0.9 4.0.0 diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index 4cde9e928..dd9e6d39f 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.5.0.8 + 3.6.5.0.9 4.0.0 diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 4b5a72a00..90d4f2ec7 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -108,7 +108,7 @@ 更新日志 - +
            1. 使用SpringDoc代替Swagger
            2. 菜单管理新增路由名称
              3. @@ -909,7 +909,7 @@ export default { data() { return { // 版本号 - version: "3.6.5.0.8", + version: "3.6.5.0.9", }; }, methods: { diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml index 34ccb695e..4fef5d2d5 100644 --- a/ruoyi-visual/pom.xml +++ b/ruoyi-visual/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.8 + 3.6.5.0.9 4.0.0 diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index 6f490074f..43c15b65d 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/ruoyi-visual/ruoyi-monitor/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-visual - 3.6.5.0.8 + 3.6.5.0.9 4.0.0 From cec1d0226d6bf100098b948234c661928b46ee17 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Thu, 26 Jun 2025 15:59:17 +0800 Subject: [PATCH 72/82] =?UTF-8?q?[feat]=20ujcms-commons=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-gateway/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index 439b21cdc..51f9fc1d6 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -84,7 +84,7 @@ com.ujcms ujcms-commons - 9.6.0 + 9.6.0.0.16 org.springframework From 14f5a1c8263bbd4e54ac92cc82b38ecec2004814 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Fri, 27 Jun 2025 10:48:47 +0800 Subject: [PATCH 73/82] =?UTF-8?q?[fix]=20=E7=BD=91=E5=85=B3=E7=9A=84ujcms-?= =?UTF-8?q?commons=E7=89=88=E6=9C=AC=E9=99=8D=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-gateway/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index 51f9fc1d6..b9f6e71a6 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -84,7 +84,7 @@ com.ujcms ujcms-commons - 9.6.0.0.16 + 9.6.0.0.14 org.springframework From bfac3686be16b857a8e0c75c3daa27073b28dd3d Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Fri, 27 Jun 2025 11:22:03 +0800 Subject: [PATCH 74/82] =?UTF-8?q?[fix]=20=E7=BD=91=E5=85=B3=E7=9A=84ujcms-?= =?UTF-8?q?commons=E7=89=88=E6=9C=AC=E9=99=8D=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-gateway/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index b9f6e71a6..2027f7c28 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -84,7 +84,7 @@ com.ujcms ujcms-commons - 9.6.0.0.14 + 9.6.0.0.1 org.springframework From 29e848c2ab9d55dfe2202dbb2686d6f46141ad01 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Fri, 27 Jun 2025 12:01:46 +0800 Subject: [PATCH 75/82] =?UTF-8?q?[fix]=20=E5=8C=85=E5=90=8D=E8=A1=A5?= =?UTF-8?q?=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/system/KSysUserMapper.xml | 8 +++--- .../mapper/system/SysConfigMapper.xml | 10 +++---- .../resources/mapper/system/SysDeptMapper.xml | 8 +++--- .../mapper/system/SysDictDataMapper.xml | 8 +++--- .../mapper/system/SysDictTypeMapper.xml | 8 +++--- .../mapper/system/SysLogininforMapper.xml | 6 ++-- .../resources/mapper/system/SysMenuMapper.xml | 12 ++++---- .../mapper/system/SysNoticeMapper.xml | 8 +++--- .../mapper/system/SysOperLogMapper.xml | 6 ++-- .../resources/mapper/system/SysPostMapper.xml | 8 +++--- .../mapper/system/SysRoleDeptMapper.xml | 2 +- .../resources/mapper/system/SysRoleMapper.xml | 8 +++--- .../mapper/system/SysRoleMenuMapper.xml | 2 +- .../resources/mapper/system/SysUserMapper.xml | 28 +++++++++---------- .../mapper/system/SysUserPostMapper.xml | 2 +- .../mapper/system/SysUserRoleMapper.xml | 4 +-- 16 files changed, 64 insertions(+), 64 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml index 50511d346..fb8493266 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -25,7 +25,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -54,7 +54,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml index b4fef50d7..e3f22b4ca 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -33,12 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - @@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where config_key = #{configKey} limit 1 - + insert into sys_config ( config_name, config_key, @@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update sys_config config_name = #{configName}, 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 000166edb..ec9efa390 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 @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_dept d - where d.del_flag = '0' @@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1 - + insert into sys_dept( dept_id, parent_id, @@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update sys_dept parent_id = #{parentId}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml index c5e1da9d0..48f04db27 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_dict_data - @@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update sys_dict_data dict_sort = #{dictSort}, @@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType} - + insert into sys_dict_data( dict_sort, dict_label, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml index 554db5441..67ed9691f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_dict_type - @@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update sys_dict_type dict_name = #{dictName}, @@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where dict_id = #{dictId} - + insert into sys_dict_type( dict_name, dict_type, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml index 67a4b1c65..f40036f07 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -13,12 +13,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into sys_logininfor (user_name, status, ipaddr, msg, access_time) values (#{userName}, #{status}, #{ipaddr}, #{msg}, sysdate()) - select info_id, user_name, ipaddr, status, msg, access_time from sys_logininfor diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml index e6be3aefd..8f025a133 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -33,7 +33,7 @@ from sys_menu - @@ -55,7 +55,7 @@ order by m.parent_id, m.order_num - select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time from sys_menu m left join sys_role_menu rm on m.menu_id = rm.menu_id @@ -128,12 +128,12 @@ select count(1) from sys_menu where parent_id = #{menuId} - where menu_name=#{menuName} and parent_id = #{parentId} limit 1 - + update sys_menu menu_name = #{menuName}, @@ -157,7 +157,7 @@ where menu_id = #{menuId} - + insert into sys_menu( menu_id, parent_id, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml index 299080ed8..37638fb06 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where notice_id = #{noticeId} - @@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" limit 1 - + insert into sys_notice ( notice_title, notice_type, @@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update sys_notice notice_title = #{noticeTitle}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml index 8d69f736a..803663e38 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -28,12 +28,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_oper_log - + insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_param, json_result, status, error_msg, cost_time, oper_time) values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate()) - diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml index faefb2f07..bcdd06330 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_post - @@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where post_code=#{postCode} limit 1 - + update sys_post post_code = #{postCode}, @@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where post_id = #{postId} - + insert into sys_post( post_id, post_code, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml index 700671e15..c2815f24e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml index a3b780ff0..3b96e9676 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_dept d on u.dept_id = d.dept_id - where r.del_flag = '0' @@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where r.role_key=#{roleKey} and r.del_flag = '0' limit 1 - + insert into sys_role( role_id, role_name, @@ -121,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update sys_role role_name = #{roleName}, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml index e75bb1744..4cc2bef86 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index c01296d6b..eb0c9c266 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -24,12 +24,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + - + @@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_role r on r.role_id = ur.role_id - select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u left join sys_dept d on u.dept_id = d.dept_id where u.del_flag = '0' @@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${params.dataScope} - select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time from sys_user u left join sys_dept d on u.dept_id = d.dept_id @@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${params.dataScope} - select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time from sys_user u left join sys_dept d on u.dept_id = d.dept_id @@ -160,7 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where u.phonenumber like CONCAT(#{phoneNumber},"%") and u.del_flag = '0' - + insert into sys_user( user_id, dept_id, @@ -192,7 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update sys_user dept_id = #{deptId}, @@ -212,15 +212,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where user_id = #{userId} - + update sys_user set status = #{status} where user_id = #{userId} - + update sys_user set avatar = #{avatar} where user_name = #{userName} - + update sys_user set pwd_update_date = sysdate(), password = #{password} where user_name = #{userName} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml index 21c40981b..0ff0cb91f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml index 95e07adb1..b210005d2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + delete from sys_user_role where user_id=#{userId} and role_id=#{roleId} From 98fc9a8df2e05d2ebf066c2932a1257f7bca641f Mon Sep 17 00:00:00 2001 From: wei Date: Mon, 30 Jun 2025 14:14:12 +0800 Subject: [PATCH 76/82] =?UTF-8?q?=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/system/KSysUserMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml index 50511d346..7e8bdc9b8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + From 692f6225a3caf41f30c4211c6b89ac671634e883 Mon Sep 17 00:00:00 2001 From: wei Date: Tue, 12 Aug 2025 17:49:54 +0800 Subject: [PATCH 77/82] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=89=93=E5=8D=A1?= =?UTF-8?q?=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-modules/ruoyi-job/pom.xml | 12 +++ .../java/com/ruoyi/job/config/SmsConfig.java | 23 ++++ .../com/ruoyi/job/domain/ScClassUserInfo.java | 78 ++++++++++++++ .../com/ruoyi/job/service/SmsService.java | 16 +++ .../job/service/impl/SmsServiceImpl.java | 35 ++++++ .../java/com/ruoyi/job/task/LiveTask.java | 34 ++++++ .../ruoyi/job/util/ProgressFormatterUtil.java | 18 ++++ .../mapper/job/ScClassUserInfoMapper.xml | 100 ++++++++++++++++++ 8 files changed, 316 insertions(+) create mode 100644 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/SmsConfig.java create mode 100644 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/ScClassUserInfo.java create mode 100644 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SmsService.java create mode 100644 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/impl/SmsServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/LiveTask.java create mode 100644 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ProgressFormatterUtil.java create mode 100644 ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/ScClassUserInfoMapper.xml diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index 492628f4b..6b5440d5b 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -75,6 +75,18 @@ de.codecentric spring-boot-admin-starter-client + + com.squareup.okhttp3 + okhttp + 3.12.13 + + + com.ujcms + ujcms-commons + 9.6.0.0.1 + compile + + diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/SmsConfig.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/SmsConfig.java new file mode 100644 index 000000000..9e483832d --- /dev/null +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/SmsConfig.java @@ -0,0 +1,23 @@ +package com.ruoyi.job.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.context.annotation.Configuration; + +/** + * 验证码配置 + * + * @author ruoyi + */ +@Data +@Configuration +@RefreshScope +@ConfigurationProperties(prefix = "security.sms.aliyuncs") +public class SmsConfig +{ + private String accessKeyId; + private String accessKeySecret; + private String signName; + private String templateCode; +} diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/ScClassUserInfo.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/ScClassUserInfo.java new file mode 100644 index 000000000..aacd7cf74 --- /dev/null +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/ScClassUserInfo.java @@ -0,0 +1,78 @@ +package com.ruoyi.job.domain; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.ruoyi.common.core.web.domain.BaseEntity; +import com.ruoyi.job.util.ProgressFormatterUtil; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.data.annotation.Id; + +import java.math.BigDecimal; + +/** + * 直播预告报名信息导出实体 + */ +@Data +@EqualsAndHashCode(callSuper = false) +public class ScClassUserInfo extends BaseEntity { + + @Id + private Long id; + + //@ExcelIgnore // 不导出该字段 + private Long userId; + + //@ExcelIgnore // 不导出该字段 + private Long classId; + + //@ColumnWidth(25) + // @ExcelProperty("名称(报名时)") + private String name; + + //@ColumnWidth(25) + //@ExcelProperty("单位") + private String firm; + + //@ColumnWidth(25) + //@ExcelProperty("专业") + private String specialized; + + //@ColumnWidth(35) + //@ExcelProperty("手机号") + private String phonenumber; + + //@ColumnWidth(35) + //@ExcelProperty("昵称") + private String nickName; + + /** + * 客户订单编号 + */ + //@ExcelProperty("客户订单编号") + private String userSn; + + //@ExcelIgnore + private Boolean todayAttendanceIs; + + @JsonIgnore + // @ExcelProperty("是否打卡") + private String attendanceIs; + + //@ExcelProperty("签到次数") + private Integer attendanceCount; + + //@ExcelIgnore + private BigDecimal progress; + + //@ExcelProperty("总学习进度") + private String progressPercent; + + public String getAttendanceIs() { + return attendanceCount.compareTo(0) > 0 ? "是" : "否"; + } + + public String getProgressPercent() { + return ProgressFormatterUtil.format(this.progress.multiply(BigDecimal.valueOf(100))); + } + +} diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SmsService.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SmsService.java new file mode 100644 index 000000000..67a8602b1 --- /dev/null +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SmsService.java @@ -0,0 +1,16 @@ +package com.ruoyi.job.service; + +import com.ruoyi.common.core.exception.CaptchaException; + +/** + * 验证码处理 + * + * @author ruoyi + */ +public interface SmsService +{ + /** + * 发送学习短信通知 + */ + public void sendStudyNoticeSms(String phone) throws CaptchaException; +} diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/impl/SmsServiceImpl.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/impl/SmsServiceImpl.java new file mode 100644 index 000000000..e8407555f --- /dev/null +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/impl/SmsServiceImpl.java @@ -0,0 +1,35 @@ +package com.ruoyi.job.service.impl; + +import com.alibaba.fastjson2.JSONObject; +import com.ruoyi.common.core.exception.CaptchaException; +import com.ruoyi.job.config.SmsConfig; +import com.ruoyi.job.service.SmsService; +import com.ujcms.commons.sms.AliyunUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * 验证码实现处理 + * + * @author ruoyi + */ +@Service +public class SmsServiceImpl implements SmsService +{ + @Autowired + private SmsConfig smsConfig; + + /** + * 发送学习短信通知 + */ + @Override + public void sendStudyNoticeSms(String phone) throws CaptchaException { + AliyunUtils.sendSms(smsConfig.getAccessKeyId(), + smsConfig.getAccessKeySecret(), + smsConfig.getSignName(), + smsConfig.getTemplateCode(), + JSONObject.of(), + phone + ); + } +} diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/LiveTask.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/LiveTask.java new file mode 100644 index 000000000..b9ffdfcf7 --- /dev/null +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/LiveTask.java @@ -0,0 +1,34 @@ +package com.ruoyi.job.task; + +import com.ruoyi.job.config.SmsConfig; +import com.ruoyi.job.domain.ScClassUserInfo; +import com.ruoyi.job.mapper.ScClassUserInfoMapper; +import com.ruoyi.job.service.SmsService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.List; + +@Slf4j +@Component("liveTask") +public class LiveTask { + @Resource + ScClassUserInfoMapper scClassUserInfoMapper; + @Autowired + private SmsService smsAliyuncs; + + @Autowired + private SmsConfig smsConfig; + /** + * 短信打卡 + */ + public void CourseSmsNotice(){ + List list = scClassUserInfoMapper.waitNoticeCourseUser(); + list.forEach(item->{ + log.info("发送打卡提醒",item.getUserId(),item.getNickName(),item.getPhonenumber()); + smsAliyuncs.sendStudyNoticeSms(item.getPhonenumber()); + }); + } +} diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ProgressFormatterUtil.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ProgressFormatterUtil.java new file mode 100644 index 000000000..b88d4bb91 --- /dev/null +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ProgressFormatterUtil.java @@ -0,0 +1,18 @@ +package com.ruoyi.job.util; + +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.text.NumberFormat; + +public class ProgressFormatterUtil { + public static String format(BigDecimal progress ) { + if (progress == null) return "0"; + // 保留两位小数（四舍五入） + BigDecimal scaled = progress.setScale(2, RoundingMode.HALF_UP); + // 去除末尾零和小数点 + NumberFormat nf = NumberFormat.getInstance(); + nf.setMaximumFractionDigits(2); + nf.setMinimumFractionDigits(0); + return nf.format(scaled) + "%"; + } +} diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/ScClassUserInfoMapper.xml b/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/ScClassUserInfoMapper.xml new file mode 100644 index 000000000..5e405ee42 --- /dev/null +++ b/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/ScClassUserInfoMapper.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + From 8f198ea261d3e9c3639ff7975f109813cef0c1f0 Mon Sep 17 00:00:00 2001 From: wei Date: Tue, 2 Sep 2025 14:08:28 +0800 Subject: [PATCH 78/82] =?UTF-8?q?token=E4=BF=AE=E6=94=B9=E5=8F=8A=E5=AE=9E?= =?UTF-8?q?=E9=AA=8C=E8=AF=BE=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/api/RemoteUserService.java | 6 +++ .../factory/RemoteUserFallbackFactory.java | 5 ++ .../core/constant/SecurityConstants.java | 14 ++++++ .../com/ruoyi/common/core/utils/JwtUtils.java | 7 ++- .../common/security/service/TokenService.java | 9 ++++ .../com/ruoyi/gateway/filter/AuthFilter.java | 13 +++-- .../handler/GatewayExceptionHandler.java | 1 - .../java/com/ruoyi/job/task/LiveTask.java | 6 ++- .../system/controller/SysUserController.java | 10 ++++ .../com/ruoyi/system/domain/SyncGoUser.java | 15 ++++++ .../ruoyi/system/service/ISysUserService.java | 8 ++++ .../service/impl/SysUserServiceImpl.java | 48 ++++++++++++++++++- .../inner/InnerSysUserController.kt | 4 +- 13 files changed, 137 insertions(+), 9 deletions(-) create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SyncGoUser.java 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 e7885f5a4..14ab3c53d 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 @@ -52,4 +52,10 @@ public interface RemoteUserService extends InnerRemoteUserService */ @PutMapping("/user/recordlogin") public R recordUserLogin(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + /** + * 同步至go框架 + */ + @PostMapping("/user/syncGO") + public R syncGO(@RequestBody SysUser sysUser); } 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 88b20845a..8b92b528a 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 @@ -68,6 +68,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory syncGO(SysUser sysUser) { + return R.fail("同步用户信息至GO失败:" + throwable.getMessage()); + } + @NotNull @Override public R edit_Inner(@NotNull LoginUser user, @NotNull String source) { 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 73cae223a..0d69def5c 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 @@ -12,6 +12,20 @@ public class SecurityConstants */ public static final String DETAILS_USER_ID = "user_id"; + /** + * 用户ID字段 + */ + public static final String DETAILS_SUB = "sub"; + + /** + * 用户ID字段 + */ + public static final String DETAILS_IAT= "iat"; + /** + * 用户ID字段 + */ + public static final String DETAILS_EXP= "exp"; + /** * 用户名字段 */ 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 abe93c0c0..14ea876c8 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,13 +1,18 @@ package com.ruoyi.common.core.utils; +import java.util.Base64; import java.util.Map; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.constant.TokenConstants; +import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.text.Convert; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; +import javax.naming.AuthenticationException; +import javax.servlet.http.HttpServletResponse; + /** * Jwt工具类 * @@ -15,7 +20,7 @@ import io.jsonwebtoken.SignatureAlgorithm; */ public class JwtUtils { - public static String secret = TokenConstants.SECRET; + public static String secret = Base64.getEncoder().encodeToString(TokenConstants.SECRET.getBytes()) ; /** * 从数据声明生成令牌 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 0a63b851e..784e63e99 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,9 +1,14 @@ package com.ruoyi.common.security.service; +import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; import javax.servlet.http.HttpServletRequest; + +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.impl.DefaultClaims; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -61,6 +66,10 @@ public class TokenService claimsMap.put(SecurityConstants.USER_KEY, token); claimsMap.put(SecurityConstants.DETAILS_USER_ID, userId); claimsMap.put(SecurityConstants.DETAILS_USERNAME, userName); + claimsMap.put(SecurityConstants.DETAILS_SUB,userId); + int now = Math.toIntExact(System.currentTimeMillis() / 1000); + claimsMap.put(SecurityConstants.DETAILS_IAT,now); + claimsMap.put(SecurityConstants.DETAILS_EXP,now+TOKEN_EXPIRE_TIME*60); // 接口返回信息 Map rspMap = new HashMap(); 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 51d39ef9f..e4d791851 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 @@ -44,7 +44,6 @@ public class AuthFilter implements GlobalFilter, Ordered { ServerHttpRequest request = exchange.getRequest(); ServerHttpRequest.Builder mutate = request.mutate(); - String url = request.getURI().getPath(); // 跳过不需要验证的路径 if (StringUtils.matches(url, ignoreWhite.getWhites())) @@ -56,11 +55,19 @@ public class AuthFilter implements GlobalFilter, Ordered { return unauthorizedResponse(exchange, "令牌不能为空"); } - Claims claims = JwtUtils.parseToken(token); + /*Claims claims = JwtUtils.parseToken(token); if (claims == null) { return unauthorizedResponse(exchange, "令牌已过期或验证不正确！"); - } + }*/ + Claims claims; + try{ + claims = JwtUtils.parseToken(token); + if (claims == null) + return unauthorizedResponse(exchange, "令牌已过期或验证不正确！"); + }catch (Exception e){ + return unauthorizedResponse(exchange, "令牌已过期或验证不正确！"); + } String userkey = JwtUtils.getUserKey(claims); boolean islogin = redisService.hasKey(getTokenKey(userkey)); if (!islogin) 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 593e7e62a..2f017bddd 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 @@ -34,7 +34,6 @@ public class GatewayExceptionHandler implements ErrorWebExceptionHandler } String msg; - if (ex instanceof NotFoundException) { msg = "服务未找到"; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/LiveTask.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/LiveTask.java index b9ffdfcf7..25f2aa07d 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/LiveTask.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/LiveTask.java @@ -27,8 +27,10 @@ public class LiveTask { public void CourseSmsNotice(){ List list = scClassUserInfoMapper.waitNoticeCourseUser(); list.forEach(item->{ - log.info("发送打卡提醒",item.getUserId(),item.getNickName(),item.getPhonenumber()); - smsAliyuncs.sendStudyNoticeSms(item.getPhonenumber()); + if (item.getPhonenumber() != null && !item.getPhonenumber().trim().isEmpty()){ + log.info("发送打卡提醒 {} {} {}",item.getUserId(),item.getNickName(),item.getPhonenumber()); + smsAliyuncs.sendStudyNoticeSms(item.getPhonenumber()); + } }); } } 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 b26e5169e..74052636f 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 @@ -166,6 +166,16 @@ public class SysUserController extends BaseController return R.ok(userService.updateUserProfile(sysUser)); } + /** + *记录用户登录IP地址和登录时间 + */ + @InnerAuth + @PutMapping("/syncGO") + public R syncGO(@RequestBody SysUser sysUser) + { + return R.ok(userService.syncGO(sysUser)); + } + /** * 获取用户信息 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SyncGoUser.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SyncGoUser.java new file mode 100644 index 000000000..d7c406e17 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SyncGoUser.java @@ -0,0 +1,15 @@ +package com.ruoyi.system.domain; + +import lombok.Data; + +@Data +public class SyncGoUser { + private Integer userId; + private String nickname; + private String username; + private String mobile; + private String lastIp; + private String remark; + private String avatar; + private Integer status; +} 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 8d6e2b2b4..b7190830f 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 @@ -170,6 +170,14 @@ public interface ISysUserService */ public boolean updateUserProfile(SysUser user); + /** + * 同步用户基本信息 + * + * @param user 用户信息 + * @return 结果 + */ + public boolean syncGO(SysUser user); + /** * 修改用户头像 * 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 fa5d7c0b7..673a056ae 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 @@ -6,12 +6,17 @@ import java.util.Objects; import java.util.stream.Collectors; import javax.validation.Validator; +import cn.hutool.system.UserInfo; import com.github.pagehelper.Page; import com.ruoyi.system.api.domain.KSysUserAccount; +import com.ruoyi.system.domain.SyncGoUser; import com.ruoyi.system.service.IKSysUserService; +import org.apache.http.client.methods.HttpPost; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -35,6 +40,7 @@ import com.ruoyi.system.mapper.SysUserRoleMapper; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysUserService; +import org.springframework.web.client.RestTemplate; /** * 用户 业务层处理 @@ -44,6 +50,11 @@ import com.ruoyi.system.service.ISysUserService; @Service public class SysUserServiceImpl implements ISysUserService { + @Value("${go.host}") + private String goHost; + @Value("${go.accessKey}") + private String accessKey; + private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class); @Autowired @@ -73,6 +84,7 @@ public class SysUserServiceImpl implements ISysUserService @Autowired protected Validator validator; + /** * 根据条件分页查询用户列表 * @@ -308,7 +320,9 @@ public class SysUserServiceImpl implements ISysUserService @Override public boolean registerUser(SysUser user) { - return userMapper.insertUser(user) > 0; + boolean res = userMapper.insertUser(user) > 0; + this.syncGO(user); + return res; } /** @@ -335,6 +349,7 @@ public class SysUserServiceImpl implements ISysUserService kSysUserService.updateSysUserAccount(user.getSysUserAccount()); } } + this.syncGO(user); return userMapper.updateUser(user); } @@ -361,6 +376,7 @@ public class SysUserServiceImpl implements ISysUserService @Override public int updateUserStatus(SysUser user) { + this.syncGO(user); return userMapper.updateUser(user); } @@ -373,9 +389,39 @@ public class SysUserServiceImpl implements ISysUserService @Override public boolean updateUserProfile(SysUser user) { + this.syncGO(user); return userMapper.updateUser(user) > 0; } + /** + * 同步用户基本信息 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public boolean syncGO(SysUser user){ + RestTemplate restTemplate = new RestTemplate(); + String url = goHost + "/api/v2/mini/user/zkSyncUser/"+accessKey; + SyncGoUser syncGoUser = new SyncGoUser(); + syncGoUser.setUserId(Math.toIntExact(user.getUserId())); + syncGoUser.setNickname(user.getNickName()); + syncGoUser.setUsername(user.getUserName()); + syncGoUser.setMobile(user.getPhonenumber()); + syncGoUser.setLastIp(user.getLoginIp()); + syncGoUser.setRemark(user.getRemark()); + syncGoUser.setAvatar(user.getAvatar()); + syncGoUser.setStatus(Objects.equals(user.getStatus(), "正常") ?0:1); + ResponseEntity response = restTemplate.postForEntity(url, syncGoUser, String.class); + // 检查响应状态码 + if (response.getStatusCode().is2xxSuccessful()) { + System.out.println("响应内容：" + response.getBody()); + } else { + System.out.println("请求失败，状态码：" + response.getStatusCode()); + } + return true; + } + /** * 修改用户头像 * diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt index 18d47c165..e125fa8a7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt @@ -141,7 +141,9 @@ open class InnerSysUserController : BaseController() { originUser.avatar = targetUser.avatar ?: originUser.avatar originUser.sex = targetUser.sex ?: originUser.sex originUser.updateBy = originUser.userName - originUser.sysUserAccount = loginUser.sysUser.sysUserAccount.apply { this.userId = originUser.userId } + if (loginUser.sysUser.sysUserAccount != null){ + originUser.sysUserAccount = loginUser.sysUser.sysUserAccount.apply { this.userId = originUser.userId } + } userService.updateUser(originUser) // 更新缓存用户信息 tokenService.setLoginUser(loginUser) From 28133272e6cc4ff9be1c35dba266e441d4505c74 Mon Sep 17 00:00:00 2001 From: wei Date: Tue, 2 Sep 2025 14:23:55 +0800 Subject: [PATCH 79/82] ScClassUserInfoMapper.java --- .../ruoyi/job/mapper/ScClassUserInfoMapper.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/ScClassUserInfoMapper.java diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/ScClassUserInfoMapper.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/ScClassUserInfoMapper.java new file mode 100644 index 000000000..71da2e0d9 --- /dev/null +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/ScClassUserInfoMapper.java @@ -0,0 +1,14 @@ +package com.ruoyi.job.mapper; + +import com.ruoyi.job.domain.ScClassUserInfo; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +//@Mapper +//public interface ScClassUserInfoMapper extends tk.mybatis.mapper.common.Mapper +public interface ScClassUserInfoMapper + { + List waitNoticeCourseUser(); + +} From ee43ab00908b0e42822bc682fd035ccb020edfd8 Mon Sep 17 00:00:00 2001 From: wei Date: Wed, 3 Sep 2025 11:16:00 +0800 Subject: [PATCH 80/82] =?UTF-8?q?=E6=B5=8B=E8=AF=95token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/common/security/service/TokenService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 784e63e99..68bd5307a 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 @@ -6,6 +6,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import javax.servlet.http.HttpServletRequest; +import com.alibaba.fastjson.JSON; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.impl.DefaultClaims; @@ -70,7 +71,8 @@ public class TokenService int now = Math.toIntExact(System.currentTimeMillis() / 1000); claimsMap.put(SecurityConstants.DETAILS_IAT,now); claimsMap.put(SecurityConstants.DETAILS_EXP,now+TOKEN_EXPIRE_TIME*60); - + System.out.println("token"); + System.out.println(JSON.toJSONString(claimsMap)); // 接口返回信息 Map rspMap = new HashMap(); rspMap.put("access_token", JwtUtils.createToken(claimsMap)); From 127aaf648f3d725bacc3ad7b1531ef6484415096 Mon Sep 17 00:00:00 2001 From: wei Date: Wed, 3 Sep 2025 11:35:32 +0800 Subject: [PATCH 81/82] remove logs --- .../java/com/ruoyi/common/security/service/TokenService.java | 2 -- 1 file changed, 2 deletions(-) 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 68bd5307a..1da75d608 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 @@ -71,8 +71,6 @@ public class TokenService int now = Math.toIntExact(System.currentTimeMillis() / 1000); claimsMap.put(SecurityConstants.DETAILS_IAT,now); claimsMap.put(SecurityConstants.DETAILS_EXP,now+TOKEN_EXPIRE_TIME*60); - System.out.println("token"); - System.out.println(JSON.toJSONString(claimsMap)); // 接口返回信息 Map rspMap = new HashMap(); rspMap.put("access_token", JwtUtils.createToken(claimsMap)); From b6cb0987e456076921a0bcda4e92928011491513 Mon Sep 17 00:00:00 2001 From: wei Date: Tue, 23 Dec 2025 16:20:20 +0800 Subject: [PATCH 82/82] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/auth/controller/TokenController.java | 15 ++++++++++----- .../java/com/ruoyi/system/domain/SyncGoUser.java | 2 ++ .../system/service/impl/SysUserServiceImpl.java | 7 ++++++- 3 files changed, 18 insertions(+), 6 deletions(-) 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 ee8993f9c..300db923e 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 @@ -46,11 +46,16 @@ public class TokenController String token = SecurityUtils.getToken(request); if (StringUtils.isNotEmpty(token)) { - String username = JwtUtils.getUserName(token); - // 删除用户缓存记录 - AuthUtil.logoutByToken(token); - // 记录用户退出日志 - sysLoginService.logout(username); + try{ + String username = JwtUtils.getUserName(token); + // 删除用户缓存记录 + AuthUtil.logoutByToken(token); + // 记录用户退出日志 + sysLoginService.logout(username); + }catch (Exception e){ + System.out.println(e.getMessage()); + return R.ok(); + } } return R.ok(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SyncGoUser.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SyncGoUser.java index d7c406e17..0e9b1d678 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SyncGoUser.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SyncGoUser.java @@ -12,4 +12,6 @@ public class SyncGoUser { private String remark; private String avatar; private Integer status; + private String openId; + private String unionId; } 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 673a056ae..54d3a88b2 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 @@ -7,6 +7,7 @@ import java.util.stream.Collectors; import javax.validation.Validator; import cn.hutool.system.UserInfo; +import com.alibaba.fastjson.JSON; import com.github.pagehelper.Page; import com.ruoyi.system.api.domain.KSysUserAccount; import com.ruoyi.system.domain.SyncGoUser; @@ -411,7 +412,11 @@ public class SysUserServiceImpl implements ISysUserService syncGoUser.setLastIp(user.getLoginIp()); syncGoUser.setRemark(user.getRemark()); syncGoUser.setAvatar(user.getAvatar()); - syncGoUser.setStatus(Objects.equals(user.getStatus(), "正常") ?0:1); + syncGoUser.setStatus(Objects.equals(user.getStatus(), "1") ?1:0); + if (user.getSysUserAccount() != null) { + syncGoUser.setUnionId(user.getSysUserAccount().getWxUnionId()); + syncGoUser.setOpenId(user.getSysUserAccount().getRoutineOpenid()); + } ResponseEntity response = restTemplate.postForEntity(url, syncGoUser, String.class); // 检查响应状态码 if (response.getStatusCode().is2xxSuccessful()) {