diff --git a/.gitignore b/.gitignore index 2c0e049aa912dea2d08c6ce523673d19230d6581..5433d4642e38088a3fe753bd897a91252d239c99 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,7 @@ nbbuild/ dist/ nbdist/ .nb-gradle/ +node_modules/ ###################################################################### # Others diff --git a/bin/clean.bat b/bin/clean.bat deleted file mode 100644 index 5c2a3b2bdfb9efbe1fb4d41e1dd395956813c9e8..0000000000000000000000000000000000000000 --- a/bin/clean.bat +++ /dev/null @@ -1,12 +0,0 @@ -@echo off -echo. -echo [信息] 清理生成路径。 -echo. - -%~d0 -cd %~dp0 - -cd .. -call mvn clean - -pause \ No newline at end of file diff --git a/bin/package.bat b/bin/package.bat deleted file mode 100644 index c693ec067499702689d496f74c089888d7840be4..0000000000000000000000000000000000000000 --- a/bin/package.bat +++ /dev/null @@ -1,12 +0,0 @@ -@echo off -echo. -echo [信息] 打包Web工程，生成war/jar包文件。 -echo. - -%~d0 -cd %~dp0 - -cd .. -call mvn clean package -Dmaven.test.skip=true - -pause \ No newline at end of file diff --git a/bin/run.bat b/bin/run.bat deleted file mode 100644 index e5fb6a6b2bf95e93a28b28b33007dbf47dd7532f..0000000000000000000000000000000000000000 --- a/bin/run.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [信息] 运行Web工程。 -echo. - -cd %~dp0 -cd ../ruoyi-admin/target - -set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -jar %JAVA_OPTS% ruoyi-admin.jar - -cd bin -pause \ No newline at end of file diff --git "a/doc/\350\213\245\344\276\235\347\216\257\345\242\203\344\275\277\347\224\250\346\211\213\345\206\214.docx" "b/doc/\350\213\245\344\276\235\347\216\257\345\242\203\344\275\277\347\224\250\346\211\213\345\206\214.docx" deleted file mode 100644 index 9e4daef4d9be2e445419109a02eaf321cd4d537e..0000000000000000000000000000000000000000 Binary files "a/doc/\350\213\245\344\276\235\347\216\257\345\242\203\344\275\277\347\224\250\346\211\213\345\206\214.docx" and /dev/null differ diff --git a/ruoyi-admin/pom.xml b/jiajiakang-admin/pom.xml similarity index 84% rename from ruoyi-admin/pom.xml rename to jiajiakang-admin/pom.xml index ae5fd0bf3866ecac11a252016ecff4589a451de1..2ee6d463ba4c1153471f6afe33930f44da1bd1f3 100644 --- a/ruoyi-admin/pom.xml +++ b/jiajiakang-admin/pom.xml @@ -1,114 +1,114 @@ - - - - ruoyi - com.ruoyi - 3.4.0 - - 4.0.0 - jar - ruoyi-admin - - - web鏈嶅姟鍏ュ彛 - - - - - - - org.springframework.boot - spring-boot-devtools - true - - - - - io.springfox - springfox-swagger2 - - - - - io.swagger - swagger-annotations - 1.5.21 - - - - io.swagger - swagger-models - 1.5.21 - - - - - io.springfox - springfox-swagger-ui - - - - - mysql - mysql-connector-java - - - - - com.ruoyi - ruoyi-framework - - - - - com.ruoyi - ruoyi-quartz - - - - - com.ruoyi - ruoyi-generator - - - - - com.ruoyi - ruoyi-demo - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - 2.1.1.RELEASE - - true - - - - - repackage - - - - - - org.apache.maven.plugins - maven-war-plugin - 3.1.0 - - false - ${project.artifactId} - - - - ${project.artifactId} - - + + + + jiajiakang + com.jiajiakang + 3.4.0 + + 4.0.0 + jar + jiajiakang-admin + + + web鏈嶅姟鍏ュ彛 + + + + + + + org.springframework.boot + spring-boot-devtools + true + + + + + io.springfox + springfox-swagger2 + + + + + io.swagger + swagger-annotations + 1.5.21 + + + + io.swagger + swagger-models + 1.5.21 + + + + + io.springfox + springfox-swagger-ui + + + + + mysql + mysql-connector-java + + + + + com.jiajiakang + jiajiakang-framework + + + + + com.jiajiakang + jiajiakang-quartz + + + + + com.jiajiakang + jiajiakang-generator + + + + + com.jiajiakang + jiajiakang-demo + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + 2.1.1.RELEASE + + true + + + + + repackage + + + + + + org.apache.maven.plugins + maven-war-plugin + 3.1.0 + + false + ${project.artifactId} + + + + ${project.artifactId} + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/jiajiakang-admin/src/main/java/com/jiajiakang/JiaJiaKangApplication.java similarity index 68% rename from ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java rename to jiajiakang-admin/src/main/java/com/jiajiakang/JiaJiaKangApplication.java index 4c87cc8d81dfcf9badbd2d86e6fc902804b21e3d..7a61c1f8e7e35a67f96ad48b13075dae7d9495cb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/jiajiakang-admin/src/main/java/com/jiajiakang/JiaJiaKangApplication.java @@ -1,4 +1,4 @@ -package com.ruoyi; +package com.jiajiakang; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -12,12 +12,12 @@ import org.springframework.cloud.openfeign.EnableFeignClients; */ @EnableFeignClients @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) -public class RuoYiApplication +public class JiaJiaKangApplication { public static void main(String[] args) { System.setProperty("spring.devtools.restart.enabled", "false"); - SpringApplication.run(RuoYiApplication.class, args); - System.out.println("(鈾モ棤鈥库棤)锞夛緸 鑻ヤ緷鍚姩鎴愬姛 醿(麓凇`醿)锞"); + SpringApplication.run(JiaJiaKangApplication.class, args); + System.out.println("(鈾モ棤鈥库棤)锞夛緸 ~~ 浣冲搴风鐞嗙郴缁熷惎鍔ㄦ垚鍔 ~~ 醿(麓凇`醿)锞"); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java b/jiajiakang-admin/src/main/java/com/jiajiakang/JiaJiaKangServletInitializer.java similarity index 65% rename from ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java rename to jiajiakang-admin/src/main/java/com/jiajiakang/JiaJiaKangServletInitializer.java index 6de67dc76ba298f6754543d61cc16735d5bef29a..1832a2da56645b7b1f0a778ea8c8ca9fd8dab70c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java +++ b/jiajiakang-admin/src/main/java/com/jiajiakang/JiaJiaKangServletInitializer.java @@ -1,4 +1,4 @@ -package com.ruoyi; +package com.jiajiakang; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; @@ -8,11 +8,11 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer * * @author ruoyi */ -public class RuoYiServletInitializer extends SpringBootServletInitializer +public class JiaJiaKangServletInitializer extends SpringBootServletInitializer { @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(RuoYiApplication.class); + return application.sources(JiaJiaKangApplication.class); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/common/CaptchaController.java similarity index 92% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java rename to jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/common/CaptchaController.java index b170b1d4f2d4d09defcbda5b2a0e1aa93f7eab7f..33e41c7b0bf242d15b2f276e540d01f72ce0da8e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java +++ b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/common/CaptchaController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.common; +package com.jiajiakang.web.controller.common; import java.util.concurrent.TimeUnit; @@ -11,14 +11,14 @@ import cn.hutool.captcha.generator.MathGenerator; import cn.hutool.captcha.generator.RandomGenerator; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import com.ruoyi.common.core.text.Convert; +import com.jiajiakang.common.core.text.Convert; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.redis.RedisCache; +import com.jiajiakang.common.constant.Constants; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.core.redis.RedisCache; import javax.annotation.Resource; @@ -79,6 +79,7 @@ public class CaptchaController { capStr = lineCaptcha.getCode(); } else if ("circle".equals(captchaCategory)) { circleCaptcha.setGenerator(codeGenerator); + circleCaptcha.createCode(); capStr = circleCaptcha.getCode(); } else if ("shear".equals(captchaCategory)) { shearCaptcha.setGenerator(codeGenerator); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/common/CommonController.java similarity index 90% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java rename to jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/common/CommonController.java index e0c728fac8959ca2fbe91b26b3df9aeb05e0bd91..9568f8e01b4ebfa2115ddd0c68e98eacd37f1b1d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/common/CommonController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.common; +package com.jiajiakang.web.controller.common; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -10,13 +10,13 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.framework.config.ServerConfig; +import com.jiajiakang.common.config.RuoYiConfig; +import com.jiajiakang.common.constant.Constants; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.common.utils.file.FileUploadUtils; +import com.jiajiakang.common.utils.file.FileUtils; +import com.jiajiakang.framework.config.ServerConfig; /** * 閫氱敤璇锋眰澶勭悊 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/monitor/CacheController.java similarity index 91% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java rename to jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/monitor/CacheController.java index fa9c623f2d8f209a46098793ab59b0f962a1406e..f2abb0b98dcc38ffadff791405f555eda0f265ae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java +++ b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/monitor/CacheController.java @@ -1,53 +1,53 @@ -package com.ruoyi.web.controller.monitor; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.RedisCallback; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.StringUtils; - -/** - * 缂撳瓨鐩戞帶 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/monitor/cache") -public class CacheController -{ - @Autowired - private RedisTemplate redisTemplate; - - @PreAuthorize("@ss.hasPermi('monitor:cache:list')") - @GetMapping() - public AjaxResult getInfo() throws Exception - { - Properties info = (Properties) redisTemplate.execute((RedisCallback) connection -> connection.info()); - Properties commandStats = (Properties) redisTemplate.execute((RedisCallback) connection -> connection.info("commandstats")); - Object dbSize = redisTemplate.execute((RedisCallback) connection -> connection.dbSize()); - - Map result = new HashMap<>(3); - result.put("info", info); - result.put("dbSize", dbSize); - - List> pieList = new ArrayList<>(); - commandStats.stringPropertyNames().forEach(key -> { - Map data = new HashMap<>(2); - String property = commandStats.getProperty(key); - data.put("name", StringUtils.removeStart(key, "cmdstat_")); - data.put("value", StringUtils.substringBetween(property, "calls=", ",usec")); - pieList.add(data); - }); - result.put("commandStats", pieList); - return AjaxResult.success(result); - } -} +package com.jiajiakang.web.controller.monitor; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisCallback; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.utils.StringUtils; + +/** + * 缂撳瓨鐩戞帶 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/monitor/cache") +public class CacheController +{ + @Autowired + private RedisTemplate redisTemplate; + + @PreAuthorize("@ss.hasPermi('monitor:cache:list')") + @GetMapping() + public AjaxResult getInfo() throws Exception + { + Properties info = (Properties) redisTemplate.execute((RedisCallback) connection -> connection.info()); + Properties commandStats = (Properties) redisTemplate.execute((RedisCallback) connection -> connection.info("commandstats")); + Object dbSize = redisTemplate.execute((RedisCallback) connection -> connection.dbSize()); + + Map result = new HashMap<>(3); + result.put("info", info); + result.put("dbSize", dbSize); + + List> pieList = new ArrayList<>(); + commandStats.stringPropertyNames().forEach(key -> { + Map data = new HashMap<>(2); + String property = commandStats.getProperty(key); + data.put("name", StringUtils.removeStart(key, "cmdstat_")); + data.put("value", StringUtils.substringBetween(property, "calls=", ",usec")); + pieList.add(data); + }); + result.put("commandStats", pieList); + return AjaxResult.success(result); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/monitor/ServerController.java similarity index 80% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java rename to jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/monitor/ServerController.java index cc805ad89da5deb3b6f7830a66e653823c2aab14..8b4417c76465a4c347edc7927228d9eedbd939ea 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java +++ b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/monitor/ServerController.java @@ -1,11 +1,11 @@ -package com.ruoyi.web.controller.monitor; +package com.jiajiakang.web.controller.monitor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.framework.web.domain.Server; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.framework.web.domain.Server; /** * 鏈嶅姟鍣ㄧ洃鎺 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/monitor/SysLogininforController.java similarity index 81% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java rename to jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/monitor/SysLogininforController.java index 339f242866e0f90dfb24a9229cc31b49e97f4f32..e4c028110e741cd85b797b61d3f6886071fb77e9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java +++ b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/monitor/SysLogininforController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.jiajiakang.web.controller.monitor; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -8,14 +8,14 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysLogininfor; -import com.ruoyi.system.service.ISysLogininforService; +import com.jiajiakang.common.annotation.Log; +import com.jiajiakang.common.core.controller.BaseController; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.core.page.TableDataInfo; +import com.jiajiakang.common.enums.BusinessType; +import com.jiajiakang.common.utils.poi.ExcelUtil; +import com.jiajiakang.system.domain.SysLogininfor; +import com.jiajiakang.system.service.ISysLogininforService; /** * 绯荤粺璁块棶璁板綍 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/monitor/SysOperlogController.java similarity index 80% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java rename to jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/monitor/SysOperlogController.java index 0332a14a952bbfe05c3523236c0cc8c20aadd07d..601ec1aca6c37d7ee36bb56b5ce344ce7b80d108 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java +++ b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/monitor/SysOperlogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.jiajiakang.web.controller.monitor; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -8,14 +8,14 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysOperLog; -import com.ruoyi.system.service.ISysOperLogService; +import com.jiajiakang.common.annotation.Log; +import com.jiajiakang.common.core.controller.BaseController; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.core.page.TableDataInfo; +import com.jiajiakang.common.enums.BusinessType; +import com.jiajiakang.common.utils.poi.ExcelUtil; +import com.jiajiakang.system.domain.SysOperLog; +import com.jiajiakang.system.service.ISysOperLogService; /** * 鎿嶄綔鏃ュ織璁板綍 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/monitor/SysUserOnlineController.java similarity index 82% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java rename to jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/monitor/SysUserOnlineController.java index 9b157ea7354ac4414383001bfd3aa319d7f389be..74740d728cb25774b83dbb296608a1b1b4f51db2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java +++ b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/monitor/SysUserOnlineController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.jiajiakang.web.controller.monitor; import java.util.ArrayList; import java.util.Collection; @@ -11,17 +11,17 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysUserOnline; -import com.ruoyi.system.service.ISysUserOnlineService; +import com.jiajiakang.common.annotation.Log; +import com.jiajiakang.common.constant.Constants; +import com.jiajiakang.common.core.controller.BaseController; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.core.domain.model.LoginUser; +import com.jiajiakang.common.core.page.TableDataInfo; +import com.jiajiakang.common.core.redis.RedisCache; +import com.jiajiakang.common.enums.BusinessType; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.system.domain.SysUserOnline; +import com.jiajiakang.system.service.ISysUserOnlineService; /** * 鍦ㄧ嚎鐢ㄦ埛鐩戞帶 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysConfigController.java similarity index 86% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java rename to jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysConfigController.java index fb39a336afa47f126818c7e3e2ddce70ad87cb88..30ffd6811cefecb9d77d6dbb3e09632055f4a821 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java +++ b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysConfigController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.jiajiakang.web.controller.system; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -12,17 +12,17 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysConfig; -import com.ruoyi.system.service.ISysConfigService; +import com.jiajiakang.common.annotation.Log; +import com.jiajiakang.common.annotation.RepeatSubmit; +import com.jiajiakang.common.constant.UserConstants; +import com.jiajiakang.common.core.controller.BaseController; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.core.page.TableDataInfo; +import com.jiajiakang.common.enums.BusinessType; +import com.jiajiakang.common.utils.SecurityUtils; +import com.jiajiakang.common.utils.poi.ExcelUtil; +import com.jiajiakang.system.domain.SysConfig; +import com.jiajiakang.system.service.ISysConfigService; /** * 鍙傛暟閰嶇疆 淇℃伅鎿嶄綔澶勭悊 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysDeptController.java similarity index 91% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java rename to jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysDeptController.java index 480816abe5585d5848fb54d0683906af40383f22..73d362d91e832def718d0a943ace2828a51384fa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysDeptController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.jiajiakang.web.controller.system; import java.util.Iterator; import java.util.List; @@ -14,15 +14,15 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.service.ISysDeptService; +import com.jiajiakang.common.annotation.Log; +import com.jiajiakang.common.constant.UserConstants; +import com.jiajiakang.common.core.controller.BaseController; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.core.domain.entity.SysDept; +import com.jiajiakang.common.enums.BusinessType; +import com.jiajiakang.common.utils.SecurityUtils; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.system.service.ISysDeptService; /** * 閮ㄩ棬淇℃伅 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysDictDataController.java similarity index 84% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java rename to jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysDictDataController.java index 91bd67db2b4719f830123edbeb5ddb0d99504631..2293ec42b759c3e6298831a692cd46675de66e4d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysDictDataController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.jiajiakang.web.controller.system; import java.util.ArrayList; import java.util.List; @@ -13,17 +13,17 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.service.ISysDictDataService; -import com.ruoyi.system.service.ISysDictTypeService; +import com.jiajiakang.common.annotation.Log; +import com.jiajiakang.common.core.controller.BaseController; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.core.domain.entity.SysDictData; +import com.jiajiakang.common.core.page.TableDataInfo; +import com.jiajiakang.common.enums.BusinessType; +import com.jiajiakang.common.utils.SecurityUtils; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.common.utils.poi.ExcelUtil; +import com.jiajiakang.system.service.ISysDictDataService; +import com.jiajiakang.system.service.ISysDictTypeService; /** * 鏁版嵁瀛楀吀淇℃伅 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysDictTypeController.java similarity index 87% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java rename to jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysDictTypeController.java index a4e0b2b146e70dff1b107dfdb43820d90c4c4a0b..6539815cc4644732b8902be220a71e2b4b35ee75 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java +++ b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysDictTypeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.jiajiakang.web.controller.system; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -12,16 +12,16 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDictType; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.service.ISysDictTypeService; +import com.jiajiakang.common.annotation.Log; +import com.jiajiakang.common.constant.UserConstants; +import com.jiajiakang.common.core.controller.BaseController; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.core.domain.entity.SysDictType; +import com.jiajiakang.common.core.page.TableDataInfo; +import com.jiajiakang.common.enums.BusinessType; +import com.jiajiakang.common.utils.SecurityUtils; +import com.jiajiakang.common.utils.poi.ExcelUtil; +import com.jiajiakang.system.service.ISysDictTypeService; /** * 鏁版嵁瀛楀吀淇℃伅 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysLoginController.java similarity index 77% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java rename to jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysLoginController.java index 997c5821d2d78c0032cec3bb37ea0bfaa88c3510..0f4b0411a2519853d243c12dbc475ea85284b48c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysLoginController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.jiajiakang.web.controller.system; import java.util.List; import java.util.Set; @@ -7,17 +7,17 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginBody; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.framework.web.service.SysLoginService; -import com.ruoyi.framework.web.service.SysPermissionService; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.system.service.ISysMenuService; +import com.jiajiakang.common.constant.Constants; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.core.domain.entity.SysMenu; +import com.jiajiakang.common.core.domain.entity.SysUser; +import com.jiajiakang.common.core.domain.model.LoginBody; +import com.jiajiakang.common.core.domain.model.LoginUser; +import com.jiajiakang.common.utils.ServletUtils; +import com.jiajiakang.framework.web.service.SysLoginService; +import com.jiajiakang.framework.web.service.SysPermissionService; +import com.jiajiakang.framework.web.service.TokenService; +import com.jiajiakang.system.service.ISysMenuService; /** * 鐧诲綍楠岃瘉 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysMenuController.java similarity index 87% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java rename to jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysMenuController.java index 2ee723833c5f4ffc678d47e1129ee85dd3e3d2f7..679b783f610c322c48609278defbebf6d8e913e9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java +++ b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysMenuController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.jiajiakang.web.controller.system; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.system.service.ISysMenuService; +import com.jiajiakang.common.annotation.Log; +import com.jiajiakang.common.constant.Constants; +import com.jiajiakang.common.constant.UserConstants; +import com.jiajiakang.common.core.controller.BaseController; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.core.domain.entity.SysMenu; +import com.jiajiakang.common.core.domain.model.LoginUser; +import com.jiajiakang.common.enums.BusinessType; +import com.jiajiakang.common.utils.SecurityUtils; +import com.jiajiakang.common.utils.ServletUtils; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.framework.web.service.TokenService; +import com.jiajiakang.system.service.ISysMenuService; /** * 鑿滃崟淇℃伅 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysNoticeController.java similarity index 85% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java rename to jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysNoticeController.java index 224e594d95272302f9f4575b2c296dc24951cb5e..90e0959f177f3c47c3e2a84f6754ba12d5950bb6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java +++ b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysNoticeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.jiajiakang.web.controller.system; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -12,14 +12,14 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.system.domain.SysNotice; -import com.ruoyi.system.service.ISysNoticeService; +import com.jiajiakang.common.annotation.Log; +import com.jiajiakang.common.core.controller.BaseController; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.core.page.TableDataInfo; +import com.jiajiakang.common.enums.BusinessType; +import com.jiajiakang.common.utils.SecurityUtils; +import com.jiajiakang.system.domain.SysNotice; +import com.jiajiakang.system.service.ISysNoticeService; /** * 鍏憡 淇℃伅鎿嶄綔澶勭悊 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysPostController.java similarity index 87% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java rename to jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysPostController.java index 0c73ea8d78feeb12d906f6b5923d28202eacbc54..cba4b4b28f8463f001c65fbe55b21822e7b5dff0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java +++ b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysPostController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.jiajiakang.web.controller.system; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -12,16 +12,16 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.service.ISysPostService; +import com.jiajiakang.common.annotation.Log; +import com.jiajiakang.common.constant.UserConstants; +import com.jiajiakang.common.core.controller.BaseController; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.core.page.TableDataInfo; +import com.jiajiakang.common.enums.BusinessType; +import com.jiajiakang.common.utils.SecurityUtils; +import com.jiajiakang.common.utils.poi.ExcelUtil; +import com.jiajiakang.system.domain.SysPost; +import com.jiajiakang.system.service.ISysPostService; /** * 宀椾綅淇℃伅鎿嶄綔澶勭悊 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysProfileController.java similarity index 86% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java rename to jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysProfileController.java index c2f3f2279ce9aec2599cf30022ead948908b7a43..ef5ab06fe16c2beea2a80732f4d29a427bbb3912 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysProfileController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.jiajiakang.web.controller.system; import java.io.IOException; import org.springframework.beans.factory.annotation.Autowired; @@ -10,18 +10,18 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.system.service.ISysUserService; +import com.jiajiakang.common.annotation.Log; +import com.jiajiakang.common.config.RuoYiConfig; +import com.jiajiakang.common.core.controller.BaseController; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.core.domain.entity.SysUser; +import com.jiajiakang.common.core.domain.model.LoginUser; +import com.jiajiakang.common.enums.BusinessType; +import com.jiajiakang.common.utils.SecurityUtils; +import com.jiajiakang.common.utils.ServletUtils; +import com.jiajiakang.common.utils.file.FileUploadUtils; +import com.jiajiakang.framework.web.service.TokenService; +import com.jiajiakang.system.service.ISysUserService; /** * 涓汉淇℃伅 涓氬姟澶勭悊 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysRoleController.java similarity index 86% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java rename to jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysRoleController.java index a06f8489bb88f22f245a4b7ae27d9e32569b4d75..9fa25457950b9991da89e22ea4b64fdbc1b2c1b6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysRoleController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.jiajiakang.web.controller.system; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -12,22 +12,22 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.web.service.SysPermissionService; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysUserService; +import com.jiajiakang.common.annotation.Log; +import com.jiajiakang.common.constant.UserConstants; +import com.jiajiakang.common.core.controller.BaseController; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.core.domain.entity.SysRole; +import com.jiajiakang.common.core.domain.model.LoginUser; +import com.jiajiakang.common.core.page.TableDataInfo; +import com.jiajiakang.common.enums.BusinessType; +import com.jiajiakang.common.utils.SecurityUtils; +import com.jiajiakang.common.utils.ServletUtils; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.common.utils.poi.ExcelUtil; +import com.jiajiakang.framework.web.service.SysPermissionService; +import com.jiajiakang.framework.web.service.TokenService; +import com.jiajiakang.system.service.ISysRoleService; +import com.jiajiakang.system.service.ISysUserService; /** * 瑙掕壊淇℃伅 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysUserController.java similarity index 88% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java rename to jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysUserController.java index 02346f12dcec4c25478592199b355144917e38f4..4df041e9a1c8d9a5c607ab758b0607f903c4a907 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysUserController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.jiajiakang.web.controller.system; import java.util.List; import java.util.stream.Collectors; @@ -14,23 +14,23 @@ 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.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.system.service.ISysPostService; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysUserService; +import com.jiajiakang.common.annotation.Log; +import com.jiajiakang.common.constant.UserConstants; +import com.jiajiakang.common.core.controller.BaseController; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.core.domain.entity.SysRole; +import com.jiajiakang.common.core.domain.entity.SysUser; +import com.jiajiakang.common.core.domain.model.LoginUser; +import com.jiajiakang.common.core.page.TableDataInfo; +import com.jiajiakang.common.enums.BusinessType; +import com.jiajiakang.common.utils.SecurityUtils; +import com.jiajiakang.common.utils.ServletUtils; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.common.utils.poi.ExcelUtil; +import com.jiajiakang.framework.web.service.TokenService; +import com.jiajiakang.system.service.ISysPostService; +import com.jiajiakang.system.service.ISysRoleService; +import com.jiajiakang.system.service.ISysUserService; /** * 鐢ㄦ埛淇℃伅 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/tool/SwaggerController.java similarity index 82% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java rename to jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/tool/SwaggerController.java index e901fedd7fdaa8935dd2d6a2bb745ac0975152e3..fd5d4c1296a2b0ee634c23b5b2c16cd09dbd493e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java +++ b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/tool/SwaggerController.java @@ -1,24 +1,24 @@ -package com.ruoyi.web.controller.tool; - -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import com.ruoyi.common.core.controller.BaseController; - -/** - * swagger 鎺ュ彛 - * - * @author ruoyi - */ -@Controller -@RequestMapping("/tool/swagger") -public class SwaggerController extends BaseController -{ - @PreAuthorize("@ss.hasPermi('tool:swagger:view')") - @GetMapping() - public String index() - { - return redirect("/swagger-ui.html"); - } -} +package com.jiajiakang.web.controller.tool; + +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import com.jiajiakang.common.core.controller.BaseController; + +/** + * swagger 鎺ュ彛 + * + * @author ruoyi + */ +@Controller +@RequestMapping("/tool/swagger") +public class SwaggerController extends BaseController +{ + @PreAuthorize("@ss.hasPermi('tool:swagger:view')") + @GetMapping() + public String index() + { + return redirect("/swagger-ui.html"); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/tool/TestController.java similarity index 95% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java rename to jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/tool/TestController.java index 9c6e6b5e97a9a7a4a471bddf9d14981a57b2fdff..803fe6fbc034a3097f0c32e787f9892532e09c56 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java +++ b/jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/tool/TestController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.tool; +package com.jiajiakang.web.controller.tool; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -11,9 +11,9 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.StringUtils; +import com.jiajiakang.common.core.controller.BaseController; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.utils.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/jiajiakang-admin/src/main/java/com/jiajiakang/web/core/config/SwaggerConfig.java similarity index 95% rename from ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java rename to jiajiakang-admin/src/main/java/com/jiajiakang/web/core/config/SwaggerConfig.java index 12737856306fcf9b73a00265681610eff094882b..ce34581e1c684603c2bcdb94bb2a25e47b68950a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java +++ b/jiajiakang-admin/src/main/java/com/jiajiakang/web/core/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.core.config; +package com.jiajiakang.web.core.config; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.ruoyi.common.config.RuoYiConfig; +import com.jiajiakang.common.config.RuoYiConfig; import io.swagger.annotations.ApiOperation; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.PathSelectors; @@ -58,7 +58,7 @@ public class SwaggerConfig // 鎵弿鎵鏈夋湁娉ㄨВ鐨刟pi锛岀敤杩欑鏂瑰紡鏇寸伒娲 .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) // 鎵弿鎸囧畾鍖呬腑鐨剆wagger娉ㄨВ - // .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger")) + // .apis(RequestHandlerSelectors.basePackage("com.jiajiakang.project.tool.swagger")) // 鎵弿鎵鏈 .apis(RequestHandlerSelectors.any()) .paths(PathSelectors.any()) .build() @@ -113,7 +113,7 @@ public class SwaggerConfig // 鐢ˋpiInfoBuilder杩涜瀹氬埗 return new ApiInfoBuilder() // 璁剧疆鏍囬 - .title("鏍囬锛氳嫢渚濈鐞嗙郴缁焈鎺ュ彛鏂囨。") + .title("鏍囬锛氫匠瀹跺悍绠＄悊绯荤粺_鎺ュ彛鏂囨。") // 鎻忚堪 .description("鎻忚堪锛氱敤浜庣鐞嗛泦鍥㈡棗涓嬪叕鍙哥殑浜哄憳淇℃伅,鍏蜂綋鍖呮嫭XXX,XXX妯″潡...") // 浣滆呬俊鎭 diff --git a/ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties b/jiajiakang-admin/src/main/resources/META-INF/spring-devtools.properties similarity index 100% rename from ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties rename to jiajiakang-admin/src/main/resources/META-INF/spring-devtools.properties diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/jiajiakang-admin/src/main/resources/application-dev.yml similarity index 90% rename from ruoyi-admin/src/main/resources/application-dev.yml rename to jiajiakang-admin/src/main/resources/application-dev.yml index 6d476c9cc01cb6b5da25ce0f386455501f3b7dec..bf6017a1f51b6b11289f3fe00fef25420db292a2 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/jiajiakang-admin/src/main/resources/application-dev.yml @@ -6,9 +6,9 @@ spring: druid: # 涓诲簱鏁版嵁婧 master: - url: jdbc:mysql://192.168.0.222:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true + url: jdbc:mysql://47.104.16.231:3306/jiajiakang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true username: root - password: root + password: cb1c31f688664e12a4d47025364de85e # 浠庡簱鏁版嵁婧 slave: # 浠庢暟鎹簮寮鍏/榛樿鍏抽棴 @@ -58,7 +58,7 @@ spring: # redis 閰嶇疆 redis: # 鍦板潃 - host: 192.168.0.222 + host: 47.104.16.231 # 绔彛锛岄粯璁や负6379 port: 6379 # 鏁版嵁搴撶储寮 diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/jiajiakang-admin/src/main/resources/application-prod.yml similarity index 90% rename from ruoyi-admin/src/main/resources/application-prod.yml rename to jiajiakang-admin/src/main/resources/application-prod.yml index e9cf4a70c0ca5db3be47b91be8468ae03bf47e11..dbab649ae2afa49675dad5fd050b74dfd8628b73 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/jiajiakang-admin/src/main/resources/application-prod.yml @@ -6,9 +6,9 @@ spring: druid: # 涓诲簱鏁版嵁婧 master: - url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true + url: jdbc:mysql://localhost:3306/jiajiakang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true username: root - password: root + password: cb1c31f688664e12a4d47025364de85e # 浠庡簱鏁版嵁婧 slave: # 浠庢暟鎹簮寮鍏/榛樿鍏抽棴 @@ -58,7 +58,7 @@ spring: # redis 閰嶇疆 redis: # 鍦板潃 - host: 192.168.0.222 + host: 127.0.0.1 # 绔彛锛岄粯璁や负6379 port: 6379 # 鏁版嵁搴撶储寮 diff --git a/ruoyi-admin/src/main/resources/application.yml b/jiajiakang-admin/src/main/resources/application.yml similarity index 97% rename from ruoyi-admin/src/main/resources/application.yml rename to jiajiakang-admin/src/main/resources/application.yml index 963614d57628fb9f6b163a1811a7d3fcda2d40d5..604181cc90a255e1d2bb64ad0c9585f59a06718e 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/jiajiakang-admin/src/main/resources/application.yml @@ -1,15 +1,15 @@ # 椤圭洰鐩稿叧閰嶇疆 -ruoyi: +jiajiakang: # 鍚嶇О - name: RuoYi + name: jiajiakang # 鐗堟湰 - version: 3.4.0 + version: 1.0.0 # 鐗堟潈骞翠唤 copyrightYear: 2021 # 瀹炰緥婕旂ず寮鍏 demoEnabled: true # 鏂囦欢璺緞,浣跨敤jvm绯荤粺鍙橀噺,鍏煎windows鍜宭inux; - profile: ${user.dir}/ruoyi/uploadPath + profile: ${user.dir}/jiajiakang/uploadPath # 鑾峰彇ip鍦板潃寮鍏 addressEnabled: false @@ -26,7 +26,7 @@ captcha: # 寮鍙戠幆澧冮厤缃 server: # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080 - port: 8080 + port: 8888 servlet: # 搴旂敤鐨勮闂矾寰 context-path: / @@ -55,7 +55,7 @@ server: # 鏃ュ織閰嶇疆 logging: level: - com.ruoyi: @logging.level@ + com.jiajiakang: @logging.level@ org.springframework: warn # Spring閰嶇疆 @@ -94,7 +94,7 @@ mybatis-plus: # 瀵瑰簲鐨 XML 鏂囦欢浣嶇疆 mapperLocations: classpath*:mapper/**/*Mapper.xml # 瀹炰綋鎵弿锛屽涓猵ackage鐢ㄩ楀彿鎴栬呭垎鍙峰垎闅 - typeAliasesPackage: com.ruoyi.**.domain + typeAliasesPackage: com.jiajiakang.**.domain # 閽堝 typeAliasesPackage锛屽鏋滈厤缃簡璇ュ睘鎬э紝鍒欎粎浠呬細鎵弿璺緞涓嬩互璇ョ被浣滀负鐖剁被鐨勫煙瀵硅薄 #typeAliasesSuperType: Class # 濡傛灉閰嶇疆浜嗚灞炴э紝SqlSessionFactoryBean 浼氭妸璇ュ寘涓嬮潰鐨勭被娉ㄥ唽涓哄搴旂殑 TypeHandler diff --git a/ruoyi-admin/src/main/resources/banner.txt b/jiajiakang-admin/src/main/resources/banner.txt similarity index 50% rename from ruoyi-admin/src/main/resources/banner.txt rename to jiajiakang-admin/src/main/resources/banner.txt index fee1ce3b57e76297369e7652c97372aa7d7e4f26..b2983b79d8bf98c74da34e5d064fdbff70cc6606 100644 --- a/ruoyi-admin/src/main/resources/banner.txt +++ b/jiajiakang-admin/src/main/resources/banner.txt @@ -1,2 +1,2 @@ -Application Version: ${ruoyi.version} +Application Version: ${jiajiakang.version} Spring Boot Version: ${spring-boot.version} \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/i18n/messages.properties b/jiajiakang-admin/src/main/resources/i18n/messages.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages.properties rename to jiajiakang-admin/src/main/resources/i18n/messages.properties diff --git a/ruoyi-admin/src/main/resources/logback.xml b/jiajiakang-admin/src/main/resources/logback.xml similarity index 98% rename from ruoyi-admin/src/main/resources/logback.xml rename to jiajiakang-admin/src/main/resources/logback.xml index f27bff9af59320c60d6acae133bac9d6fbf34678..7ff1a6e94e810edfbaece17c284aed13b78d422b 100644 --- a/ruoyi-admin/src/main/resources/logback.xml +++ b/jiajiakang-admin/src/main/resources/logback.xml @@ -73,7 +73,7 @@ - + diff --git a/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml b/jiajiakang-admin/src/main/resources/mybatis/mybatis-config.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml rename to jiajiakang-admin/src/main/resources/mybatis/mybatis-config.xml diff --git a/ruoyi-common/pom.xml b/jiajiakang-common/pom.xml similarity index 94% rename from ruoyi-common/pom.xml rename to jiajiakang-common/pom.xml index 60fb69ccd2679a6f4915ced7df25d59eab2b004e..a6885914f8ee6e6cf4fe305960e5dbf1d4e03cf0 100644 --- a/ruoyi-common/pom.xml +++ b/jiajiakang-common/pom.xml @@ -1,151 +1,151 @@ - - - - ruoyi - com.ruoyi - 3.4.0 - - 4.0.0 - - ruoyi-common - - - common閫氱敤宸ュ叿 - - - - - - - org.springframework - spring-context-support - - - - - org.springframework - spring-web - - - - - org.springframework.boot - spring-boot-starter-security - - - - - com.github.pagehelper - pagehelper-spring-boot-starter - - - - - javax.validation - validation-api - - - - - org.apache.commons - commons-lang3 - - - - - com.fasterxml.jackson.core - jackson-databind - - - - - com.alibaba - fastjson - - - - - commons-io - commons-io - - - - - commons-fileupload - commons-fileupload - - - - - org.apache.poi - poi-ooxml - - - - - org.yaml - snakeyaml - - - - - io.jsonwebtoken - jjwt - - - - - org.springframework.boot - spring-boot-starter-data-redis - - - - - org.apache.commons - commons-pool2 - - - - - eu.bitwalker - UserAgentUtils - - - - - javax.servlet - javax.servlet-api - - - - com.baomidou - mybatis-plus-boot-starter - - - com.baomidou - mybatis-plus-extension - - - cn.hutool - hutool-all - - - org.projectlombok - lombok - - - - org.springframework.cloud - spring-cloud-starter-openfeign - - - - io.github.openfeign - feign-okhttp - - - - + + + + jiajiakang + com.jiajiakang + 3.4.0 + + 4.0.0 + + jiajiakang-common + + + common閫氱敤宸ュ叿 + + + + + + + org.springframework + spring-context-support + + + + + org.springframework + spring-web + + + + + org.springframework.boot + spring-boot-starter-security + + + + + com.github.pagehelper + pagehelper-spring-boot-starter + + + + + javax.validation + validation-api + + + + + org.apache.commons + commons-lang3 + + + + + com.fasterxml.jackson.core + jackson-databind + + + + + com.alibaba + fastjson + + + + + commons-io + commons-io + + + + + commons-fileupload + commons-fileupload + + + + + org.apache.poi + poi-ooxml + + + + + org.yaml + snakeyaml + + + + + io.jsonwebtoken + jjwt + + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + org.apache.commons + commons-pool2 + + + + + eu.bitwalker + UserAgentUtils + + + + + javax.servlet + javax.servlet-api + + + + com.baomidou + mybatis-plus-boot-starter + + + com.baomidou + mybatis-plus-extension + + + cn.hutool + hutool-all + + + org.projectlombok + lombok + + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + + io.github.openfeign + feign-okhttp + + + + \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/annotation/DataScope.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/annotation/DataScope.java index 176878e9de81885a88bf3c5aee8d68198f5a1d25..b5de88f12e5c51e3233d12a0d22cd11ea9d5d749 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/annotation/DataScope.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.jiajiakang.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/annotation/DataSource.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/annotation/DataSource.java index 79cd191f8e2f85e0a28dae98880a88dd134e49fc..60bf303b8ac5bf25cfed9e8291d43ddd7d9e7336 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/annotation/DataSource.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.jiajiakang.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -6,7 +6,7 @@ import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.ruoyi.common.enums.DataSourceType; +import com.jiajiakang.common.enums.DataSourceType; /** * 鑷畾涔夊鏁版嵁婧愬垏鎹㈡敞瑙 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/annotation/Excel.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/annotation/Excel.java index 50482c57213a57573688a762a4965f97a6816ced..cc8ad8f9783cf5d8398967e46442d2e407faed79 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/annotation/Excel.java @@ -1,165 +1,165 @@ -package com.ruoyi.common.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.math.BigDecimal; - -/** - * 鑷畾涔夊鍑篍xcel鏁版嵁娉ㄨВ - * - * @author ruoyi - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.FIELD) -public @interface Excel -{ - /** - * 瀵煎嚭鏃跺湪excel涓帓搴 - */ - public int sort() default Integer.MAX_VALUE; - - /** - * 瀵煎嚭鍒癊xcel涓殑鍚嶅瓧. - */ - public String name() default ""; - - /** - * 鏃ユ湡鏍煎紡, 濡: yyyy-MM-dd - */ - public String dateFormat() default ""; - - /** - * 濡傛灉鏄瓧鍏哥被鍨嬶紝璇疯缃瓧鍏哥殑type鍊 (濡: sys_user_sex) - */ - public String dictType() default ""; - - /** - * 璇诲彇鍐呭杞〃杈惧紡 (濡: 0=鐢,1=濂,2=鏈煡) - */ - public String readConverterExp() default ""; - - /** - * 鍒嗛殧绗︼紝璇诲彇瀛楃涓茬粍鍐呭 - */ - public String separator() default ","; - - /** - * BigDecimal 绮惧害 榛樿:-1(榛樿涓嶅紑鍚疊igDecimal鏍煎紡鍖) - */ - public int scale() default -1; - - /** - * BigDecimal 鑸嶅叆瑙勫垯 榛樿:BigDecimal.ROUND_HALF_EVEN - */ - public int roundingMode() default BigDecimal.ROUND_HALF_EVEN; - - /** - * 瀵煎嚭绫诲瀷锛0鏁板瓧 1瀛楃涓诧級 - */ - public ColumnType cellType() default ColumnType.STRING; - - /** - * 瀵煎嚭鏃跺湪excel涓瘡涓垪鐨勯珮搴 鍗曚綅涓哄瓧绗 - */ - public double height() default 14; - - /** - * 瀵煎嚭鏃跺湪excel涓瘡涓垪鐨勫 鍗曚綅涓哄瓧绗 - */ - public double width() default 16; - - /** - * 鏂囧瓧鍚庣紑,濡% 90 鍙樻垚90% - */ - public String suffix() default ""; - - /** - * 褰撳间负绌烘椂,瀛楁鐨勯粯璁ゅ - */ - public String defaultValue() default ""; - - /** - * 鎻愮ず淇℃伅 - */ - public String prompt() default ""; - - /** - * 璁剧疆鍙兘閫夋嫨涓嶈兘杈撳叆鐨勫垪鍐呭. - */ - public String[] combo() default {}; - - /** - * 鏄惁瀵煎嚭鏁版嵁,搴斿闇姹:鏈夋椂鎴戜滑闇瑕佸鍑轰竴浠芥ā鏉,杩欐槸鏍囬闇瑕佷絾鍐呭闇瑕佺敤鎴锋墜宸ュ～鍐. - */ - public boolean isExport() default true; - - /** - * 鍙︿竴涓被涓殑灞炴у悕绉,鏀寔澶氱骇鑾峰彇,浠ュ皬鏁扮偣闅斿紑 - */ - public String targetAttr() default ""; - - /** - * 鏄惁鑷姩缁熻鏁版嵁,鍦ㄦ渶鍚庤拷鍔犱竴琛岀粺璁℃暟鎹诲拰 - */ - public boolean isStatistics() default false; - - /** - * 瀵煎嚭瀛楁瀵归綈鏂瑰紡锛0锛氶粯璁わ紱1锛氶潬宸︼紱2锛氬眳涓紱3锛氶潬鍙筹級 - */ - Align align() default Align.AUTO; - - public enum Align - { - AUTO(0), LEFT(1), CENTER(2), RIGHT(3); - private final int value; - - Align(int value) - { - this.value = value; - } - - public int value() - { - return this.value; - } - } - - /** - * 瀛楁绫诲瀷锛0锛氬鍑哄鍏ワ紱1锛氫粎瀵煎嚭锛2锛氫粎瀵煎叆锛 - */ - Type type() default Type.ALL; - - public enum Type - { - ALL(0), EXPORT(1), IMPORT(2); - private final int value; - - Type(int value) - { - this.value = value; - } - - public int value() - { - return this.value; - } - } - - public enum ColumnType - { - NUMERIC(0), STRING(1), IMAGE(2); - private final int value; - - ColumnType(int value) - { - this.value = value; - } - - public int value() - { - return this.value; - } - } +package com.jiajiakang.common.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.math.BigDecimal; + +/** + * 鑷畾涔夊鍑篍xcel鏁版嵁娉ㄨВ + * + * @author ruoyi + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface Excel +{ + /** + * 瀵煎嚭鏃跺湪excel涓帓搴 + */ + public int sort() default Integer.MAX_VALUE; + + /** + * 瀵煎嚭鍒癊xcel涓殑鍚嶅瓧. + */ + public String name() default ""; + + /** + * 鏃ユ湡鏍煎紡, 濡: yyyy-MM-dd + */ + public String dateFormat() default ""; + + /** + * 濡傛灉鏄瓧鍏哥被鍨嬶紝璇疯缃瓧鍏哥殑type鍊 (濡: sys_user_sex) + */ + public String dictType() default ""; + + /** + * 璇诲彇鍐呭杞〃杈惧紡 (濡: 0=鐢,1=濂,2=鏈煡) + */ + public String readConverterExp() default ""; + + /** + * 鍒嗛殧绗︼紝璇诲彇瀛楃涓茬粍鍐呭 + */ + public String separator() default ","; + + /** + * BigDecimal 绮惧害 榛樿:-1(榛樿涓嶅紑鍚疊igDecimal鏍煎紡鍖) + */ + public int scale() default -1; + + /** + * BigDecimal 鑸嶅叆瑙勫垯 榛樿:BigDecimal.ROUND_HALF_EVEN + */ + public int roundingMode() default BigDecimal.ROUND_HALF_EVEN; + + /** + * 瀵煎嚭绫诲瀷锛0鏁板瓧 1瀛楃涓诧級 + */ + public ColumnType cellType() default ColumnType.STRING; + + /** + * 瀵煎嚭鏃跺湪excel涓瘡涓垪鐨勯珮搴 鍗曚綅涓哄瓧绗 + */ + public double height() default 14; + + /** + * 瀵煎嚭鏃跺湪excel涓瘡涓垪鐨勫 鍗曚綅涓哄瓧绗 + */ + public double width() default 16; + + /** + * 鏂囧瓧鍚庣紑,濡% 90 鍙樻垚90% + */ + public String suffix() default ""; + + /** + * 褰撳间负绌烘椂,瀛楁鐨勯粯璁ゅ + */ + public String defaultValue() default ""; + + /** + * 鎻愮ず淇℃伅 + */ + public String prompt() default ""; + + /** + * 璁剧疆鍙兘閫夋嫨涓嶈兘杈撳叆鐨勫垪鍐呭. + */ + public String[] combo() default {}; + + /** + * 鏄惁瀵煎嚭鏁版嵁,搴斿闇姹:鏈夋椂鎴戜滑闇瑕佸鍑轰竴浠芥ā鏉,杩欐槸鏍囬闇瑕佷絾鍐呭闇瑕佺敤鎴锋墜宸ュ～鍐. + */ + public boolean isExport() default true; + + /** + * 鍙︿竴涓被涓殑灞炴у悕绉,鏀寔澶氱骇鑾峰彇,浠ュ皬鏁扮偣闅斿紑 + */ + public String targetAttr() default ""; + + /** + * 鏄惁鑷姩缁熻鏁版嵁,鍦ㄦ渶鍚庤拷鍔犱竴琛岀粺璁℃暟鎹诲拰 + */ + public boolean isStatistics() default false; + + /** + * 瀵煎嚭瀛楁瀵归綈鏂瑰紡锛0锛氶粯璁わ紱1锛氶潬宸︼紱2锛氬眳涓紱3锛氶潬鍙筹級 + */ + Align align() default Align.AUTO; + + public enum Align + { + AUTO(0), LEFT(1), CENTER(2), RIGHT(3); + private final int value; + + Align(int value) + { + this.value = value; + } + + public int value() + { + return this.value; + } + } + + /** + * 瀛楁绫诲瀷锛0锛氬鍑哄鍏ワ紱1锛氫粎瀵煎嚭锛2锛氫粎瀵煎叆锛 + */ + Type type() default Type.ALL; + + public enum Type + { + ALL(0), EXPORT(1), IMPORT(2); + private final int value; + + Type(int value) + { + this.value = value; + } + + public int value() + { + return this.value; + } + } + + public enum ColumnType + { + NUMERIC(0), STRING(1), IMAGE(2); + private final int value; + + ColumnType(int value) + { + this.value = value; + } + + public int value() + { + return this.value; + } + } } \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/annotation/Excels.java similarity index 85% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/annotation/Excels.java index 940763f0647d7a348d72ee49a85182c19c2216c7..d8b37cd183325a08037aaa51a3a5b1c03a920fd5 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/annotation/Excels.java @@ -1,18 +1,18 @@ -package com.ruoyi.common.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Excel娉ㄨВ闆 - * - * @author ruoyi - */ -@Target(ElementType.FIELD) -@Retention(RetentionPolicy.RUNTIME) -public @interface Excels -{ - Excel[] value(); -} +package com.jiajiakang.common.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Excel娉ㄨВ闆 + * + * @author ruoyi + */ +@Target(ElementType.FIELD) +@Retention(RetentionPolicy.RUNTIME) +public @interface Excels +{ + Excel[] value(); +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/annotation/Log.java similarity index 84% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/annotation/Log.java index eb05dc7ce378f8033e7ed7695263891ec3eb84fc..575e8341d770dfa0fcd1173c03cb5b6ba31c10d1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/annotation/Log.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.annotation; +package com.jiajiakang.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.enums.OperatorType; +import com.jiajiakang.common.enums.BusinessType; +import com.jiajiakang.common.enums.OperatorType; /** * 鑷畾涔夋搷浣滄棩蹇楄褰曟敞瑙 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/annotation/RepeatSubmit.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/annotation/RepeatSubmit.java index 628eef1ef26489cb9fe53283dbcf4f774acd8b8f..8efb431743c6d09a7481e047203b30ae9965fb26 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/annotation/RepeatSubmit.java @@ -1,23 +1,23 @@ -package com.ruoyi.common.annotation; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * 鑷畾涔夋敞瑙ｉ槻姝㈣〃鍗曢噸澶嶆彁浜 - * - * @author ruoyi - * - */ -@Inherited -@Target(ElementType.METHOD) -@Retention(RetentionPolicy.RUNTIME) -@Documented -public @interface RepeatSubmit -{ - -} +package com.jiajiakang.common.annotation; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 鑷畾涔夋敞瑙ｉ槻姝㈣〃鍗曢噸澶嶆彁浜 + * + * @author ruoyi + * + */ +@Inherited +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface RepeatSubmit +{ + +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/config/RuoYiConfig.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/config/RuoYiConfig.java index d5d8723f1f76285c2314ce8f35d72831f34b5cac..de78be0e41e495359cf85b2f36dc43a891457a24 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/config/RuoYiConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.config; +package com.jiajiakang.common.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; * @author ruoyi */ @Component -@ConfigurationProperties(prefix = "ruoyi") +@ConfigurationProperties(prefix = "jiajiakang") public class RuoYiConfig { /** 椤圭洰鍚嶇О */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/constant/Constants.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/constant/Constants.java index 534291991257fca2fa9768b3ee426e05a3c09312..7b80fc5b2ff4b193315220cdbb5077bb0a5e9c5f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/constant/Constants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.jiajiakang.common.constant; /** * 閫氱敤甯搁噺淇℃伅 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/constant/GenConstants.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/constant/GenConstants.java index 1fa328e4526bd0f87f768c60c2d83b4c2106f3ac..56d5881aa6404fa3b4704abbe6e7822bb3bdcea3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/constant/GenConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.jiajiakang.common.constant; /** * 浠ｇ爜鐢熸垚閫氱敤甯搁噺 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/constant/HttpStatus.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/constant/HttpStatus.java index d60afee2c93485cb7e2776910801abb3f4660fe4..bcb5cf239c19c7a84cf6cf1714f243415e1039f3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/constant/HttpStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.jiajiakang.common.constant; /** * 杩斿洖鐘舵佺爜 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/constant/ScheduleConstants.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/constant/ScheduleConstants.java index 8318b8f5f99ce7a046be29c57fc653a907e315f7..f53935168b12ee39131d69d0946398c859be8718 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/constant/ScheduleConstants.java @@ -1,50 +1,50 @@ -package com.ruoyi.common.constant; - -/** - * 浠诲姟璋冨害閫氱敤甯搁噺 - * - * @author ruoyi - */ -public class ScheduleConstants -{ - public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME"; - - /** 鎵ц鐩爣key */ - public static final String TASK_PROPERTIES = "TASK_PROPERTIES"; - - /** 榛樿 */ - public static final String MISFIRE_DEFAULT = "0"; - - /** 绔嬪嵆瑙﹀彂鎵ц */ - public static final String MISFIRE_IGNORE_MISFIRES = "1"; - - /** 瑙﹀彂涓娆℃墽琛 */ - public static final String MISFIRE_FIRE_AND_PROCEED = "2"; - - /** 涓嶈Е鍙戠珛鍗虫墽琛 */ - public static final String MISFIRE_DO_NOTHING = "3"; - - public enum Status - { - /** - * 姝ｅ父 - */ - NORMAL("0"), - /** - * 鏆傚仠 - */ - PAUSE("1"); - - private String value; - - private Status(String value) - { - this.value = value; - } - - public String getValue() - { - return value; - } - } -} +package com.jiajiakang.common.constant; + +/** + * 浠诲姟璋冨害閫氱敤甯搁噺 + * + * @author ruoyi + */ +public class ScheduleConstants +{ + public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME"; + + /** 鎵ц鐩爣key */ + public static final String TASK_PROPERTIES = "TASK_PROPERTIES"; + + /** 榛樿 */ + public static final String MISFIRE_DEFAULT = "0"; + + /** 绔嬪嵆瑙﹀彂鎵ц */ + public static final String MISFIRE_IGNORE_MISFIRES = "1"; + + /** 瑙﹀彂涓娆℃墽琛 */ + public static final String MISFIRE_FIRE_AND_PROCEED = "2"; + + /** 涓嶈Е鍙戠珛鍗虫墽琛 */ + public static final String MISFIRE_DO_NOTHING = "3"; + + public enum Status + { + /** + * 姝ｅ父 + */ + NORMAL("0"), + /** + * 鏆傚仠 + */ + PAUSE("1"); + + private String value; + + private Status(String value) + { + this.value = value; + } + + public String getValue() + { + return value; + } + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/constant/UserConstants.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/constant/UserConstants.java index 56b46ba8335b9951b30e9988a64ba4f0fbac5d77..6e4c1bd1e115a57ea8de1fa7e9e8bf466ec224e8 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/constant/UserConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.jiajiakang.common.constant; /** * 鐢ㄦ埛甯搁噺淇℃伅 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/controller/BaseController.java similarity index 83% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/core/controller/BaseController.java index 2a31e70f6ed56247fc65df6b78749b31cf12d2f7..bcf2bcb2e6049ca136291a42ed978f59b87fd38f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/controller/BaseController.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.controller; +package com.jiajiakang.common.core.controller; import java.beans.PropertyEditorSupport; import java.util.Date; @@ -9,14 +9,14 @@ import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.PageDomain; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.page.TableSupport; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.sql.SqlUtil; +import com.jiajiakang.common.constant.HttpStatus; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.core.page.PageDomain; +import com.jiajiakang.common.core.page.TableDataInfo; +import com.jiajiakang.common.core.page.TableSupport; +import com.jiajiakang.common.utils.DateUtils; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.common.utils.sql.SqlUtil; /** * web灞傞氱敤鏁版嵁澶勭悊 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/AjaxResult.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/AjaxResult.java index 28e5a688bf3fbae53feb16c483fae5752e29170d..19eec1a214fcca55d2dcd8ca88b69df06d5dcb66 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/AjaxResult.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.core.domain; +package com.jiajiakang.common.core.domain; import java.util.HashMap; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.utils.StringUtils; +import com.jiajiakang.common.constant.HttpStatus; +import com.jiajiakang.common.utils.StringUtils; /** * 鎿嶄綔娑堟伅鎻愰啋 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/BaseEntity.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/BaseEntity.java index f7d5bf46dff786e64b6197ca09d043fb27483566..f81a58b5fbd171d1482a825d14e342a3e6ff4350 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/BaseEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain; +package com.jiajiakang.common.core.domain; import java.io.Serializable; import java.util.Date; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/TreeEntity.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/TreeEntity.java index 171f04c9b2c18680e20ac14ff254664fb832cb97..ad9566ee02ef5c1a0f2945a4594495c34ad1b92e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/TreeEntity.java @@ -1,79 +1,79 @@ -package com.ruoyi.common.core.domain; - -import java.util.ArrayList; -import java.util.List; - -/** - * Tree鍩虹被 - * - * @author ruoyi - */ -public class TreeEntity extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 鐖惰彍鍗曞悕绉 */ - private String parentName; - - /** 鐖惰彍鍗旾D */ - private Long parentId; - - /** 鏄剧ず椤哄簭 */ - private Integer orderNum; - - /** 绁栫骇鍒楄〃 */ - private String ancestors; - - /** 瀛愰儴闂 */ - private List children = new ArrayList<>(); - - public String getParentName() - { - return parentName; - } - - public void setParentName(String parentName) - { - this.parentName = parentName; - } - - public Long getParentId() - { - return parentId; - } - - public void setParentId(Long parentId) - { - this.parentId = parentId; - } - - public Integer getOrderNum() - { - return orderNum; - } - - public void setOrderNum(Integer orderNum) - { - this.orderNum = orderNum; - } - - public String getAncestors() - { - return ancestors; - } - - public void setAncestors(String ancestors) - { - this.ancestors = ancestors; - } - - public List getChildren() - { - return children; - } - - public void setChildren(List children) - { - this.children = children; - } -} +package com.jiajiakang.common.core.domain; + +import java.util.ArrayList; +import java.util.List; + +/** + * Tree鍩虹被 + * + * @author ruoyi + */ +public class TreeEntity extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 鐖惰彍鍗曞悕绉 */ + private String parentName; + + /** 鐖惰彍鍗旾D */ + private Long parentId; + + /** 鏄剧ず椤哄簭 */ + private Integer orderNum; + + /** 绁栫骇鍒楄〃 */ + private String ancestors; + + /** 瀛愰儴闂 */ + private List children = new ArrayList<>(); + + public String getParentName() + { + return parentName; + } + + public void setParentName(String parentName) + { + this.parentName = parentName; + } + + public Long getParentId() + { + return parentId; + } + + public void setParentId(Long parentId) + { + this.parentId = parentId; + } + + public Integer getOrderNum() + { + return orderNum; + } + + public void setOrderNum(Integer orderNum) + { + this.orderNum = orderNum; + } + + public String getAncestors() + { + return ancestors; + } + + public void setAncestors(String ancestors) + { + this.ancestors = ancestors; + } + + public List getChildren() + { + return children; + } + + public void setChildren(List children) + { + this.children = children; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/TreeSelect.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/TreeSelect.java index bd835db99d8fe52c9e4a066c26bbd66dc0a9a94e..eab892bc0c85c13079e1e945c4a657d3756f2744 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/TreeSelect.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.core.domain; +package com.jiajiakang.common.core.domain; import java.io.Serializable; import java.util.List; import java.util.stream.Collectors; import com.fasterxml.jackson.annotation.JsonInclude; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.domain.entity.SysMenu; +import com.jiajiakang.common.core.domain.entity.SysDept; +import com.jiajiakang.common.core.domain.entity.SysMenu; /** * Treeselect鏍戠粨鏋勫疄浣撶被 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/entity/SysDept.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/entity/SysDept.java index c9238e234fb1b547a3f6a4109300ad3c04dca36c..b8d2b0755ed2a936da767903f6da6fe453d4f863 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/entity/SysDept.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.entity; +package com.jiajiakang.common.core.domain.entity; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,7 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; +import com.jiajiakang.common.core.domain.BaseEntity; /** * 閮ㄩ棬琛 sys_dept diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/entity/SysDictData.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/entity/SysDictData.java index 3f152b340bc545dc494f0b2ec484ca3d4e6cc605..794f884dbaa9b5699d89fbf3c5e71597f0664ab0 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/entity/SysDictData.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.core.domain.entity; +package com.jiajiakang.common.core.domain.entity; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.BaseEntity; +import com.jiajiakang.common.annotation.Excel; +import com.jiajiakang.common.annotation.Excel.ColumnType; +import com.jiajiakang.common.constant.UserConstants; +import com.jiajiakang.common.core.domain.BaseEntity; /** * 瀛楀吀鏁版嵁琛 sys_dict_data diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/entity/SysDictType.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/entity/SysDictType.java index d2c424986dcf66683c2019a94ea81802bd1f3e92..2095f1d0c0487535b1a6c7b29a08f6434e79328f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/entity/SysDictType.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.core.domain.entity; +package com.jiajiakang.common.core.domain.entity; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import com.jiajiakang.common.annotation.Excel; +import com.jiajiakang.common.annotation.Excel.ColumnType; +import com.jiajiakang.common.core.domain.BaseEntity; /** * 瀛楀吀绫诲瀷琛 sys_dict_type diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/entity/SysMenu.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/entity/SysMenu.java index 94d654ae1079e12f507601da927b8b8b5f76fe43..c076e4a813ef00dfe68c9769f4b942a9ec7b39e6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/entity/SysMenu.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.entity; +package com.jiajiakang.common.core.domain.entity; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,7 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; +import com.jiajiakang.common.core.domain.BaseEntity; /** * 鑿滃崟鏉冮檺琛 sys_menu diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/entity/SysRole.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/entity/SysRole.java index 2991595aeba970d0520842617ee7a01df29f5bce..a2450d212895281ee0b85e1e0771ba19061fd755 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/entity/SysRole.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.core.domain.entity; +package com.jiajiakang.common.core.domain.entity; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import com.jiajiakang.common.annotation.Excel; +import com.jiajiakang.common.annotation.Excel.ColumnType; +import com.jiajiakang.common.core.domain.BaseEntity; /** * 瑙掕壊琛 sys_role diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/entity/SysUser.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/entity/SysUser.java index d08668ab48b7e66b3806f5509792638ed3e42320..27f81399259c721e961591fcfc879f26fc184da0 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/entity/SysUser.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.entity; +package com.jiajiakang.common.core.domain.entity; import java.util.Date; import java.util.List; @@ -9,11 +9,11 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.annotation.Excel.Type; -import com.ruoyi.common.annotation.Excels; -import com.ruoyi.common.core.domain.BaseEntity; +import com.jiajiakang.common.annotation.Excel; +import com.jiajiakang.common.annotation.Excel.ColumnType; +import com.jiajiakang.common.annotation.Excel.Type; +import com.jiajiakang.common.annotation.Excels; +import com.jiajiakang.common.core.domain.BaseEntity; /** * 鐢ㄦ埛瀵硅薄 sys_user diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/model/LoginBody.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/model/LoginBody.java index a1f8b83379360de53f713a3ab57e9e7724a29a7f..81c9516d7db3c93244b22b468f10a37aee40a909 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/model/LoginBody.java @@ -1,69 +1,69 @@ -package com.ruoyi.common.core.domain.model; - -/** - * 鐢ㄦ埛鐧诲綍瀵硅薄 - * - * @author ruoyi - */ -public class LoginBody -{ - /** - * 鐢ㄦ埛鍚 - */ - private String username; - - /** - * 鐢ㄦ埛瀵嗙爜 - */ - private String password; - - /** - * 楠岃瘉鐮 - */ - private String code; - - /** - * 鍞竴鏍囪瘑 - */ - private String uuid = ""; - - public String getUsername() - { - return username; - } - - public void setUsername(String username) - { - this.username = username; - } - - public String getPassword() - { - return password; - } - - public void setPassword(String password) - { - this.password = password; - } - - public String getCode() - { - return code; - } - - public void setCode(String code) - { - this.code = code; - } - - public String getUuid() - { - return uuid; - } - - public void setUuid(String uuid) - { - this.uuid = uuid; - } -} +package com.jiajiakang.common.core.domain.model; + +/** + * 鐢ㄦ埛鐧诲綍瀵硅薄 + * + * @author ruoyi + */ +public class LoginBody +{ + /** + * 鐢ㄦ埛鍚 + */ + private String username; + + /** + * 鐢ㄦ埛瀵嗙爜 + */ + private String password; + + /** + * 楠岃瘉鐮 + */ + private String code; + + /** + * 鍞竴鏍囪瘑 + */ + private String uuid = ""; + + public String getUsername() + { + return username; + } + + public void setUsername(String username) + { + this.username = username; + } + + public String getPassword() + { + return password; + } + + public void setPassword(String password) + { + this.password = password; + } + + public String getCode() + { + return code; + } + + public void setCode(String code) + { + this.code = code; + } + + public String getUuid() + { + return uuid; + } + + public void setUuid(String uuid) + { + this.uuid = uuid; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/model/LoginUser.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/model/LoginUser.java index 6e3f1c6b28659393690ad7b4239dfbfc6b5bdafd..83d5e83179722c29a790656c4641191f419fb4a8 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/model/LoginUser.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.core.domain.model; +package com.jiajiakang.common.core.domain.model; import java.util.Collection; import java.util.Set; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.ruoyi.common.core.domain.entity.SysUser; +import com.jiajiakang.common.core.domain.entity.SysUser; /** * 鐧诲綍鐢ㄦ埛韬唤鏉冮檺 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/page/PageDomain.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/core/page/PageDomain.java index 6fba8837e5cd1cf218bc46794aa799425965318b..a6f041db7c42d0bfca509398f708232643e60bcc 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/page/PageDomain.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.core.page; +package com.jiajiakang.common.core.page; -import com.ruoyi.common.utils.StringUtils; +import com.jiajiakang.common.utils.StringUtils; /** * 鍒嗛〉鏁版嵁 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/page/TableDataInfo.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/core/page/TableDataInfo.java index 847685ba41234576f3d0cc0b01fc0f1e76bc460a..e66d7a7455f2989269ac3ac3797007277ade2274 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/page/TableDataInfo.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.page; +package com.jiajiakang.common.core.page; import java.io.Serializable; import java.util.List; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/page/TableSupport.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/core/page/TableSupport.java index 14eb1e117e7788085cd3959ba60300530e9d04ec..2b1b660e278215e8649485a9d5588952ad284149 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/page/TableSupport.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.core.page; +package com.jiajiakang.common.core.page; -import com.ruoyi.common.utils.ServletUtils; +import com.jiajiakang.common.utils.ServletUtils; /** * 琛ㄦ牸鏁版嵁澶勭悊 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/redis/RedisCache.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/core/redis/RedisCache.java index 22a610db0e7183afa9ce2042e2decfb27cbf3bdd..01001521380ae60e13e74f7fe051eadbc7d428fd 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/redis/RedisCache.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.redis; +package com.jiajiakang.common.core.redis; import java.util.Collection; import java.util.Iterator; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/text/CharsetKit.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/core/text/CharsetKit.java index 84124aac547f699d5ac26932be599d85d8baa715..5b31265acff73fed28e2fd276dfde2de522397b9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/text/CharsetKit.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.core.text; +package com.jiajiakang.common.core.text; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import com.ruoyi.common.utils.StringUtils; +import com.jiajiakang.common.utils.StringUtils; /** * 瀛楃闆嗗伐鍏风被 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/text/Convert.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/core/text/Convert.java index 1fb74619e5c56cedc1b28ead9b95b50a9019978b..33206c26bde26a176650d56986f6c610b672d020 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/text/Convert.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.text; +package com.jiajiakang.common.core.text; import java.math.BigDecimal; import java.math.BigInteger; @@ -6,7 +6,7 @@ import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.text.NumberFormat; import java.util.Set; -import com.ruoyi.common.utils.StringUtils; +import com.jiajiakang.common.utils.StringUtils; import org.apache.commons.lang3.ArrayUtils; /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/text/StrFormatter.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/core/text/StrFormatter.java index c78ac776db9944295f3634be2e1122472bfc346e..9587f3187bba4fa3d4b04599763eb9d48ca644f7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/core/text/StrFormatter.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.core.text; +package com.jiajiakang.common.core.text; -import com.ruoyi.common.utils.StringUtils; +import com.jiajiakang.common.utils.StringUtils; /** * 瀛楃涓叉牸寮忓寲 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/enums/BusinessStatus.java similarity index 81% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/enums/BusinessStatus.java index 10b7306fe9ba89d6ed4ed19c9647ddc421bfeb28..3766454e338f8dba6ce225695c421776f9f8f224 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/enums/BusinessStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.jiajiakang.common.enums; /** * 鎿嶄綔鐘舵 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/enums/BusinessType.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/enums/BusinessType.java index 2e17c4a5d210eb930468412673a9b408ed61a787..d8ea1b485bd5a70a4d356aad488967e2e3500646 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/enums/BusinessType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.jiajiakang.common.enums; /** * 涓氬姟鎿嶄綔绫诲瀷 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/enums/DataSourceType.java similarity index 80% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/enums/DataSourceType.java index 0d945be54936e8449d7b46f205bfa2269e15a33f..acfe64f361a868d3eba5779bf00067fc46274f05 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/enums/DataSourceType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.jiajiakang.common.enums; /** * 鏁版嵁婧 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/enums/HttpMethod.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/enums/HttpMethod.java index be6f73929f796eba7331b285bee6406fe4b50ed5..4148c0f828eba463bf84164f6c11f187a408f9da 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/enums/HttpMethod.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.jiajiakang.common.enums; import java.util.HashMap; import java.util.Map; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/enums/OperatorType.java similarity index 85% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/enums/OperatorType.java index bdd143c1cbd91b36741cf940b3887c33dadcf9f4..4a3378c44bfdedba02f521f8fe52958c9ee20830 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/enums/OperatorType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.jiajiakang.common.enums; /** * 鎿嶄綔浜虹被鍒 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/enums/UserStatus.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/enums/UserStatus.java index d7ff44a9884c3ebfae260389ed12feb9679a4bae..10abb73b0300915d3384cc6cbf492406c8293f55 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/enums/UserStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.jiajiakang.common.enums; /** * 鐢ㄦ埛鐘舵 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/BaseException.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/BaseException.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/BaseException.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/exception/BaseException.java index 92d6ae2dc62f8cf51154b89a0b310c8548000244..a8c24d4ed014f2162ddb5d048378730796f7a889 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/BaseException.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/BaseException.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.exception; +package com.jiajiakang.common.exception; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; +import com.jiajiakang.common.utils.MessageUtils; +import com.jiajiakang.common.utils.StringUtils; /** * 鍩虹寮傚父 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/CustomException.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/exception/CustomException.java index d96c7ba7b82c7f168ab756267ed8cd7338da0940..78ae63a8375556c285381db4bdbdb46a06cdc5d0 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/CustomException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception; +package com.jiajiakang.common.exception; /** * 鑷畾涔夊紓甯 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/DemoModeException.java similarity index 83% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/exception/DemoModeException.java index f6ad2ab49745be8a51eaa5ce72718ae2c373a8cb..f03fb1f2f9adef6f92cf0d3a54b3da75e308579b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/DemoModeException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception; +package com.jiajiakang.common.exception; /** * 婕旂ず妯″紡寮傚父 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/UtilException.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/exception/UtilException.java index 980fa465e866e4c0b67bdb77f065d31e1f246e8f..a4fc663991c5ce2d1e1b849d133ead2c12d6a250 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/UtilException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception; +package com.jiajiakang.common.exception; /** * 宸ュ叿绫诲紓甯 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/file/FileException.java similarity index 72% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/exception/file/FileException.java index 75d6dbf1ace9e05f9f569784f5c425dd51e29954..5e2bf13605094d54c89e72e69c962178811af5c0 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/file/FileException.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.exception.file; +package com.jiajiakang.common.exception.file; -import com.ruoyi.common.exception.BaseException; +import com.jiajiakang.common.exception.BaseException; /** * 鏂囦欢淇℃伅寮傚父绫 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/file/FileNameLengthLimitExceededException.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/exception/file/FileNameLengthLimitExceededException.java index 70e0ec9b1dfd5a521aa8cb77d64c99ecef12a3e7..fd667cabb14635a2c4322e0f442cb0731add1347 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/file/FileNameLengthLimitExceededException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.file; +package com.jiajiakang.common.exception.file; /** * 鏂囦欢鍚嶇О瓒呴暱闄愬埗寮傚父绫 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/file/FileSizeLimitExceededException.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/exception/file/FileSizeLimitExceededException.java index ec6ab054d656146c1498fac8d91123958794c326..9d7db2e2adedf5b2ec6aca97e15f0f51f6536bf5 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/file/FileSizeLimitExceededException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.file; +package com.jiajiakang.common.exception.file; /** * 鏂囦欢鍚嶅ぇ灏忛檺鍒跺紓甯哥被 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/file/InvalidExtensionException.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/exception/file/InvalidExtensionException.java index 8f63a799cecde87bd85b80d3a02cd2fae94b1f3a..2f818fc3a43c5ecafe3f4edd62a10f65de3a8ce5 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/file/InvalidExtensionException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.file; +package com.jiajiakang.common.exception.file; import java.util.Arrays; import org.apache.commons.fileupload.FileUploadException; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/job/TaskException.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/exception/job/TaskException.java index 14b2361d063c9cf3f167e4cc57bf23fd73a18cf7..0ab7d23ab6fc681f6df8e77083390860cbbb21b7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/job/TaskException.java @@ -1,34 +1,34 @@ -package com.ruoyi.common.exception.job; - -/** - * 璁″垝绛栫暐寮傚父 - * - * @author ruoyi - */ -public class TaskException extends Exception -{ - private static final long serialVersionUID = 1L; - - private Code code; - - public TaskException(String msg, Code code) - { - this(msg, code, null); - } - - public TaskException(String msg, Code code, Exception nestedEx) - { - super(msg, nestedEx); - this.code = code; - } - - public Code getCode() - { - return code; - } - - public enum Code - { - TASK_EXISTS, NO_TASK_EXISTS, TASK_ALREADY_STARTED, UNKNOWN, CONFIG_ERROR, TASK_NODE_NOT_AVAILABLE - } +package com.jiajiakang.common.exception.job; + +/** + * 璁″垝绛栫暐寮傚父 + * + * @author ruoyi + */ +public class TaskException extends Exception +{ + private static final long serialVersionUID = 1L; + + private Code code; + + public TaskException(String msg, Code code) + { + this(msg, code, null); + } + + public TaskException(String msg, Code code, Exception nestedEx) + { + super(msg, nestedEx); + this.code = code; + } + + public Code getCode() + { + return code; + } + + public enum Code + { + TASK_EXISTS, NO_TASK_EXISTS, TASK_ALREADY_STARTED, UNKNOWN, CONFIG_ERROR, TASK_NODE_NOT_AVAILABLE + } } \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/user/CaptchaException.java similarity index 84% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/exception/user/CaptchaException.java index 389dbc7535ee6640aca99296266ac50d0c56ddfb..8e86c46718da9454cb08bb0bcb1e3b31f1f16680 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/user/CaptchaException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.jiajiakang.common.exception.user; /** * 楠岃瘉鐮侀敊璇紓甯哥被 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/user/CaptchaExpireException.java similarity index 85% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/exception/user/CaptchaExpireException.java index 85f94861bcbbb43a774374cb9f1212fb79fd9203..d81e82fe918d3546f5ec41788f45540fe76d8559 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/user/CaptchaExpireException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.jiajiakang.common.exception.user; /** * 楠岃瘉鐮佸け鏁堝紓甯哥被 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/user/UserException.java similarity index 72% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/exception/user/UserException.java index aa015f88a858ee14ca1a15128beb1ddc6471d8ea..76025b7687712c6ff8cef34bcd9250c854b25c79 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/user/UserException.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.exception.user; +package com.jiajiakang.common.exception.user; -import com.ruoyi.common.exception.BaseException; +import com.jiajiakang.common.exception.BaseException; /** * 鐢ㄦ埛淇℃伅寮傚父绫 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/user/UserPasswordNotMatchException.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/exception/user/UserPasswordNotMatchException.java index a7f3e5ffed23e5e502f37f7a49cc616c33a593fd..488c56397359da58aa56a85938b46ae218cfa589 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/exception/user/UserPasswordNotMatchException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.jiajiakang.common.exception.user; /** * 鐢ㄦ埛瀵嗙爜涓嶆纭垨涓嶇鍚堣鑼冨紓甯哥被 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/filter/RepeatableFilter.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/filter/RepeatableFilter.java index 3698c75c317fec18dc802098188d452b3b6d4815..bd73039f223473c026b9b12bcfbb1402879c7d8f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/filter/RepeatableFilter.java @@ -1,52 +1,52 @@ -package com.ruoyi.common.filter; - -import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import org.springframework.http.MediaType; -import com.ruoyi.common.utils.StringUtils; - -/** - * Repeatable 杩囨护鍣 - * - * @author ruoyi - */ -public class RepeatableFilter implements Filter -{ - @Override - public void init(FilterConfig filterConfig) throws ServletException - { - - } - - @Override - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) - throws IOException, ServletException - { - ServletRequest requestWrapper = null; - if (request instanceof HttpServletRequest - && StringUtils.equalsAnyIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE)) - { - requestWrapper = new RepeatedlyRequestWrapper((HttpServletRequest) request, response); - } - if (null == requestWrapper) - { - chain.doFilter(request, response); - } - else - { - chain.doFilter(requestWrapper, response); - } - } - - @Override - public void destroy() - { - - } -} +package com.jiajiakang.common.filter; + +import java.io.IOException; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import org.springframework.http.MediaType; +import com.jiajiakang.common.utils.StringUtils; + +/** + * Repeatable 杩囨护鍣 + * + * @author ruoyi + */ +public class RepeatableFilter implements Filter +{ + @Override + public void init(FilterConfig filterConfig) throws ServletException + { + + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) + throws IOException, ServletException + { + ServletRequest requestWrapper = null; + if (request instanceof HttpServletRequest + && StringUtils.equalsAnyIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE)) + { + requestWrapper = new RepeatedlyRequestWrapper((HttpServletRequest) request, response); + } + if (null == requestWrapper) + { + chain.doFilter(request, response); + } + else + { + chain.doFilter(requestWrapper, response); + } + } + + @Override + public void destroy() + { + + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/filter/RepeatedlyRequestWrapper.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/filter/RepeatedlyRequestWrapper.java index 9ad6f4940ac9be75035aef31a36e1c2ac7ff66f4..0ca5aa20e27668b70895e48e6df4b58525424c35 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/filter/RepeatedlyRequestWrapper.java @@ -1,72 +1,72 @@ -package com.ruoyi.common.filter; - -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import javax.servlet.ReadListener; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import com.ruoyi.common.utils.http.HttpHelper; - -/** - * 鏋勫缓鍙噸澶嶈鍙杋nputStream鐨剅equest - * - * @author ruoyi - */ -public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper -{ - private final byte[] body; - - public RepeatedlyRequestWrapper(HttpServletRequest request, ServletResponse response) throws IOException - { - super(request); - request.setCharacterEncoding("UTF-8"); - response.setCharacterEncoding("UTF-8"); - - body = HttpHelper.getBodyString(request).getBytes("UTF-8"); - } - - @Override - public BufferedReader getReader() throws IOException - { - return new BufferedReader(new InputStreamReader(getInputStream())); - } - - @Override - public ServletInputStream getInputStream() throws IOException - { - - final ByteArrayInputStream bais = new ByteArrayInputStream(body); - - return new ServletInputStream() - { - - @Override - public int read() throws IOException - { - return bais.read(); - } - - @Override - public boolean isFinished() - { - return false; - } - - @Override - public boolean isReady() - { - return false; - } - - @Override - public void setReadListener(ReadListener readListener) - { - - } - }; - } -} +package com.jiajiakang.common.filter; + +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import javax.servlet.ReadListener; +import javax.servlet.ServletInputStream; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; +import com.jiajiakang.common.utils.http.HttpHelper; + +/** + * 鏋勫缓鍙噸澶嶈鍙杋nputStream鐨剅equest + * + * @author ruoyi + */ +public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper +{ + private final byte[] body; + + public RepeatedlyRequestWrapper(HttpServletRequest request, ServletResponse response) throws IOException + { + super(request); + request.setCharacterEncoding("UTF-8"); + response.setCharacterEncoding("UTF-8"); + + body = HttpHelper.getBodyString(request).getBytes("UTF-8"); + } + + @Override + public BufferedReader getReader() throws IOException + { + return new BufferedReader(new InputStreamReader(getInputStream())); + } + + @Override + public ServletInputStream getInputStream() throws IOException + { + + final ByteArrayInputStream bais = new ByteArrayInputStream(body); + + return new ServletInputStream() + { + + @Override + public int read() throws IOException + { + return bais.read(); + } + + @Override + public boolean isFinished() + { + return false; + } + + @Override + public boolean isReady() + { + return false; + } + + @Override + public void setReadListener(ReadListener readListener) + { + + } + }; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/filter/XssFilter.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/filter/XssFilter.java index b3df122ec1587a23d3945e4ebde8381f3eb49800..2f06f2e158fb26b746cc9895ef840be332718bab 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/filter/XssFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.jiajiakang.common.filter; import java.io.IOException; import java.util.ArrayList; @@ -13,7 +13,7 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.ruoyi.common.utils.StringUtils; +import com.jiajiakang.common.utils.StringUtils; /** * 闃叉XSS鏀诲嚮鐨勮繃婊ゅ櫒 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/filter/XssHttpServletRequestWrapper.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/filter/XssHttpServletRequestWrapper.java index 3c9efb29b70caf6791c76d8fa19f21546903f0e2..c1714a98b5b7a7d94d8d899ad5eee629d40fe74e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/filter/XssHttpServletRequestWrapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.jiajiakang.common.filter; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -9,8 +9,8 @@ import javax.servlet.http.HttpServletRequestWrapper; import org.apache.commons.io.IOUtils; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.html.EscapeUtil; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.common.utils.html.EscapeUtil; /** * XSS杩囨护澶勭悊 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/DateUtils.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/DateUtils.java index 536cb3cf04ae4a1d2ab579bd92da967f08df12ff..719359970503e582c26194b4de5a3a87b44ecbdf 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/DateUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.jiajiakang.common.utils; import java.lang.management.ManagementFactory; import java.text.ParseException; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/DictUtils.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/DictUtils.java index 0d3a23d51f2cdee68d7f35f5d6b92eb9a0c107a1..8c969f66334b50832a6a6a2d9fee68e7d047d8ca 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/DictUtils.java @@ -1,173 +1,173 @@ -package com.ruoyi.common.utils; - -import java.util.Collection; -import java.util.List; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.utils.spring.SpringUtils; - -/** - * 瀛楀吀宸ュ叿绫 - * - * @author ruoyi - */ -public class DictUtils -{ - /** - * 鍒嗛殧绗 - */ - public static final String SEPARATOR = ","; - - /** - * 璁剧疆瀛楀吀缂撳瓨 - * - * @param key 鍙傛暟閿 - * @param dictDatas 瀛楀吀鏁版嵁鍒楄〃 - */ - public static void setDictCache(String key, List dictDatas) - { - SpringUtils.getBean(RedisCache.class).setCacheObject(getCacheKey(key), dictDatas); - } - - /** - * 鑾峰彇瀛楀吀缂撳瓨 - * - * @param key 鍙傛暟閿 - * @return dictDatas 瀛楀吀鏁版嵁鍒楄〃 - */ - public static List getDictCache(String key) - { - Object cacheObj = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key)); - if (StringUtils.isNotNull(cacheObj)) - { - List dictDatas = StringUtils.cast(cacheObj); - return dictDatas; - } - return null; - } - - /** - * 鏍规嵁瀛楀吀绫诲瀷鍜屽瓧鍏稿艰幏鍙栧瓧鍏告爣绛 - * - * @param dictType 瀛楀吀绫诲瀷 - * @param dictValue 瀛楀吀鍊 - * @return 瀛楀吀鏍囩 - */ - public static String getDictLabel(String dictType, String dictValue) - { - return getDictLabel(dictType, dictValue, SEPARATOR); - } - - /** - * 鏍规嵁瀛楀吀绫诲瀷鍜屽瓧鍏告爣绛捐幏鍙栧瓧鍏稿 - * - * @param dictType 瀛楀吀绫诲瀷 - * @param dictLabel 瀛楀吀鏍囩 - * @return 瀛楀吀鍊 - */ - public static String getDictValue(String dictType, String dictLabel) - { - return getDictValue(dictType, dictLabel, SEPARATOR); - } - - /** - * 鏍规嵁瀛楀吀绫诲瀷鍜屽瓧鍏稿艰幏鍙栧瓧鍏告爣绛 - * - * @param dictType 瀛楀吀绫诲瀷 - * @param dictValue 瀛楀吀鍊 - * @param separator 鍒嗛殧绗 - * @return 瀛楀吀鏍囩 - */ - public static String getDictLabel(String dictType, String dictValue, String separator) - { - StringBuilder propertyString = new StringBuilder(); - List datas = getDictCache(dictType); - - if (StringUtils.containsAny(separator, dictValue) && StringUtils.isNotEmpty(datas)) - { - for (SysDictData dict : datas) - { - for (String value : dictValue.split(separator)) - { - if (value.equals(dict.getDictValue())) - { - propertyString.append(dict.getDictLabel() + separator); - break; - } - } - } - } - else - { - for (SysDictData dict : datas) - { - if (dictValue.equals(dict.getDictValue())) - { - return dict.getDictLabel(); - } - } - } - return StringUtils.stripEnd(propertyString.toString(), separator); - } - - /** - * 鏍规嵁瀛楀吀绫诲瀷鍜屽瓧鍏告爣绛捐幏鍙栧瓧鍏稿 - * - * @param dictType 瀛楀吀绫诲瀷 - * @param dictLabel 瀛楀吀鏍囩 - * @param separator 鍒嗛殧绗 - * @return 瀛楀吀鍊 - */ - public static String getDictValue(String dictType, String dictLabel, String separator) - { - StringBuilder propertyString = new StringBuilder(); - List datas = getDictCache(dictType); - - if (StringUtils.containsAny(separator, dictLabel) && StringUtils.isNotEmpty(datas)) - { - for (SysDictData dict : datas) - { - for (String label : dictLabel.split(separator)) - { - if (label.equals(dict.getDictLabel())) - { - propertyString.append(dict.getDictValue() + separator); - break; - } - } - } - } - else - { - for (SysDictData dict : datas) - { - if (dictLabel.equals(dict.getDictLabel())) - { - return dict.getDictValue(); - } - } - } - return StringUtils.stripEnd(propertyString.toString(), separator); - } - - /** - * 娓呯┖瀛楀吀缂撳瓨 - */ - public static void clearDictCache() - { - Collection keys = SpringUtils.getBean(RedisCache.class).keys(Constants.SYS_DICT_KEY + "*"); - SpringUtils.getBean(RedisCache.class).deleteObject(keys); - } - - /** - * 璁剧疆cache key - * - * @param configKey 鍙傛暟閿 - * @return 缂撳瓨閿甼ey - */ - public static String getCacheKey(String configKey) - { - return Constants.SYS_DICT_KEY + configKey; - } -} +package com.jiajiakang.common.utils; + +import java.util.Collection; +import java.util.List; +import com.jiajiakang.common.constant.Constants; +import com.jiajiakang.common.core.domain.entity.SysDictData; +import com.jiajiakang.common.core.redis.RedisCache; +import com.jiajiakang.common.utils.spring.SpringUtils; + +/** + * 瀛楀吀宸ュ叿绫 + * + * @author ruoyi + */ +public class DictUtils +{ + /** + * 鍒嗛殧绗 + */ + public static final String SEPARATOR = ","; + + /** + * 璁剧疆瀛楀吀缂撳瓨 + * + * @param key 鍙傛暟閿 + * @param dictDatas 瀛楀吀鏁版嵁鍒楄〃 + */ + public static void setDictCache(String key, List dictDatas) + { + SpringUtils.getBean(RedisCache.class).setCacheObject(getCacheKey(key), dictDatas); + } + + /** + * 鑾峰彇瀛楀吀缂撳瓨 + * + * @param key 鍙傛暟閿 + * @return dictDatas 瀛楀吀鏁版嵁鍒楄〃 + */ + public static List getDictCache(String key) + { + Object cacheObj = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key)); + if (StringUtils.isNotNull(cacheObj)) + { + List dictDatas = StringUtils.cast(cacheObj); + return dictDatas; + } + return null; + } + + /** + * 鏍规嵁瀛楀吀绫诲瀷鍜屽瓧鍏稿艰幏鍙栧瓧鍏告爣绛 + * + * @param dictType 瀛楀吀绫诲瀷 + * @param dictValue 瀛楀吀鍊 + * @return 瀛楀吀鏍囩 + */ + public static String getDictLabel(String dictType, String dictValue) + { + return getDictLabel(dictType, dictValue, SEPARATOR); + } + + /** + * 鏍规嵁瀛楀吀绫诲瀷鍜屽瓧鍏告爣绛捐幏鍙栧瓧鍏稿 + * + * @param dictType 瀛楀吀绫诲瀷 + * @param dictLabel 瀛楀吀鏍囩 + * @return 瀛楀吀鍊 + */ + public static String getDictValue(String dictType, String dictLabel) + { + return getDictValue(dictType, dictLabel, SEPARATOR); + } + + /** + * 鏍规嵁瀛楀吀绫诲瀷鍜屽瓧鍏稿艰幏鍙栧瓧鍏告爣绛 + * + * @param dictType 瀛楀吀绫诲瀷 + * @param dictValue 瀛楀吀鍊 + * @param separator 鍒嗛殧绗 + * @return 瀛楀吀鏍囩 + */ + public static String getDictLabel(String dictType, String dictValue, String separator) + { + StringBuilder propertyString = new StringBuilder(); + List datas = getDictCache(dictType); + + if (StringUtils.containsAny(separator, dictValue) && StringUtils.isNotEmpty(datas)) + { + for (SysDictData dict : datas) + { + for (String value : dictValue.split(separator)) + { + if (value.equals(dict.getDictValue())) + { + propertyString.append(dict.getDictLabel() + separator); + break; + } + } + } + } + else + { + for (SysDictData dict : datas) + { + if (dictValue.equals(dict.getDictValue())) + { + return dict.getDictLabel(); + } + } + } + return StringUtils.stripEnd(propertyString.toString(), separator); + } + + /** + * 鏍规嵁瀛楀吀绫诲瀷鍜屽瓧鍏告爣绛捐幏鍙栧瓧鍏稿 + * + * @param dictType 瀛楀吀绫诲瀷 + * @param dictLabel 瀛楀吀鏍囩 + * @param separator 鍒嗛殧绗 + * @return 瀛楀吀鍊 + */ + public static String getDictValue(String dictType, String dictLabel, String separator) + { + StringBuilder propertyString = new StringBuilder(); + List datas = getDictCache(dictType); + + if (StringUtils.containsAny(separator, dictLabel) && StringUtils.isNotEmpty(datas)) + { + for (SysDictData dict : datas) + { + for (String label : dictLabel.split(separator)) + { + if (label.equals(dict.getDictLabel())) + { + propertyString.append(dict.getDictValue() + separator); + break; + } + } + } + } + else + { + for (SysDictData dict : datas) + { + if (dictLabel.equals(dict.getDictLabel())) + { + return dict.getDictValue(); + } + } + } + return StringUtils.stripEnd(propertyString.toString(), separator); + } + + /** + * 娓呯┖瀛楀吀缂撳瓨 + */ + public static void clearDictCache() + { + Collection keys = SpringUtils.getBean(RedisCache.class).keys(Constants.SYS_DICT_KEY + "*"); + SpringUtils.getBean(RedisCache.class).deleteObject(keys); + } + + /** + * 璁剧疆cache key + * + * @param configKey 鍙傛暟閿 + * @return 缂撳瓨閿甼ey + */ + public static String getCacheKey(String configKey) + { + return Constants.SYS_DICT_KEY + configKey; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/ExceptionUtil.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/ExceptionUtil.java index 4ca52838ae57de3f4f2a6f826f2bcddba4bc438a..3b6e34f1a06aed49a3b8397b03866b87d3a90a0a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/ExceptionUtil.java @@ -1,40 +1,40 @@ -package com.ruoyi.common.utils; - -import java.io.PrintWriter; -import java.io.StringWriter; -import org.apache.commons.lang3.exception.ExceptionUtils; - -/** - * 閿欒淇℃伅澶勭悊绫汇 - * - * @author ruoyi - */ -public class ExceptionUtil -{ - /** - * 鑾峰彇exception鐨勮缁嗛敊璇俊鎭 - */ - public static String getExceptionMessage(Throwable e) - { - StringWriter sw = new StringWriter(); - e.printStackTrace(new PrintWriter(sw, true)); - String str = sw.toString(); - return str; - } - - public static String getRootErrorMseeage(Exception e) - { - Throwable root = ExceptionUtils.getRootCause(e); - root = (root == null ? e : root); - if (root == null) - { - return ""; - } - String msg = root.getMessage(); - if (msg == null) - { - return "null"; - } - return StringUtils.defaultString(msg); - } -} +package com.jiajiakang.common.utils; + +import java.io.PrintWriter; +import java.io.StringWriter; +import org.apache.commons.lang3.exception.ExceptionUtils; + +/** + * 閿欒淇℃伅澶勭悊绫汇 + * + * @author ruoyi + */ +public class ExceptionUtil +{ + /** + * 鑾峰彇exception鐨勮缁嗛敊璇俊鎭 + */ + public static String getExceptionMessage(Throwable e) + { + StringWriter sw = new StringWriter(); + e.printStackTrace(new PrintWriter(sw, true)); + String str = sw.toString(); + return str; + } + + public static String getRootErrorMseeage(Exception e) + { + Throwable root = ExceptionUtils.getRootCause(e); + root = (root == null ? e : root); + if (root == null) + { + return ""; + } + String msg = root.getMessage(); + if (msg == null) + { + return "null"; + } + return StringUtils.defaultString(msg); + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/LogUtils.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/LogUtils.java index 0de30c6b631511e12f55fb9d11fcaadd68c2f593..f47673c41c97e5f76ab48c6d10b241da140abfcd 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/LogUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.jiajiakang.common.utils; /** * 澶勭悊骞惰褰曟棩蹇楁枃浠 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/MessageUtils.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/MessageUtils.java index 7dac75a3bb3d066108584025816339ae1aab5477..32832ab8523dd6dbabccb5f4cddde6138ceb0879 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/MessageUtils.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.utils; +package com.jiajiakang.common.utils; import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.jiajiakang.common.utils.spring.SpringUtils; /** * 鑾峰彇i18n璧勬簮鏂囦欢 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/SecurityUtils.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/SecurityUtils.java index aec57768c454ce4ea1c454d51ba8c905f42848f8..2656708102146703231d095f1b24fc7bc4adf300 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/SecurityUtils.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.utils; +package com.jiajiakang.common.utils; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.exception.CustomException; +import com.jiajiakang.common.constant.HttpStatus; +import com.jiajiakang.common.core.domain.model.LoginUser; +import com.jiajiakang.common.exception.CustomException; /** * 瀹夊叏鏈嶅姟宸ュ叿绫 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/ServletUtils.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/ServletUtils.java index ab9ebcfcd20d557cc8dd737583392c876d5f8d2b..65779082c60f9bb109cf089f65e59e1321b1df05 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/ServletUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.jiajiakang.common.utils; import java.io.IOException; import javax.servlet.http.HttpServletRequest; @@ -7,7 +7,7 @@ import javax.servlet.http.HttpSession; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import com.ruoyi.common.core.text.Convert; +import com.jiajiakang.common.core.text.Convert; /** * 瀹㈡埛绔伐鍏风被 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/StringUtils.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/StringUtils.java index 7e3969f1f67b9031439a3d7a373b88fd1e581b61..2f07b26ed7d1ce702624a066ff97fc581e8ab070 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/StringUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.jiajiakang.common.utils; import java.util.ArrayList; import java.util.Collection; @@ -6,7 +6,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import com.ruoyi.common.core.text.StrFormatter; +import com.jiajiakang.common.core.text.StrFormatter; /** * 瀛楃涓插伐鍏风被 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/Threads.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/Threads.java index 193419506a2a6964c66063e9b3d292eb90e7d4b0..4c46208d28fa72554551d456a4db1240c6fd1603 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/Threads.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.jiajiakang.common.utils; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/bean/BeanUtils.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/bean/BeanUtils.java index 51cdc2fb169c3a58ef5445ca64390b2bf79270bb..b466c1a3a13e4ccc4989175c21290b557c4d6281 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/bean/BeanUtils.java @@ -1,110 +1,110 @@ -package com.ruoyi.common.utils.bean; - -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * Bean 宸ュ叿绫 - * - * @author ruoyi - */ -public class BeanUtils extends org.springframework.beans.BeanUtils -{ - /** Bean鏂规硶鍚嶄腑灞炴у悕寮濮嬬殑涓嬫爣 */ - private static final int BEAN_METHOD_PROP_INDEX = 3; - - /** * 鍖归厤getter鏂规硶鐨勬鍒欒〃杈惧紡 */ - private static final Pattern GET_PATTERN = Pattern.compile("get(\\p{javaUpperCase}\\w*)"); - - /** * 鍖归厤setter鏂规硶鐨勬鍒欒〃杈惧紡 */ - private static final Pattern SET_PATTERN = Pattern.compile("set(\\p{javaUpperCase}\\w*)"); - - /** - * Bean灞炴у鍒跺伐鍏锋柟娉曘 - * - * @param dest 鐩爣瀵硅薄 - * @param src 婧愬璞 - */ - public static void copyBeanProp(Object dest, Object src) - { - try - { - copyProperties(src, dest); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - - /** - * 鑾峰彇瀵硅薄鐨剆etter鏂规硶銆 - * - * @param obj 瀵硅薄 - * @return 瀵硅薄鐨剆etter鏂规硶鍒楄〃 - */ - public static List getSetterMethods(Object obj) - { - // setter鏂规硶鍒楄〃 - List setterMethods = new ArrayList(); - - // 鑾峰彇鎵鏈夋柟娉 - Method[] methods = obj.getClass().getMethods(); - - // 鏌ユ壘setter鏂规硶 - - for (Method method : methods) - { - Matcher m = SET_PATTERN.matcher(method.getName()); - if (m.matches() && (method.getParameterTypes().length == 1)) - { - setterMethods.add(method); - } - } - // 杩斿洖setter鏂规硶鍒楄〃 - return setterMethods; - } - - /** - * 鑾峰彇瀵硅薄鐨刧etter鏂规硶銆 - * - * @param obj 瀵硅薄 - * @return 瀵硅薄鐨刧etter鏂规硶鍒楄〃 - */ - - public static List getGetterMethods(Object obj) - { - // getter鏂规硶鍒楄〃 - List getterMethods = new ArrayList(); - // 鑾峰彇鎵鏈夋柟娉 - Method[] methods = obj.getClass().getMethods(); - // 鏌ユ壘getter鏂规硶 - for (Method method : methods) - { - Matcher m = GET_PATTERN.matcher(method.getName()); - if (m.matches() && (method.getParameterTypes().length == 0)) - { - getterMethods.add(method); - } - } - // 杩斿洖getter鏂规硶鍒楄〃 - return getterMethods; - } - - /** - * 妫鏌ean鏂规硶鍚嶄腑鐨勫睘鎬у悕鏄惁鐩哥瓑銆
- * 濡俫etName()鍜宻etName()灞炴у悕涓鏍凤紝getName()鍜宻etAge()灞炴у悕涓嶄竴鏍枫 - * - * @param m1 鏂规硶鍚1 - * @param m2 鏂规硶鍚2 - * @return 灞炴у悕涓鏍疯繑鍥瀟rue锛屽惁鍒欒繑鍥瀎alse - */ - - public static boolean isMethodPropEquals(String m1, String m2) - { - return m1.substring(BEAN_METHOD_PROP_INDEX).equals(m2.substring(BEAN_METHOD_PROP_INDEX)); - } -} +package com.jiajiakang.common.utils.bean; + +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Bean 宸ュ叿绫 + * + * @author ruoyi + */ +public class BeanUtils extends org.springframework.beans.BeanUtils +{ + /** Bean鏂规硶鍚嶄腑灞炴у悕寮濮嬬殑涓嬫爣 */ + private static final int BEAN_METHOD_PROP_INDEX = 3; + + /** * 鍖归厤getter鏂规硶鐨勬鍒欒〃杈惧紡 */ + private static final Pattern GET_PATTERN = Pattern.compile("get(\\p{javaUpperCase}\\w*)"); + + /** * 鍖归厤setter鏂规硶鐨勬鍒欒〃杈惧紡 */ + private static final Pattern SET_PATTERN = Pattern.compile("set(\\p{javaUpperCase}\\w*)"); + + /** + * Bean灞炴у鍒跺伐鍏锋柟娉曘 + * + * @param dest 鐩爣瀵硅薄 + * @param src 婧愬璞 + */ + public static void copyBeanProp(Object dest, Object src) + { + try + { + copyProperties(src, dest); + } + catch (Exception e) + { + e.printStackTrace(); + } + } + + /** + * 鑾峰彇瀵硅薄鐨剆etter鏂规硶銆 + * + * @param obj 瀵硅薄 + * @return 瀵硅薄鐨剆etter鏂规硶鍒楄〃 + */ + public static List getSetterMethods(Object obj) + { + // setter鏂规硶鍒楄〃 + List setterMethods = new ArrayList(); + + // 鑾峰彇鎵鏈夋柟娉 + Method[] methods = obj.getClass().getMethods(); + + // 鏌ユ壘setter鏂规硶 + + for (Method method : methods) + { + Matcher m = SET_PATTERN.matcher(method.getName()); + if (m.matches() && (method.getParameterTypes().length == 1)) + { + setterMethods.add(method); + } + } + // 杩斿洖setter鏂规硶鍒楄〃 + return setterMethods; + } + + /** + * 鑾峰彇瀵硅薄鐨刧etter鏂规硶銆 + * + * @param obj 瀵硅薄 + * @return 瀵硅薄鐨刧etter鏂规硶鍒楄〃 + */ + + public static List getGetterMethods(Object obj) + { + // getter鏂规硶鍒楄〃 + List getterMethods = new ArrayList(); + // 鑾峰彇鎵鏈夋柟娉 + Method[] methods = obj.getClass().getMethods(); + // 鏌ユ壘getter鏂规硶 + for (Method method : methods) + { + Matcher m = GET_PATTERN.matcher(method.getName()); + if (m.matches() && (method.getParameterTypes().length == 0)) + { + getterMethods.add(method); + } + } + // 杩斿洖getter鏂规硶鍒楄〃 + return getterMethods; + } + + /** + * 妫鏌ean鏂规硶鍚嶄腑鐨勫睘鎬у悕鏄惁鐩哥瓑銆
+ * 濡俫etName()鍜宻etName()灞炴у悕涓鏍凤紝getName()鍜宻etAge()灞炴у悕涓嶄竴鏍枫 + * + * @param m1 鏂规硶鍚1 + * @param m2 鏂规硶鍚2 + * @return 灞炴у悕涓鏍疯繑鍥瀟rue锛屽惁鍒欒繑鍥瀎alse + */ + + public static boolean isMethodPropEquals(String m1, String m2) + { + return m1.substring(BEAN_METHOD_PROP_INDEX).equals(m2.substring(BEAN_METHOD_PROP_INDEX)); + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/file/FileTypeUtils.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/file/FileTypeUtils.java index 25f53066672a251bdf8be4e5ca9e32f80f41435a..ba528f15648cefead3bb3dc16f0e7c64f621fad5 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/file/FileTypeUtils.java @@ -1,76 +1,76 @@ -package com.ruoyi.common.utils.file; - -import java.io.File; -import org.apache.commons.lang3.StringUtils; - -/** - * 鏂囦欢绫诲瀷宸ュ叿绫 - * - * @author ruoyi - */ -public class FileTypeUtils -{ - /** - * 鑾峰彇鏂囦欢绫诲瀷 - *

- * 渚嬪: ruoyi.txt, 杩斿洖: txt - * - * @param file 鏂囦欢鍚 - * @return 鍚庣紑锛堜笉鍚".") - */ - public static String getFileType(File file) - { - if (null == file) - { - return StringUtils.EMPTY; - } - return getFileType(file.getName()); - } - - /** - * 鑾峰彇鏂囦欢绫诲瀷 - *

- * 渚嬪: ruoyi.txt, 杩斿洖: txt - * - * @param fileName 鏂囦欢鍚 - * @return 鍚庣紑锛堜笉鍚".") - */ - public static String getFileType(String fileName) - { - int separatorIndex = fileName.lastIndexOf("."); - if (separatorIndex < 0) - { - return ""; - } - return fileName.substring(separatorIndex + 1).toLowerCase(); - } - - /** - * 鑾峰彇鏂囦欢绫诲瀷 - * - * @param photoByte 鏂囦欢瀛楄妭鐮 - * @return 鍚庣紑锛堜笉鍚".") - */ - public static String getFileExtendName(byte[] photoByte) - { - String strFileExtendName = "JPG"; - if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56) - && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97)) - { - strFileExtendName = "GIF"; - } - else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70)) - { - strFileExtendName = "JPG"; - } - else if ((photoByte[0] == 66) && (photoByte[1] == 77)) - { - strFileExtendName = "BMP"; - } - else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71)) - { - strFileExtendName = "PNG"; - } - return strFileExtendName; - } +package com.jiajiakang.common.utils.file; + +import java.io.File; +import org.apache.commons.lang3.StringUtils; + +/** + * 鏂囦欢绫诲瀷宸ュ叿绫 + * + * @author ruoyi + */ +public class FileTypeUtils +{ + /** + * 鑾峰彇鏂囦欢绫诲瀷 + *

+ * 渚嬪: ruoyi.txt, 杩斿洖: txt + * + * @param file 鏂囦欢鍚 + * @return 鍚庣紑锛堜笉鍚".") + */ + public static String getFileType(File file) + { + if (null == file) + { + return StringUtils.EMPTY; + } + return getFileType(file.getName()); + } + + /** + * 鑾峰彇鏂囦欢绫诲瀷 + *

+ * 渚嬪: ruoyi.txt, 杩斿洖: txt + * + * @param fileName 鏂囦欢鍚 + * @return 鍚庣紑锛堜笉鍚".") + */ + public static String getFileType(String fileName) + { + int separatorIndex = fileName.lastIndexOf("."); + if (separatorIndex < 0) + { + return ""; + } + return fileName.substring(separatorIndex + 1).toLowerCase(); + } + + /** + * 鑾峰彇鏂囦欢绫诲瀷 + * + * @param photoByte 鏂囦欢瀛楄妭鐮 + * @return 鍚庣紑锛堜笉鍚".") + */ + public static String getFileExtendName(byte[] photoByte) + { + String strFileExtendName = "JPG"; + if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56) + && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97)) + { + strFileExtendName = "GIF"; + } + else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70)) + { + strFileExtendName = "JPG"; + } + else if ((photoByte[0] == 66) && (photoByte[1] == 77)) + { + strFileExtendName = "BMP"; + } + else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71)) + { + strFileExtendName = "PNG"; + } + return strFileExtendName; + } } \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/file/FileUploadUtils.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/file/FileUploadUtils.java index 2d1bc95f76216cccf54e6ff279661aaa76223698..295b09b1d03948e71d498ad28bc77b96717be7f6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/file/FileUploadUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.jiajiakang.common.utils.file; import java.io.File; import java.io.IOException; @@ -6,13 +6,13 @@ import java.io.IOException; import cn.hutool.core.util.IdUtil; import org.apache.commons.io.FilenameUtils; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.exception.file.FileNameLengthLimitExceededException; -import com.ruoyi.common.exception.file.FileSizeLimitExceededException; -import com.ruoyi.common.exception.file.InvalidExtensionException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; +import com.jiajiakang.common.config.RuoYiConfig; +import com.jiajiakang.common.constant.Constants; +import com.jiajiakang.common.exception.file.FileNameLengthLimitExceededException; +import com.jiajiakang.common.exception.file.FileSizeLimitExceededException; +import com.jiajiakang.common.exception.file.InvalidExtensionException; +import com.jiajiakang.common.utils.DateUtils; +import com.jiajiakang.common.utils.StringUtils; /** * 鏂囦欢涓婁紶宸ュ叿绫 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/file/FileUtils.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/file/FileUtils.java index 66c9f24840ade31def0834cf848795a728498f04..895fb8b112446a6bc33aa121cfe35c960d5b91dd 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/file/FileUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.jiajiakang.common.utils.file; import java.io.File; import java.io.FileInputStream; @@ -11,7 +11,7 @@ import java.nio.charset.StandardCharsets; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.ArrayUtils; -import com.ruoyi.common.utils.StringUtils; +import com.jiajiakang.common.utils.StringUtils; /** * 鏂囦欢澶勭悊宸ュ叿绫 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/file/ImageUtils.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/file/ImageUtils.java index 411ef15e09e24a3b8be389d021fc1e17afa04654..7ecff0d81567e4ca4440a7ca3274fd9ce377ef66 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/file/ImageUtils.java @@ -1,100 +1,100 @@ -package com.ruoyi.common.utils.file; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.FileInputStream; -import java.io.InputStream; -import java.net.URL; -import java.net.URLConnection; -import java.util.Arrays; -import org.apache.poi.util.IOUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.StringUtils; - -/** - * 鍥剧墖澶勭悊宸ュ叿绫 - * - * @author ruoyi - */ -public class ImageUtils -{ - private static final Logger log = LoggerFactory.getLogger(ImageUtils.class); - - public static byte[] getImage(String imagePath) - { - InputStream is = getFile(imagePath); - try - { - return IOUtils.toByteArray(is); - } - catch (Exception e) - { - log.error("鍥剧墖鍔犺浇寮傚父 {}", e); - return null; - } - finally - { - IOUtils.closeQuietly(is); - } - } - - public static InputStream getFile(String imagePath) - { - try - { - byte[] result = readFile(imagePath); - result = Arrays.copyOf(result, result.length); - return new ByteArrayInputStream(result); - } - catch (Exception e) - { - log.error("鑾峰彇鍥剧墖寮傚父 {}", e); - } - return null; - } - - /** - * 璇诲彇鏂囦欢涓哄瓧鑺傛暟鎹 - * - * @param key 鍦板潃 - * @return 瀛楄妭鏁版嵁 - */ - public static byte[] readFile(String url) - { - InputStream in = null; - ByteArrayOutputStream baos = null; - try - { - if (url.startsWith("http")) - { - // 缃戠粶鍦板潃 - URL urlObj = new URL(url); - URLConnection urlConnection = urlObj.openConnection(); - urlConnection.setConnectTimeout(30 * 1000); - urlConnection.setReadTimeout(60 * 1000); - urlConnection.setDoInput(true); - in = urlConnection.getInputStream(); - } - else - { - // 鏈満鍦板潃 - String localPath = RuoYiConfig.getProfile(); - String downloadPath = localPath + StringUtils.substringAfter(url, Constants.RESOURCE_PREFIX); - in = new FileInputStream(downloadPath); - } - return IOUtils.toByteArray(in); - } - catch (Exception e) - { - log.error("鑾峰彇鏂囦欢璺緞寮傚父 {}", e); - return null; - } - finally - { - IOUtils.closeQuietly(baos); - } - } -} +package com.jiajiakang.common.utils.file; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileInputStream; +import java.io.InputStream; +import java.net.URL; +import java.net.URLConnection; +import java.util.Arrays; +import org.apache.poi.util.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import com.jiajiakang.common.config.RuoYiConfig; +import com.jiajiakang.common.constant.Constants; +import com.jiajiakang.common.utils.StringUtils; + +/** + * 鍥剧墖澶勭悊宸ュ叿绫 + * + * @author ruoyi + */ +public class ImageUtils +{ + private static final Logger log = LoggerFactory.getLogger(ImageUtils.class); + + public static byte[] getImage(String imagePath) + { + InputStream is = getFile(imagePath); + try + { + return IOUtils.toByteArray(is); + } + catch (Exception e) + { + log.error("鍥剧墖鍔犺浇寮傚父 {}", e); + return null; + } + finally + { + IOUtils.closeQuietly(is); + } + } + + public static InputStream getFile(String imagePath) + { + try + { + byte[] result = readFile(imagePath); + result = Arrays.copyOf(result, result.length); + return new ByteArrayInputStream(result); + } + catch (Exception e) + { + log.error("鑾峰彇鍥剧墖寮傚父 {}", e); + } + return null; + } + + /** + * 璇诲彇鏂囦欢涓哄瓧鑺傛暟鎹 + * + * @param key 鍦板潃 + * @return 瀛楄妭鏁版嵁 + */ + public static byte[] readFile(String url) + { + InputStream in = null; + ByteArrayOutputStream baos = null; + try + { + if (url.startsWith("http")) + { + // 缃戠粶鍦板潃 + URL urlObj = new URL(url); + URLConnection urlConnection = urlObj.openConnection(); + urlConnection.setConnectTimeout(30 * 1000); + urlConnection.setReadTimeout(60 * 1000); + urlConnection.setDoInput(true); + in = urlConnection.getInputStream(); + } + else + { + // 鏈満鍦板潃 + String localPath = RuoYiConfig.getProfile(); + String downloadPath = localPath + StringUtils.substringAfter(url, Constants.RESOURCE_PREFIX); + in = new FileInputStream(downloadPath); + } + return IOUtils.toByteArray(in); + } + catch (Exception e) + { + log.error("鑾峰彇鏂囦欢璺緞寮傚父 {}", e); + return null; + } + finally + { + IOUtils.closeQuietly(baos); + } + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/file/MimeTypeUtils.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/file/MimeTypeUtils.java index 698464128a671ef84dc698aff0318cb2fb17f3d5..06aacc5de59b7efb9de4d7c90f6ec68d0c7d5c81 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/file/MimeTypeUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.jiajiakang.common.utils.file; /** * 濯掍綋绫诲瀷宸ュ叿绫 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/html/EscapeUtil.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/html/EscapeUtil.java index bf9980a366a8a8d5f45c32372a9285e7ab1c9a18..9624640256fce01e6324396ab44b504423a62545 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/html/EscapeUtil.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.utils.html; +package com.jiajiakang.common.utils.html; -import com.ruoyi.common.utils.StringUtils; +import com.jiajiakang.common.utils.StringUtils; /** * 杞箟鍜屽弽杞箟宸ュ叿绫 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/html/HTMLFilter.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/html/HTMLFilter.java index 3de26bb4b1f3015a03cb2743657bd2cec12a8b82..bad8cd800c1db5053fe4631a78bacab8f456e018 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/html/HTMLFilter.java @@ -1,570 +1,570 @@ -package com.ruoyi.common.utils.html; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * HTML杩囨护鍣紝鐢ㄤ簬鍘婚櫎XSS婕忔礊闅愭偅銆 - * - * @author ruoyi - */ -public final class HTMLFilter -{ - /** - * regex flag union representing /si modifiers in php - **/ - private static final int REGEX_FLAGS_SI = Pattern.CASE_INSENSITIVE | Pattern.DOTALL; - private static final Pattern P_COMMENTS = Pattern.compile("", Pattern.DOTALL); - private static final Pattern P_COMMENT = Pattern.compile("^!--(.*)--$", REGEX_FLAGS_SI); - private static final Pattern P_TAGS = Pattern.compile("<(.*?)>", Pattern.DOTALL); - private static final Pattern P_END_TAG = Pattern.compile("^/([a-z0-9]+)", REGEX_FLAGS_SI); - private static final Pattern P_START_TAG = Pattern.compile("^([a-z0-9]+)(.*?)(/?)$", REGEX_FLAGS_SI); - private static final Pattern P_QUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)=([\"'])(.*?)\\2", REGEX_FLAGS_SI); - private static final Pattern P_UNQUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)(=)([^\"\\s']+)", REGEX_FLAGS_SI); - private static final Pattern P_PROTOCOL = Pattern.compile("^([^:]+):", REGEX_FLAGS_SI); - private static final Pattern P_ENTITY = Pattern.compile("&#(\\d+);?"); - private static final Pattern P_ENTITY_UNICODE = Pattern.compile("&#x([0-9a-f]+);?"); - private static final Pattern P_ENCODE = Pattern.compile("%([0-9a-f]{2});?"); - private static final Pattern P_VALID_ENTITIES = Pattern.compile("&([^&;]*)(?=(;|&|$))"); - private static final Pattern P_VALID_QUOTES = Pattern.compile("(>|^)([^<]+?)(<|$)", Pattern.DOTALL); - private static final Pattern P_END_ARROW = Pattern.compile("^>"); - private static final Pattern P_BODY_TO_END = Pattern.compile("<([^>]*?)(?=<|$)"); - private static final Pattern P_XML_CONTENT = Pattern.compile("(^|>)([^<]*?)(?=>)"); - private static final Pattern P_STRAY_LEFT_ARROW = Pattern.compile("<([^>]*?)(?=<|$)"); - private static final Pattern P_STRAY_RIGHT_ARROW = Pattern.compile("(^|>)([^<]*?)(?=>)"); - private static final Pattern P_AMP = Pattern.compile("&"); - private static final Pattern P_QUOTE = Pattern.compile("\""); - private static final Pattern P_LEFT_ARROW = Pattern.compile("<"); - private static final Pattern P_RIGHT_ARROW = Pattern.compile(">"); - private static final Pattern P_BOTH_ARROWS = Pattern.compile("<>"); - - // @xxx could grow large... maybe use sesat's ReferenceMap - private static final ConcurrentMap P_REMOVE_PAIR_BLANKS = new ConcurrentHashMap<>(); - private static final ConcurrentMap P_REMOVE_SELF_BLANKS = new ConcurrentHashMap<>(); - - /** - * set of allowed html elements, along with allowed attributes for each element - **/ - private final Map> vAllowed; - /** - * counts of open tags for each (allowable) html element - **/ - private final Map vTagCounts = new HashMap<>(); - - /** - * html elements which must always be self-closing (e.g. "") - **/ - private final String[] vSelfClosingTags; - /** - * html elements which must always have separate opening and closing tags (e.g. "") - **/ - private final String[] vNeedClosingTags; - /** - * set of disallowed html elements - **/ - private final String[] vDisallowed; - /** - * attributes which should be checked for valid protocols - **/ - private final String[] vProtocolAtts; - /** - * allowed protocols - **/ - private final String[] vAllowedProtocols; - /** - * tags which should be removed if they contain no content (e.g. "" or "") - **/ - private final String[] vRemoveBlanks; - /** - * entities allowed within html markup - **/ - private final String[] vAllowedEntities; - /** - * flag determining whether comments are allowed in input String. - */ - private final boolean stripComment; - private final boolean encodeQuotes; - /** - * flag determining whether to try to make tags when presented with "unbalanced" angle brackets (e.g. "" - * becomes " text "). If set to false, unbalanced angle brackets will be html escaped. - */ - private final boolean alwaysMakeTags; - - /** - * Default constructor. - */ - public HTMLFilter() - { - vAllowed = new HashMap<>(); - - final ArrayList a_atts = new ArrayList<>(); - a_atts.add("href"); - a_atts.add("target"); - vAllowed.put("a", a_atts); - - final ArrayList img_atts = new ArrayList<>(); - img_atts.add("src"); - img_atts.add("width"); - img_atts.add("height"); - img_atts.add("alt"); - vAllowed.put("img", img_atts); - - final ArrayList no_atts = new ArrayList<>(); - vAllowed.put("b", no_atts); - vAllowed.put("strong", no_atts); - vAllowed.put("i", no_atts); - vAllowed.put("em", no_atts); - - vSelfClosingTags = new String[] { "img" }; - vNeedClosingTags = new String[] { "a", "b", "strong", "i", "em" }; - vDisallowed = new String[] {}; - vAllowedProtocols = new String[] { "http", "mailto", "https" }; // no ftp. - vProtocolAtts = new String[] { "src", "href" }; - vRemoveBlanks = new String[] { "a", "b", "strong", "i", "em" }; - vAllowedEntities = new String[] { "amp", "gt", "lt", "quot" }; - stripComment = true; - encodeQuotes = true; - alwaysMakeTags = false; - } - - /** - * Map-parameter configurable constructor. - * - * @param conf map containing configuration. keys match field names. - */ - @SuppressWarnings("unchecked") - public HTMLFilter(final Map conf) - { - - assert conf.containsKey("vAllowed") : "configuration requires vAllowed"; - assert conf.containsKey("vSelfClosingTags") : "configuration requires vSelfClosingTags"; - assert conf.containsKey("vNeedClosingTags") : "configuration requires vNeedClosingTags"; - assert conf.containsKey("vDisallowed") : "configuration requires vDisallowed"; - assert conf.containsKey("vAllowedProtocols") : "configuration requires vAllowedProtocols"; - assert conf.containsKey("vProtocolAtts") : "configuration requires vProtocolAtts"; - assert conf.containsKey("vRemoveBlanks") : "configuration requires vRemoveBlanks"; - assert conf.containsKey("vAllowedEntities") : "configuration requires vAllowedEntities"; - - vAllowed = Collections.unmodifiableMap((HashMap>) conf.get("vAllowed")); - vSelfClosingTags = (String[]) conf.get("vSelfClosingTags"); - vNeedClosingTags = (String[]) conf.get("vNeedClosingTags"); - vDisallowed = (String[]) conf.get("vDisallowed"); - vAllowedProtocols = (String[]) conf.get("vAllowedProtocols"); - vProtocolAtts = (String[]) conf.get("vProtocolAtts"); - vRemoveBlanks = (String[]) conf.get("vRemoveBlanks"); - vAllowedEntities = (String[]) conf.get("vAllowedEntities"); - stripComment = conf.containsKey("stripComment") ? (Boolean) conf.get("stripComment") : true; - encodeQuotes = conf.containsKey("encodeQuotes") ? (Boolean) conf.get("encodeQuotes") : true; - alwaysMakeTags = conf.containsKey("alwaysMakeTags") ? (Boolean) conf.get("alwaysMakeTags") : true; - } - - private void reset() - { - vTagCounts.clear(); - } - - // --------------------------------------------------------------- - // my versions of some PHP library functions - public static String chr(final int decimal) - { - return String.valueOf((char) decimal); - } - - public static String htmlSpecialChars(final String s) - { - String result = s; - result = regexReplace(P_AMP, "&", result); - result = regexReplace(P_QUOTE, """, result); - result = regexReplace(P_LEFT_ARROW, "<", result); - result = regexReplace(P_RIGHT_ARROW, ">", result); - return result; - } - - // --------------------------------------------------------------- - - /** - * given a user submitted input String, filter out any invalid or restricted html. - * - * @param input text (i.e. submitted by a user) than may contain html - * @return "clean" version of input, with only valid, whitelisted html elements allowed - */ - public String filter(final String input) - { - reset(); - String s = input; - - s = escapeComments(s); - - s = balanceHTML(s); - - s = checkTags(s); - - s = processRemoveBlanks(s); - - // s = validateEntities(s); - - return s; - } - - public boolean isAlwaysMakeTags() - { - return alwaysMakeTags; - } - - public boolean isStripComments() - { - return stripComment; - } - - private String escapeComments(final String s) - { - final Matcher m = P_COMMENTS.matcher(s); - final StringBuffer buf = new StringBuffer(); - if (m.find()) - { - final String match = m.group(1); // (.*?) - m.appendReplacement(buf, Matcher.quoteReplacement("")); - } - m.appendTail(buf); - - return buf.toString(); - } - - private String balanceHTML(String s) - { - if (alwaysMakeTags) - { - // - // try and form html - // - s = regexReplace(P_END_ARROW, "", s); - // 涓嶈拷鍔犵粨鏉熸爣绛 - s = regexReplace(P_BODY_TO_END, "<$1>", s); - s = regexReplace(P_XML_CONTENT, "$1<$2", s); - - } - else - { - // - // escape stray brackets - // - s = regexReplace(P_STRAY_LEFT_ARROW, "<$1", s); - s = regexReplace(P_STRAY_RIGHT_ARROW, "$1$2><", s); - - // - // the last regexp causes '<>' entities to appear - // (we need to do a lookahead assertion so that the last bracket can - // be used in the next pass of the regexp) - // - s = regexReplace(P_BOTH_ARROWS, "", s); - } - - return s; - } - - private String checkTags(String s) - { - Matcher m = P_TAGS.matcher(s); - - final StringBuffer buf = new StringBuffer(); - while (m.find()) - { - String replaceStr = m.group(1); - replaceStr = processTag(replaceStr); - m.appendReplacement(buf, Matcher.quoteReplacement(replaceStr)); - } - m.appendTail(buf); - - // these get tallied in processTag - // (remember to reset before subsequent calls to filter method) - final StringBuilder sBuilder = new StringBuilder(buf.toString()); - for (String key : vTagCounts.keySet()) - { - for (int ii = 0; ii < vTagCounts.get(key); ii++) - { - sBuilder.append(""); - } - } - s = sBuilder.toString(); - - return s; - } - - private String processRemoveBlanks(final String s) - { - String result = s; - for (String tag : vRemoveBlanks) - { - if (!P_REMOVE_PAIR_BLANKS.containsKey(tag)) - { - P_REMOVE_PAIR_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?>")); - } - result = regexReplace(P_REMOVE_PAIR_BLANKS.get(tag), "", result); - if (!P_REMOVE_SELF_BLANKS.containsKey(tag)) - { - P_REMOVE_SELF_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?/>")); - } - result = regexReplace(P_REMOVE_SELF_BLANKS.get(tag), "", result); - } - - return result; - } - - private static String regexReplace(final Pattern regex_pattern, final String replacement, final String s) - { - Matcher m = regex_pattern.matcher(s); - return m.replaceAll(replacement); - } - - private String processTag(final String s) - { - // ending tags - Matcher m = P_END_TAG.matcher(s); - if (m.find()) - { - final String name = m.group(1).toLowerCase(); - if (allowed(name)) - { - if (false == inArray(name, vSelfClosingTags)) - { - if (vTagCounts.containsKey(name)) - { - vTagCounts.put(name, vTagCounts.get(name) - 1); - return ""; - } - } - } - } - - // starting tags - m = P_START_TAG.matcher(s); - if (m.find()) - { - final String name = m.group(1).toLowerCase(); - final String body = m.group(2); - String ending = m.group(3); - - // debug( "in a starting tag, name='" + name + "'; body='" + body + "'; ending='" + ending + "'" ); - if (allowed(name)) - { - final StringBuilder params = new StringBuilder(); - - final Matcher m2 = P_QUOTED_ATTRIBUTES.matcher(body); - final Matcher m3 = P_UNQUOTED_ATTRIBUTES.matcher(body); - final List paramNames = new ArrayList<>(); - final List paramValues = new ArrayList<>(); - while (m2.find()) - { - paramNames.add(m2.group(1)); // ([a-z0-9]+) - paramValues.add(m2.group(3)); // (.*?) - } - while (m3.find()) - { - paramNames.add(m3.group(1)); // ([a-z0-9]+) - paramValues.add(m3.group(3)); // ([^\"\\s']+) - } - - String paramName, paramValue; - for (int ii = 0; ii < paramNames.size(); ii++) - { - paramName = paramNames.get(ii).toLowerCase(); - paramValue = paramValues.get(ii); - - // debug( "paramName='" + paramName + "'" ); - // debug( "paramValue='" + paramValue + "'" ); - // debug( "allowed? " + vAllowed.get( name ).contains( paramName ) ); - - if (allowedAttribute(name, paramName)) - { - if (inArray(paramName, vProtocolAtts)) - { - paramValue = processParamProtocol(paramValue); - } - params.append(' ').append(paramName).append("=\"").append(paramValue).append("\""); - } - } - - if (inArray(name, vSelfClosingTags)) - { - ending = " /"; - } - - if (inArray(name, vNeedClosingTags)) - { - ending = ""; - } - - if (ending == null || ending.length() < 1) - { - if (vTagCounts.containsKey(name)) - { - vTagCounts.put(name, vTagCounts.get(name) + 1); - } - else - { - vTagCounts.put(name, 1); - } - } - else - { - ending = " /"; - } - return "<" + name + params + ending + ">"; - } - else - { - return ""; - } - } - - // comments - m = P_COMMENT.matcher(s); - if (!stripComment && m.find()) - { - return "<" + m.group() + ">"; - } - - return ""; - } - - private String processParamProtocol(String s) - { - s = decodeEntities(s); - final Matcher m = P_PROTOCOL.matcher(s); - if (m.find()) - { - final String protocol = m.group(1); - if (!inArray(protocol, vAllowedProtocols)) - { - // bad protocol, turn into local anchor link instead - s = "#" + s.substring(protocol.length() + 1); - if (s.startsWith("#//")) - { - s = "#" + s.substring(3); - } - } - } - - return s; - } - - private String decodeEntities(String s) - { - StringBuffer buf = new StringBuffer(); - - Matcher m = P_ENTITY.matcher(s); - while (m.find()) - { - final String match = m.group(1); - final int decimal = Integer.decode(match).intValue(); - m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal))); - } - m.appendTail(buf); - s = buf.toString(); - - buf = new StringBuffer(); - m = P_ENTITY_UNICODE.matcher(s); - while (m.find()) - { - final String match = m.group(1); - final int decimal = Integer.valueOf(match, 16).intValue(); - m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal))); - } - m.appendTail(buf); - s = buf.toString(); - - buf = new StringBuffer(); - m = P_ENCODE.matcher(s); - while (m.find()) - { - final String match = m.group(1); - final int decimal = Integer.valueOf(match, 16).intValue(); - m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal))); - } - m.appendTail(buf); - s = buf.toString(); - - s = validateEntities(s); - return s; - } - - private String validateEntities(final String s) - { - StringBuffer buf = new StringBuffer(); - - // validate entities throughout the string - Matcher m = P_VALID_ENTITIES.matcher(s); - while (m.find()) - { - final String one = m.group(1); // ([^&;]*) - final String two = m.group(2); // (?=(;|&|$)) - m.appendReplacement(buf, Matcher.quoteReplacement(checkEntity(one, two))); - } - m.appendTail(buf); - - return encodeQuotes(buf.toString()); - } - - private String encodeQuotes(final String s) - { - if (encodeQuotes) - { - StringBuffer buf = new StringBuffer(); - Matcher m = P_VALID_QUOTES.matcher(s); - while (m.find()) - { - final String one = m.group(1); // (>|^) - final String two = m.group(2); // ([^<]+?) - final String three = m.group(3); // (<|$) - // 涓嶆浛鎹㈠弻寮曞彿涓"锛岄槻姝son鏍煎紡鏃犳晥 regexReplace(P_QUOTE, """, two) - m.appendReplacement(buf, Matcher.quoteReplacement(one + two + three)); - } - m.appendTail(buf); - return buf.toString(); - } - else - { - return s; - } - } - - private String checkEntity(final String preamble, final String term) - { - - return ";".equals(term) && isValidEntity(preamble) ? '&' + preamble : "&" + preamble; - } - - private boolean isValidEntity(final String entity) - { - return inArray(entity, vAllowedEntities); - } - - private static boolean inArray(final String s, final String[] array) - { - for (String item : array) - { - if (item != null && item.equals(s)) - { - return true; - } - } - return false; - } - - private boolean allowed(final String name) - { - return (vAllowed.isEmpty() || vAllowed.containsKey(name)) && !inArray(name, vDisallowed); - } - - private boolean allowedAttribute(final String name, final String paramName) - { - return allowed(name) && (vAllowed.isEmpty() || vAllowed.get(name).contains(paramName)); - } +package com.jiajiakang.common.utils.html; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * HTML杩囨护鍣紝鐢ㄤ簬鍘婚櫎XSS婕忔礊闅愭偅銆 + * + * @author ruoyi + */ +public final class HTMLFilter +{ + /** + * regex flag union representing /si modifiers in php + **/ + private static final int REGEX_FLAGS_SI = Pattern.CASE_INSENSITIVE | Pattern.DOTALL; + private static final Pattern P_COMMENTS = Pattern.compile("", Pattern.DOTALL); + private static final Pattern P_COMMENT = Pattern.compile("^!--(.*)--$", REGEX_FLAGS_SI); + private static final Pattern P_TAGS = Pattern.compile("<(.*?)>", Pattern.DOTALL); + private static final Pattern P_END_TAG = Pattern.compile("^/([a-z0-9]+)", REGEX_FLAGS_SI); + private static final Pattern P_START_TAG = Pattern.compile("^([a-z0-9]+)(.*?)(/?)$", REGEX_FLAGS_SI); + private static final Pattern P_QUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)=([\"'])(.*?)\\2", REGEX_FLAGS_SI); + private static final Pattern P_UNQUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)(=)([^\"\\s']+)", REGEX_FLAGS_SI); + private static final Pattern P_PROTOCOL = Pattern.compile("^([^:]+):", REGEX_FLAGS_SI); + private static final Pattern P_ENTITY = Pattern.compile("&#(\\d+);?"); + private static final Pattern P_ENTITY_UNICODE = Pattern.compile("&#x([0-9a-f]+);?"); + private static final Pattern P_ENCODE = Pattern.compile("%([0-9a-f]{2});?"); + private static final Pattern P_VALID_ENTITIES = Pattern.compile("&([^&;]*)(?=(;|&|$))"); + private static final Pattern P_VALID_QUOTES = Pattern.compile("(>|^)([^<]+?)(<|$)", Pattern.DOTALL); + private static final Pattern P_END_ARROW = Pattern.compile("^>"); + private static final Pattern P_BODY_TO_END = Pattern.compile("<([^>]*?)(?=<|$)"); + private static final Pattern P_XML_CONTENT = Pattern.compile("(^|>)([^<]*?)(?=>)"); + private static final Pattern P_STRAY_LEFT_ARROW = Pattern.compile("<([^>]*?)(?=<|$)"); + private static final Pattern P_STRAY_RIGHT_ARROW = Pattern.compile("(^|>)([^<]*?)(?=>)"); + private static final Pattern P_AMP = Pattern.compile("&"); + private static final Pattern P_QUOTE = Pattern.compile("\""); + private static final Pattern P_LEFT_ARROW = Pattern.compile("<"); + private static final Pattern P_RIGHT_ARROW = Pattern.compile(">"); + private static final Pattern P_BOTH_ARROWS = Pattern.compile("<>"); + + // @xxx could grow large... maybe use sesat's ReferenceMap + private static final ConcurrentMap P_REMOVE_PAIR_BLANKS = new ConcurrentHashMap<>(); + private static final ConcurrentMap P_REMOVE_SELF_BLANKS = new ConcurrentHashMap<>(); + + /** + * set of allowed html elements, along with allowed attributes for each element + **/ + private final Map> vAllowed; + /** + * counts of open tags for each (allowable) html element + **/ + private final Map vTagCounts = new HashMap<>(); + + /** + * html elements which must always be self-closing (e.g. "") + **/ + private final String[] vSelfClosingTags; + /** + * html elements which must always have separate opening and closing tags (e.g. "") + **/ + private final String[] vNeedClosingTags; + /** + * set of disallowed html elements + **/ + private final String[] vDisallowed; + /** + * attributes which should be checked for valid protocols + **/ + private final String[] vProtocolAtts; + /** + * allowed protocols + **/ + private final String[] vAllowedProtocols; + /** + * tags which should be removed if they contain no content (e.g. "" or "") + **/ + private final String[] vRemoveBlanks; + /** + * entities allowed within html markup + **/ + private final String[] vAllowedEntities; + /** + * flag determining whether comments are allowed in input String. + */ + private final boolean stripComment; + private final boolean encodeQuotes; + /** + * flag determining whether to try to make tags when presented with "unbalanced" angle brackets (e.g. "" + * becomes " text "). If set to false, unbalanced angle brackets will be html escaped. + */ + private final boolean alwaysMakeTags; + + /** + * Default constructor. + */ + public HTMLFilter() + { + vAllowed = new HashMap<>(); + + final ArrayList a_atts = new ArrayList<>(); + a_atts.add("href"); + a_atts.add("target"); + vAllowed.put("a", a_atts); + + final ArrayList img_atts = new ArrayList<>(); + img_atts.add("src"); + img_atts.add("width"); + img_atts.add("height"); + img_atts.add("alt"); + vAllowed.put("img", img_atts); + + final ArrayList no_atts = new ArrayList<>(); + vAllowed.put("b", no_atts); + vAllowed.put("strong", no_atts); + vAllowed.put("i", no_atts); + vAllowed.put("em", no_atts); + + vSelfClosingTags = new String[] { "img" }; + vNeedClosingTags = new String[] { "a", "b", "strong", "i", "em" }; + vDisallowed = new String[] {}; + vAllowedProtocols = new String[] { "http", "mailto", "https" }; // no ftp. + vProtocolAtts = new String[] { "src", "href" }; + vRemoveBlanks = new String[] { "a", "b", "strong", "i", "em" }; + vAllowedEntities = new String[] { "amp", "gt", "lt", "quot" }; + stripComment = true; + encodeQuotes = true; + alwaysMakeTags = false; + } + + /** + * Map-parameter configurable constructor. + * + * @param conf map containing configuration. keys match field names. + */ + @SuppressWarnings("unchecked") + public HTMLFilter(final Map conf) + { + + assert conf.containsKey("vAllowed") : "configuration requires vAllowed"; + assert conf.containsKey("vSelfClosingTags") : "configuration requires vSelfClosingTags"; + assert conf.containsKey("vNeedClosingTags") : "configuration requires vNeedClosingTags"; + assert conf.containsKey("vDisallowed") : "configuration requires vDisallowed"; + assert conf.containsKey("vAllowedProtocols") : "configuration requires vAllowedProtocols"; + assert conf.containsKey("vProtocolAtts") : "configuration requires vProtocolAtts"; + assert conf.containsKey("vRemoveBlanks") : "configuration requires vRemoveBlanks"; + assert conf.containsKey("vAllowedEntities") : "configuration requires vAllowedEntities"; + + vAllowed = Collections.unmodifiableMap((HashMap>) conf.get("vAllowed")); + vSelfClosingTags = (String[]) conf.get("vSelfClosingTags"); + vNeedClosingTags = (String[]) conf.get("vNeedClosingTags"); + vDisallowed = (String[]) conf.get("vDisallowed"); + vAllowedProtocols = (String[]) conf.get("vAllowedProtocols"); + vProtocolAtts = (String[]) conf.get("vProtocolAtts"); + vRemoveBlanks = (String[]) conf.get("vRemoveBlanks"); + vAllowedEntities = (String[]) conf.get("vAllowedEntities"); + stripComment = conf.containsKey("stripComment") ? (Boolean) conf.get("stripComment") : true; + encodeQuotes = conf.containsKey("encodeQuotes") ? (Boolean) conf.get("encodeQuotes") : true; + alwaysMakeTags = conf.containsKey("alwaysMakeTags") ? (Boolean) conf.get("alwaysMakeTags") : true; + } + + private void reset() + { + vTagCounts.clear(); + } + + // --------------------------------------------------------------- + // my versions of some PHP library functions + public static String chr(final int decimal) + { + return String.valueOf((char) decimal); + } + + public static String htmlSpecialChars(final String s) + { + String result = s; + result = regexReplace(P_AMP, "&", result); + result = regexReplace(P_QUOTE, """, result); + result = regexReplace(P_LEFT_ARROW, "<", result); + result = regexReplace(P_RIGHT_ARROW, ">", result); + return result; + } + + // --------------------------------------------------------------- + + /** + * given a user submitted input String, filter out any invalid or restricted html. + * + * @param input text (i.e. submitted by a user) than may contain html + * @return "clean" version of input, with only valid, whitelisted html elements allowed + */ + public String filter(final String input) + { + reset(); + String s = input; + + s = escapeComments(s); + + s = balanceHTML(s); + + s = checkTags(s); + + s = processRemoveBlanks(s); + + // s = validateEntities(s); + + return s; + } + + public boolean isAlwaysMakeTags() + { + return alwaysMakeTags; + } + + public boolean isStripComments() + { + return stripComment; + } + + private String escapeComments(final String s) + { + final Matcher m = P_COMMENTS.matcher(s); + final StringBuffer buf = new StringBuffer(); + if (m.find()) + { + final String match = m.group(1); // (.*?) + m.appendReplacement(buf, Matcher.quoteReplacement("")); + } + m.appendTail(buf); + + return buf.toString(); + } + + private String balanceHTML(String s) + { + if (alwaysMakeTags) + { + // + // try and form html + // + s = regexReplace(P_END_ARROW, "", s); + // 涓嶈拷鍔犵粨鏉熸爣绛 + s = regexReplace(P_BODY_TO_END, "<$1>", s); + s = regexReplace(P_XML_CONTENT, "$1<$2", s); + + } + else + { + // + // escape stray brackets + // + s = regexReplace(P_STRAY_LEFT_ARROW, "<$1", s); + s = regexReplace(P_STRAY_RIGHT_ARROW, "$1$2><", s); + + // + // the last regexp causes '<>' entities to appear + // (we need to do a lookahead assertion so that the last bracket can + // be used in the next pass of the regexp) + // + s = regexReplace(P_BOTH_ARROWS, "", s); + } + + return s; + } + + private String checkTags(String s) + { + Matcher m = P_TAGS.matcher(s); + + final StringBuffer buf = new StringBuffer(); + while (m.find()) + { + String replaceStr = m.group(1); + replaceStr = processTag(replaceStr); + m.appendReplacement(buf, Matcher.quoteReplacement(replaceStr)); + } + m.appendTail(buf); + + // these get tallied in processTag + // (remember to reset before subsequent calls to filter method) + final StringBuilder sBuilder = new StringBuilder(buf.toString()); + for (String key : vTagCounts.keySet()) + { + for (int ii = 0; ii < vTagCounts.get(key); ii++) + { + sBuilder.append(""); + } + } + s = sBuilder.toString(); + + return s; + } + + private String processRemoveBlanks(final String s) + { + String result = s; + for (String tag : vRemoveBlanks) + { + if (!P_REMOVE_PAIR_BLANKS.containsKey(tag)) + { + P_REMOVE_PAIR_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?>")); + } + result = regexReplace(P_REMOVE_PAIR_BLANKS.get(tag), "", result); + if (!P_REMOVE_SELF_BLANKS.containsKey(tag)) + { + P_REMOVE_SELF_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?/>")); + } + result = regexReplace(P_REMOVE_SELF_BLANKS.get(tag), "", result); + } + + return result; + } + + private static String regexReplace(final Pattern regex_pattern, final String replacement, final String s) + { + Matcher m = regex_pattern.matcher(s); + return m.replaceAll(replacement); + } + + private String processTag(final String s) + { + // ending tags + Matcher m = P_END_TAG.matcher(s); + if (m.find()) + { + final String name = m.group(1).toLowerCase(); + if (allowed(name)) + { + if (false == inArray(name, vSelfClosingTags)) + { + if (vTagCounts.containsKey(name)) + { + vTagCounts.put(name, vTagCounts.get(name) - 1); + return ""; + } + } + } + } + + // starting tags + m = P_START_TAG.matcher(s); + if (m.find()) + { + final String name = m.group(1).toLowerCase(); + final String body = m.group(2); + String ending = m.group(3); + + // debug( "in a starting tag, name='" + name + "'; body='" + body + "'; ending='" + ending + "'" ); + if (allowed(name)) + { + final StringBuilder params = new StringBuilder(); + + final Matcher m2 = P_QUOTED_ATTRIBUTES.matcher(body); + final Matcher m3 = P_UNQUOTED_ATTRIBUTES.matcher(body); + final List paramNames = new ArrayList<>(); + final List paramValues = new ArrayList<>(); + while (m2.find()) + { + paramNames.add(m2.group(1)); // ([a-z0-9]+) + paramValues.add(m2.group(3)); // (.*?) + } + while (m3.find()) + { + paramNames.add(m3.group(1)); // ([a-z0-9]+) + paramValues.add(m3.group(3)); // ([^\"\\s']+) + } + + String paramName, paramValue; + for (int ii = 0; ii < paramNames.size(); ii++) + { + paramName = paramNames.get(ii).toLowerCase(); + paramValue = paramValues.get(ii); + + // debug( "paramName='" + paramName + "'" ); + // debug( "paramValue='" + paramValue + "'" ); + // debug( "allowed? " + vAllowed.get( name ).contains( paramName ) ); + + if (allowedAttribute(name, paramName)) + { + if (inArray(paramName, vProtocolAtts)) + { + paramValue = processParamProtocol(paramValue); + } + params.append(' ').append(paramName).append("=\"").append(paramValue).append("\""); + } + } + + if (inArray(name, vSelfClosingTags)) + { + ending = " /"; + } + + if (inArray(name, vNeedClosingTags)) + { + ending = ""; + } + + if (ending == null || ending.length() < 1) + { + if (vTagCounts.containsKey(name)) + { + vTagCounts.put(name, vTagCounts.get(name) + 1); + } + else + { + vTagCounts.put(name, 1); + } + } + else + { + ending = " /"; + } + return "<" + name + params + ending + ">"; + } + else + { + return ""; + } + } + + // comments + m = P_COMMENT.matcher(s); + if (!stripComment && m.find()) + { + return "<" + m.group() + ">"; + } + + return ""; + } + + private String processParamProtocol(String s) + { + s = decodeEntities(s); + final Matcher m = P_PROTOCOL.matcher(s); + if (m.find()) + { + final String protocol = m.group(1); + if (!inArray(protocol, vAllowedProtocols)) + { + // bad protocol, turn into local anchor link instead + s = "#" + s.substring(protocol.length() + 1); + if (s.startsWith("#//")) + { + s = "#" + s.substring(3); + } + } + } + + return s; + } + + private String decodeEntities(String s) + { + StringBuffer buf = new StringBuffer(); + + Matcher m = P_ENTITY.matcher(s); + while (m.find()) + { + final String match = m.group(1); + final int decimal = Integer.decode(match).intValue(); + m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal))); + } + m.appendTail(buf); + s = buf.toString(); + + buf = new StringBuffer(); + m = P_ENTITY_UNICODE.matcher(s); + while (m.find()) + { + final String match = m.group(1); + final int decimal = Integer.valueOf(match, 16).intValue(); + m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal))); + } + m.appendTail(buf); + s = buf.toString(); + + buf = new StringBuffer(); + m = P_ENCODE.matcher(s); + while (m.find()) + { + final String match = m.group(1); + final int decimal = Integer.valueOf(match, 16).intValue(); + m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal))); + } + m.appendTail(buf); + s = buf.toString(); + + s = validateEntities(s); + return s; + } + + private String validateEntities(final String s) + { + StringBuffer buf = new StringBuffer(); + + // validate entities throughout the string + Matcher m = P_VALID_ENTITIES.matcher(s); + while (m.find()) + { + final String one = m.group(1); // ([^&;]*) + final String two = m.group(2); // (?=(;|&|$)) + m.appendReplacement(buf, Matcher.quoteReplacement(checkEntity(one, two))); + } + m.appendTail(buf); + + return encodeQuotes(buf.toString()); + } + + private String encodeQuotes(final String s) + { + if (encodeQuotes) + { + StringBuffer buf = new StringBuffer(); + Matcher m = P_VALID_QUOTES.matcher(s); + while (m.find()) + { + final String one = m.group(1); // (>|^) + final String two = m.group(2); // ([^<]+?) + final String three = m.group(3); // (<|$) + // 涓嶆浛鎹㈠弻寮曞彿涓"锛岄槻姝son鏍煎紡鏃犳晥 regexReplace(P_QUOTE, """, two) + m.appendReplacement(buf, Matcher.quoteReplacement(one + two + three)); + } + m.appendTail(buf); + return buf.toString(); + } + else + { + return s; + } + } + + private String checkEntity(final String preamble, final String term) + { + + return ";".equals(term) && isValidEntity(preamble) ? '&' + preamble : "&" + preamble; + } + + private boolean isValidEntity(final String entity) + { + return inArray(entity, vAllowedEntities); + } + + private static boolean inArray(final String s, final String[] array) + { + for (String item : array) + { + if (item != null && item.equals(s)) + { + return true; + } + } + return false; + } + + private boolean allowed(final String name) + { + return (vAllowed.isEmpty() || vAllowed.containsKey(name)) && !inArray(name, vDisallowed); + } + + private boolean allowedAttribute(final String name, final String paramName) + { + return allowed(name) && (vAllowed.isEmpty() || vAllowed.get(name).contains(paramName)); + } } \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/http/HttpHelper.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/http/HttpHelper.java index e34fa5ae6ac68dc2bb27584335cefe4345564e67..45840898805b385e462d396e1bca706131ef924d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/http/HttpHelper.java @@ -1,55 +1,55 @@ -package com.ruoyi.common.utils.http; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.Charset; -import javax.servlet.ServletRequest; -import org.apache.commons.lang3.exception.ExceptionUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * 閫氱敤http宸ュ叿灏佽 - * - * @author ruoyi - */ -public class HttpHelper -{ - private static final Logger LOGGER = LoggerFactory.getLogger(HttpHelper.class); - - public static String getBodyString(ServletRequest request) - { - StringBuilder sb = new StringBuilder(); - BufferedReader reader = null; - try (InputStream inputStream = request.getInputStream()) - { - reader = new BufferedReader(new InputStreamReader(inputStream, Charset.forName("UTF-8"))); - String line = ""; - while ((line = reader.readLine()) != null) - { - sb.append(line); - } - } - catch (IOException e) - { - LOGGER.warn("getBodyString鍑虹幇闂锛"); - } - finally - { - if (reader != null) - { - try - { - reader.close(); - } - catch (IOException e) - { - LOGGER.error(ExceptionUtils.getMessage(e)); - } - } - } - return sb.toString(); - } -} +package com.jiajiakang.common.utils.http; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.Charset; +import javax.servlet.ServletRequest; +import org.apache.commons.lang3.exception.ExceptionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * 閫氱敤http宸ュ叿灏佽 + * + * @author ruoyi + */ +public class HttpHelper +{ + private static final Logger LOGGER = LoggerFactory.getLogger(HttpHelper.class); + + public static String getBodyString(ServletRequest request) + { + StringBuilder sb = new StringBuilder(); + BufferedReader reader = null; + try (InputStream inputStream = request.getInputStream()) + { + reader = new BufferedReader(new InputStreamReader(inputStream, Charset.forName("UTF-8"))); + String line = ""; + while ((line = reader.readLine()) != null) + { + sb.append(line); + } + } + catch (IOException e) + { + LOGGER.warn("getBodyString鍑虹幇闂锛"); + } + finally + { + if (reader != null) + { + try + { + reader.close(); + } + catch (IOException e) + { + LOGGER.error(ExceptionUtils.getMessage(e)); + } + } + } + return sb.toString(); + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/http/HttpUtils.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/http/HttpUtils.java index 9aee92ef5cd2d20e025f1e3931763b597bcbaf01..cc6f58d278be3f74cfdf4a19213951c7e6eb4722 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/http/HttpUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.http; +package com.jiajiakang.common.utils.http; import java.io.BufferedReader; import java.io.IOException; @@ -18,7 +18,7 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.Constants; +import com.jiajiakang.common.constant.Constants; /** * 閫氱敤http鍙戦佹柟娉 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/ip/AddressUtils.java similarity index 85% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/ip/AddressUtils.java index 01c24fc76f1031144928041e72e46a3e3480dccd..a3a87e9a4713a8ed58ee630e0297f7fb4746eba4 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/ip/AddressUtils.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.utils.ip; +package com.jiajiakang.common.utils.ip; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.http.HttpUtils; +import com.jiajiakang.common.config.RuoYiConfig; +import com.jiajiakang.common.constant.Constants; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.common.utils.http.HttpUtils; /** * 鑾峰彇鍦板潃绫 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/ip/IpUtils.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/ip/IpUtils.java index 1b3f42ba4142b500ec9ec78ce4571c5b586ad181..59e4a77a07c2c191e0767fe316a9bf8b7f59c375 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/ip/IpUtils.java @@ -1,10 +1,10 @@ -package com.ruoyi.common.utils.ip; +package com.jiajiakang.common.utils.ip; import java.net.InetAddress; import java.net.UnknownHostException; import javax.servlet.http.HttpServletRequest; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.html.EscapeUtil; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.common.utils.html.EscapeUtil; /** * 鑾峰彇IP鏂规硶 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/poi/ExcelUtil.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/poi/ExcelUtil.java index dcba68e09ae9133e2cd5f56bcf964ed7c0a60e3d..4e50357f248b7bf2c7ecb15545e2eaf6bb668fcd 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/poi/ExcelUtil.java @@ -1,1093 +1,1093 @@ -package com.ruoyi.common.utils.poi; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.lang.reflect.Field; -import java.math.BigDecimal; -import java.text.DecimalFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.stream.Collectors; -import org.apache.poi.ss.usermodel.BorderStyle; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.CellStyle; -import org.apache.poi.ss.usermodel.CellType; -import org.apache.poi.ss.usermodel.ClientAnchor; -import org.apache.poi.ss.usermodel.DataValidation; -import org.apache.poi.ss.usermodel.DataValidationConstraint; -import org.apache.poi.ss.usermodel.DataValidationHelper; -import org.apache.poi.ss.usermodel.DateUtil; -import org.apache.poi.ss.usermodel.Drawing; -import org.apache.poi.ss.usermodel.FillPatternType; -import org.apache.poi.ss.usermodel.Font; -import org.apache.poi.ss.usermodel.HorizontalAlignment; -import org.apache.poi.ss.usermodel.IndexedColors; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.VerticalAlignment; -import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.ss.usermodel.WorkbookFactory; -import org.apache.poi.ss.util.CellRangeAddressList; -import org.apache.poi.xssf.streaming.SXSSFWorkbook; -import org.apache.poi.xssf.usermodel.XSSFClientAnchor; -import org.apache.poi.xssf.usermodel.XSSFDataValidation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.annotation.Excel.Type; -import com.ruoyi.common.annotation.Excels; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.DictUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileTypeUtils; -import com.ruoyi.common.utils.file.ImageUtils; -import com.ruoyi.common.utils.reflect.ReflectUtils; - -/** - * Excel鐩稿叧澶勭悊 - * - * @author ruoyi - */ -public class ExcelUtil -{ - private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class); - - /** - * Excel sheet鏈澶ц鏁帮紝榛樿65536 - */ - public static final int sheetSize = 65536; - - /** - * 宸ヤ綔琛ㄥ悕绉 - */ - private String sheetName; - - /** - * 瀵煎嚭绫诲瀷锛圗XPORT:瀵煎嚭鏁版嵁锛汭MPORT锛氬鍏ユā鏉匡級 - */ - private Type type; - - /** - * 宸ヤ綔钖勫璞 - */ - private Workbook wb; - - /** - * 宸ヤ綔琛ㄥ璞 - */ - private Sheet sheet; - - /** - * 鏍峰紡鍒楄〃 - */ - private Map styles; - - /** - * 瀵煎叆瀵煎嚭鏁版嵁鍒楄〃 - */ - private List list; - - /** - * 娉ㄨВ鍒楄〃 - */ - private List fields; - - /** - * 鏈澶ч珮搴 - */ - private short maxHeight; - - /** - * 缁熻鍒楄〃 - */ - private Map statistics = new HashMap(); - - /** - * 鏁板瓧鏍煎紡 - */ - private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00"); - - /** - * 瀹炰綋瀵硅薄 - */ - public Class clazz; - - public ExcelUtil(Class clazz) - { - this.clazz = clazz; - } - - public void init(List list, String sheetName, Type type) - { - if (list == null) - { - list = new ArrayList(); - } - this.list = list; - this.sheetName = sheetName; - this.type = type; - createExcelField(); - createWorkbook(); - } - - /** - * 瀵筫xcel琛ㄥ崟榛樿绗竴涓储寮曞悕杞崲鎴恖ist - * - * @param is 杈撳叆娴 - * @return 杞崲鍚庨泦鍚 - */ - public List importExcel(InputStream is) throws Exception - { - return importExcel(StringUtils.EMPTY, is); - } - - /** - * 瀵筫xcel琛ㄥ崟鎸囧畾琛ㄦ牸绱㈠紩鍚嶈浆鎹㈡垚list - * - * @param sheetName 琛ㄦ牸绱㈠紩鍚 - * @param is 杈撳叆娴 - * @return 杞崲鍚庨泦鍚 - */ - public List importExcel(String sheetName, InputStream is) throws Exception - { - this.type = Type.IMPORT; - this.wb = WorkbookFactory.create(is); - List list = new ArrayList(); - Sheet sheet = null; - if (StringUtils.isNotEmpty(sheetName)) - { - // 濡傛灉鎸囧畾sheet鍚,鍒欏彇鎸囧畾sheet涓殑鍐呭. - sheet = wb.getSheet(sheetName); - } - else - { - // 濡傛灉浼犲叆鐨剆heet鍚嶄笉瀛樺湪鍒欓粯璁ゆ寚鍚戠1涓猻heet. - sheet = wb.getSheetAt(0); - } - - if (sheet == null) - { - throw new IOException("鏂囦欢sheet涓嶅瓨鍦"); - } - - int rows = sheet.getPhysicalNumberOfRows(); - - if (rows > 0) - { - // 瀹氫箟涓涓猰ap鐢ㄤ簬瀛樻斁excel鍒楃殑搴忓彿鍜宖ield. - Map cellMap = new HashMap(); - // 鑾峰彇琛ㄥご - Row heard = sheet.getRow(0); - for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) - { - Cell cell = heard.getCell(i); - if (StringUtils.isNotNull(cell)) - { - String value = this.getCellValue(heard, i).toString(); - cellMap.put(value, i); - } - else - { - cellMap.put(null, i); - } - } - // 鏈夋暟鎹椂鎵嶅鐞 寰楀埌绫荤殑鎵鏈塮ield. - Field[] allFields = clazz.getDeclaredFields(); - // 瀹氫箟涓涓猰ap鐢ㄤ簬瀛樻斁鍒楃殑搴忓彿鍜宖ield. - Map fieldsMap = new HashMap(); - for (int col = 0; col < allFields.length; col++) - { - Field field = allFields[col]; - Excel attr = field.getAnnotation(Excel.class); - if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) - { - // 璁剧疆绫荤殑绉佹湁瀛楁灞炴у彲璁块棶. - field.setAccessible(true); - Integer column = cellMap.get(attr.name()); - if (column != null) - { - fieldsMap.put(column, field); - } - } - } - for (int i = 1; i < rows; i++) - { - // 浠庣2琛屽紑濮嬪彇鏁版嵁,榛樿绗竴琛屾槸琛ㄥご. - Row row = sheet.getRow(i); - T entity = null; - for (Map.Entry entry : fieldsMap.entrySet()) - { - Object val = this.getCellValue(row, entry.getKey()); - - // 濡傛灉涓嶅瓨鍦ㄥ疄渚嬪垯鏂板缓. - entity = (entity == null ? clazz.newInstance() : entity); - // 浠巑ap涓緱鍒板搴斿垪鐨刦ield. - Field field = fieldsMap.get(entry.getKey()); - // 鍙栧緱绫诲瀷,骞舵牴鎹璞＄被鍨嬭缃. - Class fieldType = field.getType(); - if (String.class == fieldType) - { - String s = Convert.toStr(val); - if (StringUtils.endsWith(s, ".0")) - { - val = StringUtils.substringBefore(s, ".0"); - } - else - { - String dateFormat = field.getAnnotation(Excel.class).dateFormat(); - if (StringUtils.isNotEmpty(dateFormat)) - { - val = DateUtils.parseDateToStr(dateFormat, (Date) val); - } - else - { - val = Convert.toStr(val); - } - } - } - else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val))) - { - val = Convert.toInt(val); - } - else if (Long.TYPE == fieldType || Long.class == fieldType) - { - val = Convert.toLong(val); - } - else if (Double.TYPE == fieldType || Double.class == fieldType) - { - val = Convert.toDouble(val); - } - else if (Float.TYPE == fieldType || Float.class == fieldType) - { - val = Convert.toFloat(val); - } - else if (BigDecimal.class == fieldType) - { - val = Convert.toBigDecimal(val); - } - else if (Date.class == fieldType) - { - if (val instanceof String) - { - val = DateUtils.parseDate(val); - } - else if (val instanceof Double) - { - val = DateUtil.getJavaDate((Double) val); - } - } - else if (Boolean.TYPE == fieldType || Boolean.class == fieldType) - { - val = Convert.toBool(val, false); - } - if (StringUtils.isNotNull(fieldType)) - { - Excel attr = field.getAnnotation(Excel.class); - String propertyName = field.getName(); - if (StringUtils.isNotEmpty(attr.targetAttr())) - { - propertyName = field.getName() + "." + attr.targetAttr(); - } - else if (StringUtils.isNotEmpty(attr.readConverterExp())) - { - val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator()); - } - else if (StringUtils.isNotEmpty(attr.dictType())) - { - val = reverseDictByExp(Convert.toStr(val), attr.dictType(), attr.separator()); - } - ReflectUtils.invokeSetter(entity, propertyName, val); - } - } - list.add(entity); - } - } - return list; - } - - /** - * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟 - * - * @param list 瀵煎嚭鏁版嵁闆嗗悎 - * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О - * @return 缁撴灉 - */ - public AjaxResult exportExcel(List list, String sheetName) - { - this.init(list, sheetName, Type.EXPORT); - return exportExcel(); - } - - /** - * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟 - * - * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О - * @return 缁撴灉 - */ - public AjaxResult importTemplateExcel(String sheetName) - { - this.init(null, sheetName, Type.IMPORT); - return exportExcel(); - } - - /** - * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟 - * - * @return 缁撴灉 - */ - public AjaxResult exportExcel() - { - OutputStream out = null; - try - { - // 鍙栧嚭涓鍏辨湁澶氬皯涓猻heet. - double sheetNo = Math.ceil(list.size() / sheetSize); - for (int index = 0; index <= sheetNo; index++) - { - createSheet(sheetNo, index); - - // 浜х敓涓琛 - Row row = sheet.createRow(0); - int column = 0; - // 鍐欏叆鍚勪釜瀛楁鐨勫垪澶村悕绉 - for (Object[] os : fields) - { - Excel excel = (Excel) os[1]; - this.createCell(excel, row, column++); - } - if (Type.EXPORT.equals(type)) - { - fillExcelData(index, row); - addStatisticsRow(); - } - } - String filename = encodingFilename(sheetName); - out = new FileOutputStream(getAbsoluteFile(filename)); - wb.write(out); - return AjaxResult.success(filename); - } - catch (Exception e) - { - log.error("瀵煎嚭Excel寮傚父{}", e.getMessage()); - throw new CustomException("瀵煎嚭Excel澶辫触锛岃鑱旂郴缃戠珯绠＄悊鍛橈紒"); - } - finally - { - if (wb != null) - { - try - { - wb.close(); - } - catch (IOException e1) - { - e1.printStackTrace(); - } - } - if (out != null) - { - try - { - out.close(); - } - catch (IOException e1) - { - e1.printStackTrace(); - } - } - } - } - - /** - * 濉厖excel鏁版嵁 - * - * @param index 搴忓彿 - * @param row 鍗曞厓鏍艰 - */ - public void fillExcelData(int index, Row row) - { - int startNo = index * sheetSize; - int endNo = Math.min(startNo + sheetSize, list.size()); - for (int i = startNo; i < endNo; i++) - { - row = sheet.createRow(i + 1 - startNo); - // 寰楀埌瀵煎嚭瀵硅薄. - T vo = (T) list.get(i); - int column = 0; - for (Object[] os : fields) - { - Field field = (Field) os[0]; - Excel excel = (Excel) os[1]; - // 璁剧疆瀹炰綋绫荤鏈夊睘鎬у彲璁块棶 - field.setAccessible(true); - this.addCell(excel, row, vo, field, column++); - } - } - } - - /** - * 鍒涘缓琛ㄦ牸鏍峰紡 - * - * @param wb 宸ヤ綔钖勫璞 - * @return 鏍峰紡鍒楄〃 - */ - private Map createStyles(Workbook wb) - { - // 鍐欏叆鍚勬潯璁板綍,姣忔潯璁板綍瀵瑰簲excel琛ㄤ腑鐨勪竴琛 - Map styles = new HashMap(); - CellStyle style = wb.createCellStyle(); - style.setAlignment(HorizontalAlignment.CENTER); - style.setVerticalAlignment(VerticalAlignment.CENTER); - style.setBorderRight(BorderStyle.THIN); - style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); - style.setBorderLeft(BorderStyle.THIN); - style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); - style.setBorderTop(BorderStyle.THIN); - style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); - style.setBorderBottom(BorderStyle.THIN); - style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); - Font dataFont = wb.createFont(); - dataFont.setFontName("Arial"); - dataFont.setFontHeightInPoints((short) 10); - style.setFont(dataFont); - styles.put("data", style); - - style = wb.createCellStyle(); - style.cloneStyleFrom(styles.get("data")); - style.setAlignment(HorizontalAlignment.CENTER); - style.setVerticalAlignment(VerticalAlignment.CENTER); - style.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex()); - style.setFillPattern(FillPatternType.SOLID_FOREGROUND); - Font headerFont = wb.createFont(); - headerFont.setFontName("Arial"); - headerFont.setFontHeightInPoints((short) 10); - headerFont.setBold(true); - headerFont.setColor(IndexedColors.WHITE.getIndex()); - style.setFont(headerFont); - styles.put("header", style); - - style = wb.createCellStyle(); - style.setAlignment(HorizontalAlignment.CENTER); - style.setVerticalAlignment(VerticalAlignment.CENTER); - Font totalFont = wb.createFont(); - totalFont.setFontName("Arial"); - totalFont.setFontHeightInPoints((short) 10); - style.setFont(totalFont); - styles.put("total", style); - - style = wb.createCellStyle(); - style.cloneStyleFrom(styles.get("data")); - style.setAlignment(HorizontalAlignment.LEFT); - styles.put("data1", style); - - style = wb.createCellStyle(); - style.cloneStyleFrom(styles.get("data")); - style.setAlignment(HorizontalAlignment.CENTER); - styles.put("data2", style); - - style = wb.createCellStyle(); - style.cloneStyleFrom(styles.get("data")); - style.setAlignment(HorizontalAlignment.RIGHT); - styles.put("data3", style); - - return styles; - } - - /** - * 鍒涘缓鍗曞厓鏍 - */ - public Cell createCell(Excel attr, Row row, int column) - { - // 鍒涘缓鍒 - Cell cell = row.createCell(column); - // 鍐欏叆鍒椾俊鎭 - cell.setCellValue(attr.name()); - setDataValidation(attr, row, column); - cell.setCellStyle(styles.get("header")); - return cell; - } - - /** - * 璁剧疆鍗曞厓鏍间俊鎭 - * - * @param value 鍗曞厓鏍煎 - * @param attr 娉ㄨВ鐩稿叧 - * @param cell 鍗曞厓鏍间俊鎭 - */ - public void setCellVo(Object value, Excel attr, Cell cell) - { - if (ColumnType.STRING == attr.cellType()) - { - cell.setCellValue(StringUtils.isNull(value) ? attr.defaultValue() : value + attr.suffix()); - } - else if (ColumnType.NUMERIC == attr.cellType()) - { - cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value)); - } - else if (ColumnType.IMAGE == attr.cellType()) - { - ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() + 1), - cell.getRow().getRowNum() + 1); - String imagePath = Convert.toStr(value); - if (StringUtils.isNotEmpty(imagePath)) - { - byte[] data = ImageUtils.getImage(imagePath); - getDrawingPatriarch(cell.getSheet()).createPicture(anchor, - cell.getSheet().getWorkbook().addPicture(data, getImageType(data))); - } - } - } - - /** - * 鑾峰彇鐢诲竷 - */ - public static Drawing getDrawingPatriarch(Sheet sheet) - { - if (sheet.getDrawingPatriarch() == null) - { - sheet.createDrawingPatriarch(); - } - return sheet.getDrawingPatriarch(); - } - - /** - * 鑾峰彇鍥剧墖绫诲瀷,璁剧疆鍥剧墖鎻掑叆绫诲瀷 - */ - public int getImageType(byte[] value) - { - String type = FileTypeUtils.getFileExtendName(value); - if ("JPG".equalsIgnoreCase(type)) - { - return Workbook.PICTURE_TYPE_JPEG; - } - else if ("PNG".equalsIgnoreCase(type)) - { - return Workbook.PICTURE_TYPE_PNG; - } - return Workbook.PICTURE_TYPE_JPEG; - } - - /** - * 鍒涘缓琛ㄦ牸鏍峰紡 - */ - public void setDataValidation(Excel attr, Row row, int column) - { - if (attr.name().indexOf("娉細") >= 0) - { - sheet.setColumnWidth(column, 6000); - } - else - { - // 璁剧疆鍒楀 - sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256)); - } - // 濡傛灉璁剧疆浜嗘彁绀轰俊鎭垯榧犳爣鏀句笂鍘绘彁绀. - if (StringUtils.isNotEmpty(attr.prompt())) - { - // 杩欓噷榛樿璁句簡2-101鍒楁彁绀. - setXSSFPrompt(sheet, "", attr.prompt(), 1, 100, column, column); - } - // 濡傛灉璁剧疆浜哻ombo灞炴у垯鏈垪鍙兘閫夋嫨涓嶈兘杈撳叆 - if (attr.combo().length > 0) - { - // 杩欓噷榛樿璁句簡2-101鍒楀彧鑳介夋嫨涓嶈兘杈撳叆. - setXSSFValidation(sheet, attr.combo(), 1, 100, column, column); - } - } - - /** - * 娣诲姞鍗曞厓鏍 - */ - public Cell addCell(Excel attr, Row row, T vo, Field field, int column) - { - Cell cell = null; - try - { - // 璁剧疆琛岄珮 - row.setHeight(maxHeight); - // 鏍规嵁Excel涓缃儏鍐靛喅瀹氭槸鍚﹀鍑,鏈変簺鎯呭喌闇瑕佷繚鎸佷负绌,甯屾湜鐢ㄦ埛濉啓杩欎竴鍒. - if (attr.isExport()) - { - // 鍒涘缓cell - cell = row.createCell(column); - int align = attr.align().value(); - cell.setCellStyle(styles.get("data" + (align >= 1 && align <= 3 ? align : ""))); - - // 鐢ㄤ簬璇诲彇瀵硅薄涓殑灞炴 - Object value = getTargetValue(vo, field, attr); - String dateFormat = attr.dateFormat(); - String readConverterExp = attr.readConverterExp(); - String separator = attr.separator(); - String dictType = attr.dictType(); - if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value)) - { - cell.setCellValue(DateUtils.parseDateToStr(dateFormat, (Date) value)); - } - else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value)) - { - cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator)); - } - else if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotNull(value)) - { - cell.setCellValue(convertDictByExp(Convert.toStr(value), dictType, separator)); - } - else if (value instanceof BigDecimal && -1 != attr.scale()) - { - cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).toString()); - } - else - { - // 璁剧疆鍒楃被鍨 - setCellVo(value, attr, cell); - } - addStatisticsData(column, Convert.toStr(value), attr); - } - } - catch (Exception e) - { - log.error("瀵煎嚭Excel澶辫触{}", e); - } - return cell; - } - - /** - * 璁剧疆 POI XSSFSheet 鍗曞厓鏍兼彁绀 - * - * @param sheet 琛ㄥ崟 - * @param promptTitle 鎻愮ず鏍囬 - * @param promptContent 鎻愮ず鍐呭 - * @param firstRow 寮濮嬭 - * @param endRow 缁撴潫琛 - * @param firstCol 寮濮嬪垪 - * @param endCol 缁撴潫鍒 - */ - public void setXSSFPrompt(Sheet sheet, String promptTitle, String promptContent, int firstRow, int endRow, - int firstCol, int endCol) - { - DataValidationHelper helper = sheet.getDataValidationHelper(); - DataValidationConstraint constraint = helper.createCustomConstraint("DD1"); - CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol); - DataValidation dataValidation = helper.createValidation(constraint, regions); - dataValidation.createPromptBox(promptTitle, promptContent); - dataValidation.setShowPromptBox(true); - sheet.addValidationData(dataValidation); - } - - /** - * 璁剧疆鏌愪簺鍒楃殑鍊煎彧鑳借緭鍏ラ鍒剁殑鏁版嵁,鏄剧ず涓嬫媺妗. - * - * @param sheet 瑕佽缃殑sheet. - * @param textlist 涓嬫媺妗嗘樉绀虹殑鍐呭 - * @param firstRow 寮濮嬭 - * @param endRow 缁撴潫琛 - * @param firstCol 寮濮嬪垪 - * @param endCol 缁撴潫鍒 - * @return 璁剧疆濂界殑sheet. - */ - public void setXSSFValidation(Sheet sheet, String[] textlist, int firstRow, int endRow, int firstCol, int endCol) - { - DataValidationHelper helper = sheet.getDataValidationHelper(); - // 鍔犺浇涓嬫媺鍒楄〃鍐呭 - DataValidationConstraint constraint = helper.createExplicitListConstraint(textlist); - // 璁剧疆鏁版嵁鏈夋晥鎬у姞杞藉湪鍝釜鍗曞厓鏍间笂,鍥涗釜鍙傛暟鍒嗗埆鏄細璧峰琛屻佺粓姝㈣銆佽捣濮嬪垪銆佺粓姝㈠垪 - CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol); - // 鏁版嵁鏈夋晥鎬у璞 - DataValidation dataValidation = helper.createValidation(constraint, regions); - // 澶勭悊Excel鍏煎鎬ч棶棰 - if (dataValidation instanceof XSSFDataValidation) - { - dataValidation.setSuppressDropDownArrow(true); - dataValidation.setShowErrorBox(true); - } - else - { - dataValidation.setSuppressDropDownArrow(false); - } - - sheet.addValidationData(dataValidation); - } - - /** - * 瑙ｆ瀽瀵煎嚭鍊 0=鐢,1=濂,2=鏈煡 - * - * @param propertyValue 鍙傛暟鍊 - * @param converterExp 缈昏瘧娉ㄨВ - * @param separator 鍒嗛殧绗 - * @return 瑙ｆ瀽鍚庡 - */ - public static String convertByExp(String propertyValue, String converterExp, String separator) - { - StringBuilder propertyString = new StringBuilder(); - String[] convertSource = converterExp.split(","); - for (String item : convertSource) - { - String[] itemArray = item.split("="); - if (StringUtils.containsAny(separator, propertyValue)) - { - for (String value : propertyValue.split(separator)) - { - if (itemArray[0].equals(value)) - { - propertyString.append(itemArray[1] + separator); - break; - } - } - } - else - { - if (itemArray[0].equals(propertyValue)) - { - return itemArray[1]; - } - } - } - return StringUtils.stripEnd(propertyString.toString(), separator); - } - - /** - * 鍙嶅悜瑙ｆ瀽鍊 鐢=0,濂=1,鏈煡=2 - * - * @param propertyValue 鍙傛暟鍊 - * @param converterExp 缈昏瘧娉ㄨВ - * @param separator 鍒嗛殧绗 - * @return 瑙ｆ瀽鍚庡 - */ - public static String reverseByExp(String propertyValue, String converterExp, String separator) - { - StringBuilder propertyString = new StringBuilder(); - String[] convertSource = converterExp.split(","); - for (String item : convertSource) - { - String[] itemArray = item.split("="); - if (StringUtils.containsAny(separator, propertyValue)) - { - for (String value : propertyValue.split(separator)) - { - if (itemArray[1].equals(value)) - { - propertyString.append(itemArray[0] + separator); - break; - } - } - } - else - { - if (itemArray[1].equals(propertyValue)) - { - return itemArray[0]; - } - } - } - return StringUtils.stripEnd(propertyString.toString(), separator); - } - - /** - * 瑙ｆ瀽瀛楀吀鍊 - * - * @param dictValue 瀛楀吀鍊 - * @param dictType 瀛楀吀绫诲瀷 - * @param separator 鍒嗛殧绗 - * @return 瀛楀吀鏍囩 - */ - public static String convertDictByExp(String dictValue, String dictType, String separator) - { - return DictUtils.getDictLabel(dictType, dictValue, separator); - } - - /** - * 鍙嶅悜瑙ｆ瀽鍊煎瓧鍏稿 - * - * @param dictLabel 瀛楀吀鏍囩 - * @param dictType 瀛楀吀绫诲瀷 - * @param separator 鍒嗛殧绗 - * @return 瀛楀吀鍊 - */ - public static String reverseDictByExp(String dictLabel, String dictType, String separator) - { - return DictUtils.getDictValue(dictType, dictLabel, separator); - } - - /** - * 鍚堣缁熻淇℃伅 - */ - private void addStatisticsData(Integer index, String text, Excel entity) - { - if (entity != null && entity.isStatistics()) - { - Double temp = 0D; - if (!statistics.containsKey(index)) - { - statistics.put(index, temp); - } - try - { - temp = Double.valueOf(text); - } - catch (NumberFormatException e) - { - } - statistics.put(index, statistics.get(index) + temp); - } - } - - /** - * 鍒涘缓缁熻琛 - */ - public void addStatisticsRow() - { - if (statistics.size() > 0) - { - Cell cell = null; - Row row = sheet.createRow(sheet.getLastRowNum() + 1); - Set keys = statistics.keySet(); - cell = row.createCell(0); - cell.setCellStyle(styles.get("total")); - cell.setCellValue("鍚堣"); - - for (Integer key : keys) - { - cell = row.createCell(key); - cell.setCellStyle(styles.get("total")); - cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key))); - } - statistics.clear(); - } - } - - /** - * 缂栫爜鏂囦欢鍚 - */ - public String encodingFilename(String filename) - { - filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx"; - return filename; - } - - /** - * 鑾峰彇涓嬭浇璺緞 - * - * @param filename 鏂囦欢鍚嶇О - */ - public String getAbsoluteFile(String filename) - { - String downloadPath = RuoYiConfig.getDownloadPath() + filename; - File desc = new File(downloadPath); - if (!desc.getParentFile().exists()) - { - desc.getParentFile().mkdirs(); - } - return downloadPath; - } - - /** - * 鑾峰彇bean涓殑灞炴у - * - * @param vo 瀹炰綋瀵硅薄 - * @param field 瀛楁 - * @param excel 娉ㄨВ - * @return 鏈缁堢殑灞炴у - * @throws Exception - */ - private Object getTargetValue(T vo, Field field, Excel excel) throws Exception - { - Object o = field.get(vo); - if (StringUtils.isNotEmpty(excel.targetAttr())) - { - String target = excel.targetAttr(); - if (target.indexOf(".") > -1) - { - String[] targets = target.split("[.]"); - for (String name : targets) - { - o = getValue(o, name); - } - } - else - { - o = getValue(o, target); - } - } - return o; - } - - /** - * 浠ョ被鐨勫睘鎬х殑get鏂规硶鏂规硶褰㈠紡鑾峰彇鍊 - * - * @param o - * @param name - * @return value - * @throws Exception - */ - private Object getValue(Object o, String name) throws Exception - { - if (StringUtils.isNotNull(o) && StringUtils.isNotEmpty(name)) - { - Class clazz = o.getClass(); - Field field = clazz.getDeclaredField(name); - field.setAccessible(true); - o = field.get(o); - } - return o; - } - - /** - * 寰楀埌鎵鏈夊畾涔夊瓧娈 - */ - private void createExcelField() - { - this.fields = new ArrayList(); - List tempFields = new ArrayList<>(); - tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields())); - tempFields.addAll(Arrays.asList(clazz.getDeclaredFields())); - for (Field field : tempFields) - { - // 鍗曟敞瑙 - if (field.isAnnotationPresent(Excel.class)) - { - putToField(field, field.getAnnotation(Excel.class)); - } - - // 澶氭敞瑙 - if (field.isAnnotationPresent(Excels.class)) - { - Excels attrs = field.getAnnotation(Excels.class); - Excel[] excels = attrs.value(); - for (Excel excel : excels) - { - putToField(field, excel); - } - } - } - this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList()); - this.maxHeight = getRowHeight(); - } - - /** - * 鏍规嵁娉ㄨВ鑾峰彇鏈澶ц楂 - */ - public short getRowHeight() - { - double maxHeight = 0; - for (Object[] os : this.fields) - { - Excel excel = (Excel) os[1]; - maxHeight = maxHeight > excel.height() ? maxHeight : excel.height(); - } - return (short) (maxHeight * 20); - } - - /** - * 鏀惧埌瀛楁闆嗗悎涓 - */ - private void putToField(Field field, Excel attr) - { - if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) - { - this.fields.add(new Object[] { field, attr }); - } - } - - /** - * 鍒涘缓涓涓伐浣滅翱 - */ - public void createWorkbook() - { - this.wb = new SXSSFWorkbook(500); - } - - /** - * 鍒涘缓宸ヤ綔琛 - * - * @param sheetNo sheet鏁伴噺 - * @param index 搴忓彿 - */ - public void createSheet(double sheetNo, int index) - { - this.sheet = wb.createSheet(); - this.styles = createStyles(wb); - // 璁剧疆宸ヤ綔琛ㄧ殑鍚嶇О. - if (sheetNo == 0) - { - wb.setSheetName(index, sheetName); - } - else - { - wb.setSheetName(index, sheetName + index); - } - } - - /** - * 鑾峰彇鍗曞厓鏍煎 - * - * @param row 鑾峰彇鐨勮 - * @param column 鑾峰彇鍗曞厓鏍煎垪鍙 - * @return 鍗曞厓鏍煎 - */ - public Object getCellValue(Row row, int column) - { - if (row == null) - { - return row; - } - Object val = ""; - try - { - Cell cell = row.getCell(column); - if (StringUtils.isNotNull(cell)) - { - if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA) - { - val = cell.getNumericCellValue(); - if (DateUtil.isCellDateFormatted(cell)) - { - val = DateUtil.getJavaDate((Double) val); // POI Excel 鏃ユ湡鏍煎紡杞崲 - } - else - { - if ((Double) val % 1 != 0) - { - val = new BigDecimal(val.toString()); - } - else - { - val = new DecimalFormat("0").format(val); - } - } - } - else if (cell.getCellType() == CellType.STRING) - { - val = cell.getStringCellValue(); - } - else if (cell.getCellType() == CellType.BOOLEAN) - { - val = cell.getBooleanCellValue(); - } - else if (cell.getCellType() == CellType.ERROR) - { - val = cell.getErrorCellValue(); - } - - } - } - catch (Exception e) - { - return val; - } - return val; - } +package com.jiajiakang.common.utils.poi; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.lang.reflect.Field; +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; +import org.apache.poi.ss.usermodel.BorderStyle; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.CellType; +import org.apache.poi.ss.usermodel.ClientAnchor; +import org.apache.poi.ss.usermodel.DataValidation; +import org.apache.poi.ss.usermodel.DataValidationConstraint; +import org.apache.poi.ss.usermodel.DataValidationHelper; +import org.apache.poi.ss.usermodel.DateUtil; +import org.apache.poi.ss.usermodel.Drawing; +import org.apache.poi.ss.usermodel.FillPatternType; +import org.apache.poi.ss.usermodel.Font; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.IndexedColors; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.VerticalAlignment; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.WorkbookFactory; +import org.apache.poi.ss.util.CellRangeAddressList; +import org.apache.poi.xssf.streaming.SXSSFWorkbook; +import org.apache.poi.xssf.usermodel.XSSFClientAnchor; +import org.apache.poi.xssf.usermodel.XSSFDataValidation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import com.jiajiakang.common.annotation.Excel; +import com.jiajiakang.common.annotation.Excel.ColumnType; +import com.jiajiakang.common.annotation.Excel.Type; +import com.jiajiakang.common.annotation.Excels; +import com.jiajiakang.common.config.RuoYiConfig; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.core.text.Convert; +import com.jiajiakang.common.exception.CustomException; +import com.jiajiakang.common.utils.DateUtils; +import com.jiajiakang.common.utils.DictUtils; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.common.utils.file.FileTypeUtils; +import com.jiajiakang.common.utils.file.ImageUtils; +import com.jiajiakang.common.utils.reflect.ReflectUtils; + +/** + * Excel鐩稿叧澶勭悊 + * + * @author ruoyi + */ +public class ExcelUtil +{ + private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class); + + /** + * Excel sheet鏈澶ц鏁帮紝榛樿65536 + */ + public static final int sheetSize = 65536; + + /** + * 宸ヤ綔琛ㄥ悕绉 + */ + private String sheetName; + + /** + * 瀵煎嚭绫诲瀷锛圗XPORT:瀵煎嚭鏁版嵁锛汭MPORT锛氬鍏ユā鏉匡級 + */ + private Type type; + + /** + * 宸ヤ綔钖勫璞 + */ + private Workbook wb; + + /** + * 宸ヤ綔琛ㄥ璞 + */ + private Sheet sheet; + + /** + * 鏍峰紡鍒楄〃 + */ + private Map styles; + + /** + * 瀵煎叆瀵煎嚭鏁版嵁鍒楄〃 + */ + private List list; + + /** + * 娉ㄨВ鍒楄〃 + */ + private List fields; + + /** + * 鏈澶ч珮搴 + */ + private short maxHeight; + + /** + * 缁熻鍒楄〃 + */ + private Map statistics = new HashMap(); + + /** + * 鏁板瓧鏍煎紡 + */ + private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00"); + + /** + * 瀹炰綋瀵硅薄 + */ + public Class clazz; + + public ExcelUtil(Class clazz) + { + this.clazz = clazz; + } + + public void init(List list, String sheetName, Type type) + { + if (list == null) + { + list = new ArrayList(); + } + this.list = list; + this.sheetName = sheetName; + this.type = type; + createExcelField(); + createWorkbook(); + } + + /** + * 瀵筫xcel琛ㄥ崟榛樿绗竴涓储寮曞悕杞崲鎴恖ist + * + * @param is 杈撳叆娴 + * @return 杞崲鍚庨泦鍚 + */ + public List importExcel(InputStream is) throws Exception + { + return importExcel(StringUtils.EMPTY, is); + } + + /** + * 瀵筫xcel琛ㄥ崟鎸囧畾琛ㄦ牸绱㈠紩鍚嶈浆鎹㈡垚list + * + * @param sheetName 琛ㄦ牸绱㈠紩鍚 + * @param is 杈撳叆娴 + * @return 杞崲鍚庨泦鍚 + */ + public List importExcel(String sheetName, InputStream is) throws Exception + { + this.type = Type.IMPORT; + this.wb = WorkbookFactory.create(is); + List list = new ArrayList(); + Sheet sheet = null; + if (StringUtils.isNotEmpty(sheetName)) + { + // 濡傛灉鎸囧畾sheet鍚,鍒欏彇鎸囧畾sheet涓殑鍐呭. + sheet = wb.getSheet(sheetName); + } + else + { + // 濡傛灉浼犲叆鐨剆heet鍚嶄笉瀛樺湪鍒欓粯璁ゆ寚鍚戠1涓猻heet. + sheet = wb.getSheetAt(0); + } + + if (sheet == null) + { + throw new IOException("鏂囦欢sheet涓嶅瓨鍦"); + } + + int rows = sheet.getPhysicalNumberOfRows(); + + if (rows > 0) + { + // 瀹氫箟涓涓猰ap鐢ㄤ簬瀛樻斁excel鍒楃殑搴忓彿鍜宖ield. + Map cellMap = new HashMap(); + // 鑾峰彇琛ㄥご + Row heard = sheet.getRow(0); + for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) + { + Cell cell = heard.getCell(i); + if (StringUtils.isNotNull(cell)) + { + String value = this.getCellValue(heard, i).toString(); + cellMap.put(value, i); + } + else + { + cellMap.put(null, i); + } + } + // 鏈夋暟鎹椂鎵嶅鐞 寰楀埌绫荤殑鎵鏈塮ield. + Field[] allFields = clazz.getDeclaredFields(); + // 瀹氫箟涓涓猰ap鐢ㄤ簬瀛樻斁鍒楃殑搴忓彿鍜宖ield. + Map fieldsMap = new HashMap(); + for (int col = 0; col < allFields.length; col++) + { + Field field = allFields[col]; + Excel attr = field.getAnnotation(Excel.class); + if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) + { + // 璁剧疆绫荤殑绉佹湁瀛楁灞炴у彲璁块棶. + field.setAccessible(true); + Integer column = cellMap.get(attr.name()); + if (column != null) + { + fieldsMap.put(column, field); + } + } + } + for (int i = 1; i < rows; i++) + { + // 浠庣2琛屽紑濮嬪彇鏁版嵁,榛樿绗竴琛屾槸琛ㄥご. + Row row = sheet.getRow(i); + T entity = null; + for (Map.Entry entry : fieldsMap.entrySet()) + { + Object val = this.getCellValue(row, entry.getKey()); + + // 濡傛灉涓嶅瓨鍦ㄥ疄渚嬪垯鏂板缓. + entity = (entity == null ? clazz.newInstance() : entity); + // 浠巑ap涓緱鍒板搴斿垪鐨刦ield. + Field field = fieldsMap.get(entry.getKey()); + // 鍙栧緱绫诲瀷,骞舵牴鎹璞＄被鍨嬭缃. + Class fieldType = field.getType(); + if (String.class == fieldType) + { + String s = Convert.toStr(val); + if (StringUtils.endsWith(s, ".0")) + { + val = StringUtils.substringBefore(s, ".0"); + } + else + { + String dateFormat = field.getAnnotation(Excel.class).dateFormat(); + if (StringUtils.isNotEmpty(dateFormat)) + { + val = DateUtils.parseDateToStr(dateFormat, (Date) val); + } + else + { + val = Convert.toStr(val); + } + } + } + else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val))) + { + val = Convert.toInt(val); + } + else if (Long.TYPE == fieldType || Long.class == fieldType) + { + val = Convert.toLong(val); + } + else if (Double.TYPE == fieldType || Double.class == fieldType) + { + val = Convert.toDouble(val); + } + else if (Float.TYPE == fieldType || Float.class == fieldType) + { + val = Convert.toFloat(val); + } + else if (BigDecimal.class == fieldType) + { + val = Convert.toBigDecimal(val); + } + else if (Date.class == fieldType) + { + if (val instanceof String) + { + val = DateUtils.parseDate(val); + } + else if (val instanceof Double) + { + val = DateUtil.getJavaDate((Double) val); + } + } + else if (Boolean.TYPE == fieldType || Boolean.class == fieldType) + { + val = Convert.toBool(val, false); + } + if (StringUtils.isNotNull(fieldType)) + { + Excel attr = field.getAnnotation(Excel.class); + String propertyName = field.getName(); + if (StringUtils.isNotEmpty(attr.targetAttr())) + { + propertyName = field.getName() + "." + attr.targetAttr(); + } + else if (StringUtils.isNotEmpty(attr.readConverterExp())) + { + val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator()); + } + else if (StringUtils.isNotEmpty(attr.dictType())) + { + val = reverseDictByExp(Convert.toStr(val), attr.dictType(), attr.separator()); + } + ReflectUtils.invokeSetter(entity, propertyName, val); + } + } + list.add(entity); + } + } + return list; + } + + /** + * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟 + * + * @param list 瀵煎嚭鏁版嵁闆嗗悎 + * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О + * @return 缁撴灉 + */ + public AjaxResult exportExcel(List list, String sheetName) + { + this.init(list, sheetName, Type.EXPORT); + return exportExcel(); + } + + /** + * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟 + * + * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О + * @return 缁撴灉 + */ + public AjaxResult importTemplateExcel(String sheetName) + { + this.init(null, sheetName, Type.IMPORT); + return exportExcel(); + } + + /** + * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟 + * + * @return 缁撴灉 + */ + public AjaxResult exportExcel() + { + OutputStream out = null; + try + { + // 鍙栧嚭涓鍏辨湁澶氬皯涓猻heet. + double sheetNo = Math.ceil(list.size() / sheetSize); + for (int index = 0; index <= sheetNo; index++) + { + createSheet(sheetNo, index); + + // 浜х敓涓琛 + Row row = sheet.createRow(0); + int column = 0; + // 鍐欏叆鍚勪釜瀛楁鐨勫垪澶村悕绉 + for (Object[] os : fields) + { + Excel excel = (Excel) os[1]; + this.createCell(excel, row, column++); + } + if (Type.EXPORT.equals(type)) + { + fillExcelData(index, row); + addStatisticsRow(); + } + } + String filename = encodingFilename(sheetName); + out = new FileOutputStream(getAbsoluteFile(filename)); + wb.write(out); + return AjaxResult.success(filename); + } + catch (Exception e) + { + log.error("瀵煎嚭Excel寮傚父{}", e.getMessage()); + throw new CustomException("瀵煎嚭Excel澶辫触锛岃鑱旂郴缃戠珯绠＄悊鍛橈紒"); + } + finally + { + if (wb != null) + { + try + { + wb.close(); + } + catch (IOException e1) + { + e1.printStackTrace(); + } + } + if (out != null) + { + try + { + out.close(); + } + catch (IOException e1) + { + e1.printStackTrace(); + } + } + } + } + + /** + * 濉厖excel鏁版嵁 + * + * @param index 搴忓彿 + * @param row 鍗曞厓鏍艰 + */ + public void fillExcelData(int index, Row row) + { + int startNo = index * sheetSize; + int endNo = Math.min(startNo + sheetSize, list.size()); + for (int i = startNo; i < endNo; i++) + { + row = sheet.createRow(i + 1 - startNo); + // 寰楀埌瀵煎嚭瀵硅薄. + T vo = (T) list.get(i); + int column = 0; + for (Object[] os : fields) + { + Field field = (Field) os[0]; + Excel excel = (Excel) os[1]; + // 璁剧疆瀹炰綋绫荤鏈夊睘鎬у彲璁块棶 + field.setAccessible(true); + this.addCell(excel, row, vo, field, column++); + } + } + } + + /** + * 鍒涘缓琛ㄦ牸鏍峰紡 + * + * @param wb 宸ヤ綔钖勫璞 + * @return 鏍峰紡鍒楄〃 + */ + private Map createStyles(Workbook wb) + { + // 鍐欏叆鍚勬潯璁板綍,姣忔潯璁板綍瀵瑰簲excel琛ㄤ腑鐨勪竴琛 + Map styles = new HashMap(); + CellStyle style = wb.createCellStyle(); + style.setAlignment(HorizontalAlignment.CENTER); + style.setVerticalAlignment(VerticalAlignment.CENTER); + style.setBorderRight(BorderStyle.THIN); + style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); + style.setBorderLeft(BorderStyle.THIN); + style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); + style.setBorderTop(BorderStyle.THIN); + style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); + style.setBorderBottom(BorderStyle.THIN); + style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); + Font dataFont = wb.createFont(); + dataFont.setFontName("Arial"); + dataFont.setFontHeightInPoints((short) 10); + style.setFont(dataFont); + styles.put("data", style); + + style = wb.createCellStyle(); + style.cloneStyleFrom(styles.get("data")); + style.setAlignment(HorizontalAlignment.CENTER); + style.setVerticalAlignment(VerticalAlignment.CENTER); + style.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex()); + style.setFillPattern(FillPatternType.SOLID_FOREGROUND); + Font headerFont = wb.createFont(); + headerFont.setFontName("Arial"); + headerFont.setFontHeightInPoints((short) 10); + headerFont.setBold(true); + headerFont.setColor(IndexedColors.WHITE.getIndex()); + style.setFont(headerFont); + styles.put("header", style); + + style = wb.createCellStyle(); + style.setAlignment(HorizontalAlignment.CENTER); + style.setVerticalAlignment(VerticalAlignment.CENTER); + Font totalFont = wb.createFont(); + totalFont.setFontName("Arial"); + totalFont.setFontHeightInPoints((short) 10); + style.setFont(totalFont); + styles.put("total", style); + + style = wb.createCellStyle(); + style.cloneStyleFrom(styles.get("data")); + style.setAlignment(HorizontalAlignment.LEFT); + styles.put("data1", style); + + style = wb.createCellStyle(); + style.cloneStyleFrom(styles.get("data")); + style.setAlignment(HorizontalAlignment.CENTER); + styles.put("data2", style); + + style = wb.createCellStyle(); + style.cloneStyleFrom(styles.get("data")); + style.setAlignment(HorizontalAlignment.RIGHT); + styles.put("data3", style); + + return styles; + } + + /** + * 鍒涘缓鍗曞厓鏍 + */ + public Cell createCell(Excel attr, Row row, int column) + { + // 鍒涘缓鍒 + Cell cell = row.createCell(column); + // 鍐欏叆鍒椾俊鎭 + cell.setCellValue(attr.name()); + setDataValidation(attr, row, column); + cell.setCellStyle(styles.get("header")); + return cell; + } + + /** + * 璁剧疆鍗曞厓鏍间俊鎭 + * + * @param value 鍗曞厓鏍煎 + * @param attr 娉ㄨВ鐩稿叧 + * @param cell 鍗曞厓鏍间俊鎭 + */ + public void setCellVo(Object value, Excel attr, Cell cell) + { + if (ColumnType.STRING == attr.cellType()) + { + cell.setCellValue(StringUtils.isNull(value) ? attr.defaultValue() : value + attr.suffix()); + } + else if (ColumnType.NUMERIC == attr.cellType()) + { + cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value)); + } + else if (ColumnType.IMAGE == attr.cellType()) + { + ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() + 1), + cell.getRow().getRowNum() + 1); + String imagePath = Convert.toStr(value); + if (StringUtils.isNotEmpty(imagePath)) + { + byte[] data = ImageUtils.getImage(imagePath); + getDrawingPatriarch(cell.getSheet()).createPicture(anchor, + cell.getSheet().getWorkbook().addPicture(data, getImageType(data))); + } + } + } + + /** + * 鑾峰彇鐢诲竷 + */ + public static Drawing getDrawingPatriarch(Sheet sheet) + { + if (sheet.getDrawingPatriarch() == null) + { + sheet.createDrawingPatriarch(); + } + return sheet.getDrawingPatriarch(); + } + + /** + * 鑾峰彇鍥剧墖绫诲瀷,璁剧疆鍥剧墖鎻掑叆绫诲瀷 + */ + public int getImageType(byte[] value) + { + String type = FileTypeUtils.getFileExtendName(value); + if ("JPG".equalsIgnoreCase(type)) + { + return Workbook.PICTURE_TYPE_JPEG; + } + else if ("PNG".equalsIgnoreCase(type)) + { + return Workbook.PICTURE_TYPE_PNG; + } + return Workbook.PICTURE_TYPE_JPEG; + } + + /** + * 鍒涘缓琛ㄦ牸鏍峰紡 + */ + public void setDataValidation(Excel attr, Row row, int column) + { + if (attr.name().indexOf("娉細") >= 0) + { + sheet.setColumnWidth(column, 6000); + } + else + { + // 璁剧疆鍒楀 + sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256)); + } + // 濡傛灉璁剧疆浜嗘彁绀轰俊鎭垯榧犳爣鏀句笂鍘绘彁绀. + if (StringUtils.isNotEmpty(attr.prompt())) + { + // 杩欓噷榛樿璁句簡2-101鍒楁彁绀. + setXSSFPrompt(sheet, "", attr.prompt(), 1, 100, column, column); + } + // 濡傛灉璁剧疆浜哻ombo灞炴у垯鏈垪鍙兘閫夋嫨涓嶈兘杈撳叆 + if (attr.combo().length > 0) + { + // 杩欓噷榛樿璁句簡2-101鍒楀彧鑳介夋嫨涓嶈兘杈撳叆. + setXSSFValidation(sheet, attr.combo(), 1, 100, column, column); + } + } + + /** + * 娣诲姞鍗曞厓鏍 + */ + public Cell addCell(Excel attr, Row row, T vo, Field field, int column) + { + Cell cell = null; + try + { + // 璁剧疆琛岄珮 + row.setHeight(maxHeight); + // 鏍规嵁Excel涓缃儏鍐靛喅瀹氭槸鍚﹀鍑,鏈変簺鎯呭喌闇瑕佷繚鎸佷负绌,甯屾湜鐢ㄦ埛濉啓杩欎竴鍒. + if (attr.isExport()) + { + // 鍒涘缓cell + cell = row.createCell(column); + int align = attr.align().value(); + cell.setCellStyle(styles.get("data" + (align >= 1 && align <= 3 ? align : ""))); + + // 鐢ㄤ簬璇诲彇瀵硅薄涓殑灞炴 + Object value = getTargetValue(vo, field, attr); + String dateFormat = attr.dateFormat(); + String readConverterExp = attr.readConverterExp(); + String separator = attr.separator(); + String dictType = attr.dictType(); + if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value)) + { + cell.setCellValue(DateUtils.parseDateToStr(dateFormat, (Date) value)); + } + else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value)) + { + cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator)); + } + else if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotNull(value)) + { + cell.setCellValue(convertDictByExp(Convert.toStr(value), dictType, separator)); + } + else if (value instanceof BigDecimal && -1 != attr.scale()) + { + cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).toString()); + } + else + { + // 璁剧疆鍒楃被鍨 + setCellVo(value, attr, cell); + } + addStatisticsData(column, Convert.toStr(value), attr); + } + } + catch (Exception e) + { + log.error("瀵煎嚭Excel澶辫触{}", e); + } + return cell; + } + + /** + * 璁剧疆 POI XSSFSheet 鍗曞厓鏍兼彁绀 + * + * @param sheet 琛ㄥ崟 + * @param promptTitle 鎻愮ず鏍囬 + * @param promptContent 鎻愮ず鍐呭 + * @param firstRow 寮濮嬭 + * @param endRow 缁撴潫琛 + * @param firstCol 寮濮嬪垪 + * @param endCol 缁撴潫鍒 + */ + public void setXSSFPrompt(Sheet sheet, String promptTitle, String promptContent, int firstRow, int endRow, + int firstCol, int endCol) + { + DataValidationHelper helper = sheet.getDataValidationHelper(); + DataValidationConstraint constraint = helper.createCustomConstraint("DD1"); + CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol); + DataValidation dataValidation = helper.createValidation(constraint, regions); + dataValidation.createPromptBox(promptTitle, promptContent); + dataValidation.setShowPromptBox(true); + sheet.addValidationData(dataValidation); + } + + /** + * 璁剧疆鏌愪簺鍒楃殑鍊煎彧鑳借緭鍏ラ鍒剁殑鏁版嵁,鏄剧ず涓嬫媺妗. + * + * @param sheet 瑕佽缃殑sheet. + * @param textlist 涓嬫媺妗嗘樉绀虹殑鍐呭 + * @param firstRow 寮濮嬭 + * @param endRow 缁撴潫琛 + * @param firstCol 寮濮嬪垪 + * @param endCol 缁撴潫鍒 + * @return 璁剧疆濂界殑sheet. + */ + public void setXSSFValidation(Sheet sheet, String[] textlist, int firstRow, int endRow, int firstCol, int endCol) + { + DataValidationHelper helper = sheet.getDataValidationHelper(); + // 鍔犺浇涓嬫媺鍒楄〃鍐呭 + DataValidationConstraint constraint = helper.createExplicitListConstraint(textlist); + // 璁剧疆鏁版嵁鏈夋晥鎬у姞杞藉湪鍝釜鍗曞厓鏍间笂,鍥涗釜鍙傛暟鍒嗗埆鏄細璧峰琛屻佺粓姝㈣銆佽捣濮嬪垪銆佺粓姝㈠垪 + CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol); + // 鏁版嵁鏈夋晥鎬у璞 + DataValidation dataValidation = helper.createValidation(constraint, regions); + // 澶勭悊Excel鍏煎鎬ч棶棰 + if (dataValidation instanceof XSSFDataValidation) + { + dataValidation.setSuppressDropDownArrow(true); + dataValidation.setShowErrorBox(true); + } + else + { + dataValidation.setSuppressDropDownArrow(false); + } + + sheet.addValidationData(dataValidation); + } + + /** + * 瑙ｆ瀽瀵煎嚭鍊 0=鐢,1=濂,2=鏈煡 + * + * @param propertyValue 鍙傛暟鍊 + * @param converterExp 缈昏瘧娉ㄨВ + * @param separator 鍒嗛殧绗 + * @return 瑙ｆ瀽鍚庡 + */ + public static String convertByExp(String propertyValue, String converterExp, String separator) + { + StringBuilder propertyString = new StringBuilder(); + String[] convertSource = converterExp.split(","); + for (String item : convertSource) + { + String[] itemArray = item.split("="); + if (StringUtils.containsAny(separator, propertyValue)) + { + for (String value : propertyValue.split(separator)) + { + if (itemArray[0].equals(value)) + { + propertyString.append(itemArray[1] + separator); + break; + } + } + } + else + { + if (itemArray[0].equals(propertyValue)) + { + return itemArray[1]; + } + } + } + return StringUtils.stripEnd(propertyString.toString(), separator); + } + + /** + * 鍙嶅悜瑙ｆ瀽鍊 鐢=0,濂=1,鏈煡=2 + * + * @param propertyValue 鍙傛暟鍊 + * @param converterExp 缈昏瘧娉ㄨВ + * @param separator 鍒嗛殧绗 + * @return 瑙ｆ瀽鍚庡 + */ + public static String reverseByExp(String propertyValue, String converterExp, String separator) + { + StringBuilder propertyString = new StringBuilder(); + String[] convertSource = converterExp.split(","); + for (String item : convertSource) + { + String[] itemArray = item.split("="); + if (StringUtils.containsAny(separator, propertyValue)) + { + for (String value : propertyValue.split(separator)) + { + if (itemArray[1].equals(value)) + { + propertyString.append(itemArray[0] + separator); + break; + } + } + } + else + { + if (itemArray[1].equals(propertyValue)) + { + return itemArray[0]; + } + } + } + return StringUtils.stripEnd(propertyString.toString(), separator); + } + + /** + * 瑙ｆ瀽瀛楀吀鍊 + * + * @param dictValue 瀛楀吀鍊 + * @param dictType 瀛楀吀绫诲瀷 + * @param separator 鍒嗛殧绗 + * @return 瀛楀吀鏍囩 + */ + public static String convertDictByExp(String dictValue, String dictType, String separator) + { + return DictUtils.getDictLabel(dictType, dictValue, separator); + } + + /** + * 鍙嶅悜瑙ｆ瀽鍊煎瓧鍏稿 + * + * @param dictLabel 瀛楀吀鏍囩 + * @param dictType 瀛楀吀绫诲瀷 + * @param separator 鍒嗛殧绗 + * @return 瀛楀吀鍊 + */ + public static String reverseDictByExp(String dictLabel, String dictType, String separator) + { + return DictUtils.getDictValue(dictType, dictLabel, separator); + } + + /** + * 鍚堣缁熻淇℃伅 + */ + private void addStatisticsData(Integer index, String text, Excel entity) + { + if (entity != null && entity.isStatistics()) + { + Double temp = 0D; + if (!statistics.containsKey(index)) + { + statistics.put(index, temp); + } + try + { + temp = Double.valueOf(text); + } + catch (NumberFormatException e) + { + } + statistics.put(index, statistics.get(index) + temp); + } + } + + /** + * 鍒涘缓缁熻琛 + */ + public void addStatisticsRow() + { + if (statistics.size() > 0) + { + Cell cell = null; + Row row = sheet.createRow(sheet.getLastRowNum() + 1); + Set keys = statistics.keySet(); + cell = row.createCell(0); + cell.setCellStyle(styles.get("total")); + cell.setCellValue("鍚堣"); + + for (Integer key : keys) + { + cell = row.createCell(key); + cell.setCellStyle(styles.get("total")); + cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key))); + } + statistics.clear(); + } + } + + /** + * 缂栫爜鏂囦欢鍚 + */ + public String encodingFilename(String filename) + { + filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx"; + return filename; + } + + /** + * 鑾峰彇涓嬭浇璺緞 + * + * @param filename 鏂囦欢鍚嶇О + */ + public String getAbsoluteFile(String filename) + { + String downloadPath = RuoYiConfig.getDownloadPath() + filename; + File desc = new File(downloadPath); + if (!desc.getParentFile().exists()) + { + desc.getParentFile().mkdirs(); + } + return downloadPath; + } + + /** + * 鑾峰彇bean涓殑灞炴у + * + * @param vo 瀹炰綋瀵硅薄 + * @param field 瀛楁 + * @param excel 娉ㄨВ + * @return 鏈缁堢殑灞炴у + * @throws Exception + */ + private Object getTargetValue(T vo, Field field, Excel excel) throws Exception + { + Object o = field.get(vo); + if (StringUtils.isNotEmpty(excel.targetAttr())) + { + String target = excel.targetAttr(); + if (target.indexOf(".") > -1) + { + String[] targets = target.split("[.]"); + for (String name : targets) + { + o = getValue(o, name); + } + } + else + { + o = getValue(o, target); + } + } + return o; + } + + /** + * 浠ョ被鐨勫睘鎬х殑get鏂规硶鏂规硶褰㈠紡鑾峰彇鍊 + * + * @param o + * @param name + * @return value + * @throws Exception + */ + private Object getValue(Object o, String name) throws Exception + { + if (StringUtils.isNotNull(o) && StringUtils.isNotEmpty(name)) + { + Class clazz = o.getClass(); + Field field = clazz.getDeclaredField(name); + field.setAccessible(true); + o = field.get(o); + } + return o; + } + + /** + * 寰楀埌鎵鏈夊畾涔夊瓧娈 + */ + private void createExcelField() + { + this.fields = new ArrayList(); + List tempFields = new ArrayList<>(); + tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields())); + tempFields.addAll(Arrays.asList(clazz.getDeclaredFields())); + for (Field field : tempFields) + { + // 鍗曟敞瑙 + if (field.isAnnotationPresent(Excel.class)) + { + putToField(field, field.getAnnotation(Excel.class)); + } + + // 澶氭敞瑙 + if (field.isAnnotationPresent(Excels.class)) + { + Excels attrs = field.getAnnotation(Excels.class); + Excel[] excels = attrs.value(); + for (Excel excel : excels) + { + putToField(field, excel); + } + } + } + this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList()); + this.maxHeight = getRowHeight(); + } + + /** + * 鏍规嵁娉ㄨВ鑾峰彇鏈澶ц楂 + */ + public short getRowHeight() + { + double maxHeight = 0; + for (Object[] os : this.fields) + { + Excel excel = (Excel) os[1]; + maxHeight = maxHeight > excel.height() ? maxHeight : excel.height(); + } + return (short) (maxHeight * 20); + } + + /** + * 鏀惧埌瀛楁闆嗗悎涓 + */ + private void putToField(Field field, Excel attr) + { + if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) + { + this.fields.add(new Object[] { field, attr }); + } + } + + /** + * 鍒涘缓涓涓伐浣滅翱 + */ + public void createWorkbook() + { + this.wb = new SXSSFWorkbook(500); + } + + /** + * 鍒涘缓宸ヤ綔琛 + * + * @param sheetNo sheet鏁伴噺 + * @param index 搴忓彿 + */ + public void createSheet(double sheetNo, int index) + { + this.sheet = wb.createSheet(); + this.styles = createStyles(wb); + // 璁剧疆宸ヤ綔琛ㄧ殑鍚嶇О. + if (sheetNo == 0) + { + wb.setSheetName(index, sheetName); + } + else + { + wb.setSheetName(index, sheetName + index); + } + } + + /** + * 鑾峰彇鍗曞厓鏍煎 + * + * @param row 鑾峰彇鐨勮 + * @param column 鑾峰彇鍗曞厓鏍煎垪鍙 + * @return 鍗曞厓鏍煎 + */ + public Object getCellValue(Row row, int column) + { + if (row == null) + { + return row; + } + Object val = ""; + try + { + Cell cell = row.getCell(column); + if (StringUtils.isNotNull(cell)) + { + if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA) + { + val = cell.getNumericCellValue(); + if (DateUtil.isCellDateFormatted(cell)) + { + val = DateUtil.getJavaDate((Double) val); // POI Excel 鏃ユ湡鏍煎紡杞崲 + } + else + { + if ((Double) val % 1 != 0) + { + val = new BigDecimal(val.toString()); + } + else + { + val = new DecimalFormat("0").format(val); + } + } + } + else if (cell.getCellType() == CellType.STRING) + { + val = cell.getStringCellValue(); + } + else if (cell.getCellType() == CellType.BOOLEAN) + { + val = cell.getBooleanCellValue(); + } + else if (cell.getCellType() == CellType.ERROR) + { + val = cell.getErrorCellValue(); + } + + } + } + catch (Exception e) + { + return val; + } + return val; + } } \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/reflect/ReflectUtils.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/reflect/ReflectUtils.java index 9befe41ae04acc0047c0eae74b1b026e59101d34..af15c3f42c86673c1dec387e19b244b228db4631 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/reflect/ReflectUtils.java @@ -1,410 +1,410 @@ -package com.ruoyi.common.utils.reflect; - -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.util.Date; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.Validate; -import org.apache.poi.ss.usermodel.DateUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.DateUtils; - -/** - * 鍙嶅皠宸ュ叿绫. 鎻愪緵璋冪敤getter/setter鏂规硶, 璁块棶绉佹湁鍙橀噺, 璋冪敤绉佹湁鏂规硶, 鑾峰彇娉涘瀷绫诲瀷Class, 琚獳OP杩囩殑鐪熷疄绫荤瓑宸ュ叿鍑芥暟. - * - * @author ruoyi - */ -@SuppressWarnings("rawtypes") -public class ReflectUtils -{ - private static final String SETTER_PREFIX = "set"; - - private static final String GETTER_PREFIX = "get"; - - private static final String CGLIB_CLASS_SEPARATOR = "$$"; - - private static Logger logger = LoggerFactory.getLogger(ReflectUtils.class); - - /** - * 璋冪敤Getter鏂规硶. - * 鏀寔澶氱骇锛屽锛氬璞″悕.瀵硅薄鍚.鏂规硶 - */ - @SuppressWarnings("unchecked") - public static E invokeGetter(Object obj, String propertyName) - { - Object object = obj; - for (String name : StringUtils.split(propertyName, ".")) - { - String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name); - object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {}); - } - return (E) object; - } - - /** - * 璋冪敤Setter鏂规硶, 浠呭尮閰嶆柟娉曞悕銆 - * 鏀寔澶氱骇锛屽锛氬璞″悕.瀵硅薄鍚.鏂规硶 - */ - public static void invokeSetter(Object obj, String propertyName, E value) - { - Object object = obj; - String[] names = StringUtils.split(propertyName, "."); - for (int i = 0; i < names.length; i++) - { - if (i < names.length - 1) - { - String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(names[i]); - object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {}); - } - else - { - String setterMethodName = SETTER_PREFIX + StringUtils.capitalize(names[i]); - invokeMethodByName(object, setterMethodName, new Object[] { value }); - } - } - } - - /** - * 鐩存帴璇诲彇瀵硅薄灞炴у, 鏃犺private/protected淇グ绗, 涓嶇粡杩噂etter鍑芥暟. - */ - @SuppressWarnings("unchecked") - public static E getFieldValue(final Object obj, final String fieldName) - { - Field field = getAccessibleField(obj, fieldName); - if (field == null) - { - logger.debug("鍦 [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + fieldName + "] 瀛楁 "); - return null; - } - E result = null; - try - { - result = (E) field.get(obj); - } - catch (IllegalAccessException e) - { - logger.error("涓嶅彲鑳芥姏鍑虹殑寮傚父{}", e.getMessage()); - } - return result; - } - - /** - * 鐩存帴璁剧疆瀵硅薄灞炴у, 鏃犺private/protected淇グ绗, 涓嶇粡杩噑etter鍑芥暟. - */ - public static void setFieldValue(final Object obj, final String fieldName, final E value) - { - Field field = getAccessibleField(obj, fieldName); - if (field == null) - { - // throw new IllegalArgumentException("鍦 [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + fieldName + "] 瀛楁 "); - logger.debug("鍦 [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + fieldName + "] 瀛楁 "); - return; - } - try - { - field.set(obj, value); - } - catch (IllegalAccessException e) - { - logger.error("涓嶅彲鑳芥姏鍑虹殑寮傚父: {}", e.getMessage()); - } - } - - /** - * 鐩存帴璋冪敤瀵硅薄鏂规硶, 鏃犺private/protected淇グ绗. - * 鐢ㄤ簬涓娆℃ц皟鐢ㄧ殑鎯呭喌锛屽惁鍒欏簲浣跨敤getAccessibleMethod()鍑芥暟鑾峰緱Method鍚庡弽澶嶈皟鐢. - * 鍚屾椂鍖归厤鏂规硶鍚+鍙傛暟绫诲瀷锛 - */ - @SuppressWarnings("unchecked") - public static E invokeMethod(final Object obj, final String methodName, final Class[] parameterTypes, - final Object[] args) - { - if (obj == null || methodName == null) - { - return null; - } - Method method = getAccessibleMethod(obj, methodName, parameterTypes); - if (method == null) - { - logger.debug("鍦 [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + methodName + "] 鏂规硶 "); - return null; - } - try - { - return (E) method.invoke(obj, args); - } - catch (Exception e) - { - String msg = "method: " + method + ", obj: " + obj + ", args: " + args + ""; - throw convertReflectionExceptionToUnchecked(msg, e); - } - } - - /** - * 鐩存帴璋冪敤瀵硅薄鏂规硶, 鏃犺private/protected淇グ绗︼紝 - * 鐢ㄤ簬涓娆℃ц皟鐢ㄧ殑鎯呭喌锛屽惁鍒欏簲浣跨敤getAccessibleMethodByName()鍑芥暟鑾峰緱Method鍚庡弽澶嶈皟鐢. - * 鍙尮閰嶅嚱鏁板悕锛屽鏋滄湁澶氫釜鍚屽悕鍑芥暟璋冪敤绗竴涓 - */ - @SuppressWarnings("unchecked") - public static E invokeMethodByName(final Object obj, final String methodName, final Object[] args) - { - Method method = getAccessibleMethodByName(obj, methodName, args.length); - if (method == null) - { - // 濡傛灉涓虹┖涓嶆姤閿欙紝鐩存帴杩斿洖绌恒 - logger.debug("鍦 [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + methodName + "] 鏂规硶 "); - return null; - } - try - { - // 绫诲瀷杞崲锛堝皢鍙傛暟鏁版嵁绫诲瀷杞崲涓虹洰鏍囨柟娉曞弬鏁扮被鍨嬶級 - Class[] cs = method.getParameterTypes(); - for (int i = 0; i < cs.length; i++) - { - if (args[i] != null && !args[i].getClass().equals(cs[i])) - { - if (cs[i] == String.class) - { - args[i] = Convert.toStr(args[i]); - if (StringUtils.endsWith((String) args[i], ".0")) - { - args[i] = StringUtils.substringBefore((String) args[i], ".0"); - } - } - else if (cs[i] == Integer.class) - { - args[i] = Convert.toInt(args[i]); - } - else if (cs[i] == Long.class) - { - args[i] = Convert.toLong(args[i]); - } - else if (cs[i] == Double.class) - { - args[i] = Convert.toDouble(args[i]); - } - else if (cs[i] == Float.class) - { - args[i] = Convert.toFloat(args[i]); - } - else if (cs[i] == Date.class) - { - if (args[i] instanceof String) - { - args[i] = DateUtils.parseDate(args[i]); - } - else - { - args[i] = DateUtil.getJavaDate((Double) args[i]); - } - } - else if (cs[i] == boolean.class || cs[i] == Boolean.class) - { - args[i] = Convert.toBool(args[i]); - } - } - } - return (E) method.invoke(obj, args); - } - catch (Exception e) - { - String msg = "method: " + method + ", obj: " + obj + ", args: " + args + ""; - throw convertReflectionExceptionToUnchecked(msg, e); - } - } - - /** - * 寰幆鍚戜笂杞瀷, 鑾峰彇瀵硅薄鐨凞eclaredField, 骞跺己鍒惰缃负鍙闂. - * 濡傚悜涓婅浆鍨嬪埌Object浠嶆棤娉曟壘鍒, 杩斿洖null. - */ - public static Field getAccessibleField(final Object obj, final String fieldName) - { - // 涓虹┖涓嶆姤閿欍傜洿鎺ヨ繑鍥 null - if (obj == null) - { - return null; - } - Validate.notBlank(fieldName, "fieldName can't be blank"); - for (Class superClass = obj.getClass(); superClass != Object.class; superClass = superClass.getSuperclass()) - { - try - { - Field field = superClass.getDeclaredField(fieldName); - makeAccessible(field); - return field; - } - catch (NoSuchFieldException e) - { - continue; - } - } - return null; - } - - /** - * 寰幆鍚戜笂杞瀷, 鑾峰彇瀵硅薄鐨凞eclaredMethod,骞跺己鍒惰缃负鍙闂. - * 濡傚悜涓婅浆鍨嬪埌Object浠嶆棤娉曟壘鍒, 杩斿洖null. - * 鍖归厤鍑芥暟鍚+鍙傛暟绫诲瀷銆 - * 鐢ㄤ簬鏂规硶闇瑕佽澶氭璋冪敤鐨勬儏鍐. 鍏堜娇鐢ㄦ湰鍑芥暟鍏堝彇寰桵ethod,鐒跺悗璋冪敤Method.invoke(Object obj, Object... args) - */ - public static Method getAccessibleMethod(final Object obj, final String methodName, - final Class... parameterTypes) - { - // 涓虹┖涓嶆姤閿欍傜洿鎺ヨ繑鍥 null - if (obj == null) - { - return null; - } - Validate.notBlank(methodName, "methodName can't be blank"); - for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass()) - { - try - { - Method method = searchType.getDeclaredMethod(methodName, parameterTypes); - makeAccessible(method); - return method; - } - catch (NoSuchMethodException e) - { - continue; - } - } - return null; - } - - /** - * 寰幆鍚戜笂杞瀷, 鑾峰彇瀵硅薄鐨凞eclaredMethod,骞跺己鍒惰缃负鍙闂. - * 濡傚悜涓婅浆鍨嬪埌Object浠嶆棤娉曟壘鍒, 杩斿洖null. - * 鍙尮閰嶅嚱鏁板悕銆 - * 鐢ㄤ簬鏂规硶闇瑕佽澶氭璋冪敤鐨勬儏鍐. 鍏堜娇鐢ㄦ湰鍑芥暟鍏堝彇寰桵ethod,鐒跺悗璋冪敤Method.invoke(Object obj, Object... args) - */ - public static Method getAccessibleMethodByName(final Object obj, final String methodName, int argsNum) - { - // 涓虹┖涓嶆姤閿欍傜洿鎺ヨ繑鍥 null - if (obj == null) - { - return null; - } - Validate.notBlank(methodName, "methodName can't be blank"); - for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass()) - { - Method[] methods = searchType.getDeclaredMethods(); - for (Method method : methods) - { - if (method.getName().equals(methodName) && method.getParameterTypes().length == argsNum) - { - makeAccessible(method); - return method; - } - } - } - return null; - } - - /** - * 鏀瑰彉private/protected鐨勬柟娉曚负public锛屽敖閲忎笉璋冪敤瀹為檯鏀瑰姩鐨勮鍙ワ紝閬垮厤JDK鐨凷ecurityManager鎶辨ㄣ - */ - public static void makeAccessible(Method method) - { - if ((!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers())) - && !method.isAccessible()) - { - method.setAccessible(true); - } - } - - /** - * 鏀瑰彉private/protected鐨勬垚鍛樺彉閲忎负public锛屽敖閲忎笉璋冪敤瀹為檯鏀瑰姩鐨勮鍙ワ紝閬垮厤JDK鐨凷ecurityManager鎶辨ㄣ - */ - public static void makeAccessible(Field field) - { - if ((!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers()) - || Modifier.isFinal(field.getModifiers())) && !field.isAccessible()) - { - field.setAccessible(true); - } - } - - /** - * 閫氳繃鍙嶅皠, 鑾峰緱Class瀹氫箟涓０鏄庣殑娉涘瀷鍙傛暟鐨勭被鍨, 娉ㄦ剰娉涘瀷蹇呴』瀹氫箟鍦ㄧ埗绫诲 - * 濡傛棤娉曟壘鍒, 杩斿洖Object.class. - */ - @SuppressWarnings("unchecked") - public static Class getClassGenricType(final Class clazz) - { - return getClassGenricType(clazz, 0); - } - - /** - * 閫氳繃鍙嶅皠, 鑾峰緱Class瀹氫箟涓０鏄庣殑鐖剁被鐨勬硾鍨嬪弬鏁扮殑绫诲瀷. - * 濡傛棤娉曟壘鍒, 杩斿洖Object.class. - */ - public static Class getClassGenricType(final Class clazz, final int index) - { - Type genType = clazz.getGenericSuperclass(); - - if (!(genType instanceof ParameterizedType)) - { - logger.debug(clazz.getSimpleName() + "'s superclass not ParameterizedType"); - return Object.class; - } - - Type[] params = ((ParameterizedType) genType).getActualTypeArguments(); - - if (index >= params.length || index < 0) - { - logger.debug("Index: " + index + ", Size of " + clazz.getSimpleName() + "'s Parameterized Type: " - + params.length); - return Object.class; - } - if (!(params[index] instanceof Class)) - { - logger.debug(clazz.getSimpleName() + " not set the actual class on superclass generic parameter"); - return Object.class; - } - - return (Class) params[index]; - } - - public static Class getUserClass(Object instance) - { - if (instance == null) - { - throw new RuntimeException("Instance must not be null"); - } - Class clazz = instance.getClass(); - if (clazz != null && clazz.getName().contains(CGLIB_CLASS_SEPARATOR)) - { - Class superClass = clazz.getSuperclass(); - if (superClass != null && !Object.class.equals(superClass)) - { - return superClass; - } - } - return clazz; - - } - - /** - * 灏嗗弽灏勬椂鐨刢hecked exception杞崲涓簎nchecked exception. - */ - public static RuntimeException convertReflectionExceptionToUnchecked(String msg, Exception e) - { - if (e instanceof IllegalAccessException || e instanceof IllegalArgumentException - || e instanceof NoSuchMethodException) - { - return new IllegalArgumentException(msg, e); - } - else if (e instanceof InvocationTargetException) - { - return new RuntimeException(msg, ((InvocationTargetException) e).getTargetException()); - } - return new RuntimeException(msg, e); - } -} +package com.jiajiakang.common.utils.reflect; + +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.Date; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; +import org.apache.poi.ss.usermodel.DateUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import com.jiajiakang.common.core.text.Convert; +import com.jiajiakang.common.utils.DateUtils; + +/** + * 鍙嶅皠宸ュ叿绫. 鎻愪緵璋冪敤getter/setter鏂规硶, 璁块棶绉佹湁鍙橀噺, 璋冪敤绉佹湁鏂规硶, 鑾峰彇娉涘瀷绫诲瀷Class, 琚獳OP杩囩殑鐪熷疄绫荤瓑宸ュ叿鍑芥暟. + * + * @author ruoyi + */ +@SuppressWarnings("rawtypes") +public class ReflectUtils +{ + private static final String SETTER_PREFIX = "set"; + + private static final String GETTER_PREFIX = "get"; + + private static final String CGLIB_CLASS_SEPARATOR = "$$"; + + private static Logger logger = LoggerFactory.getLogger(ReflectUtils.class); + + /** + * 璋冪敤Getter鏂规硶. + * 鏀寔澶氱骇锛屽锛氬璞″悕.瀵硅薄鍚.鏂规硶 + */ + @SuppressWarnings("unchecked") + public static E invokeGetter(Object obj, String propertyName) + { + Object object = obj; + for (String name : StringUtils.split(propertyName, ".")) + { + String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name); + object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {}); + } + return (E) object; + } + + /** + * 璋冪敤Setter鏂规硶, 浠呭尮閰嶆柟娉曞悕銆 + * 鏀寔澶氱骇锛屽锛氬璞″悕.瀵硅薄鍚.鏂规硶 + */ + public static void invokeSetter(Object obj, String propertyName, E value) + { + Object object = obj; + String[] names = StringUtils.split(propertyName, "."); + for (int i = 0; i < names.length; i++) + { + if (i < names.length - 1) + { + String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(names[i]); + object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {}); + } + else + { + String setterMethodName = SETTER_PREFIX + StringUtils.capitalize(names[i]); + invokeMethodByName(object, setterMethodName, new Object[] { value }); + } + } + } + + /** + * 鐩存帴璇诲彇瀵硅薄灞炴у, 鏃犺private/protected淇グ绗, 涓嶇粡杩噂etter鍑芥暟. + */ + @SuppressWarnings("unchecked") + public static E getFieldValue(final Object obj, final String fieldName) + { + Field field = getAccessibleField(obj, fieldName); + if (field == null) + { + logger.debug("鍦 [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + fieldName + "] 瀛楁 "); + return null; + } + E result = null; + try + { + result = (E) field.get(obj); + } + catch (IllegalAccessException e) + { + logger.error("涓嶅彲鑳芥姏鍑虹殑寮傚父{}", e.getMessage()); + } + return result; + } + + /** + * 鐩存帴璁剧疆瀵硅薄灞炴у, 鏃犺private/protected淇グ绗, 涓嶇粡杩噑etter鍑芥暟. + */ + public static void setFieldValue(final Object obj, final String fieldName, final E value) + { + Field field = getAccessibleField(obj, fieldName); + if (field == null) + { + // throw new IllegalArgumentException("鍦 [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + fieldName + "] 瀛楁 "); + logger.debug("鍦 [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + fieldName + "] 瀛楁 "); + return; + } + try + { + field.set(obj, value); + } + catch (IllegalAccessException e) + { + logger.error("涓嶅彲鑳芥姏鍑虹殑寮傚父: {}", e.getMessage()); + } + } + + /** + * 鐩存帴璋冪敤瀵硅薄鏂规硶, 鏃犺private/protected淇グ绗. + * 鐢ㄤ簬涓娆℃ц皟鐢ㄧ殑鎯呭喌锛屽惁鍒欏簲浣跨敤getAccessibleMethod()鍑芥暟鑾峰緱Method鍚庡弽澶嶈皟鐢. + * 鍚屾椂鍖归厤鏂规硶鍚+鍙傛暟绫诲瀷锛 + */ + @SuppressWarnings("unchecked") + public static E invokeMethod(final Object obj, final String methodName, final Class[] parameterTypes, + final Object[] args) + { + if (obj == null || methodName == null) + { + return null; + } + Method method = getAccessibleMethod(obj, methodName, parameterTypes); + if (method == null) + { + logger.debug("鍦 [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + methodName + "] 鏂规硶 "); + return null; + } + try + { + return (E) method.invoke(obj, args); + } + catch (Exception e) + { + String msg = "method: " + method + ", obj: " + obj + ", args: " + args + ""; + throw convertReflectionExceptionToUnchecked(msg, e); + } + } + + /** + * 鐩存帴璋冪敤瀵硅薄鏂规硶, 鏃犺private/protected淇グ绗︼紝 + * 鐢ㄤ簬涓娆℃ц皟鐢ㄧ殑鎯呭喌锛屽惁鍒欏簲浣跨敤getAccessibleMethodByName()鍑芥暟鑾峰緱Method鍚庡弽澶嶈皟鐢. + * 鍙尮閰嶅嚱鏁板悕锛屽鏋滄湁澶氫釜鍚屽悕鍑芥暟璋冪敤绗竴涓 + */ + @SuppressWarnings("unchecked") + public static E invokeMethodByName(final Object obj, final String methodName, final Object[] args) + { + Method method = getAccessibleMethodByName(obj, methodName, args.length); + if (method == null) + { + // 濡傛灉涓虹┖涓嶆姤閿欙紝鐩存帴杩斿洖绌恒 + logger.debug("鍦 [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + methodName + "] 鏂规硶 "); + return null; + } + try + { + // 绫诲瀷杞崲锛堝皢鍙傛暟鏁版嵁绫诲瀷杞崲涓虹洰鏍囨柟娉曞弬鏁扮被鍨嬶級 + Class[] cs = method.getParameterTypes(); + for (int i = 0; i < cs.length; i++) + { + if (args[i] != null && !args[i].getClass().equals(cs[i])) + { + if (cs[i] == String.class) + { + args[i] = Convert.toStr(args[i]); + if (StringUtils.endsWith((String) args[i], ".0")) + { + args[i] = StringUtils.substringBefore((String) args[i], ".0"); + } + } + else if (cs[i] == Integer.class) + { + args[i] = Convert.toInt(args[i]); + } + else if (cs[i] == Long.class) + { + args[i] = Convert.toLong(args[i]); + } + else if (cs[i] == Double.class) + { + args[i] = Convert.toDouble(args[i]); + } + else if (cs[i] == Float.class) + { + args[i] = Convert.toFloat(args[i]); + } + else if (cs[i] == Date.class) + { + if (args[i] instanceof String) + { + args[i] = DateUtils.parseDate(args[i]); + } + else + { + args[i] = DateUtil.getJavaDate((Double) args[i]); + } + } + else if (cs[i] == boolean.class || cs[i] == Boolean.class) + { + args[i] = Convert.toBool(args[i]); + } + } + } + return (E) method.invoke(obj, args); + } + catch (Exception e) + { + String msg = "method: " + method + ", obj: " + obj + ", args: " + args + ""; + throw convertReflectionExceptionToUnchecked(msg, e); + } + } + + /** + * 寰幆鍚戜笂杞瀷, 鑾峰彇瀵硅薄鐨凞eclaredField, 骞跺己鍒惰缃负鍙闂. + * 濡傚悜涓婅浆鍨嬪埌Object浠嶆棤娉曟壘鍒, 杩斿洖null. + */ + public static Field getAccessibleField(final Object obj, final String fieldName) + { + // 涓虹┖涓嶆姤閿欍傜洿鎺ヨ繑鍥 null + if (obj == null) + { + return null; + } + Validate.notBlank(fieldName, "fieldName can't be blank"); + for (Class superClass = obj.getClass(); superClass != Object.class; superClass = superClass.getSuperclass()) + { + try + { + Field field = superClass.getDeclaredField(fieldName); + makeAccessible(field); + return field; + } + catch (NoSuchFieldException e) + { + continue; + } + } + return null; + } + + /** + * 寰幆鍚戜笂杞瀷, 鑾峰彇瀵硅薄鐨凞eclaredMethod,骞跺己鍒惰缃负鍙闂. + * 濡傚悜涓婅浆鍨嬪埌Object浠嶆棤娉曟壘鍒, 杩斿洖null. + * 鍖归厤鍑芥暟鍚+鍙傛暟绫诲瀷銆 + * 鐢ㄤ簬鏂规硶闇瑕佽澶氭璋冪敤鐨勬儏鍐. 鍏堜娇鐢ㄦ湰鍑芥暟鍏堝彇寰桵ethod,鐒跺悗璋冪敤Method.invoke(Object obj, Object... args) + */ + public static Method getAccessibleMethod(final Object obj, final String methodName, + final Class... parameterTypes) + { + // 涓虹┖涓嶆姤閿欍傜洿鎺ヨ繑鍥 null + if (obj == null) + { + return null; + } + Validate.notBlank(methodName, "methodName can't be blank"); + for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass()) + { + try + { + Method method = searchType.getDeclaredMethod(methodName, parameterTypes); + makeAccessible(method); + return method; + } + catch (NoSuchMethodException e) + { + continue; + } + } + return null; + } + + /** + * 寰幆鍚戜笂杞瀷, 鑾峰彇瀵硅薄鐨凞eclaredMethod,骞跺己鍒惰缃负鍙闂. + * 濡傚悜涓婅浆鍨嬪埌Object浠嶆棤娉曟壘鍒, 杩斿洖null. + * 鍙尮閰嶅嚱鏁板悕銆 + * 鐢ㄤ簬鏂规硶闇瑕佽澶氭璋冪敤鐨勬儏鍐. 鍏堜娇鐢ㄦ湰鍑芥暟鍏堝彇寰桵ethod,鐒跺悗璋冪敤Method.invoke(Object obj, Object... args) + */ + public static Method getAccessibleMethodByName(final Object obj, final String methodName, int argsNum) + { + // 涓虹┖涓嶆姤閿欍傜洿鎺ヨ繑鍥 null + if (obj == null) + { + return null; + } + Validate.notBlank(methodName, "methodName can't be blank"); + for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass()) + { + Method[] methods = searchType.getDeclaredMethods(); + for (Method method : methods) + { + if (method.getName().equals(methodName) && method.getParameterTypes().length == argsNum) + { + makeAccessible(method); + return method; + } + } + } + return null; + } + + /** + * 鏀瑰彉private/protected鐨勬柟娉曚负public锛屽敖閲忎笉璋冪敤瀹為檯鏀瑰姩鐨勮鍙ワ紝閬垮厤JDK鐨凷ecurityManager鎶辨ㄣ + */ + public static void makeAccessible(Method method) + { + if ((!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers())) + && !method.isAccessible()) + { + method.setAccessible(true); + } + } + + /** + * 鏀瑰彉private/protected鐨勬垚鍛樺彉閲忎负public锛屽敖閲忎笉璋冪敤瀹為檯鏀瑰姩鐨勮鍙ワ紝閬垮厤JDK鐨凷ecurityManager鎶辨ㄣ + */ + public static void makeAccessible(Field field) + { + if ((!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers()) + || Modifier.isFinal(field.getModifiers())) && !field.isAccessible()) + { + field.setAccessible(true); + } + } + + /** + * 閫氳繃鍙嶅皠, 鑾峰緱Class瀹氫箟涓０鏄庣殑娉涘瀷鍙傛暟鐨勭被鍨, 娉ㄦ剰娉涘瀷蹇呴』瀹氫箟鍦ㄧ埗绫诲 + * 濡傛棤娉曟壘鍒, 杩斿洖Object.class. + */ + @SuppressWarnings("unchecked") + public static Class getClassGenricType(final Class clazz) + { + return getClassGenricType(clazz, 0); + } + + /** + * 閫氳繃鍙嶅皠, 鑾峰緱Class瀹氫箟涓０鏄庣殑鐖剁被鐨勬硾鍨嬪弬鏁扮殑绫诲瀷. + * 濡傛棤娉曟壘鍒, 杩斿洖Object.class. + */ + public static Class getClassGenricType(final Class clazz, final int index) + { + Type genType = clazz.getGenericSuperclass(); + + if (!(genType instanceof ParameterizedType)) + { + logger.debug(clazz.getSimpleName() + "'s superclass not ParameterizedType"); + return Object.class; + } + + Type[] params = ((ParameterizedType) genType).getActualTypeArguments(); + + if (index >= params.length || index < 0) + { + logger.debug("Index: " + index + ", Size of " + clazz.getSimpleName() + "'s Parameterized Type: " + + params.length); + return Object.class; + } + if (!(params[index] instanceof Class)) + { + logger.debug(clazz.getSimpleName() + " not set the actual class on superclass generic parameter"); + return Object.class; + } + + return (Class) params[index]; + } + + public static Class getUserClass(Object instance) + { + if (instance == null) + { + throw new RuntimeException("Instance must not be null"); + } + Class clazz = instance.getClass(); + if (clazz != null && clazz.getName().contains(CGLIB_CLASS_SEPARATOR)) + { + Class superClass = clazz.getSuperclass(); + if (superClass != null && !Object.class.equals(superClass)) + { + return superClass; + } + } + return clazz; + + } + + /** + * 灏嗗弽灏勬椂鐨刢hecked exception杞崲涓簎nchecked exception. + */ + public static RuntimeException convertReflectionExceptionToUnchecked(String msg, Exception e) + { + if (e instanceof IllegalAccessException || e instanceof IllegalArgumentException + || e instanceof NoSuchMethodException) + { + return new IllegalArgumentException(msg, e); + } + else if (e instanceof InvocationTargetException) + { + return new RuntimeException(msg, ((InvocationTargetException) e).getTargetException()); + } + return new RuntimeException(msg, e); + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/sign/Base64.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/sign/Base64.java index ca1cd92480e958a7cf4da69a6e8c2457dbed9776..b2648358028fde58b003591dcdf2dc1a06657327 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/sign/Base64.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.sign; +package com.jiajiakang.common.utils.sign; /** * Base64宸ュ叿绫 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/spring/SpringUtils.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/spring/SpringUtils.java index 9993b98ff878f1e81adb352bece964fd15f96d5b..73f7939b23d49275fe7ac54b4728bc87d6445f7b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/spring/SpringUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.spring; +package com.jiajiakang.common.utils.spring; import org.springframework.aop.framework.AopContext; import org.springframework.beans.BeansException; @@ -8,7 +8,7 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.StringUtils; +import com.jiajiakang.common.utils.StringUtils; /** * spring宸ュ叿绫 鏂逛究鍦ㄩ潪spring绠＄悊鐜涓幏鍙朾ean diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/sql/SqlUtil.java similarity index 84% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java rename to jiajiakang-common/src/main/java/com/jiajiakang/common/utils/sql/SqlUtil.java index 0b06dd96a231b2cc25e2463e2af070f732fd5e39..70aebb0c4734b4f18b8f89f33904c6f579dce444 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java +++ b/jiajiakang-common/src/main/java/com/jiajiakang/common/utils/sql/SqlUtil.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.utils.sql; +package com.jiajiakang.common.utils.sql; -import com.ruoyi.common.exception.BaseException; -import com.ruoyi.common.utils.StringUtils; +import com.jiajiakang.common.exception.BaseException; +import com.jiajiakang.common.utils.StringUtils; /** * sql鎿嶄綔宸ュ叿绫 diff --git a/ruoyi-demo/pom.xml b/jiajiakang-demo/pom.xml similarity index 70% rename from ruoyi-demo/pom.xml rename to jiajiakang-demo/pom.xml index 0ee0331d57c8f2e140cdfe3e5d115dd65d2a31a9..b54371aa025e687dd81f275db3421910a06c37eb 100644 --- a/ruoyi-demo/pom.xml +++ b/jiajiakang-demo/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + jiajiakang + com.jiajiakang 3.4.0 4.0.0 - ruoyi-demo + jiajiakang-demo demo妯″潡 @@ -19,8 +19,8 @@ - com.ruoyi - ruoyi-common + com.jiajiakang + jiajiakang-common diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/FeignTestController.java b/jiajiakang-demo/src/main/java/com/ruoyi/demo/controller/FeignTestController.java similarity index 83% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/FeignTestController.java rename to jiajiakang-demo/src/main/java/com/ruoyi/demo/controller/FeignTestController.java index f4c5f4499f28f91463c80d4c08044778ef16d0b1..9a2ccd8874f649a6bb7c09d65a600f5cce6d8c96 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/FeignTestController.java +++ b/jiajiakang-demo/src/main/java/com/ruoyi/demo/controller/FeignTestController.java @@ -1,7 +1,7 @@ -package com.ruoyi.demo.controller; +package com.jiajiakang.demo.controller; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.demo.feign.FeignTestService; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.demo.feign.FeignTestService; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/jiajiakang-demo/src/main/java/com/ruoyi/demo/controller/package-info.java b/jiajiakang-demo/src/main/java/com/ruoyi/demo/controller/package-info.java new file mode 100644 index 0000000000000000000000000000000000000000..fdcd3751cab367144c1faed78488e0b573534bd4 --- /dev/null +++ b/jiajiakang-demo/src/main/java/com/ruoyi/demo/controller/package-info.java @@ -0,0 +1 @@ +package com.jiajiakang.demo.controller; \ No newline at end of file diff --git a/jiajiakang-demo/src/main/java/com/ruoyi/demo/domain/package-info.java b/jiajiakang-demo/src/main/java/com/ruoyi/demo/domain/package-info.java new file mode 100644 index 0000000000000000000000000000000000000000..e588637b284dcfe5d7ce9e82e3a92c7383ce2081 --- /dev/null +++ b/jiajiakang-demo/src/main/java/com/ruoyi/demo/domain/package-info.java @@ -0,0 +1 @@ +package com.jiajiakang.demo.domain; \ No newline at end of file diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/FeignTestService.java b/jiajiakang-demo/src/main/java/com/ruoyi/demo/feign/FeignTestService.java similarity index 79% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/feign/FeignTestService.java rename to jiajiakang-demo/src/main/java/com/ruoyi/demo/feign/FeignTestService.java index 4945f596728172e59f6684b0a36cd130ef609b19..7941f53541131ca5c71e8da1f9e25ebdfd8ffd70 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/FeignTestService.java +++ b/jiajiakang-demo/src/main/java/com/ruoyi/demo/feign/FeignTestService.java @@ -1,6 +1,6 @@ -package com.ruoyi.demo.feign; +package com.jiajiakang.demo.feign; -import com.ruoyi.demo.feign.fallback.FeignTestFallback; +import com.jiajiakang.demo.feign.fallback.FeignTestFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/FeignTestFallback.java b/jiajiakang-demo/src/main/java/com/ruoyi/demo/feign/fallback/FeignTestFallback.java similarity index 60% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/FeignTestFallback.java rename to jiajiakang-demo/src/main/java/com/ruoyi/demo/feign/fallback/FeignTestFallback.java index f2012f96522434bfd10eb934550957e6c06e419f..171873ac14cb3f23f709c716fd680f1746591f1e 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/FeignTestFallback.java +++ b/jiajiakang-demo/src/main/java/com/ruoyi/demo/feign/fallback/FeignTestFallback.java @@ -1,7 +1,7 @@ -package com.ruoyi.demo.feign.fallback; +package com.jiajiakang.demo.feign.fallback; -import com.ruoyi.demo.feign.FeignTestService; +import com.jiajiakang.demo.feign.FeignTestService; public class FeignTestFallback implements FeignTestService { diff --git a/jiajiakang-demo/src/main/java/com/ruoyi/demo/feign/fallback/package-info.java b/jiajiakang-demo/src/main/java/com/ruoyi/demo/feign/fallback/package-info.java new file mode 100644 index 0000000000000000000000000000000000000000..76ac93ac7e4328f09c7382f47f6866ef82db2b45 --- /dev/null +++ b/jiajiakang-demo/src/main/java/com/ruoyi/demo/feign/fallback/package-info.java @@ -0,0 +1 @@ +package com.jiajiakang.demo.feign.fallback; \ No newline at end of file diff --git a/jiajiakang-demo/src/main/java/com/ruoyi/demo/feign/package-info.java b/jiajiakang-demo/src/main/java/com/ruoyi/demo/feign/package-info.java new file mode 100644 index 0000000000000000000000000000000000000000..ed3124300257b795bbc2f4d0b8a00ebd15c073f0 --- /dev/null +++ b/jiajiakang-demo/src/main/java/com/ruoyi/demo/feign/package-info.java @@ -0,0 +1 @@ +package com.jiajiakang.demo.feign; \ No newline at end of file diff --git a/jiajiakang-demo/src/main/java/com/ruoyi/demo/mapper/package-info.java b/jiajiakang-demo/src/main/java/com/ruoyi/demo/mapper/package-info.java new file mode 100644 index 0000000000000000000000000000000000000000..76910e5f054837f9d135b1b8ecc79e3ce7764bc4 --- /dev/null +++ b/jiajiakang-demo/src/main/java/com/ruoyi/demo/mapper/package-info.java @@ -0,0 +1 @@ +package com.jiajiakang.demo.mapper; \ No newline at end of file diff --git a/jiajiakang-demo/src/main/java/com/ruoyi/demo/service/impl/package-info.java b/jiajiakang-demo/src/main/java/com/ruoyi/demo/service/impl/package-info.java new file mode 100644 index 0000000000000000000000000000000000000000..0d704372b5dc3f15dbb72e38127377287fe3013c --- /dev/null +++ b/jiajiakang-demo/src/main/java/com/ruoyi/demo/service/impl/package-info.java @@ -0,0 +1 @@ +package com.jiajiakang.demo.service.impl; \ No newline at end of file diff --git a/jiajiakang-demo/src/main/java/com/ruoyi/demo/service/package-info.java b/jiajiakang-demo/src/main/java/com/ruoyi/demo/service/package-info.java new file mode 100644 index 0000000000000000000000000000000000000000..30e480eea6e2be55fa26a023d4880b9a440bafae --- /dev/null +++ b/jiajiakang-demo/src/main/java/com/ruoyi/demo/service/package-info.java @@ -0,0 +1 @@ +package com.jiajiakang.demo.service; \ No newline at end of file diff --git a/ruoyi-demo/src/main/resources/mapper/demo/package-info.md b/jiajiakang-demo/src/main/resources/mapper/demo/package-info.md similarity index 100% rename from ruoyi-demo/src/main/resources/mapper/demo/package-info.md rename to jiajiakang-demo/src/main/resources/mapper/demo/package-info.md diff --git a/ruoyi-framework/pom.xml b/jiajiakang-framework/pom.xml similarity index 88% rename from ruoyi-framework/pom.xml rename to jiajiakang-framework/pom.xml index d738880e9fdb235dde52c52f60706f279cd4d5f2..5796c527f278a575c8544a40e4ecd2e29be6cdab 100644 --- a/ruoyi-framework/pom.xml +++ b/jiajiakang-framework/pom.xml @@ -1,72 +1,72 @@ - - - - ruoyi - com.ruoyi - 3.4.0 - - 4.0.0 - - ruoyi-framework - - - framework妗嗘灦鏍稿績 - - - - - - - - org.springframework.boot - spring-boot-starter-web - - - spring-boot-starter-tomcat - org.springframework.boot - - - - - - org.springframework.boot - spring-boot-starter-undertow - - - - - - - - - - - - - org.springframework.boot - spring-boot-starter-aop - - - - - com.alibaba - druid-spring-boot-starter - - - - - com.github.oshi - oshi-core - - - - - com.ruoyi - ruoyi-system - - - - + + + + jiajiakang + com.jiajiakang + 3.4.0 + + 4.0.0 + + jiajiakang-framework + + + framework妗嗘灦鏍稿績 + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + spring-boot-starter-tomcat + org.springframework.boot + + + + + + org.springframework.boot + spring-boot-starter-undertow + + + + + + + + + + + + + org.springframework.boot + spring-boot-starter-aop + + + + + com.alibaba + druid-spring-boot-starter + + + + + com.github.oshi + oshi-core + + + + + com.jiajiakang + jiajiakang-system + + + + \ No newline at end of file diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/aspectj/DataScopeAspect.java similarity index 88% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/aspectj/DataScopeAspect.java index 45d939bbe934333fb9f3ef7c9ee08583b97a6dd0..d815233b785c70b00aa7cd19fd2b9581a3ff9202 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/aspectj/DataScopeAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj; +package com.jiajiakang.framework.aspectj; import java.lang.reflect.Method; import org.aspectj.lang.JoinPoint; @@ -8,15 +8,15 @@ import org.aspectj.lang.annotation.Before; import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; import org.springframework.stereotype.Component; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.web.service.TokenService; +import com.jiajiakang.common.annotation.DataScope; +import com.jiajiakang.common.core.domain.BaseEntity; +import com.jiajiakang.common.core.domain.entity.SysRole; +import com.jiajiakang.common.core.domain.entity.SysUser; +import com.jiajiakang.common.core.domain.model.LoginUser; +import com.jiajiakang.common.utils.ServletUtils; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.common.utils.spring.SpringUtils; +import com.jiajiakang.framework.web.service.TokenService; /** * 鏁版嵁杩囨护澶勭悊 @@ -58,7 +58,7 @@ public class DataScopeAspect public static final String DATA_SCOPE = "dataScope"; // 閰嶇疆缁囧叆鐐 - @Pointcut("@annotation(com.ruoyi.common.annotation.DataScope)") + @Pointcut("@annotation(com.jiajiakang.common.annotation.DataScope)") public void dataScopePointCut() { } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/aspectj/DataSourceAspect.java similarity index 82% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/aspectj/DataSourceAspect.java index 8c2c9f4385732249ebd98b9a793352358d2dd7db..9cd9d067d184c08958f28c828c9513b1bf4c21df 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/aspectj/DataSourceAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj; +package com.jiajiakang.framework.aspectj; import java.util.Objects; import org.aspectj.lang.ProceedingJoinPoint; @@ -11,9 +11,9 @@ import org.slf4j.LoggerFactory; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; -import com.ruoyi.common.annotation.DataSource; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder; +import com.jiajiakang.common.annotation.DataSource; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.framework.datasource.DynamicDataSourceContextHolder; /** * 澶氭暟鎹簮澶勭悊 @@ -27,8 +27,8 @@ public class DataSourceAspect { protected Logger logger = LoggerFactory.getLogger(getClass()); - @Pointcut("@annotation(com.ruoyi.common.annotation.DataSource)" - + "|| @within(com.ruoyi.common.annotation.DataSource)") + @Pointcut("@annotation(com.jiajiakang.common.annotation.DataSource)" + + "|| @within(com.jiajiakang.common.annotation.DataSource)") public void dsPointCut() { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/aspectj/LogAspect.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/aspectj/LogAspect.java index 7e180ab7cef6b0aee5b8a032a089815008a3087d..bdff3101a1419f4bc2059073f71afce199e4aab9 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/aspectj/LogAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj; +package com.jiajiakang.framework.aspectj; import java.lang.reflect.Method; import java.util.Collection; @@ -19,18 +19,18 @@ import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.HandlerMapping; import com.alibaba.fastjson.JSON; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.BusinessStatus; -import com.ruoyi.common.enums.HttpMethod; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.system.domain.SysOperLog; +import com.jiajiakang.common.annotation.Log; +import com.jiajiakang.common.core.domain.model.LoginUser; +import com.jiajiakang.common.enums.BusinessStatus; +import com.jiajiakang.common.enums.HttpMethod; +import com.jiajiakang.common.utils.ServletUtils; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.common.utils.ip.IpUtils; +import com.jiajiakang.common.utils.spring.SpringUtils; +import com.jiajiakang.framework.manager.AsyncManager; +import com.jiajiakang.framework.manager.factory.AsyncFactory; +import com.jiajiakang.framework.web.service.TokenService; +import com.jiajiakang.system.domain.SysOperLog; /** * 鎿嶄綔鏃ュ織璁板綍澶勭悊 @@ -44,7 +44,7 @@ public class LogAspect private static final Logger log = LoggerFactory.getLogger(LogAspect.class); // 閰嶇疆缁囧叆鐐 - @Pointcut("@annotation(com.ruoyi.common.annotation.Log)") + @Pointcut("@annotation(com.jiajiakang.common.annotation.Log)") public void logPointCut() { } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/ApplicationConfig.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/ApplicationConfig.java index 1d4dc1f724ca36dbdfaa693ea88510606ebfd91f..bbad887c6d8897cf14343a50f824796af95380e8 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/ApplicationConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jiajiakang.framework.config; import java.util.TimeZone; import org.mybatis.spring.annotation.MapperScan; @@ -16,7 +16,7 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy; // 琛ㄧず閫氳繃aop妗嗘灦鏆撮湶璇ヤ唬鐞嗗璞,AopContext鑳藉璁块棶 @EnableAspectJAutoProxy(exposeProxy = true) // 鎸囧畾瑕佹壂鎻忕殑Mapper绫荤殑鍖呯殑璺緞 -@MapperScan("com.ruoyi.**.mapper") +@MapperScan("com.jiajiakang.**.mapper") public class ApplicationConfig { /** diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/CaptchaConfig.java similarity index 97% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/CaptchaConfig.java index 4cd99970ce828aa9a9a0e1f2226b7fbdd934551e..24c76b37a3749099d4609213a59cc73874d5b0d3 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/CaptchaConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jiajiakang.framework.config; import java.awt.*; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/DruidConfig.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/DruidConfig.java index 3fab843f9b2d0b3b9e1ea6606872a42d0e0725fb..51dbdfe81b524e1124db5071be820788344c0be1 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/DruidConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jiajiakang.framework.config; import java.io.IOException; import java.util.HashMap; @@ -19,10 +19,10 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties; import com.alibaba.druid.util.Utils; -import com.ruoyi.common.enums.DataSourceType; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.config.properties.DruidProperties; -import com.ruoyi.framework.datasource.DynamicDataSource; +import com.jiajiakang.common.enums.DataSourceType; +import com.jiajiakang.common.utils.spring.SpringUtils; +import com.jiajiakang.framework.config.properties.DruidProperties; +import com.jiajiakang.framework.datasource.DynamicDataSource; /** * druid 閰嶇疆澶氭暟鎹簮 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/FastJson2JsonRedisSerializer.java similarity index 97% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/FastJson2JsonRedisSerializer.java index 59812ea5db80fc7d3116c6fc9ce0bc01bd3756c8..0ded28e6d7f7f7a71d91321bdc65a2008df87b53 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/FastJson2JsonRedisSerializer.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jiajiakang.framework.config; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/FeignConfig.java similarity index 97% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/FeignConfig.java index cdb0c8be324e4e02f7e8ce9af9fbbffae5138039..47c6f59a46ab018ed45bd61aa31f1c5ccabf5638 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/FeignConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jiajiakang.framework.config; import feign.*; import okhttp3.ConnectionPool; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/FilterConfig.java similarity index 90% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/FilterConfig.java index b5f03ec88db90a5ad450208b932f42c842382624..66ce243872989f04a21fb33e243aa83e0936b0d1 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/FilterConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jiajiakang.framework.config; import java.util.HashMap; import java.util.Map; @@ -7,9 +7,9 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.ruoyi.common.filter.RepeatableFilter; -import com.ruoyi.common.filter.XssFilter; -import com.ruoyi.common.utils.StringUtils; +import com.jiajiakang.common.filter.RepeatableFilter; +import com.jiajiakang.common.filter.XssFilter; +import com.jiajiakang.common.utils.StringUtils; /** * Filter閰嶇疆 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/MybatisPlusConfig.java similarity index 98% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/MybatisPlusConfig.java index c274e36dc3292c9893461be681752d82eb1990b1..d2744ee6f585345730796322cefcddc8317c7024 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jiajiakang.framework.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/RedisConfig.java similarity index 97% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/RedisConfig.java index a65626aaaa529aa00cc6253f233ae2512b00b785..dda4063f5250cc747b7573b97bc44520be0faec9 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/RedisConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jiajiakang.framework.config; import org.springframework.cache.annotation.CachingConfigurerSupport; import org.springframework.cache.annotation.EnableCaching; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/ResourcesConfig.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/ResourcesConfig.java index 7f0a629bca023a00c12d1fe6a7277fbc09c8ac71..ced82dc1aaece295e1f7cd9b3195956ad8b84f57 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/ResourcesConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jiajiakang.framework.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -9,9 +9,9 @@ import org.springframework.web.filter.CorsFilter; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor; +import com.jiajiakang.common.config.RuoYiConfig; +import com.jiajiakang.common.constant.Constants; +import com.jiajiakang.framework.interceptor.RepeatSubmitInterceptor; /** * 閫氱敤閰嶇疆 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/SecurityConfig.java similarity index 95% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/SecurityConfig.java index 385439e213f694817c33da22c29af983daef4d79..0f72614f35ed904ffc22213458ccdaf91832a86e 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jiajiakang.framework.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -14,9 +14,9 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.security.web.authentication.logout.LogoutFilter; import org.springframework.web.filter.CorsFilter; -import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter; -import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl; -import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl; +import com.jiajiakang.framework.security.filter.JwtAuthenticationTokenFilter; +import com.jiajiakang.framework.security.handle.AuthenticationEntryPointImpl; +import com.jiajiakang.framework.security.handle.LogoutSuccessHandlerImpl; /** * spring security閰嶇疆 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/ServerConfig.java similarity index 89% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/ServerConfig.java index b5b7de31659f588674b5acc9d6c5b6d6d97e1121..f327bfe68563ee020a12aa2b6ef6cfe3dacbe5db 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/ServerConfig.java @@ -1,8 +1,8 @@ -package com.ruoyi.framework.config; +package com.jiajiakang.framework.config; import javax.servlet.http.HttpServletRequest; import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.ServletUtils; +import com.jiajiakang.common.utils.ServletUtils; /** * 鏈嶅姟鐩稿叧閰嶇疆 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/ThreadPoolConfig.java similarity index 95% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/ThreadPoolConfig.java index 0d67c224116ac44cc8adeb0eee0f6db0c9f68c60..bf29e088afd717c50217c0d6652f8501033facc2 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/ThreadPoolConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jiajiakang.framework.config; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledThreadPoolExecutor; @@ -7,7 +7,7 @@ import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; -import com.ruoyi.common.utils.Threads; +import com.jiajiakang.common.utils.Threads; /** * 绾跨▼姹犻厤缃 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ValidatorConfig.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/ValidatorConfig.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ValidatorConfig.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/ValidatorConfig.java index d9b0b3d9998237e52617ee0638d1b3c9fc42bab0..c790410d8c9936fbd98b73646cd95b3cc445ee2a 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ValidatorConfig.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/ValidatorConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jiajiakang.framework.config; import org.hibernate.validator.HibernateValidator; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/properties/DruidProperties.java similarity index 98% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/properties/DruidProperties.java index 84f7e0090bb65861abd685eb77c3fb7159b10ed3..a9ec53d1a221e4655187898dda47f9445d994402 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/config/properties/DruidProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.jiajiakang.framework.config.properties; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/datasource/DynamicDataSource.java similarity index 93% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/datasource/DynamicDataSource.java index e70b8cfa7a96a7a4bab5473172fca33a5d1ecea2..8a647bf2efa153f8ce8f88af2c2ce4d5e6c0d639 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/datasource/DynamicDataSource.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.datasource; +package com.jiajiakang.framework.datasource; import java.util.Map; import javax.sql.DataSource; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/datasource/DynamicDataSourceContextHolder.java similarity index 95% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/datasource/DynamicDataSourceContextHolder.java index 3572db91707884599a7e9ecb4416dce778b50904..9e233003fed77907f5b4b91872dd989bfd4a1f33 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/datasource/DynamicDataSourceContextHolder.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.datasource; +package com.jiajiakang.framework.datasource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/interceptor/RepeatSubmitInterceptor.java similarity index 87% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/interceptor/RepeatSubmitInterceptor.java index d310382f8c7f5c1fe482d473b2d8d5e72963ea30..af104fdd42dadacfa20148810ff32bbeeaf1d4ed 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/interceptor/RepeatSubmitInterceptor.java @@ -1,55 +1,55 @@ -package com.ruoyi.framework.interceptor; - -import java.lang.reflect.Method; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.springframework.stereotype.Component; -import org.springframework.web.method.HandlerMethod; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; -import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.ServletUtils; - -/** - * 闃叉閲嶅鎻愪氦鎷︽埅鍣 - * - * @author ruoyi - */ -@Component -public abstract class RepeatSubmitInterceptor extends HandlerInterceptorAdapter -{ - @Override - public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception - { - if (handler instanceof HandlerMethod) - { - HandlerMethod handlerMethod = (HandlerMethod) handler; - Method method = handlerMethod.getMethod(); - RepeatSubmit annotation = method.getAnnotation(RepeatSubmit.class); - if (annotation != null) - { - if (this.isRepeatSubmit(request)) - { - AjaxResult ajaxResult = AjaxResult.error("涓嶅厑璁搁噸澶嶆彁浜わ紝璇风◢鍚庡啀璇"); - ServletUtils.renderString(response, JSONObject.toJSONString(ajaxResult)); - return false; - } - } - return true; - } - else - { - return super.preHandle(request, response, handler); - } - } - - /** - * 楠岃瘉鏄惁閲嶅鎻愪氦鐢卞瓙绫诲疄鐜板叿浣撶殑闃查噸澶嶆彁浜ょ殑瑙勫垯 - * - * @param request - * @return - * @throws Exception - */ - public abstract boolean isRepeatSubmit(HttpServletRequest request); -} +package com.jiajiakang.framework.interceptor; + +import java.lang.reflect.Method; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.springframework.stereotype.Component; +import org.springframework.web.method.HandlerMethod; +import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; +import com.alibaba.fastjson.JSONObject; +import com.jiajiakang.common.annotation.RepeatSubmit; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.utils.ServletUtils; + +/** + * 闃叉閲嶅鎻愪氦鎷︽埅鍣 + * + * @author ruoyi + */ +@Component +public abstract class RepeatSubmitInterceptor extends HandlerInterceptorAdapter +{ + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception + { + if (handler instanceof HandlerMethod) + { + HandlerMethod handlerMethod = (HandlerMethod) handler; + Method method = handlerMethod.getMethod(); + RepeatSubmit annotation = method.getAnnotation(RepeatSubmit.class); + if (annotation != null) + { + if (this.isRepeatSubmit(request)) + { + AjaxResult ajaxResult = AjaxResult.error("涓嶅厑璁搁噸澶嶆彁浜わ紝璇风◢鍚庡啀璇"); + ServletUtils.renderString(response, JSONObject.toJSONString(ajaxResult)); + return false; + } + } + return true; + } + else + { + return super.preHandle(request, response, handler); + } + } + + /** + * 楠岃瘉鏄惁閲嶅鎻愪氦鐢卞瓙绫诲疄鐜板叿浣撶殑闃查噸澶嶆彁浜ょ殑瑙勫垯 + * + * @param request + * @return + * @throws Exception + */ + public abstract boolean isRepeatSubmit(HttpServletRequest request); +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/interceptor/impl/SameUrlDataInterceptor.java similarity index 89% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/interceptor/impl/SameUrlDataInterceptor.java index e3864c7ac37fc47cd3ed9b5d097498b8a2753101..0f0815bda98fa370162fd9c8c806787cefd47071 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/interceptor/impl/SameUrlDataInterceptor.java @@ -1,125 +1,125 @@ -package com.ruoyi.framework.interceptor.impl; - -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import javax.servlet.http.HttpServletRequest; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; -import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.filter.RepeatedlyRequestWrapper; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.http.HttpHelper; -import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor; - -/** - * 鍒ゆ柇璇锋眰url鍜屾暟鎹槸鍚﹀拰涓婁竴娆＄浉鍚岋紝 - * 濡傛灉鍜屼笂娆＄浉鍚岋紝鍒欐槸閲嶅鎻愪氦琛ㄥ崟銆 鏈夋晥鏃堕棿涓10绉掑唴銆 - * - * @author ruoyi - */ -@Component -public class SameUrlDataInterceptor extends RepeatSubmitInterceptor -{ - public final String REPEAT_PARAMS = "repeatParams"; - - public final String REPEAT_TIME = "repeatTime"; - - // 浠ょ墝鑷畾涔夋爣璇 - @Value("${token.header}") - private String header; - - @Autowired - private RedisCache redisCache; - - /** - * 闂撮殧鏃堕棿锛屽崟浣:绉 榛樿10绉 - * - * 涓ゆ鐩稿悓鍙傛暟鐨勮姹傦紝濡傛灉闂撮殧鏃堕棿澶т簬璇ュ弬鏁帮紝绯荤粺涓嶄細璁ゅ畾涓洪噸澶嶆彁浜ょ殑鏁版嵁 - */ - private int intervalTime = 10; - - public void setIntervalTime(int intervalTime) - { - this.intervalTime = intervalTime; - } - - @SuppressWarnings("unchecked") - @Override - public boolean isRepeatSubmit(HttpServletRequest request) - { - String nowParams = ""; - if (request instanceof RepeatedlyRequestWrapper) - { - RepeatedlyRequestWrapper repeatedlyRequest = (RepeatedlyRequestWrapper) request; - nowParams = HttpHelper.getBodyString(repeatedlyRequest); - } - - // body鍙傛暟涓虹┖锛岃幏鍙朠arameter鐨勬暟鎹 - if (StringUtils.isEmpty(nowParams)) - { - nowParams = JSONObject.toJSONString(request.getParameterMap()); - } - Map nowDataMap = new HashMap(); - nowDataMap.put(REPEAT_PARAMS, nowParams); - nowDataMap.put(REPEAT_TIME, System.currentTimeMillis()); - - // 璇锋眰鍦板潃锛堜綔涓哄瓨鏀綾ache鐨刱ey鍊硷級 - String url = request.getRequestURI(); - - // 鍞竴鍊硷紙娌℃湁娑堟伅澶村垯浣跨敤璇锋眰鍦板潃锛 - String submitKey = request.getHeader(header); - if (StringUtils.isEmpty(submitKey)) - { - submitKey = url; - } - - // 鍞竴鏍囪瘑锛堟寚瀹歬ey + 娑堟伅澶达級 - String cache_repeat_key = Constants.REPEAT_SUBMIT_KEY + submitKey; - - Object sessionObj = redisCache.getCacheObject(cache_repeat_key); - if (sessionObj != null) - { - Map sessionMap = (Map) sessionObj; - if (sessionMap.containsKey(url)) - { - Map preDataMap = (Map) sessionMap.get(url); - if (compareParams(nowDataMap, preDataMap) && compareTime(nowDataMap, preDataMap)) - { - return true; - } - } - } - Map cacheMap = new HashMap(); - cacheMap.put(url, nowDataMap); - redisCache.setCacheObject(cache_repeat_key, cacheMap, intervalTime, TimeUnit.SECONDS); - return false; - } - - /** - * 鍒ゆ柇鍙傛暟鏄惁鐩稿悓 - */ - private boolean compareParams(Map nowMap, Map preMap) - { - String nowParams = (String) nowMap.get(REPEAT_PARAMS); - String preParams = (String) preMap.get(REPEAT_PARAMS); - return nowParams.equals(preParams); - } - - /** - * 鍒ゆ柇涓ゆ闂撮殧鏃堕棿 - */ - private boolean compareTime(Map nowMap, Map preMap) - { - long time1 = (Long) nowMap.get(REPEAT_TIME); - long time2 = (Long) preMap.get(REPEAT_TIME); - if ((time1 - time2) < (this.intervalTime * 1000)) - { - return true; - } - return false; - } -} +package com.jiajiakang.framework.interceptor.impl; + +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import javax.servlet.http.HttpServletRequest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import com.alibaba.fastjson.JSONObject; +import com.jiajiakang.common.constant.Constants; +import com.jiajiakang.common.core.redis.RedisCache; +import com.jiajiakang.common.filter.RepeatedlyRequestWrapper; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.common.utils.http.HttpHelper; +import com.jiajiakang.framework.interceptor.RepeatSubmitInterceptor; + +/** + * 鍒ゆ柇璇锋眰url鍜屾暟鎹槸鍚﹀拰涓婁竴娆＄浉鍚岋紝 + * 濡傛灉鍜屼笂娆＄浉鍚岋紝鍒欐槸閲嶅鎻愪氦琛ㄥ崟銆 鏈夋晥鏃堕棿涓10绉掑唴銆 + * + * @author ruoyi + */ +@Component +public class SameUrlDataInterceptor extends RepeatSubmitInterceptor +{ + public final String REPEAT_PARAMS = "repeatParams"; + + public final String REPEAT_TIME = "repeatTime"; + + // 浠ょ墝鑷畾涔夋爣璇 + @Value("${token.header}") + private String header; + + @Autowired + private RedisCache redisCache; + + /** + * 闂撮殧鏃堕棿锛屽崟浣:绉 榛樿10绉 + * + * 涓ゆ鐩稿悓鍙傛暟鐨勮姹傦紝濡傛灉闂撮殧鏃堕棿澶т簬璇ュ弬鏁帮紝绯荤粺涓嶄細璁ゅ畾涓洪噸澶嶆彁浜ょ殑鏁版嵁 + */ + private int intervalTime = 10; + + public void setIntervalTime(int intervalTime) + { + this.intervalTime = intervalTime; + } + + @SuppressWarnings("unchecked") + @Override + public boolean isRepeatSubmit(HttpServletRequest request) + { + String nowParams = ""; + if (request instanceof RepeatedlyRequestWrapper) + { + RepeatedlyRequestWrapper repeatedlyRequest = (RepeatedlyRequestWrapper) request; + nowParams = HttpHelper.getBodyString(repeatedlyRequest); + } + + // body鍙傛暟涓虹┖锛岃幏鍙朠arameter鐨勬暟鎹 + if (StringUtils.isEmpty(nowParams)) + { + nowParams = JSONObject.toJSONString(request.getParameterMap()); + } + Map nowDataMap = new HashMap(); + nowDataMap.put(REPEAT_PARAMS, nowParams); + nowDataMap.put(REPEAT_TIME, System.currentTimeMillis()); + + // 璇锋眰鍦板潃锛堜綔涓哄瓨鏀綾ache鐨刱ey鍊硷級 + String url = request.getRequestURI(); + + // 鍞竴鍊硷紙娌℃湁娑堟伅澶村垯浣跨敤璇锋眰鍦板潃锛 + String submitKey = request.getHeader(header); + if (StringUtils.isEmpty(submitKey)) + { + submitKey = url; + } + + // 鍞竴鏍囪瘑锛堟寚瀹歬ey + 娑堟伅澶达級 + String cache_repeat_key = Constants.REPEAT_SUBMIT_KEY + submitKey; + + Object sessionObj = redisCache.getCacheObject(cache_repeat_key); + if (sessionObj != null) + { + Map sessionMap = (Map) sessionObj; + if (sessionMap.containsKey(url)) + { + Map preDataMap = (Map) sessionMap.get(url); + if (compareParams(nowDataMap, preDataMap) && compareTime(nowDataMap, preDataMap)) + { + return true; + } + } + } + Map cacheMap = new HashMap(); + cacheMap.put(url, nowDataMap); + redisCache.setCacheObject(cache_repeat_key, cacheMap, intervalTime, TimeUnit.SECONDS); + return false; + } + + /** + * 鍒ゆ柇鍙傛暟鏄惁鐩稿悓 + */ + private boolean compareParams(Map nowMap, Map preMap) + { + String nowParams = (String) nowMap.get(REPEAT_PARAMS); + String preParams = (String) preMap.get(REPEAT_PARAMS); + return nowParams.equals(preParams); + } + + /** + * 鍒ゆ柇涓ゆ闂撮殧鏃堕棿 + */ + private boolean compareTime(Map nowMap, Map preMap) + { + long time1 = (Long) nowMap.get(REPEAT_TIME); + long time2 = (Long) preMap.get(REPEAT_TIME); + if ((time1 - time2) < (this.intervalTime * 1000)) + { + return true; + } + return false; + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/manager/AsyncManager.java similarity index 87% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/manager/AsyncManager.java index 7387a02cb13d0e0a1926a440f4566fa68595f7e9..331e617b816ab2552068494ffa0ece6e54520bb6 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/manager/AsyncManager.java @@ -1,10 +1,10 @@ -package com.ruoyi.framework.manager; +package com.jiajiakang.framework.manager; import java.util.TimerTask; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import com.ruoyi.common.utils.Threads; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.jiajiakang.common.utils.Threads; +import com.jiajiakang.common.utils.spring.SpringUtils; /** * 寮傛浠诲姟绠＄悊鍣 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/manager/ShutdownManager.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/manager/ShutdownManager.java index e36ca3c58c4d6c6f04fd07a2789f749fcece8524..bb8e80fbacd06c637d7aea4ba6ff11af84767244 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/manager/ShutdownManager.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.manager; +package com.jiajiakang.framework.manager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/manager/factory/AsyncFactory.java similarity index 84% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/manager/factory/AsyncFactory.java index 17a8f40fa514daf78239d7d9758d66a8bb051373..3282f23be7ed6b49143e251134e20637855417cb 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/manager/factory/AsyncFactory.java @@ -1,18 +1,18 @@ -package com.ruoyi.framework.manager.factory; +package com.jiajiakang.framework.manager.factory; import java.util.TimerTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.LogUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.ip.AddressUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.system.domain.SysLogininfor; -import com.ruoyi.system.domain.SysOperLog; -import com.ruoyi.system.service.ISysLogininforService; -import com.ruoyi.system.service.ISysOperLogService; +import com.jiajiakang.common.constant.Constants; +import com.jiajiakang.common.utils.LogUtils; +import com.jiajiakang.common.utils.ServletUtils; +import com.jiajiakang.common.utils.ip.AddressUtils; +import com.jiajiakang.common.utils.ip.IpUtils; +import com.jiajiakang.common.utils.spring.SpringUtils; +import com.jiajiakang.system.domain.SysLogininfor; +import com.jiajiakang.system.domain.SysOperLog; +import com.jiajiakang.system.service.ISysLogininforService; +import com.jiajiakang.system.service.ISysOperLogService; import eu.bitwalker.useragentutils.UserAgent; /** diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/security/filter/JwtAuthenticationTokenFilter.java similarity index 86% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/security/filter/JwtAuthenticationTokenFilter.java index 3eb24954e7aafafb6b06872313213e8abdb7c2d4..553caf4cdeb6d9ea4c98ea0cd16428bc83ecdd60 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/security/filter/JwtAuthenticationTokenFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.filter; +package com.jiajiakang.framework.security.filter; import java.io.IOException; import javax.servlet.FilterChain; @@ -11,10 +11,10 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.web.service.TokenService; +import com.jiajiakang.common.core.domain.model.LoginUser; +import com.jiajiakang.common.utils.SecurityUtils; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.framework.web.service.TokenService; /** * token杩囨护鍣 楠岃瘉token鏈夋晥鎬 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/security/handle/AuthenticationEntryPointImpl.java similarity index 80% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/security/handle/AuthenticationEntryPointImpl.java index c22dd324e8cb8de826dc3c7b9ccfb1e5d34f31a0..5a9c93ac92502f6636d6a65946eadd5d0861f04a 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/security/handle/AuthenticationEntryPointImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.handle; +package com.jiajiakang.framework.security.handle; import java.io.IOException; import java.io.Serializable; @@ -8,10 +8,10 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.stereotype.Component; import com.alibaba.fastjson.JSON; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; +import com.jiajiakang.common.constant.HttpStatus; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.utils.ServletUtils; +import com.jiajiakang.common.utils.StringUtils; /** * 璁よ瘉澶辫触澶勭悊绫 杩斿洖鏈巿鏉 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/security/handle/LogoutSuccessHandlerImpl.java similarity index 73% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/security/handle/LogoutSuccessHandlerImpl.java index e5fc11d08af284b9746a682634e8891c37595b3b..b7713d15d90d736de3d4e6a53b6ca36ae981e162 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/security/handle/LogoutSuccessHandlerImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.handle; +package com.jiajiakang.framework.security.handle; import java.io.IOException; import javax.servlet.ServletException; @@ -9,15 +9,15 @@ import org.springframework.context.annotation.Configuration; import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; import com.alibaba.fastjson.JSON; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.framework.web.service.TokenService; +import com.jiajiakang.common.constant.Constants; +import com.jiajiakang.common.constant.HttpStatus; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.core.domain.model.LoginUser; +import com.jiajiakang.common.utils.ServletUtils; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.framework.manager.AsyncManager; +import com.jiajiakang.framework.manager.factory.AsyncFactory; +import com.jiajiakang.framework.web.service.TokenService; /** * 鑷畾涔夐鍑哄鐞嗙被 杩斿洖鎴愬姛 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/domain/Server.java similarity index 93% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/domain/Server.java index 5195efadaf25af7804024acd1875953d3847fa06..7041039789b74e11cb13ee98d6f43d75b5532d38 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/domain/Server.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.domain; +package com.jiajiakang.framework.web.domain; import java.util.LinkedList; import java.util.List; @@ -10,11 +10,11 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.system.*; import cn.hutool.system.oshi.CpuInfo; import cn.hutool.system.oshi.OshiUtil; -import com.ruoyi.framework.web.domain.server.Cpu; -import com.ruoyi.framework.web.domain.server.Jvm; -import com.ruoyi.framework.web.domain.server.Mem; -import com.ruoyi.framework.web.domain.server.Sys; -import com.ruoyi.framework.web.domain.server.SysFile; +import com.jiajiakang.framework.web.domain.server.Cpu; +import com.jiajiakang.framework.web.domain.server.Jvm; +import com.jiajiakang.framework.web.domain.server.Mem; +import com.jiajiakang.framework.web.domain.server.Sys; +import com.jiajiakang.framework.web.domain.server.SysFile; import lombok.Data; import oshi.hardware.GlobalMemory; import oshi.software.os.FileSystem; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/domain/server/Cpu.java similarity index 96% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/domain/server/Cpu.java index 4295f6eeca6e41af5165fe1618f2e9f86631f80b..97899af8db7a0c5d279461ba4aba7c22587029d9 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/domain/server/Cpu.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.domain.server; +package com.jiajiakang.framework.web.domain.server; import cn.hutool.core.util.NumberUtil; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/domain/server/Jvm.java similarity index 95% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/domain/server/Jvm.java index 4b70cbb843b5d07e441b38f1ea3522bcdf7c92bc..00bdf71d60d94559530b50c970fb2e7418bf8e49 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/domain/server/Jvm.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.domain.server; +package com.jiajiakang.framework.web.domain.server; import java.lang.management.ManagementFactory; import java.util.Date; @@ -6,7 +6,7 @@ import java.util.Date; import cn.hutool.core.date.BetweenFormatter; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; -import com.ruoyi.common.utils.DateUtils; +import com.jiajiakang.common.utils.DateUtils; /** * JVM鐩稿叧淇℃伅 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/domain/server/Mem.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/domain/server/Mem.java index 757ff5712eb4d83d09cd23d61f141afa31565f37..0d16d2a0331b2f1d51a58c226d6458e74f1ae667 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/domain/server/Mem.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.domain.server; +package com.jiajiakang.framework.web.domain.server; import cn.hutool.core.util.NumberUtil; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/domain/server/Sys.java similarity index 95% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/domain/server/Sys.java index 45d64d9cde55be168dbaf22959c8d78835bd3ed3..529e2884d45908a990f1a22645e8db8385217d66 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/domain/server/Sys.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.domain.server; +package com.jiajiakang.framework.web.domain.server; /** * 绯荤粺鐩稿叧淇℃伅 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/domain/server/SysFile.java similarity index 96% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/domain/server/SysFile.java index 1320cde6ecc13557972c359ac9c8acc87959e721..762247ef82f461119d3dd0d8b45fd8d164fb5dd7 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/domain/server/SysFile.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.domain.server; +package com.jiajiakang.framework.web.domain.server; /** * 绯荤粺鏂囦欢鐩稿叧淇℃伅 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/exception/GlobalExceptionHandler.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/exception/GlobalExceptionHandler.java index cd497ccb65023a0f20301cc166aa5340e1f51b88..87dc032744fb14722152fe2642621d8754d822b3 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/exception/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.exception; +package com.jiajiakang.framework.web.exception; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -10,12 +10,12 @@ import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.servlet.NoHandlerFoundException; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.exception.BaseException; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.exception.DemoModeException; -import com.ruoyi.common.utils.StringUtils; +import com.jiajiakang.common.constant.HttpStatus; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.exception.BaseException; +import com.jiajiakang.common.exception.CustomException; +import com.jiajiakang.common.exception.DemoModeException; +import com.jiajiakang.common.utils.StringUtils; import javax.validation.ConstraintViolationException; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/service/PermissionService.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/service/PermissionService.java index 277e4b9980491da79dc1610de5e399501d90c497..223a3be402b06a6a5f711544541ac4d7d1d6b6cc 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/service/PermissionService.java @@ -1,13 +1,13 @@ -package com.ruoyi.framework.web.service; +package com.jiajiakang.framework.web.service; import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; +import com.jiajiakang.common.core.domain.entity.SysRole; +import com.jiajiakang.common.core.domain.model.LoginUser; +import com.jiajiakang.common.utils.ServletUtils; +import com.jiajiakang.common.utils.StringUtils; /** * RuoYi棣栧垱 鑷畾涔夋潈闄愬疄鐜帮紝ss鍙栬嚜SpringSecurity棣栧瓧姣 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/service/SysLoginService.java similarity index 81% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/service/SysLoginService.java index b56b43705a483eb8183c8fc11402f6e8a052bd38..062af5592cceb791fa5e3bf8ae6c52f8dc9158f2 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/service/SysLoginService.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.service; +package com.jiajiakang.framework.web.service; import javax.annotation.Resource; import org.springframework.beans.factory.annotation.Autowired; @@ -7,16 +7,16 @@ import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Component; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.exception.user.CaptchaException; -import com.ruoyi.common.exception.user.CaptchaExpireException; -import com.ruoyi.common.exception.user.UserPasswordNotMatchException; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; +import com.jiajiakang.common.constant.Constants; +import com.jiajiakang.common.core.domain.model.LoginUser; +import com.jiajiakang.common.core.redis.RedisCache; +import com.jiajiakang.common.exception.CustomException; +import com.jiajiakang.common.exception.user.CaptchaException; +import com.jiajiakang.common.exception.user.CaptchaExpireException; +import com.jiajiakang.common.exception.user.UserPasswordNotMatchException; +import com.jiajiakang.common.utils.MessageUtils; +import com.jiajiakang.framework.manager.AsyncManager; +import com.jiajiakang.framework.manager.factory.AsyncFactory; /** * 鐧诲綍鏍￠獙鏂规硶 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/service/SysPermissionService.java similarity index 86% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/service/SysPermissionService.java index feb803875d669cdf3490a3bb1af88e3dae850a19..3a033e6333f89de369c9e38e3e794c4c2279ebe1 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/service/SysPermissionService.java @@ -1,12 +1,12 @@ -package com.ruoyi.framework.web.service; +package com.jiajiakang.framework.web.service; import java.util.HashSet; import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.system.service.ISysMenuService; -import com.ruoyi.system.service.ISysRoleService; +import com.jiajiakang.common.core.domain.entity.SysUser; +import com.jiajiakang.system.service.ISysMenuService; +import com.jiajiakang.system.service.ISysRoleService; /** * 鐢ㄦ埛鏉冮檺澶勭悊 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/service/TokenService.java similarity index 93% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/service/TokenService.java index 89a81ad1610d2da5b23f73ab541e7ea1b08a67ac..cfb563441f8d4b4342da0a285fa49ff03af22a49 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/service/TokenService.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.service; +package com.jiajiakang.framework.web.service; import java.util.HashMap; import java.util.Map; @@ -9,13 +9,13 @@ import cn.hutool.core.util.IdUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.AddressUtils; -import com.ruoyi.common.utils.ip.IpUtils; +import com.jiajiakang.common.constant.Constants; +import com.jiajiakang.common.core.domain.model.LoginUser; +import com.jiajiakang.common.core.redis.RedisCache; +import com.jiajiakang.common.utils.ServletUtils; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.common.utils.ip.AddressUtils; +import com.jiajiakang.common.utils.ip.IpUtils; import eu.bitwalker.useragentutils.UserAgent; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/service/UserDetailsServiceImpl.java similarity index 83% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java rename to jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/service/UserDetailsServiceImpl.java index 35fd05e29388461aaa2e45e80bcde04f7e760aa0..9d28851dc045abf7daead45481a91fb91d5d1f9a 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java +++ b/jiajiakang-framework/src/main/java/com/jiajiakang/framework/web/service/UserDetailsServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.service; +package com.jiajiakang.framework.web.service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -7,12 +7,12 @@ import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.UserStatus; -import com.ruoyi.common.exception.BaseException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.service.ISysUserService; +import com.jiajiakang.common.core.domain.entity.SysUser; +import com.jiajiakang.common.core.domain.model.LoginUser; +import com.jiajiakang.common.enums.UserStatus; +import com.jiajiakang.common.exception.BaseException; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.system.service.ISysUserService; /** * 鐢ㄦ埛楠岃瘉澶勭悊 diff --git a/ruoyi-generator/pom.xml b/jiajiakang-generator/pom.xml similarity index 75% rename from ruoyi-generator/pom.xml rename to jiajiakang-generator/pom.xml index 594d0b306e8ac6615dd960a8f809abd349691225..49b488ae187d968267f135caf471a85a90b9e9b9 100644 --- a/ruoyi-generator/pom.xml +++ b/jiajiakang-generator/pom.xml @@ -1,34 +1,34 @@ - - - - ruoyi - com.ruoyi - 3.4.0 - - 4.0.0 - - ruoyi-generator - - - generator浠ｇ爜鐢熸垚 - - - - - - - org.apache.velocity - velocity - - - - - com.ruoyi - ruoyi-common - - - - + + + + jiajiakang + com.jiajiakang + 3.4.0 + + 4.0.0 + + jiajiakang-generator + + + generator浠ｇ爜鐢熸垚 + + + + + + + org.apache.velocity + velocity + + + + + com.jiajiakang + jiajiakang-common + + + + \ No newline at end of file diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/config/GenConfig.java similarity index 97% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java rename to jiajiakang-generator/src/main/java/com/jiajiakang/generator/config/GenConfig.java index cc4cd14c83a69a064debb30731de462d51d11972..3e2ce377fb7ad5ca4e6bd16171eaca357c7d4153 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java +++ b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/config/GenConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.generator.config; +package com.jiajiakang.generator.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/controller/GenController.java similarity index 92% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java rename to jiajiakang-generator/src/main/java/com/jiajiakang/generator/controller/GenController.java index 8195206fe3b5d6a24e26fc1bc23944aecd7b08f8..e06783b1bb021de100cbd1e875a70a267d4fa2c4 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java +++ b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/controller/GenController.java @@ -1,4 +1,4 @@ -package com.ruoyi.generator.controller; +package com.jiajiakang.generator.controller; import java.io.IOException; import java.util.HashMap; @@ -17,16 +17,16 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; -import com.ruoyi.generator.service.IGenTableColumnService; -import com.ruoyi.generator.service.IGenTableService; +import com.jiajiakang.common.annotation.Log; +import com.jiajiakang.common.core.controller.BaseController; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.core.page.TableDataInfo; +import com.jiajiakang.common.core.text.Convert; +import com.jiajiakang.common.enums.BusinessType; +import com.jiajiakang.generator.domain.GenTable; +import com.jiajiakang.generator.domain.GenTableColumn; +import com.jiajiakang.generator.service.IGenTableColumnService; +import com.jiajiakang.generator.service.IGenTableService; /** * 浠ｇ爜鐢熸垚 鎿嶄綔澶勭悊 diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/domain/GenTable.java similarity index 97% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java rename to jiajiakang-generator/src/main/java/com/jiajiakang/generator/domain/GenTable.java index 269779cf252789b9edde68ed20ef3fcc3a0478ec..a146884408ea21f33165e5f421c3ec20214b79d9 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java +++ b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/domain/GenTable.java @@ -1,12 +1,12 @@ -package com.ruoyi.generator.domain; +package com.jiajiakang.generator.domain; import java.util.List; import javax.validation.Valid; import javax.validation.constraints.NotBlank; import org.apache.commons.lang3.ArrayUtils; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; +import com.jiajiakang.common.constant.GenConstants; +import com.jiajiakang.common.core.domain.BaseEntity; +import com.jiajiakang.common.utils.StringUtils; /** * 涓氬姟琛 gen_table diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/domain/GenTableColumn.java similarity index 98% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java rename to jiajiakang-generator/src/main/java/com/jiajiakang/generator/domain/GenTableColumn.java index d1733b645c7ed7c6285712189b3f53171d35858d..ae6ddbe695204295fd0a8ff36eca2424e77cfc7f 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java +++ b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/domain/GenTableColumn.java @@ -1,8 +1,8 @@ -package com.ruoyi.generator.domain; +package com.jiajiakang.generator.domain; import javax.validation.constraints.NotBlank; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; +import com.jiajiakang.common.core.domain.BaseEntity; +import com.jiajiakang.common.utils.StringUtils; /** * 浠ｇ爜鐢熸垚涓氬姟瀛楁琛 gen_table_column diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/mapper/GenTableColumnMapper.java similarity index 93% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java rename to jiajiakang-generator/src/main/java/com/jiajiakang/generator/mapper/GenTableColumnMapper.java index 951e16670f68a37dce4545cf9b94d6e4d0c4567e..a1b76a958248156392a43d2ab0f50f0add022726 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java +++ b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/mapper/GenTableColumnMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.generator.mapper; +package com.jiajiakang.generator.mapper; import java.util.List; -import com.ruoyi.generator.domain.GenTableColumn; +import com.jiajiakang.generator.domain.GenTableColumn; /** * 涓氬姟瀛楁 鏁版嵁灞 diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/mapper/GenTableMapper.java similarity index 94% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java rename to jiajiakang-generator/src/main/java/com/jiajiakang/generator/mapper/GenTableMapper.java index cb2750989ecad88def070dad41e9bd8d56a7bdce..9b02b73b509f2fe58f029b8f06ba2f192bc9d2f0 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java +++ b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/mapper/GenTableMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.generator.mapper; +package com.jiajiakang.generator.mapper; import java.util.List; -import com.ruoyi.generator.domain.GenTable; +import com.jiajiakang.generator.domain.GenTable; /** * 涓氬姟 鏁版嵁灞 diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/service/GenTableColumnServiceImpl.java similarity index 87% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java rename to jiajiakang-generator/src/main/java/com/jiajiakang/generator/service/GenTableColumnServiceImpl.java index 0679689d2febdae8dfbdc7aff39fafbd0cd72e42..702c2d474636f39d760417ea60fba64b1071d05a 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java +++ b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/service/GenTableColumnServiceImpl.java @@ -1,11 +1,11 @@ -package com.ruoyi.generator.service; +package com.jiajiakang.generator.service; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.generator.domain.GenTableColumn; -import com.ruoyi.generator.mapper.GenTableColumnMapper; +import com.jiajiakang.common.core.text.Convert; +import com.jiajiakang.generator.domain.GenTableColumn; +import com.jiajiakang.generator.mapper.GenTableColumnMapper; /** * 涓氬姟瀛楁 鏈嶅姟灞傚疄鐜 diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/service/GenTableServiceImpl.java similarity index 95% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java rename to jiajiakang-generator/src/main/java/com/jiajiakang/generator/service/GenTableServiceImpl.java index 796b54514bd934252da573df58b8f493fe65e1d2..ff937d7002d130f701247c02fc0fe759db19e82f 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java +++ b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/service/GenTableServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.generator.service; +package com.jiajiakang.generator.service; import java.io.ByteArrayOutputStream; import java.io.File; @@ -21,20 +21,20 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.core.text.CharsetKit; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; -import com.ruoyi.generator.mapper.GenTableColumnMapper; -import com.ruoyi.generator.mapper.GenTableMapper; -import com.ruoyi.generator.util.GenUtils; -import com.ruoyi.generator.util.VelocityInitializer; -import com.ruoyi.generator.util.VelocityUtils; +import com.jiajiakang.common.constant.Constants; +import com.jiajiakang.common.constant.GenConstants; +import com.jiajiakang.common.core.text.CharsetKit; +import com.jiajiakang.common.exception.CustomException; +import com.jiajiakang.common.utils.SecurityUtils; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.common.utils.file.FileUtils; +import com.jiajiakang.generator.domain.GenTable; +import com.jiajiakang.generator.domain.GenTableColumn; +import com.jiajiakang.generator.mapper.GenTableColumnMapper; +import com.jiajiakang.generator.mapper.GenTableMapper; +import com.jiajiakang.generator.util.GenUtils; +import com.jiajiakang.generator.util.VelocityInitializer; +import com.jiajiakang.generator.util.VelocityUtils; /** * 涓氬姟 鏈嶅姟灞傚疄鐜 diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/service/IGenTableColumnService.java similarity index 90% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java rename to jiajiakang-generator/src/main/java/com/jiajiakang/generator/service/IGenTableColumnService.java index 3037f707e485149668c2b415ac14a911c7f07f02..08f8f9e4c9351eb04c3f403b0cd4da5caae1884a 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java +++ b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/service/IGenTableColumnService.java @@ -1,7 +1,7 @@ -package com.ruoyi.generator.service; +package com.jiajiakang.generator.service; import java.util.List; -import com.ruoyi.generator.domain.GenTableColumn; +import com.jiajiakang.generator.domain.GenTableColumn; /** * 涓氬姟瀛楁 鏈嶅姟灞 diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/service/IGenTableService.java similarity index 96% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java rename to jiajiakang-generator/src/main/java/com/jiajiakang/generator/service/IGenTableService.java index e6267cbe54703120200973add8a92127360d9f20..1ccb4dd6faf4d9e151fb615720982982593b36da 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java +++ b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/service/IGenTableService.java @@ -1,8 +1,8 @@ -package com.ruoyi.generator.service; +package com.jiajiakang.generator.service; import java.util.List; import java.util.Map; -import com.ruoyi.generator.domain.GenTable; +import com.jiajiakang.generator.domain.GenTable; /** * 涓氬姟 鏈嶅姟灞 diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/util/GenUtils.java similarity index 96% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java rename to jiajiakang-generator/src/main/java/com/jiajiakang/generator/util/GenUtils.java index 06c6821440d4facd5c482d1de72da2d3a6ccb4de..ad833dc3cc3bfc44a3e29d8bec275549be126eb7 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java +++ b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/util/GenUtils.java @@ -1,12 +1,12 @@ -package com.ruoyi.generator.util; +package com.jiajiakang.generator.util; import java.util.Arrays; import org.apache.commons.lang3.RegExUtils; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.generator.config.GenConfig; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; +import com.jiajiakang.common.constant.GenConstants; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.generator.config.GenConfig; +import com.jiajiakang.generator.domain.GenTable; +import com.jiajiakang.generator.domain.GenTableColumn; /** * 浠ｇ爜鐢熸垚鍣 宸ュ叿绫 diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/util/VelocityInitializer.java similarity index 90% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java rename to jiajiakang-generator/src/main/java/com/jiajiakang/generator/util/VelocityInitializer.java index 3b7b3a10e288c6ee32e660e01c6aa637ec7fb384..033b798acebf88fe9063524610bfd380b40dbbce 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java +++ b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/util/VelocityInitializer.java @@ -1,8 +1,8 @@ -package com.ruoyi.generator.util; +package com.jiajiakang.generator.util; import java.util.Properties; import org.apache.velocity.app.Velocity; -import com.ruoyi.common.constant.Constants; +import com.jiajiakang.common.constant.Constants; /** * VelocityEngine宸ュ巶 diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/util/VelocityUtils.java similarity index 97% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java rename to jiajiakang-generator/src/main/java/com/jiajiakang/generator/util/VelocityUtils.java index 12702b7849e59ee32d08d36e2953eb216c6cba90..7bfb283f83a92b88e70a4645a25c694a6327520a 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java +++ b/jiajiakang-generator/src/main/java/com/jiajiakang/generator/util/VelocityUtils.java @@ -1,15 +1,15 @@ -package com.ruoyi.generator.util; +package com.jiajiakang.generator.util; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import org.apache.velocity.VelocityContext; import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; +import com.jiajiakang.common.constant.GenConstants; +import com.jiajiakang.common.utils.DateUtils; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.generator.domain.GenTable; +import com.jiajiakang.generator.domain.GenTableColumn; /** * 妯℃澘澶勭悊宸ュ叿绫 diff --git a/ruoyi-generator/src/main/resources/generator.yml b/jiajiakang-generator/src/main/resources/generator.yml similarity index 87% rename from ruoyi-generator/src/main/resources/generator.yml rename to jiajiakang-generator/src/main/resources/generator.yml index 4544c8c2420a19971796e58a306f3bac55121678..2353a7512eaa3b791a03544558d3fc4e402f0b7b 100644 --- a/ruoyi-generator/src/main/resources/generator.yml +++ b/jiajiakang-generator/src/main/resources/generator.yml @@ -1,10 +1,10 @@ -# 浠ｇ爜鐢熸垚 -gen: - # 浣滆 - author: ruoyi - # 榛樿鐢熸垚鍖呰矾寰 system 闇鏀规垚鑷繁鐨勬ā鍧楀悕绉 濡 system monitor tool - packageName: com.ruoyi.system - # 鑷姩鍘婚櫎琛ㄥ墠缂锛岄粯璁ゆ槸false - autoRemovePre: false - # 琛ㄥ墠缂锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛 +# 浠ｇ爜鐢熸垚 +gen: + # 浣滆 + author: ruoyi + # 榛樿鐢熸垚鍖呰矾寰 system 闇鏀规垚鑷繁鐨勬ā鍧楀悕绉 濡 system monitor tool + packageName: com.jiajiakang.system + # 鑷姩鍘婚櫎琛ㄥ墠缂锛岄粯璁ゆ槸false + autoRemovePre: false + # 琛ㄥ墠缂锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛 tablePrefix: sys_ \ No newline at end of file diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/jiajiakang-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml similarity index 98% rename from ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml rename to jiajiakang-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml index 5fa790f5a78bc1d1d3619a6ea8139fa5058127d4..6ee745ec837383e9d6792e8015a1f924f65368a6 100644 --- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/jiajiakang-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/jiajiakang-generator/src/main/resources/mapper/generator/GenTableMapper.xml similarity index 99% rename from ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml rename to jiajiakang-generator/src/main/resources/mapper/generator/GenTableMapper.xml index 528e9250c106e0cc5750e9f2ed7c45d4b4330c60..62b3f5904f5f5cd46e26d54362171f614ae93222 100644 --- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/jiajiakang-generator/src/main/resources/mapper/generator/GenTableMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/jiajiakang-generator/src/main/resources/vm/java/controller.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/controller.java.vm rename to jiajiakang-generator/src/main/resources/vm/java/controller.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/jiajiakang-generator/src/main/resources/vm/java/domain.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/domain.java.vm rename to jiajiakang-generator/src/main/resources/vm/java/domain.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/jiajiakang-generator/src/main/resources/vm/java/mapper.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/mapper.java.vm rename to jiajiakang-generator/src/main/resources/vm/java/mapper.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/jiajiakang-generator/src/main/resources/vm/java/service.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/service.java.vm rename to jiajiakang-generator/src/main/resources/vm/java/service.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/jiajiakang-generator/src/main/resources/vm/java/serviceImpl.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm rename to jiajiakang-generator/src/main/resources/vm/java/serviceImpl.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm b/jiajiakang-generator/src/main/resources/vm/java/sub-domain.java.vm similarity index 96% rename from ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm rename to jiajiakang-generator/src/main/resources/vm/java/sub-domain.java.vm index b5e308cf7428a9c9ecfc280dfda9098d32bb3a2c..a3f53ebab9896cd40de0fd40d80153c3d2ba812e 100644 --- a/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm +++ b/jiajiakang-generator/src/main/resources/vm/java/sub-domain.java.vm @@ -1,76 +1,76 @@ -package ${packageName}.domain; - -#foreach ($import in $subImportList) -import ${import}; -#end -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * ${subTable.functionName}瀵硅薄 ${subTableName} - * - * @author ${author} - * @date ${datetime} - */ -public class ${subClassName} extends BaseEntity -{ - private static final long serialVersionUID = 1L; - -#foreach ($column in $subTable.columns) -#if(!$table.isSuperColumn($column.javaField)) - /** $column.columnComment */ -#if($column.list) -#set($parentheseIndex=$column.columnComment.indexOf("锛")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#if($parentheseIndex != -1) - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") -#elseif($column.javaType == 'Date') - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") -#else - @Excel(name = "${comment}") -#end -#end - private $column.javaType $column.javaField; - -#end -#end -#foreach ($column in $subTable.columns) -#if(!$table.isSuperColumn($column.javaField)) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end - public void set${AttrName}($column.javaType $column.javaField) - { - this.$column.javaField = $column.javaField; - } - - public $column.javaType get${AttrName}() - { - return $column.javaField; - } -#end -#end - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) -#foreach ($column in $subTable.columns) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end - .append("${column.javaField}", get${AttrName}()) -#end - .toString(); - } -} +package ${packageName}.domain; + +#foreach ($import in $subImportList) +import ${import}; +#end +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * ${subTable.functionName}瀵硅薄 ${subTableName} + * + * @author ${author} + * @date ${datetime} + */ +public class ${subClassName} extends BaseEntity +{ + private static final long serialVersionUID = 1L; + +#foreach ($column in $subTable.columns) +#if(!$table.isSuperColumn($column.javaField)) + /** $column.columnComment */ +#if($column.list) +#set($parentheseIndex=$column.columnComment.indexOf("锛")) +#if($parentheseIndex != -1) +#set($comment=$column.columnComment.substring(0, $parentheseIndex)) +#else +#set($comment=$column.columnComment) +#end +#if($parentheseIndex != -1) + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") +#elseif($column.javaType == 'Date') + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") +#else + @Excel(name = "${comment}") +#end +#end + private $column.javaType $column.javaField; + +#end +#end +#foreach ($column in $subTable.columns) +#if(!$table.isSuperColumn($column.javaField)) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) +#else +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end + public void set${AttrName}($column.javaType $column.javaField) + { + this.$column.javaField = $column.javaField; + } + + public $column.javaType get${AttrName}() + { + return $column.javaField; + } +#end +#end + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) +#foreach ($column in $subTable.columns) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) +#else +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end + .append("${column.javaField}", get${AttrName}()) +#end + .toString(); + } +} diff --git a/ruoyi-generator/src/main/resources/vm/js/api.js.vm b/jiajiakang-generator/src/main/resources/vm/js/api.js.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/js/api.js.vm rename to jiajiakang-generator/src/main/resources/vm/js/api.js.vm diff --git a/ruoyi-generator/src/main/resources/vm/sql/sql.vm b/jiajiakang-generator/src/main/resources/vm/sql/sql.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/sql/sql.vm rename to jiajiakang-generator/src/main/resources/vm/sql/sql.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/jiajiakang-generator/src/main/resources/vm/vue/index-tree.vue.vm similarity index 97% rename from ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm rename to jiajiakang-generator/src/main/resources/vm/vue/index-tree.vue.vm index aac0faf3102cb0a063a2e5dee49730335766f683..bc244c913ff1b907e86c9e7c0a294134f19856fe 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm +++ b/jiajiakang-generator/src/main/resources/vm/vue/index-tree.vue.vm @@ -1,523 +1,523 @@ - - - + + + diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/jiajiakang-generator/src/main/resources/vm/vue/index.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/index.vue.vm rename to jiajiakang-generator/src/main/resources/vm/vue/index.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/jiajiakang-generator/src/main/resources/vm/xml/mapper.xml.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm rename to jiajiakang-generator/src/main/resources/vm/xml/mapper.xml.vm diff --git a/ruoyi-quartz/pom.xml b/jiajiakang-quartz/pom.xml similarity index 78% rename from ruoyi-quartz/pom.xml rename to jiajiakang-quartz/pom.xml index cc2d760a36a657579a92574d4edbdc6872643834..0bb008e99b5ff2c2e1e28e7f978345f069f520a7 100644 --- a/ruoyi-quartz/pom.xml +++ b/jiajiakang-quartz/pom.xml @@ -1,40 +1,40 @@ - - - - ruoyi - com.ruoyi - 3.4.0 - - 4.0.0 - - ruoyi-quartz - - - quartz瀹氭椂浠诲姟 - - - - - - - org.quartz-scheduler - quartz - - - com.mchange - c3p0 - - - - - - - com.ruoyi - ruoyi-common - - - - + + + + jiajiakang + com.jiajiakang + 3.4.0 + + 4.0.0 + + jiajiakang-quartz + + + quartz瀹氭椂浠诲姟 + + + + + + + org.quartz-scheduler + quartz + + + com.mchange + c3p0 + + + + + + + com.jiajiakang + jiajiakang-common + + + + \ No newline at end of file diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/config/ScheduleConfig.java similarity index 96% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java rename to jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/config/ScheduleConfig.java index e466ed0578f142e7b73df85d51ceaa973ad47b21..7cb22d7f8d139c4e517093b8821540eda40bccc2 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java +++ b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/config/ScheduleConfig.java @@ -1,57 +1,57 @@ -package com.ruoyi.quartz.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.quartz.SchedulerFactoryBean; -import javax.sql.DataSource; -import java.util.Properties; - -/** - * 瀹氭椂浠诲姟閰嶇疆 - * - * @author ruoyi - */ -@Configuration -public class ScheduleConfig -{ - @Bean - public SchedulerFactoryBean schedulerFactoryBean(DataSource dataSource) - { - SchedulerFactoryBean factory = new SchedulerFactoryBean(); - factory.setDataSource(dataSource); - - // quartz鍙傛暟 - Properties prop = new Properties(); - prop.put("org.quartz.scheduler.instanceName", "RuoyiScheduler"); - prop.put("org.quartz.scheduler.instanceId", "AUTO"); - // 绾跨▼姹犻厤缃 - prop.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool"); - prop.put("org.quartz.threadPool.threadCount", "20"); - prop.put("org.quartz.threadPool.threadPriority", "5"); - // JobStore閰嶇疆 - prop.put("org.quartz.jobStore.class", "org.quartz.impl.jdbcjobstore.JobStoreTX"); - // 闆嗙兢閰嶇疆 - prop.put("org.quartz.jobStore.isClustered", "true"); - prop.put("org.quartz.jobStore.clusterCheckinInterval", "15000"); - prop.put("org.quartz.jobStore.maxMisfiresToHandleAtATime", "1"); - prop.put("org.quartz.jobStore.txIsolationLevelSerializable", "true"); - - // sqlserver 鍚敤 - // prop.put("org.quartz.jobStore.selectWithLockSQL", "SELECT * FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?"); - prop.put("org.quartz.jobStore.misfireThreshold", "12000"); - prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_"); - factory.setQuartzProperties(prop); - - factory.setSchedulerName("RuoyiScheduler"); - // 寤舵椂鍚姩 - factory.setStartupDelay(1); - factory.setApplicationContextSchedulerContextKey("applicationContextKey"); - // 鍙夛紝QuartzScheduler - // 鍚姩鏃舵洿鏂板繁瀛樺湪鐨凧ob锛岃繖鏍峰氨涓嶇敤姣忔淇敼targetObject鍚庡垹闄rtz_job_details琛ㄥ搴旇褰曚簡 - factory.setOverwriteExistingJobs(true); - // 璁剧疆鑷姩鍚姩锛岄粯璁や负true - factory.setAutoStartup(true); - - return factory; - } -} +package com.jiajiakang.quartz.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.quartz.SchedulerFactoryBean; +import javax.sql.DataSource; +import java.util.Properties; + +/** + * 瀹氭椂浠诲姟閰嶇疆 + * + * @author ruoyi + */ +@Configuration +public class ScheduleConfig +{ + @Bean + public SchedulerFactoryBean schedulerFactoryBean(DataSource dataSource) + { + SchedulerFactoryBean factory = new SchedulerFactoryBean(); + factory.setDataSource(dataSource); + + // quartz鍙傛暟 + Properties prop = new Properties(); + prop.put("org.quartz.scheduler.instanceName", "RuoyiScheduler"); + prop.put("org.quartz.scheduler.instanceId", "AUTO"); + // 绾跨▼姹犻厤缃 + prop.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool"); + prop.put("org.quartz.threadPool.threadCount", "20"); + prop.put("org.quartz.threadPool.threadPriority", "5"); + // JobStore閰嶇疆 + prop.put("org.quartz.jobStore.class", "org.quartz.impl.jdbcjobstore.JobStoreTX"); + // 闆嗙兢閰嶇疆 + prop.put("org.quartz.jobStore.isClustered", "true"); + prop.put("org.quartz.jobStore.clusterCheckinInterval", "15000"); + prop.put("org.quartz.jobStore.maxMisfiresToHandleAtATime", "1"); + prop.put("org.quartz.jobStore.txIsolationLevelSerializable", "true"); + + // sqlserver 鍚敤 + // prop.put("org.quartz.jobStore.selectWithLockSQL", "SELECT * FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?"); + prop.put("org.quartz.jobStore.misfireThreshold", "12000"); + prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_"); + factory.setQuartzProperties(prop); + + factory.setSchedulerName("RuoyiScheduler"); + // 寤舵椂鍚姩 + factory.setStartupDelay(1); + factory.setApplicationContextSchedulerContextKey("applicationContextKey"); + // 鍙夛紝QuartzScheduler + // 鍚姩鏃舵洿鏂板繁瀛樺湪鐨凧ob锛岃繖鏍峰氨涓嶇敤姣忔淇敼targetObject鍚庡垹闄rtz_job_details琛ㄥ搴旇褰曚簡 + factory.setOverwriteExistingJobs(true); + // 璁剧疆鑷姩鍚姩锛岄粯璁や负true + factory.setAutoStartup(true); + + return factory; + } +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/controller/SysJobController.java similarity index 86% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java rename to jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/controller/SysJobController.java index f770a7d8f01d250cb3d6aff4a968fb172f2ca2ae..239be779ce1d3be288eddddc88763881a90ad688 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java +++ b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/controller/SysJobController.java @@ -1,142 +1,142 @@ -package com.ruoyi.quartz.controller; - -import java.util.List; -import org.quartz.SchedulerException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.quartz.domain.SysJob; -import com.ruoyi.quartz.service.ISysJobService; -import com.ruoyi.quartz.util.CronUtils; - -/** - * 璋冨害浠诲姟淇℃伅鎿嶄綔澶勭悊 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/monitor/job") -public class SysJobController extends BaseController -{ - @Autowired - private ISysJobService jobService; - - /** - * 鏌ヨ瀹氭椂浠诲姟鍒楄〃 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:list')") - @GetMapping("/list") - public TableDataInfo list(SysJob sysJob) - { - startPage(); - List list = jobService.selectJobList(sysJob); - return getDataTable(list); - } - - /** - * 瀵煎嚭瀹氭椂浠诲姟鍒楄〃 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:export')") - @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public AjaxResult export(SysJob sysJob) - { - List list = jobService.selectJobList(sysJob); - ExcelUtil util = new ExcelUtil(SysJob.class); - return util.exportExcel(list, "瀹氭椂浠诲姟"); - } - - /** - * 鑾峰彇瀹氭椂浠诲姟璇︾粏淇℃伅 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:query')") - @GetMapping(value = "/{jobId}") - public AjaxResult getInfo(@PathVariable("jobId") Long jobId) - { - return AjaxResult.success(jobService.selectJobById(jobId)); - } - - /** - * 鏂板瀹氭椂浠诲姟 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:add')") - @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody SysJob sysJob) throws SchedulerException, TaskException - { - if (!CronUtils.isValid(sysJob.getCronExpression())) - { - return AjaxResult.error("cron琛ㄨ揪寮忎笉姝ｇ‘"); - } - sysJob.setCreateBy(SecurityUtils.getUsername()); - return toAjax(jobService.insertJob(sysJob)); - } - - /** - * 淇敼瀹氭椂浠诲姟 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:edit')") - @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SysJob sysJob) throws SchedulerException, TaskException - { - if (!CronUtils.isValid(sysJob.getCronExpression())) - { - return AjaxResult.error("cron琛ㄨ揪寮忎笉姝ｇ‘"); - } - sysJob.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(jobService.updateJob(sysJob)); - } - - /** - * 瀹氭椂浠诲姟鐘舵佷慨鏀 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')") - @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE) - @PutMapping("/changeStatus") - public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException - { - SysJob newJob = jobService.selectJobById(job.getJobId()); - newJob.setStatus(job.getStatus()); - return toAjax(jobService.changeStatus(newJob)); - } - - /** - * 瀹氭椂浠诲姟绔嬪嵆鎵ц涓娆 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')") - @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE) - @PutMapping("/run") - public AjaxResult run(@RequestBody SysJob job) throws SchedulerException - { - jobService.run(job); - return AjaxResult.success(); - } - - /** - * 鍒犻櫎瀹氭椂浠诲姟 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:remove')") - @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.DELETE) - @DeleteMapping("/{jobIds}") - public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException - { - jobService.deleteJobByIds(jobIds); - return AjaxResult.success(); - } -} +package com.jiajiakang.quartz.controller; + +import java.util.List; +import org.quartz.SchedulerException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.jiajiakang.common.annotation.Log; +import com.jiajiakang.common.core.controller.BaseController; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.core.page.TableDataInfo; +import com.jiajiakang.common.enums.BusinessType; +import com.jiajiakang.common.exception.job.TaskException; +import com.jiajiakang.common.utils.SecurityUtils; +import com.jiajiakang.common.utils.poi.ExcelUtil; +import com.jiajiakang.quartz.domain.SysJob; +import com.jiajiakang.quartz.service.ISysJobService; +import com.jiajiakang.quartz.util.CronUtils; + +/** + * 璋冨害浠诲姟淇℃伅鎿嶄綔澶勭悊 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/monitor/job") +public class SysJobController extends BaseController +{ + @Autowired + private ISysJobService jobService; + + /** + * 鏌ヨ瀹氭椂浠诲姟鍒楄〃 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:list')") + @GetMapping("/list") + public TableDataInfo list(SysJob sysJob) + { + startPage(); + List list = jobService.selectJobList(sysJob); + return getDataTable(list); + } + + /** + * 瀵煎嚭瀹氭椂浠诲姟鍒楄〃 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:export')") + @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(SysJob sysJob) + { + List list = jobService.selectJobList(sysJob); + ExcelUtil util = new ExcelUtil(SysJob.class); + return util.exportExcel(list, "瀹氭椂浠诲姟"); + } + + /** + * 鑾峰彇瀹氭椂浠诲姟璇︾粏淇℃伅 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:query')") + @GetMapping(value = "/{jobId}") + public AjaxResult getInfo(@PathVariable("jobId") Long jobId) + { + return AjaxResult.success(jobService.selectJobById(jobId)); + } + + /** + * 鏂板瀹氭椂浠诲姟 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:add')") + @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SysJob sysJob) throws SchedulerException, TaskException + { + if (!CronUtils.isValid(sysJob.getCronExpression())) + { + return AjaxResult.error("cron琛ㄨ揪寮忎笉姝ｇ‘"); + } + sysJob.setCreateBy(SecurityUtils.getUsername()); + return toAjax(jobService.insertJob(sysJob)); + } + + /** + * 淇敼瀹氭椂浠诲姟 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:edit')") + @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SysJob sysJob) throws SchedulerException, TaskException + { + if (!CronUtils.isValid(sysJob.getCronExpression())) + { + return AjaxResult.error("cron琛ㄨ揪寮忎笉姝ｇ‘"); + } + sysJob.setUpdateBy(SecurityUtils.getUsername()); + return toAjax(jobService.updateJob(sysJob)); + } + + /** + * 瀹氭椂浠诲姟鐘舵佷慨鏀 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')") + @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE) + @PutMapping("/changeStatus") + public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException + { + SysJob newJob = jobService.selectJobById(job.getJobId()); + newJob.setStatus(job.getStatus()); + return toAjax(jobService.changeStatus(newJob)); + } + + /** + * 瀹氭椂浠诲姟绔嬪嵆鎵ц涓娆 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')") + @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE) + @PutMapping("/run") + public AjaxResult run(@RequestBody SysJob job) throws SchedulerException + { + jobService.run(job); + return AjaxResult.success(); + } + + /** + * 鍒犻櫎瀹氭椂浠诲姟 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:remove')") + @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.DELETE) + @DeleteMapping("/{jobIds}") + public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException + { + jobService.deleteJobByIds(jobIds); + return AjaxResult.success(); + } +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/controller/SysJobLogController.java similarity index 83% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java rename to jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/controller/SysJobLogController.java index 10a842b6d6382307477bb0b52508eb967e0e5c23..0a5fbb1fad7ab6bf55cbe9512edc47ee8f305e2a 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java +++ b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/controller/SysJobLogController.java @@ -1,90 +1,90 @@ -package com.ruoyi.quartz.controller; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.quartz.domain.SysJobLog; -import com.ruoyi.quartz.service.ISysJobLogService; - -/** - * 璋冨害鏃ュ織鎿嶄綔澶勭悊 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/monitor/jobLog") -public class SysJobLogController extends BaseController -{ - @Autowired - private ISysJobLogService jobLogService; - - /** - * 鏌ヨ瀹氭椂浠诲姟璋冨害鏃ュ織鍒楄〃 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:list')") - @GetMapping("/list") - public TableDataInfo list(SysJobLog sysJobLog) - { - startPage(); - List list = jobLogService.selectJobLogList(sysJobLog); - return getDataTable(list); - } - - /** - * 瀵煎嚭瀹氭椂浠诲姟璋冨害鏃ュ織鍒楄〃 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:export')") - @Log(title = "浠诲姟璋冨害鏃ュ織", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public AjaxResult export(SysJobLog sysJobLog) - { - List list = jobLogService.selectJobLogList(sysJobLog); - ExcelUtil util = new ExcelUtil(SysJobLog.class); - return util.exportExcel(list, "璋冨害鏃ュ織"); - } - - /** - * 鏍规嵁璋冨害缂栧彿鑾峰彇璇︾粏淇℃伅 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:query')") - @GetMapping(value = "/{configId}") - public AjaxResult getInfo(@PathVariable Long jobLogId) - { - return AjaxResult.success(jobLogService.selectJobLogById(jobLogId)); - } - - - /** - * 鍒犻櫎瀹氭椂浠诲姟璋冨害鏃ュ織 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:remove')") - @Log(title = "瀹氭椂浠诲姟璋冨害鏃ュ織", businessType = BusinessType.DELETE) - @DeleteMapping("/{jobLogIds}") - public AjaxResult remove(@PathVariable Long[] jobLogIds) - { - return toAjax(jobLogService.deleteJobLogByIds(jobLogIds)); - } - - /** - * 娓呯┖瀹氭椂浠诲姟璋冨害鏃ュ織 - */ - @PreAuthorize("@ss.hasPermi('monitor:job:remove')") - @Log(title = "璋冨害鏃ュ織", businessType = BusinessType.CLEAN) - @DeleteMapping("/clean") - public AjaxResult clean() - { - jobLogService.cleanJobLog(); - return AjaxResult.success(); - } -} +package com.jiajiakang.quartz.controller; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.jiajiakang.common.annotation.Log; +import com.jiajiakang.common.core.controller.BaseController; +import com.jiajiakang.common.core.domain.AjaxResult; +import com.jiajiakang.common.core.page.TableDataInfo; +import com.jiajiakang.common.enums.BusinessType; +import com.jiajiakang.common.utils.poi.ExcelUtil; +import com.jiajiakang.quartz.domain.SysJobLog; +import com.jiajiakang.quartz.service.ISysJobLogService; + +/** + * 璋冨害鏃ュ織鎿嶄綔澶勭悊 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/monitor/jobLog") +public class SysJobLogController extends BaseController +{ + @Autowired + private ISysJobLogService jobLogService; + + /** + * 鏌ヨ瀹氭椂浠诲姟璋冨害鏃ュ織鍒楄〃 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:list')") + @GetMapping("/list") + public TableDataInfo list(SysJobLog sysJobLog) + { + startPage(); + List list = jobLogService.selectJobLogList(sysJobLog); + return getDataTable(list); + } + + /** + * 瀵煎嚭瀹氭椂浠诲姟璋冨害鏃ュ織鍒楄〃 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:export')") + @Log(title = "浠诲姟璋冨害鏃ュ織", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(SysJobLog sysJobLog) + { + List list = jobLogService.selectJobLogList(sysJobLog); + ExcelUtil util = new ExcelUtil(SysJobLog.class); + return util.exportExcel(list, "璋冨害鏃ュ織"); + } + + /** + * 鏍规嵁璋冨害缂栧彿鑾峰彇璇︾粏淇℃伅 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:query')") + @GetMapping(value = "/{configId}") + public AjaxResult getInfo(@PathVariable Long jobLogId) + { + return AjaxResult.success(jobLogService.selectJobLogById(jobLogId)); + } + + + /** + * 鍒犻櫎瀹氭椂浠诲姟璋冨害鏃ュ織 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:remove')") + @Log(title = "瀹氭椂浠诲姟璋冨害鏃ュ織", businessType = BusinessType.DELETE) + @DeleteMapping("/{jobLogIds}") + public AjaxResult remove(@PathVariable Long[] jobLogIds) + { + return toAjax(jobLogService.deleteJobLogByIds(jobLogIds)); + } + + /** + * 娓呯┖瀹氭椂浠诲姟璋冨害鏃ュ織 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:remove')") + @Log(title = "璋冨害鏃ュ織", businessType = BusinessType.CLEAN) + @DeleteMapping("/clean") + public AjaxResult clean() + { + jobLogService.cleanJobLog(); + return AjaxResult.success(); + } +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/domain/SysJob.java similarity index 90% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java rename to jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/domain/SysJob.java index e9b80711f9cdfde48f5d420fd2e5276525bd1c56..8eb2651ce9c0663114d21e6873e138a5e37333b1 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java +++ b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/domain/SysJob.java @@ -1,172 +1,172 @@ -package com.ruoyi.quartz.domain; - -import java.io.Serializable; -import java.util.Date; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.quartz.util.CronUtils; - -/** - * 瀹氭椂浠诲姟璋冨害琛 sys_job - * - * @author ruoyi - */ -public class SysJob extends BaseEntity implements Serializable -{ - private static final long serialVersionUID = 1L; - - /** 浠诲姟ID */ - @Excel(name = "浠诲姟搴忓彿", cellType = ColumnType.NUMERIC) - private Long jobId; - - /** 浠诲姟鍚嶇О */ - @Excel(name = "浠诲姟鍚嶇О") - private String jobName; - - /** 浠诲姟缁勫悕 */ - @Excel(name = "浠诲姟缁勫悕") - private String jobGroup; - - /** 璋冪敤鐩爣瀛楃涓 */ - @Excel(name = "璋冪敤鐩爣瀛楃涓") - private String invokeTarget; - - /** cron鎵ц琛ㄨ揪寮 */ - @Excel(name = "鎵ц琛ㄨ揪寮 ") - private String cronExpression; - - /** cron璁″垝绛栫暐 */ - @Excel(name = "璁″垝绛栫暐 ", readConverterExp = "0=榛樿,1=绔嬪嵆瑙﹀彂鎵ц,2=瑙﹀彂涓娆℃墽琛,3=涓嶈Е鍙戠珛鍗虫墽琛") - private String misfirePolicy = ScheduleConstants.MISFIRE_DEFAULT; - - /** 鏄惁骞跺彂鎵ц锛0鍏佽 1绂佹锛 */ - @Excel(name = "骞跺彂鎵ц", readConverterExp = "0=鍏佽,1=绂佹") - private String concurrent; - - /** 浠诲姟鐘舵侊紙0姝ｅ父 1鏆傚仠锛 */ - @Excel(name = "浠诲姟鐘舵", readConverterExp = "0=姝ｅ父,1=鏆傚仠") - private String status; - - public Long getJobId() - { - return jobId; - } - - public void setJobId(Long jobId) - { - this.jobId = jobId; - } - - @NotBlank(message = "浠诲姟鍚嶇О涓嶈兘涓虹┖") - @Size(min = 0, max = 64, message = "浠诲姟鍚嶇О涓嶈兘瓒呰繃64涓瓧绗") - public String getJobName() - { - return jobName; - } - - public void setJobName(String jobName) - { - this.jobName = jobName; - } - - public String getJobGroup() - { - return jobGroup; - } - - public void setJobGroup(String jobGroup) - { - this.jobGroup = jobGroup; - } - - @NotBlank(message = "璋冪敤鐩爣瀛楃涓蹭笉鑳戒负绌") - @Size(min = 0, max = 500, message = "璋冪敤鐩爣瀛楃涓查暱搴︿笉鑳借秴杩500涓瓧绗") - public String getInvokeTarget() - { - return invokeTarget; - } - - public void setInvokeTarget(String invokeTarget) - { - this.invokeTarget = invokeTarget; - } - - @NotBlank(message = "Cron鎵ц琛ㄨ揪寮忎笉鑳戒负绌") - @Size(min = 0, max = 255, message = "Cron鎵ц琛ㄨ揪寮忎笉鑳借秴杩255涓瓧绗") - public String getCronExpression() - { - return cronExpression; - } - - public void setCronExpression(String cronExpression) - { - this.cronExpression = cronExpression; - } - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - public Date getNextValidTime() - { - if (StringUtils.isNotEmpty(cronExpression)) - { - return CronUtils.getNextExecution(cronExpression); - } - return null; - } - - public String getMisfirePolicy() - { - return misfirePolicy; - } - - public void setMisfirePolicy(String misfirePolicy) - { - this.misfirePolicy = misfirePolicy; - } - - public String getConcurrent() - { - return concurrent; - } - - public void setConcurrent(String concurrent) - { - this.concurrent = concurrent; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("jobId", getJobId()) - .append("jobName", getJobName()) - .append("jobGroup", getJobGroup()) - .append("cronExpression", getCronExpression()) - .append("nextValidTime", getNextValidTime()) - .append("misfirePolicy", getMisfirePolicy()) - .append("concurrent", getConcurrent()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} +package com.jiajiakang.quartz.domain; + +import java.io.Serializable; +import java.util.Date; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.jiajiakang.common.annotation.Excel; +import com.jiajiakang.common.annotation.Excel.ColumnType; +import com.jiajiakang.common.constant.ScheduleConstants; +import com.jiajiakang.common.core.domain.BaseEntity; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.quartz.util.CronUtils; + +/** + * 瀹氭椂浠诲姟璋冨害琛 sys_job + * + * @author ruoyi + */ +public class SysJob extends BaseEntity implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 浠诲姟ID */ + @Excel(name = "浠诲姟搴忓彿", cellType = ColumnType.NUMERIC) + private Long jobId; + + /** 浠诲姟鍚嶇О */ + @Excel(name = "浠诲姟鍚嶇О") + private String jobName; + + /** 浠诲姟缁勫悕 */ + @Excel(name = "浠诲姟缁勫悕") + private String jobGroup; + + /** 璋冪敤鐩爣瀛楃涓 */ + @Excel(name = "璋冪敤鐩爣瀛楃涓") + private String invokeTarget; + + /** cron鎵ц琛ㄨ揪寮 */ + @Excel(name = "鎵ц琛ㄨ揪寮 ") + private String cronExpression; + + /** cron璁″垝绛栫暐 */ + @Excel(name = "璁″垝绛栫暐 ", readConverterExp = "0=榛樿,1=绔嬪嵆瑙﹀彂鎵ц,2=瑙﹀彂涓娆℃墽琛,3=涓嶈Е鍙戠珛鍗虫墽琛") + private String misfirePolicy = ScheduleConstants.MISFIRE_DEFAULT; + + /** 鏄惁骞跺彂鎵ц锛0鍏佽 1绂佹锛 */ + @Excel(name = "骞跺彂鎵ц", readConverterExp = "0=鍏佽,1=绂佹") + private String concurrent; + + /** 浠诲姟鐘舵侊紙0姝ｅ父 1鏆傚仠锛 */ + @Excel(name = "浠诲姟鐘舵", readConverterExp = "0=姝ｅ父,1=鏆傚仠") + private String status; + + public Long getJobId() + { + return jobId; + } + + public void setJobId(Long jobId) + { + this.jobId = jobId; + } + + @NotBlank(message = "浠诲姟鍚嶇О涓嶈兘涓虹┖") + @Size(min = 0, max = 64, message = "浠诲姟鍚嶇О涓嶈兘瓒呰繃64涓瓧绗") + public String getJobName() + { + return jobName; + } + + public void setJobName(String jobName) + { + this.jobName = jobName; + } + + public String getJobGroup() + { + return jobGroup; + } + + public void setJobGroup(String jobGroup) + { + this.jobGroup = jobGroup; + } + + @NotBlank(message = "璋冪敤鐩爣瀛楃涓蹭笉鑳戒负绌") + @Size(min = 0, max = 500, message = "璋冪敤鐩爣瀛楃涓查暱搴︿笉鑳借秴杩500涓瓧绗") + public String getInvokeTarget() + { + return invokeTarget; + } + + public void setInvokeTarget(String invokeTarget) + { + this.invokeTarget = invokeTarget; + } + + @NotBlank(message = "Cron鎵ц琛ㄨ揪寮忎笉鑳戒负绌") + @Size(min = 0, max = 255, message = "Cron鎵ц琛ㄨ揪寮忎笉鑳借秴杩255涓瓧绗") + public String getCronExpression() + { + return cronExpression; + } + + public void setCronExpression(String cronExpression) + { + this.cronExpression = cronExpression; + } + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + public Date getNextValidTime() + { + if (StringUtils.isNotEmpty(cronExpression)) + { + return CronUtils.getNextExecution(cronExpression); + } + return null; + } + + public String getMisfirePolicy() + { + return misfirePolicy; + } + + public void setMisfirePolicy(String misfirePolicy) + { + this.misfirePolicy = misfirePolicy; + } + + public String getConcurrent() + { + return concurrent; + } + + public void setConcurrent(String concurrent) + { + this.concurrent = concurrent; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("jobId", getJobId()) + .append("jobName", getJobName()) + .append("jobGroup", getJobGroup()) + .append("cronExpression", getCronExpression()) + .append("nextValidTime", getNextValidTime()) + .append("misfirePolicy", getMisfirePolicy()) + .append("concurrent", getConcurrent()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/domain/SysJobLog.java similarity index 91% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java rename to jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/domain/SysJobLog.java index 63c4cd69d221f25e3d1303cc24753d038566ddd8..7330000ff3ca3d54694939b5bc8731e506996733 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java +++ b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/domain/SysJobLog.java @@ -1,155 +1,155 @@ -package com.ruoyi.quartz.domain; - -import java.util.Date; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 瀹氭椂浠诲姟璋冨害鏃ュ織琛 sys_job_log - * - * @author ruoyi - */ -public class SysJobLog extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** ID */ - @Excel(name = "鏃ュ織搴忓彿") - private Long jobLogId; - - /** 浠诲姟鍚嶇О */ - @Excel(name = "浠诲姟鍚嶇О") - private String jobName; - - /** 浠诲姟缁勫悕 */ - @Excel(name = "浠诲姟缁勫悕") - private String jobGroup; - - /** 璋冪敤鐩爣瀛楃涓 */ - @Excel(name = "璋冪敤鐩爣瀛楃涓") - private String invokeTarget; - - /** 鏃ュ織淇℃伅 */ - @Excel(name = "鏃ュ織淇℃伅") - private String jobMessage; - - /** 鎵ц鐘舵侊紙0姝ｅ父 1澶辫触锛 */ - @Excel(name = "鎵ц鐘舵", readConverterExp = "0=姝ｅ父,1=澶辫触") - private String status; - - /** 寮傚父淇℃伅 */ - @Excel(name = "寮傚父淇℃伅") - private String exceptionInfo; - - /** 寮濮嬫椂闂 */ - private Date startTime; - - /** 鍋滄鏃堕棿 */ - private Date stopTime; - - public Long getJobLogId() - { - return jobLogId; - } - - public void setJobLogId(Long jobLogId) - { - this.jobLogId = jobLogId; - } - - public String getJobName() - { - return jobName; - } - - public void setJobName(String jobName) - { - this.jobName = jobName; - } - - public String getJobGroup() - { - return jobGroup; - } - - public void setJobGroup(String jobGroup) - { - this.jobGroup = jobGroup; - } - - public String getInvokeTarget() - { - return invokeTarget; - } - - public void setInvokeTarget(String invokeTarget) - { - this.invokeTarget = invokeTarget; - } - - public String getJobMessage() - { - return jobMessage; - } - - public void setJobMessage(String jobMessage) - { - this.jobMessage = jobMessage; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - public String getExceptionInfo() - { - return exceptionInfo; - } - - public void setExceptionInfo(String exceptionInfo) - { - this.exceptionInfo = exceptionInfo; - } - - public Date getStartTime() - { - return startTime; - } - - public void setStartTime(Date startTime) - { - this.startTime = startTime; - } - - public Date getStopTime() - { - return stopTime; - } - - public void setStopTime(Date stopTime) - { - this.stopTime = stopTime; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("jobLogId", getJobLogId()) - .append("jobName", getJobName()) - .append("jobGroup", getJobGroup()) - .append("jobMessage", getJobMessage()) - .append("status", getStatus()) - .append("exceptionInfo", getExceptionInfo()) - .append("startTime", getStartTime()) - .append("stopTime", getStopTime()) - .toString(); - } -} +package com.jiajiakang.quartz.domain; + +import java.util.Date; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.jiajiakang.common.annotation.Excel; +import com.jiajiakang.common.core.domain.BaseEntity; + +/** + * 瀹氭椂浠诲姟璋冨害鏃ュ織琛 sys_job_log + * + * @author ruoyi + */ +public class SysJobLog extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** ID */ + @Excel(name = "鏃ュ織搴忓彿") + private Long jobLogId; + + /** 浠诲姟鍚嶇О */ + @Excel(name = "浠诲姟鍚嶇О") + private String jobName; + + /** 浠诲姟缁勫悕 */ + @Excel(name = "浠诲姟缁勫悕") + private String jobGroup; + + /** 璋冪敤鐩爣瀛楃涓 */ + @Excel(name = "璋冪敤鐩爣瀛楃涓") + private String invokeTarget; + + /** 鏃ュ織淇℃伅 */ + @Excel(name = "鏃ュ織淇℃伅") + private String jobMessage; + + /** 鎵ц鐘舵侊紙0姝ｅ父 1澶辫触锛 */ + @Excel(name = "鎵ц鐘舵", readConverterExp = "0=姝ｅ父,1=澶辫触") + private String status; + + /** 寮傚父淇℃伅 */ + @Excel(name = "寮傚父淇℃伅") + private String exceptionInfo; + + /** 寮濮嬫椂闂 */ + private Date startTime; + + /** 鍋滄鏃堕棿 */ + private Date stopTime; + + public Long getJobLogId() + { + return jobLogId; + } + + public void setJobLogId(Long jobLogId) + { + this.jobLogId = jobLogId; + } + + public String getJobName() + { + return jobName; + } + + public void setJobName(String jobName) + { + this.jobName = jobName; + } + + public String getJobGroup() + { + return jobGroup; + } + + public void setJobGroup(String jobGroup) + { + this.jobGroup = jobGroup; + } + + public String getInvokeTarget() + { + return invokeTarget; + } + + public void setInvokeTarget(String invokeTarget) + { + this.invokeTarget = invokeTarget; + } + + public String getJobMessage() + { + return jobMessage; + } + + public void setJobMessage(String jobMessage) + { + this.jobMessage = jobMessage; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getExceptionInfo() + { + return exceptionInfo; + } + + public void setExceptionInfo(String exceptionInfo) + { + this.exceptionInfo = exceptionInfo; + } + + public Date getStartTime() + { + return startTime; + } + + public void setStartTime(Date startTime) + { + this.startTime = startTime; + } + + public Date getStopTime() + { + return stopTime; + } + + public void setStopTime(Date stopTime) + { + this.stopTime = stopTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("jobLogId", getJobLogId()) + .append("jobName", getJobName()) + .append("jobGroup", getJobGroup()) + .append("jobMessage", getJobMessage()) + .append("status", getStatus()) + .append("exceptionInfo", getExceptionInfo()) + .append("startTime", getStartTime()) + .append("stopTime", getStopTime()) + .toString(); + } +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/mapper/SysJobLogMapper.java similarity index 90% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java rename to jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/mapper/SysJobLogMapper.java index ed01ef72edf360eeaa750865bc9b36974e9b87bb..ec9cbdb0fac799078dc74988b9fe700bb139eb53 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java +++ b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/mapper/SysJobLogMapper.java @@ -1,64 +1,64 @@ -package com.ruoyi.quartz.mapper; - -import java.util.List; -import com.ruoyi.quartz.domain.SysJobLog; - -/** - * 璋冨害浠诲姟鏃ュ織淇℃伅 鏁版嵁灞 - * - * @author ruoyi - */ -public interface SysJobLogMapper -{ - /** - * 鑾峰彇quartz璋冨害鍣ㄦ棩蹇楃殑璁″垝浠诲姟 - * - * @param jobLog 璋冨害鏃ュ織淇℃伅 - * @return 璋冨害浠诲姟鏃ュ織闆嗗悎 - */ - public List selectJobLogList(SysJobLog jobLog); - - /** - * 鏌ヨ鎵鏈夎皟搴︿换鍔℃棩蹇 - * - * @return 璋冨害浠诲姟鏃ュ織鍒楄〃 - */ - public List selectJobLogAll(); - - /** - * 閫氳繃璋冨害浠诲姟鏃ュ織ID鏌ヨ璋冨害淇℃伅 - * - * @param jobLogId 璋冨害浠诲姟鏃ュ織ID - * @return 璋冨害浠诲姟鏃ュ織瀵硅薄淇℃伅 - */ - public SysJobLog selectJobLogById(Long jobLogId); - - /** - * 鏂板浠诲姟鏃ュ織 - * - * @param jobLog 璋冨害鏃ュ織淇℃伅 - * @return 缁撴灉 - */ - public int insertJobLog(SysJobLog jobLog); - - /** - * 鎵归噺鍒犻櫎璋冨害鏃ュ織淇℃伅 - * - * @param logIds 闇瑕佸垹闄ょ殑鏁版嵁ID - * @return 缁撴灉 - */ - public int deleteJobLogByIds(Long[] logIds); - - /** - * 鍒犻櫎浠诲姟鏃ュ織 - * - * @param jobId 璋冨害鏃ュ織ID - * @return 缁撴灉 - */ - public int deleteJobLogById(Long jobId); - - /** - * 娓呯┖浠诲姟鏃ュ織 - */ - public void cleanJobLog(); -} +package com.jiajiakang.quartz.mapper; + +import java.util.List; +import com.jiajiakang.quartz.domain.SysJobLog; + +/** + * 璋冨害浠诲姟鏃ュ織淇℃伅 鏁版嵁灞 + * + * @author ruoyi + */ +public interface SysJobLogMapper +{ + /** + * 鑾峰彇quartz璋冨害鍣ㄦ棩蹇楃殑璁″垝浠诲姟 + * + * @param jobLog 璋冨害鏃ュ織淇℃伅 + * @return 璋冨害浠诲姟鏃ュ織闆嗗悎 + */ + public List selectJobLogList(SysJobLog jobLog); + + /** + * 鏌ヨ鎵鏈夎皟搴︿换鍔℃棩蹇 + * + * @return 璋冨害浠诲姟鏃ュ織鍒楄〃 + */ + public List selectJobLogAll(); + + /** + * 閫氳繃璋冨害浠诲姟鏃ュ織ID鏌ヨ璋冨害淇℃伅 + * + * @param jobLogId 璋冨害浠诲姟鏃ュ織ID + * @return 璋冨害浠诲姟鏃ュ織瀵硅薄淇℃伅 + */ + public SysJobLog selectJobLogById(Long jobLogId); + + /** + * 鏂板浠诲姟鏃ュ織 + * + * @param jobLog 璋冨害鏃ュ織淇℃伅 + * @return 缁撴灉 + */ + public int insertJobLog(SysJobLog jobLog); + + /** + * 鎵归噺鍒犻櫎璋冨害鏃ュ織淇℃伅 + * + * @param logIds 闇瑕佸垹闄ょ殑鏁版嵁ID + * @return 缁撴灉 + */ + public int deleteJobLogByIds(Long[] logIds); + + /** + * 鍒犻櫎浠诲姟鏃ュ織 + * + * @param jobId 璋冨害鏃ュ織ID + * @return 缁撴灉 + */ + public int deleteJobLogById(Long jobId); + + /** + * 娓呯┖浠诲姟鏃ュ織 + */ + public void cleanJobLog(); +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/mapper/SysJobMapper.java similarity index 89% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java rename to jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/mapper/SysJobMapper.java index f481ea12e12999489257c7639e541fde74673395..a5993b3888882cb07a7183110cf441b89d23d21b 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java +++ b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/mapper/SysJobMapper.java @@ -1,67 +1,67 @@ -package com.ruoyi.quartz.mapper; - -import java.util.List; -import com.ruoyi.quartz.domain.SysJob; - -/** - * 璋冨害浠诲姟淇℃伅 鏁版嵁灞 - * - * @author ruoyi - */ -public interface SysJobMapper -{ - /** - * 鏌ヨ璋冨害浠诲姟鏃ュ織闆嗗悎 - * - * @param job 璋冨害淇℃伅 - * @return 鎿嶄綔鏃ュ織闆嗗悎 - */ - public List selectJobList(SysJob job); - - /** - * 鏌ヨ鎵鏈夎皟搴︿换鍔 - * - * @return 璋冨害浠诲姟鍒楄〃 - */ - public List selectJobAll(); - - /** - * 閫氳繃璋冨害ID鏌ヨ璋冨害浠诲姟淇℃伅 - * - * @param jobId 璋冨害ID - * @return 瑙掕壊瀵硅薄淇℃伅 - */ - public SysJob selectJobById(Long jobId); - - /** - * 閫氳繃璋冨害ID鍒犻櫎璋冨害浠诲姟淇℃伅 - * - * @param jobId 璋冨害ID - * @return 缁撴灉 - */ - public int deleteJobById(Long jobId); - - /** - * 鎵归噺鍒犻櫎璋冨害浠诲姟淇℃伅 - * - * @param ids 闇瑕佸垹闄ょ殑鏁版嵁ID - * @return 缁撴灉 - */ - public int deleteJobByIds(Long[] ids); - - /** - * 淇敼璋冨害浠诲姟淇℃伅 - * - * @param job 璋冨害浠诲姟淇℃伅 - * @return 缁撴灉 - */ - public int updateJob(SysJob job); - - /** - * 鏂板璋冨害浠诲姟淇℃伅 - * - * @param job 璋冨害浠诲姟淇℃伅 - * @return 缁撴灉 - */ - public int insertJob(SysJob job); -} +package com.jiajiakang.quartz.mapper; + +import java.util.List; +import com.jiajiakang.quartz.domain.SysJob; + +/** + * 璋冨害浠诲姟淇℃伅 鏁版嵁灞 + * + * @author ruoyi + */ +public interface SysJobMapper +{ + /** + * 鏌ヨ璋冨害浠诲姟鏃ュ織闆嗗悎 + * + * @param job 璋冨害淇℃伅 + * @return 鎿嶄綔鏃ュ織闆嗗悎 + */ + public List selectJobList(SysJob job); + + /** + * 鏌ヨ鎵鏈夎皟搴︿换鍔 + * + * @return 璋冨害浠诲姟鍒楄〃 + */ + public List selectJobAll(); + + /** + * 閫氳繃璋冨害ID鏌ヨ璋冨害浠诲姟淇℃伅 + * + * @param jobId 璋冨害ID + * @return 瑙掕壊瀵硅薄淇℃伅 + */ + public SysJob selectJobById(Long jobId); + + /** + * 閫氳繃璋冨害ID鍒犻櫎璋冨害浠诲姟淇℃伅 + * + * @param jobId 璋冨害ID + * @return 缁撴灉 + */ + public int deleteJobById(Long jobId); + + /** + * 鎵归噺鍒犻櫎璋冨害浠诲姟淇℃伅 + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁ID + * @return 缁撴灉 + */ + public int deleteJobByIds(Long[] ids); + + /** + * 淇敼璋冨害浠诲姟淇℃伅 + * + * @param job 璋冨害浠诲姟淇℃伅 + * @return 缁撴灉 + */ + public int updateJob(SysJob job); + + /** + * 鏂板璋冨害浠诲姟淇℃伅 + * + * @param job 璋冨害浠诲姟淇℃伅 + * @return 缁撴灉 + */ + public int insertJob(SysJob job); +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/service/ISysJobLogService.java similarity index 89% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java rename to jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/service/ISysJobLogService.java index 5291a63ac214a6ac492fe9de775b5a630208df97..113bf0da2f2ef679523f82dc1fa47ec0a6539e94 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java +++ b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/service/ISysJobLogService.java @@ -1,56 +1,56 @@ -package com.ruoyi.quartz.service; - -import java.util.List; -import com.ruoyi.quartz.domain.SysJobLog; - -/** - * 瀹氭椂浠诲姟璋冨害鏃ュ織淇℃伅淇℃伅 鏈嶅姟灞 - * - * @author ruoyi - */ -public interface ISysJobLogService -{ - /** - * 鑾峰彇quartz璋冨害鍣ㄦ棩蹇楃殑璁″垝浠诲姟 - * - * @param jobLog 璋冨害鏃ュ織淇℃伅 - * @return 璋冨害浠诲姟鏃ュ織闆嗗悎 - */ - public List selectJobLogList(SysJobLog jobLog); - - /** - * 閫氳繃璋冨害浠诲姟鏃ュ織ID鏌ヨ璋冨害淇℃伅 - * - * @param jobLogId 璋冨害浠诲姟鏃ュ織ID - * @return 璋冨害浠诲姟鏃ュ織瀵硅薄淇℃伅 - */ - public SysJobLog selectJobLogById(Long jobLogId); - - /** - * 鏂板浠诲姟鏃ュ織 - * - * @param jobLog 璋冨害鏃ュ織淇℃伅 - */ - public void addJobLog(SysJobLog jobLog); - - /** - * 鎵归噺鍒犻櫎璋冨害鏃ュ織淇℃伅 - * - * @param logIds 闇瑕佸垹闄ょ殑鏃ュ織ID - * @return 缁撴灉 - */ - public int deleteJobLogByIds(Long[] logIds); - - /** - * 鍒犻櫎浠诲姟鏃ュ織 - * - * @param jobId 璋冨害鏃ュ織ID - * @return 缁撴灉 - */ - public int deleteJobLogById(Long jobId); - - /** - * 娓呯┖浠诲姟鏃ュ織 - */ - public void cleanJobLog(); -} +package com.jiajiakang.quartz.service; + +import java.util.List; +import com.jiajiakang.quartz.domain.SysJobLog; + +/** + * 瀹氭椂浠诲姟璋冨害鏃ュ織淇℃伅淇℃伅 鏈嶅姟灞 + * + * @author ruoyi + */ +public interface ISysJobLogService +{ + /** + * 鑾峰彇quartz璋冨害鍣ㄦ棩蹇楃殑璁″垝浠诲姟 + * + * @param jobLog 璋冨害鏃ュ織淇℃伅 + * @return 璋冨害浠诲姟鏃ュ織闆嗗悎 + */ + public List selectJobLogList(SysJobLog jobLog); + + /** + * 閫氳繃璋冨害浠诲姟鏃ュ織ID鏌ヨ璋冨害淇℃伅 + * + * @param jobLogId 璋冨害浠诲姟鏃ュ織ID + * @return 璋冨害浠诲姟鏃ュ織瀵硅薄淇℃伅 + */ + public SysJobLog selectJobLogById(Long jobLogId); + + /** + * 鏂板浠诲姟鏃ュ織 + * + * @param jobLog 璋冨害鏃ュ織淇℃伅 + */ + public void addJobLog(SysJobLog jobLog); + + /** + * 鎵归噺鍒犻櫎璋冨害鏃ュ織淇℃伅 + * + * @param logIds 闇瑕佸垹闄ょ殑鏃ュ織ID + * @return 缁撴灉 + */ + public int deleteJobLogByIds(Long[] logIds); + + /** + * 鍒犻櫎浠诲姟鏃ュ織 + * + * @param jobId 璋冨害鏃ュ織ID + * @return 缁撴灉 + */ + public int deleteJobLogById(Long jobId); + + /** + * 娓呯┖浠诲姟鏃ュ織 + */ + public void cleanJobLog(); +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/service/ISysJobService.java similarity index 90% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java rename to jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/service/ISysJobService.java index 53f0989562abb0303a0d74bf6f588b9c31c74dfd..b9aa5cb53fe64178b21393f75c1e67b45dfe8cff 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java +++ b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/service/ISysJobService.java @@ -1,102 +1,102 @@ -package com.ruoyi.quartz.service; - -import java.util.List; -import org.quartz.SchedulerException; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.quartz.domain.SysJob; - -/** - * 瀹氭椂浠诲姟璋冨害淇℃伅淇℃伅 鏈嶅姟灞 - * - * @author ruoyi - */ -public interface ISysJobService -{ - /** - * 鑾峰彇quartz璋冨害鍣ㄧ殑璁″垝浠诲姟 - * - * @param job 璋冨害淇℃伅 - * @return 璋冨害浠诲姟闆嗗悎 - */ - public List selectJobList(SysJob job); - - /** - * 閫氳繃璋冨害浠诲姟ID鏌ヨ璋冨害淇℃伅 - * - * @param jobId 璋冨害浠诲姟ID - * @return 璋冨害浠诲姟瀵硅薄淇℃伅 - */ - public SysJob selectJobById(Long jobId); - - /** - * 鏆傚仠浠诲姟 - * - * @param job 璋冨害淇℃伅 - * @return 缁撴灉 - */ - public int pauseJob(SysJob job) throws SchedulerException; - - /** - * 鎭㈠浠诲姟 - * - * @param job 璋冨害淇℃伅 - * @return 缁撴灉 - */ - public int resumeJob(SysJob job) throws SchedulerException; - - /** - * 鍒犻櫎浠诲姟鍚庯紝鎵瀵瑰簲鐨則rigger涔熷皢琚垹闄 - * - * @param job 璋冨害淇℃伅 - * @return 缁撴灉 - */ - public int deleteJob(SysJob job) throws SchedulerException; - - /** - * 鎵归噺鍒犻櫎璋冨害淇℃伅 - * - * @param jobIds 闇瑕佸垹闄ょ殑浠诲姟ID - * @return 缁撴灉 - */ - public void deleteJobByIds(Long[] jobIds) throws SchedulerException; - - /** - * 浠诲姟璋冨害鐘舵佷慨鏀 - * - * @param job 璋冨害淇℃伅 - * @return 缁撴灉 - */ - public int changeStatus(SysJob job) throws SchedulerException; - - /** - * 绔嬪嵆杩愯浠诲姟 - * - * @param job 璋冨害淇℃伅 - * @return 缁撴灉 - */ - public void run(SysJob job) throws SchedulerException; - - /** - * 鏂板浠诲姟 - * - * @param job 璋冨害淇℃伅 - * @return 缁撴灉 - */ - public int insertJob(SysJob job) throws SchedulerException, TaskException; - - /** - * 鏇存柊浠诲姟 - * - * @param job 璋冨害淇℃伅 - * @return 缁撴灉 - */ - public int updateJob(SysJob job) throws SchedulerException, TaskException; - - /** - * 鏍￠獙cron琛ㄨ揪寮忔槸鍚︽湁鏁 - * - * @param cronExpression 琛ㄨ揪寮 - * @return 缁撴灉 - */ - public boolean checkCronExpressionIsValid(String cronExpression); -} +package com.jiajiakang.quartz.service; + +import java.util.List; +import org.quartz.SchedulerException; +import com.jiajiakang.common.exception.job.TaskException; +import com.jiajiakang.quartz.domain.SysJob; + +/** + * 瀹氭椂浠诲姟璋冨害淇℃伅淇℃伅 鏈嶅姟灞 + * + * @author ruoyi + */ +public interface ISysJobService +{ + /** + * 鑾峰彇quartz璋冨害鍣ㄧ殑璁″垝浠诲姟 + * + * @param job 璋冨害淇℃伅 + * @return 璋冨害浠诲姟闆嗗悎 + */ + public List selectJobList(SysJob job); + + /** + * 閫氳繃璋冨害浠诲姟ID鏌ヨ璋冨害淇℃伅 + * + * @param jobId 璋冨害浠诲姟ID + * @return 璋冨害浠诲姟瀵硅薄淇℃伅 + */ + public SysJob selectJobById(Long jobId); + + /** + * 鏆傚仠浠诲姟 + * + * @param job 璋冨害淇℃伅 + * @return 缁撴灉 + */ + public int pauseJob(SysJob job) throws SchedulerException; + + /** + * 鎭㈠浠诲姟 + * + * @param job 璋冨害淇℃伅 + * @return 缁撴灉 + */ + public int resumeJob(SysJob job) throws SchedulerException; + + /** + * 鍒犻櫎浠诲姟鍚庯紝鎵瀵瑰簲鐨則rigger涔熷皢琚垹闄 + * + * @param job 璋冨害淇℃伅 + * @return 缁撴灉 + */ + public int deleteJob(SysJob job) throws SchedulerException; + + /** + * 鎵归噺鍒犻櫎璋冨害淇℃伅 + * + * @param jobIds 闇瑕佸垹闄ょ殑浠诲姟ID + * @return 缁撴灉 + */ + public void deleteJobByIds(Long[] jobIds) throws SchedulerException; + + /** + * 浠诲姟璋冨害鐘舵佷慨鏀 + * + * @param job 璋冨害淇℃伅 + * @return 缁撴灉 + */ + public int changeStatus(SysJob job) throws SchedulerException; + + /** + * 绔嬪嵆杩愯浠诲姟 + * + * @param job 璋冨害淇℃伅 + * @return 缁撴灉 + */ + public void run(SysJob job) throws SchedulerException; + + /** + * 鏂板浠诲姟 + * + * @param job 璋冨害淇℃伅 + * @return 缁撴灉 + */ + public int insertJob(SysJob job) throws SchedulerException, TaskException; + + /** + * 鏇存柊浠诲姟 + * + * @param job 璋冨害淇℃伅 + * @return 缁撴灉 + */ + public int updateJob(SysJob job) throws SchedulerException, TaskException; + + /** + * 鏍￠獙cron琛ㄨ揪寮忔槸鍚︽湁鏁 + * + * @param cronExpression 琛ㄨ揪寮 + * @return 缁撴灉 + */ + public boolean checkCronExpressionIsValid(String cronExpression); +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/service/impl/SysJobLogServiceImpl.java similarity index 86% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java rename to jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/service/impl/SysJobLogServiceImpl.java index f68a5482bf52092b2a56e15b53e933d60a11fdf4..3d2be65c844678e55af0ff987a77eb04efaf9490 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java +++ b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/service/impl/SysJobLogServiceImpl.java @@ -1,87 +1,87 @@ -package com.ruoyi.quartz.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.quartz.domain.SysJobLog; -import com.ruoyi.quartz.mapper.SysJobLogMapper; -import com.ruoyi.quartz.service.ISysJobLogService; - -/** - * 瀹氭椂浠诲姟璋冨害鏃ュ織淇℃伅 鏈嶅姟灞 - * - * @author ruoyi - */ -@Service -public class SysJobLogServiceImpl implements ISysJobLogService -{ - @Autowired - private SysJobLogMapper jobLogMapper; - - /** - * 鑾峰彇quartz璋冨害鍣ㄦ棩蹇楃殑璁″垝浠诲姟 - * - * @param jobLog 璋冨害鏃ュ織淇℃伅 - * @return 璋冨害浠诲姟鏃ュ織闆嗗悎 - */ - @Override - public List selectJobLogList(SysJobLog jobLog) - { - return jobLogMapper.selectJobLogList(jobLog); - } - - /** - * 閫氳繃璋冨害浠诲姟鏃ュ織ID鏌ヨ璋冨害淇℃伅 - * - * @param jobLogId 璋冨害浠诲姟鏃ュ織ID - * @return 璋冨害浠诲姟鏃ュ織瀵硅薄淇℃伅 - */ - @Override - public SysJobLog selectJobLogById(Long jobLogId) - { - return jobLogMapper.selectJobLogById(jobLogId); - } - - /** - * 鏂板浠诲姟鏃ュ織 - * - * @param jobLog 璋冨害鏃ュ織淇℃伅 - */ - @Override - public void addJobLog(SysJobLog jobLog) - { - jobLogMapper.insertJobLog(jobLog); - } - - /** - * 鎵归噺鍒犻櫎璋冨害鏃ュ織淇℃伅 - * - * @param logIds 闇瑕佸垹闄ょ殑鏁版嵁ID - * @return 缁撴灉 - */ - @Override - public int deleteJobLogByIds(Long[] logIds) - { - return jobLogMapper.deleteJobLogByIds(logIds); - } - - /** - * 鍒犻櫎浠诲姟鏃ュ織 - * - * @param jobId 璋冨害鏃ュ織ID - */ - @Override - public int deleteJobLogById(Long jobId) - { - return jobLogMapper.deleteJobLogById(jobId); - } - - /** - * 娓呯┖浠诲姟鏃ュ織 - */ - @Override - public void cleanJobLog() - { - jobLogMapper.cleanJobLog(); - } -} +package com.jiajiakang.quartz.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.jiajiakang.quartz.domain.SysJobLog; +import com.jiajiakang.quartz.mapper.SysJobLogMapper; +import com.jiajiakang.quartz.service.ISysJobLogService; + +/** + * 瀹氭椂浠诲姟璋冨害鏃ュ織淇℃伅 鏈嶅姟灞 + * + * @author ruoyi + */ +@Service +public class SysJobLogServiceImpl implements ISysJobLogService +{ + @Autowired + private SysJobLogMapper jobLogMapper; + + /** + * 鑾峰彇quartz璋冨害鍣ㄦ棩蹇楃殑璁″垝浠诲姟 + * + * @param jobLog 璋冨害鏃ュ織淇℃伅 + * @return 璋冨害浠诲姟鏃ュ織闆嗗悎 + */ + @Override + public List selectJobLogList(SysJobLog jobLog) + { + return jobLogMapper.selectJobLogList(jobLog); + } + + /** + * 閫氳繃璋冨害浠诲姟鏃ュ織ID鏌ヨ璋冨害淇℃伅 + * + * @param jobLogId 璋冨害浠诲姟鏃ュ織ID + * @return 璋冨害浠诲姟鏃ュ織瀵硅薄淇℃伅 + */ + @Override + public SysJobLog selectJobLogById(Long jobLogId) + { + return jobLogMapper.selectJobLogById(jobLogId); + } + + /** + * 鏂板浠诲姟鏃ュ織 + * + * @param jobLog 璋冨害鏃ュ織淇℃伅 + */ + @Override + public void addJobLog(SysJobLog jobLog) + { + jobLogMapper.insertJobLog(jobLog); + } + + /** + * 鎵归噺鍒犻櫎璋冨害鏃ュ織淇℃伅 + * + * @param logIds 闇瑕佸垹闄ょ殑鏁版嵁ID + * @return 缁撴灉 + */ + @Override + public int deleteJobLogByIds(Long[] logIds) + { + return jobLogMapper.deleteJobLogByIds(logIds); + } + + /** + * 鍒犻櫎浠诲姟鏃ュ織 + * + * @param jobId 璋冨害鏃ュ織ID + */ + @Override + public int deleteJobLogById(Long jobId) + { + return jobLogMapper.deleteJobLogById(jobId); + } + + /** + * 娓呯┖浠诲姟鏃ュ織 + */ + @Override + public void cleanJobLog() + { + jobLogMapper.cleanJobLog(); + } +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/service/impl/SysJobServiceImpl.java similarity index 91% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java rename to jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/service/impl/SysJobServiceImpl.java index d7bc6c984ac8657fb2522a417a24a3287f2d9e44..8ab2dc7d1e8bf68e30e254e6a0453fe470f6b192 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java +++ b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/service/impl/SysJobServiceImpl.java @@ -1,254 +1,254 @@ -package com.ruoyi.quartz.service.impl; - -import java.util.List; -import javax.annotation.PostConstruct; -import org.quartz.JobDataMap; -import org.quartz.JobKey; -import org.quartz.Scheduler; -import org.quartz.SchedulerException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.quartz.domain.SysJob; -import com.ruoyi.quartz.mapper.SysJobMapper; -import com.ruoyi.quartz.service.ISysJobService; -import com.ruoyi.quartz.util.CronUtils; -import com.ruoyi.quartz.util.ScheduleUtils; - -/** - * 瀹氭椂浠诲姟璋冨害淇℃伅 鏈嶅姟灞 - * - * @author ruoyi - */ -@Service -public class SysJobServiceImpl implements ISysJobService -{ - @Autowired - private Scheduler scheduler; - - @Autowired - private SysJobMapper jobMapper; - - /** - * 椤圭洰鍚姩鏃讹紝鍒濆鍖栧畾鏃跺櫒 涓昏鏄槻姝㈡墜鍔ㄤ慨鏀规暟鎹簱瀵艰嚧鏈悓姝ュ埌瀹氭椂浠诲姟澶勭悊锛堟敞锛氫笉鑳芥墜鍔ㄤ慨鏀规暟鎹簱ID鍜屼换鍔＄粍鍚嶏紝鍚﹀垯浼氬鑷磋剰鏁版嵁锛 - */ - @PostConstruct - public void init() throws SchedulerException, TaskException - { - scheduler.clear(); - List jobList = jobMapper.selectJobAll(); - for (SysJob job : jobList) - { - ScheduleUtils.createScheduleJob(scheduler, job); - } - } - - /** - * 鑾峰彇quartz璋冨害鍣ㄧ殑璁″垝浠诲姟鍒楄〃 - * - * @param job 璋冨害淇℃伅 - * @return - */ - @Override - public List selectJobList(SysJob job) - { - return jobMapper.selectJobList(job); - } - - /** - * 閫氳繃璋冨害浠诲姟ID鏌ヨ璋冨害淇℃伅 - * - * @param jobId 璋冨害浠诲姟ID - * @return 璋冨害浠诲姟瀵硅薄淇℃伅 - */ - @Override - public SysJob selectJobById(Long jobId) - { - return jobMapper.selectJobById(jobId); - } - - /** - * 鏆傚仠浠诲姟 - * - * @param job 璋冨害淇℃伅 - */ - @Override - @Transactional - public int pauseJob(SysJob job) throws SchedulerException - { - Long jobId = job.getJobId(); - String jobGroup = job.getJobGroup(); - job.setStatus(ScheduleConstants.Status.PAUSE.getValue()); - int rows = jobMapper.updateJob(job); - if (rows > 0) - { - scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup)); - } - return rows; - } - - /** - * 鎭㈠浠诲姟 - * - * @param job 璋冨害淇℃伅 - */ - @Override - @Transactional - public int resumeJob(SysJob job) throws SchedulerException - { - Long jobId = job.getJobId(); - String jobGroup = job.getJobGroup(); - job.setStatus(ScheduleConstants.Status.NORMAL.getValue()); - int rows = jobMapper.updateJob(job); - if (rows > 0) - { - scheduler.resumeJob(ScheduleUtils.getJobKey(jobId, jobGroup)); - } - return rows; - } - - /** - * 鍒犻櫎浠诲姟鍚庯紝鎵瀵瑰簲鐨則rigger涔熷皢琚垹闄 - * - * @param job 璋冨害淇℃伅 - */ - @Override - @Transactional - public int deleteJob(SysJob job) throws SchedulerException - { - Long jobId = job.getJobId(); - String jobGroup = job.getJobGroup(); - int rows = jobMapper.deleteJobById(jobId); - if (rows > 0) - { - scheduler.deleteJob(ScheduleUtils.getJobKey(jobId, jobGroup)); - } - return rows; - } - - /** - * 鎵归噺鍒犻櫎璋冨害淇℃伅 - * - * @param jobIds 闇瑕佸垹闄ょ殑浠诲姟ID - * @return 缁撴灉 - */ - @Override - @Transactional - public void deleteJobByIds(Long[] jobIds) throws SchedulerException - { - for (Long jobId : jobIds) - { - SysJob job = jobMapper.selectJobById(jobId); - deleteJob(job); - } - } - - /** - * 浠诲姟璋冨害鐘舵佷慨鏀 - * - * @param job 璋冨害淇℃伅 - */ - @Override - @Transactional - public int changeStatus(SysJob job) throws SchedulerException - { - int rows = 0; - String status = job.getStatus(); - if (ScheduleConstants.Status.NORMAL.getValue().equals(status)) - { - rows = resumeJob(job); - } - else if (ScheduleConstants.Status.PAUSE.getValue().equals(status)) - { - rows = pauseJob(job); - } - return rows; - } - - /** - * 绔嬪嵆杩愯浠诲姟 - * - * @param job 璋冨害淇℃伅 - */ - @Override - @Transactional - public void run(SysJob job) throws SchedulerException - { - Long jobId = job.getJobId(); - String jobGroup = job.getJobGroup(); - SysJob properties = selectJobById(job.getJobId()); - // 鍙傛暟 - JobDataMap dataMap = new JobDataMap(); - dataMap.put(ScheduleConstants.TASK_PROPERTIES, properties); - scheduler.triggerJob(ScheduleUtils.getJobKey(jobId, jobGroup), dataMap); - } - - /** - * 鏂板浠诲姟 - * - * @param job 璋冨害淇℃伅 璋冨害淇℃伅 - */ - @Override - @Transactional - public int insertJob(SysJob job) throws SchedulerException, TaskException - { - job.setStatus(ScheduleConstants.Status.PAUSE.getValue()); - int rows = jobMapper.insertJob(job); - if (rows > 0) - { - ScheduleUtils.createScheduleJob(scheduler, job); - } - return rows; - } - - /** - * 鏇存柊浠诲姟鐨勬椂闂磋〃杈惧紡 - * - * @param job 璋冨害淇℃伅 - */ - @Override - @Transactional - public int updateJob(SysJob job) throws SchedulerException, TaskException - { - SysJob properties = selectJobById(job.getJobId()); - int rows = jobMapper.updateJob(job); - if (rows > 0) - { - updateSchedulerJob(job, properties.getJobGroup()); - } - return rows; - } - - /** - * 鏇存柊浠诲姟 - * - * @param job 浠诲姟瀵硅薄 - * @param jobGroup 浠诲姟缁勫悕 - */ - public void updateSchedulerJob(SysJob job, String jobGroup) throws SchedulerException, TaskException - { - Long jobId = job.getJobId(); - // 鍒ゆ柇鏄惁瀛樺湪 - JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup); - if (scheduler.checkExists(jobKey)) - { - // 闃叉鍒涘缓鏃跺瓨鍦ㄦ暟鎹棶棰 鍏堢Щ闄わ紝鐒跺悗鍦ㄦ墽琛屽垱寤烘搷浣 - scheduler.deleteJob(jobKey); - } - ScheduleUtils.createScheduleJob(scheduler, job); - } - - /** - * 鏍￠獙cron琛ㄨ揪寮忔槸鍚︽湁鏁 - * - * @param cronExpression 琛ㄨ揪寮 - * @return 缁撴灉 - */ - @Override - public boolean checkCronExpressionIsValid(String cronExpression) - { - return CronUtils.isValid(cronExpression); - } -} +package com.jiajiakang.quartz.service.impl; + +import java.util.List; +import javax.annotation.PostConstruct; +import org.quartz.JobDataMap; +import org.quartz.JobKey; +import org.quartz.Scheduler; +import org.quartz.SchedulerException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.jiajiakang.common.constant.ScheduleConstants; +import com.jiajiakang.common.exception.job.TaskException; +import com.jiajiakang.quartz.domain.SysJob; +import com.jiajiakang.quartz.mapper.SysJobMapper; +import com.jiajiakang.quartz.service.ISysJobService; +import com.jiajiakang.quartz.util.CronUtils; +import com.jiajiakang.quartz.util.ScheduleUtils; + +/** + * 瀹氭椂浠诲姟璋冨害淇℃伅 鏈嶅姟灞 + * + * @author ruoyi + */ +@Service +public class SysJobServiceImpl implements ISysJobService +{ + @Autowired + private Scheduler scheduler; + + @Autowired + private SysJobMapper jobMapper; + + /** + * 椤圭洰鍚姩鏃讹紝鍒濆鍖栧畾鏃跺櫒 涓昏鏄槻姝㈡墜鍔ㄤ慨鏀规暟鎹簱瀵艰嚧鏈悓姝ュ埌瀹氭椂浠诲姟澶勭悊锛堟敞锛氫笉鑳芥墜鍔ㄤ慨鏀规暟鎹簱ID鍜屼换鍔＄粍鍚嶏紝鍚﹀垯浼氬鑷磋剰鏁版嵁锛 + */ + @PostConstruct + public void init() throws SchedulerException, TaskException + { + scheduler.clear(); + List jobList = jobMapper.selectJobAll(); + for (SysJob job : jobList) + { + ScheduleUtils.createScheduleJob(scheduler, job); + } + } + + /** + * 鑾峰彇quartz璋冨害鍣ㄧ殑璁″垝浠诲姟鍒楄〃 + * + * @param job 璋冨害淇℃伅 + * @return + */ + @Override + public List selectJobList(SysJob job) + { + return jobMapper.selectJobList(job); + } + + /** + * 閫氳繃璋冨害浠诲姟ID鏌ヨ璋冨害淇℃伅 + * + * @param jobId 璋冨害浠诲姟ID + * @return 璋冨害浠诲姟瀵硅薄淇℃伅 + */ + @Override + public SysJob selectJobById(Long jobId) + { + return jobMapper.selectJobById(jobId); + } + + /** + * 鏆傚仠浠诲姟 + * + * @param job 璋冨害淇℃伅 + */ + @Override + @Transactional + public int pauseJob(SysJob job) throws SchedulerException + { + Long jobId = job.getJobId(); + String jobGroup = job.getJobGroup(); + job.setStatus(ScheduleConstants.Status.PAUSE.getValue()); + int rows = jobMapper.updateJob(job); + if (rows > 0) + { + scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup)); + } + return rows; + } + + /** + * 鎭㈠浠诲姟 + * + * @param job 璋冨害淇℃伅 + */ + @Override + @Transactional + public int resumeJob(SysJob job) throws SchedulerException + { + Long jobId = job.getJobId(); + String jobGroup = job.getJobGroup(); + job.setStatus(ScheduleConstants.Status.NORMAL.getValue()); + int rows = jobMapper.updateJob(job); + if (rows > 0) + { + scheduler.resumeJob(ScheduleUtils.getJobKey(jobId, jobGroup)); + } + return rows; + } + + /** + * 鍒犻櫎浠诲姟鍚庯紝鎵瀵瑰簲鐨則rigger涔熷皢琚垹闄 + * + * @param job 璋冨害淇℃伅 + */ + @Override + @Transactional + public int deleteJob(SysJob job) throws SchedulerException + { + Long jobId = job.getJobId(); + String jobGroup = job.getJobGroup(); + int rows = jobMapper.deleteJobById(jobId); + if (rows > 0) + { + scheduler.deleteJob(ScheduleUtils.getJobKey(jobId, jobGroup)); + } + return rows; + } + + /** + * 鎵归噺鍒犻櫎璋冨害淇℃伅 + * + * @param jobIds 闇瑕佸垹闄ょ殑浠诲姟ID + * @return 缁撴灉 + */ + @Override + @Transactional + public void deleteJobByIds(Long[] jobIds) throws SchedulerException + { + for (Long jobId : jobIds) + { + SysJob job = jobMapper.selectJobById(jobId); + deleteJob(job); + } + } + + /** + * 浠诲姟璋冨害鐘舵佷慨鏀 + * + * @param job 璋冨害淇℃伅 + */ + @Override + @Transactional + public int changeStatus(SysJob job) throws SchedulerException + { + int rows = 0; + String status = job.getStatus(); + if (ScheduleConstants.Status.NORMAL.getValue().equals(status)) + { + rows = resumeJob(job); + } + else if (ScheduleConstants.Status.PAUSE.getValue().equals(status)) + { + rows = pauseJob(job); + } + return rows; + } + + /** + * 绔嬪嵆杩愯浠诲姟 + * + * @param job 璋冨害淇℃伅 + */ + @Override + @Transactional + public void run(SysJob job) throws SchedulerException + { + Long jobId = job.getJobId(); + String jobGroup = job.getJobGroup(); + SysJob properties = selectJobById(job.getJobId()); + // 鍙傛暟 + JobDataMap dataMap = new JobDataMap(); + dataMap.put(ScheduleConstants.TASK_PROPERTIES, properties); + scheduler.triggerJob(ScheduleUtils.getJobKey(jobId, jobGroup), dataMap); + } + + /** + * 鏂板浠诲姟 + * + * @param job 璋冨害淇℃伅 璋冨害淇℃伅 + */ + @Override + @Transactional + public int insertJob(SysJob job) throws SchedulerException, TaskException + { + job.setStatus(ScheduleConstants.Status.PAUSE.getValue()); + int rows = jobMapper.insertJob(job); + if (rows > 0) + { + ScheduleUtils.createScheduleJob(scheduler, job); + } + return rows; + } + + /** + * 鏇存柊浠诲姟鐨勬椂闂磋〃杈惧紡 + * + * @param job 璋冨害淇℃伅 + */ + @Override + @Transactional + public int updateJob(SysJob job) throws SchedulerException, TaskException + { + SysJob properties = selectJobById(job.getJobId()); + int rows = jobMapper.updateJob(job); + if (rows > 0) + { + updateSchedulerJob(job, properties.getJobGroup()); + } + return rows; + } + + /** + * 鏇存柊浠诲姟 + * + * @param job 浠诲姟瀵硅薄 + * @param jobGroup 浠诲姟缁勫悕 + */ + public void updateSchedulerJob(SysJob job, String jobGroup) throws SchedulerException, TaskException + { + Long jobId = job.getJobId(); + // 鍒ゆ柇鏄惁瀛樺湪 + JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup); + if (scheduler.checkExists(jobKey)) + { + // 闃叉鍒涘缓鏃跺瓨鍦ㄦ暟鎹棶棰 鍏堢Щ闄わ紝鐒跺悗鍦ㄦ墽琛屽垱寤烘搷浣 + scheduler.deleteJob(jobKey); + } + ScheduleUtils.createScheduleJob(scheduler, job); + } + + /** + * 鏍￠獙cron琛ㄨ揪寮忔槸鍚︽湁鏁 + * + * @param cronExpression 琛ㄨ揪寮 + * @return 缁撴灉 + */ + @Override + public boolean checkCronExpressionIsValid(String cronExpression) + { + return CronUtils.isValid(cronExpression); + } +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/task/RyTask.java similarity index 85% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java rename to jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/task/RyTask.java index 25d1ddd029ca91c53e64c5d0b4dfa8ba4f1bdcbc..aacac39eee8017421088b2cdfa1b33801a30a70d 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java +++ b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/task/RyTask.java @@ -1,28 +1,28 @@ -package com.ruoyi.quartz.task; - -import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.StringUtils; - -/** - * 瀹氭椂浠诲姟璋冨害娴嬭瘯 - * - * @author ruoyi - */ -@Component("ryTask") -public class RyTask -{ - public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) - { - System.out.println(StringUtils.format("鎵ц澶氬弬鏂规硶锛 瀛楃涓茬被鍨媨}锛屽竷灏旂被鍨媨}锛岄暱鏁村瀷{}锛屾诞鐐瑰瀷{}锛屾暣褰}", s, b, l, d, i)); - } - - public void ryParams(String params) - { - System.out.println("鎵ц鏈夊弬鏂规硶锛" + params); - } - - public void ryNoParams() - { - System.out.println("鎵ц鏃犲弬鏂规硶"); - } -} +package com.jiajiakang.quartz.task; + +import org.springframework.stereotype.Component; +import com.jiajiakang.common.utils.StringUtils; + +/** + * 瀹氭椂浠诲姟璋冨害娴嬭瘯 + * + * @author ruoyi + */ +@Component("ryTask") +public class RyTask +{ + public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) + { + System.out.println(StringUtils.format("鎵ц澶氬弬鏂规硶锛 瀛楃涓茬被鍨媨}锛屽竷灏旂被鍨媨}锛岄暱鏁村瀷{}锛屾诞鐐瑰瀷{}锛屾暣褰}", s, b, l, d, i)); + } + + public void ryParams(String params) + { + System.out.println("鎵ц鏈夊弬鏂规硶锛" + params); + } + + public void ryNoParams() + { + System.out.println("鎵ц鏃犲弬鏂规硶"); + } +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/util/AbstractQuartzJob.java similarity index 84% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java rename to jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/util/AbstractQuartzJob.java index fd652d677b60046b74d4da3445cf477532daae5f..8b71a617dd80a69628b14ecf4206c8649c40a26d 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java +++ b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/util/AbstractQuartzJob.java @@ -1,107 +1,107 @@ -package com.ruoyi.quartz.util; - -import java.util.Date; -import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.utils.ExceptionUtil; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.bean.BeanUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.quartz.domain.SysJob; -import com.ruoyi.quartz.domain.SysJobLog; -import com.ruoyi.quartz.service.ISysJobLogService; - -/** - * 鎶借薄quartz璋冪敤 - * - * @author ruoyi - */ -public abstract class AbstractQuartzJob implements Job -{ - private static final Logger log = LoggerFactory.getLogger(AbstractQuartzJob.class); - - /** - * 绾跨▼鏈湴鍙橀噺 - */ - private static ThreadLocal threadLocal = new ThreadLocal<>(); - - @Override - public void execute(JobExecutionContext context) throws JobExecutionException - { - SysJob sysJob = new SysJob(); - BeanUtils.copyBeanProp(sysJob, context.getMergedJobDataMap().get(ScheduleConstants.TASK_PROPERTIES)); - try - { - before(context, sysJob); - if (sysJob != null) - { - doExecute(context, sysJob); - } - after(context, sysJob, null); - } - catch (Exception e) - { - log.error("浠诲姟鎵ц寮傚父 - 锛", e); - after(context, sysJob, e); - } - } - - /** - * 鎵ц鍓 - * - * @param context 宸ヤ綔鎵ц涓婁笅鏂囧璞 - * @param sysJob 绯荤粺璁″垝浠诲姟 - */ - protected void before(JobExecutionContext context, SysJob sysJob) - { - threadLocal.set(new Date()); - } - - /** - * 鎵ц鍚 - * - * @param context 宸ヤ綔鎵ц涓婁笅鏂囧璞 - * @param sysJob 绯荤粺璁″垝浠诲姟 - */ - protected void after(JobExecutionContext context, SysJob sysJob, Exception e) - { - Date startTime = threadLocal.get(); - threadLocal.remove(); - - final SysJobLog sysJobLog = new SysJobLog(); - sysJobLog.setJobName(sysJob.getJobName()); - sysJobLog.setJobGroup(sysJob.getJobGroup()); - sysJobLog.setInvokeTarget(sysJob.getInvokeTarget()); - sysJobLog.setStartTime(startTime); - sysJobLog.setStopTime(new Date()); - long runMs = sysJobLog.getStopTime().getTime() - sysJobLog.getStartTime().getTime(); - sysJobLog.setJobMessage(sysJobLog.getJobName() + " 鎬诲叡鑰楁椂锛" + runMs + "姣"); - if (e != null) - { - sysJobLog.setStatus(Constants.FAIL); - String errorMsg = StringUtils.substring(ExceptionUtil.getExceptionMessage(e), 0, 2000); - sysJobLog.setExceptionInfo(errorMsg); - } - else - { - sysJobLog.setStatus(Constants.SUCCESS); - } - - // 鍐欏叆鏁版嵁搴撳綋涓 - SpringUtils.getBean(ISysJobLogService.class).addJobLog(sysJobLog); - } - - /** - * 鎵ц鏂规硶锛岀敱瀛愮被閲嶈浇 - * - * @param context 宸ヤ綔鎵ц涓婁笅鏂囧璞 - * @param sysJob 绯荤粺璁″垝浠诲姟 - * @throws Exception 鎵ц杩囩▼涓殑寮傚父 - */ - protected abstract void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception; -} +package com.jiajiakang.quartz.util; + +import java.util.Date; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import com.jiajiakang.common.constant.Constants; +import com.jiajiakang.common.constant.ScheduleConstants; +import com.jiajiakang.common.utils.ExceptionUtil; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.common.utils.bean.BeanUtils; +import com.jiajiakang.common.utils.spring.SpringUtils; +import com.jiajiakang.quartz.domain.SysJob; +import com.jiajiakang.quartz.domain.SysJobLog; +import com.jiajiakang.quartz.service.ISysJobLogService; + +/** + * 鎶借薄quartz璋冪敤 + * + * @author ruoyi + */ +public abstract class AbstractQuartzJob implements Job +{ + private static final Logger log = LoggerFactory.getLogger(AbstractQuartzJob.class); + + /** + * 绾跨▼鏈湴鍙橀噺 + */ + private static ThreadLocal threadLocal = new ThreadLocal<>(); + + @Override + public void execute(JobExecutionContext context) throws JobExecutionException + { + SysJob sysJob = new SysJob(); + BeanUtils.copyBeanProp(sysJob, context.getMergedJobDataMap().get(ScheduleConstants.TASK_PROPERTIES)); + try + { + before(context, sysJob); + if (sysJob != null) + { + doExecute(context, sysJob); + } + after(context, sysJob, null); + } + catch (Exception e) + { + log.error("浠诲姟鎵ц寮傚父 - 锛", e); + after(context, sysJob, e); + } + } + + /** + * 鎵ц鍓 + * + * @param context 宸ヤ綔鎵ц涓婁笅鏂囧璞 + * @param sysJob 绯荤粺璁″垝浠诲姟 + */ + protected void before(JobExecutionContext context, SysJob sysJob) + { + threadLocal.set(new Date()); + } + + /** + * 鎵ц鍚 + * + * @param context 宸ヤ綔鎵ц涓婁笅鏂囧璞 + * @param sysJob 绯荤粺璁″垝浠诲姟 + */ + protected void after(JobExecutionContext context, SysJob sysJob, Exception e) + { + Date startTime = threadLocal.get(); + threadLocal.remove(); + + final SysJobLog sysJobLog = new SysJobLog(); + sysJobLog.setJobName(sysJob.getJobName()); + sysJobLog.setJobGroup(sysJob.getJobGroup()); + sysJobLog.setInvokeTarget(sysJob.getInvokeTarget()); + sysJobLog.setStartTime(startTime); + sysJobLog.setStopTime(new Date()); + long runMs = sysJobLog.getStopTime().getTime() - sysJobLog.getStartTime().getTime(); + sysJobLog.setJobMessage(sysJobLog.getJobName() + " 鎬诲叡鑰楁椂锛" + runMs + "姣"); + if (e != null) + { + sysJobLog.setStatus(Constants.FAIL); + String errorMsg = StringUtils.substring(ExceptionUtil.getExceptionMessage(e), 0, 2000); + sysJobLog.setExceptionInfo(errorMsg); + } + else + { + sysJobLog.setStatus(Constants.SUCCESS); + } + + // 鍐欏叆鏁版嵁搴撳綋涓 + SpringUtils.getBean(ISysJobLogService.class).addJobLog(sysJobLog); + } + + /** + * 鎵ц鏂规硶锛岀敱瀛愮被閲嶈浇 + * + * @param context 宸ヤ綔鎵ц涓婁笅鏂囧璞 + * @param sysJob 绯荤粺璁″垝浠诲姟 + * @throws Exception 鎵ц杩囩▼涓殑寮傚父 + */ + protected abstract void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception; +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/util/CronUtils.java similarity index 94% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java rename to jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/util/CronUtils.java index 6826787a67ca822749de60b49440ba0c66f7ef62..63d474a16204cfcefa31c5f5929ea1a1d2cc207b 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java +++ b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/util/CronUtils.java @@ -1,63 +1,63 @@ -package com.ruoyi.quartz.util; - -import java.text.ParseException; -import java.util.Date; -import org.quartz.CronExpression; - -/** - * cron琛ㄨ揪寮忓伐鍏风被 - * - * @author ruoyi - * - */ -public class CronUtils -{ - /** - * 杩斿洖涓涓竷灏斿间唬琛ㄤ竴涓粰瀹氱殑Cron琛ㄨ揪寮忕殑鏈夋晥鎬 - * - * @param cronExpression Cron琛ㄨ揪寮 - * @return boolean 琛ㄨ揪寮忔槸鍚︽湁鏁 - */ - public static boolean isValid(String cronExpression) - { - return CronExpression.isValidExpression(cronExpression); - } - - /** - * 杩斿洖涓涓瓧绗︿覆鍊,琛ㄧず璇ユ秷鎭棤鏁圕ron琛ㄨ揪寮忕粰鍑烘湁鏁堟 - * - * @param cronExpression Cron琛ㄨ揪寮 - * @return String 鏃犳晥鏃惰繑鍥炶〃杈惧紡閿欒鎻忚堪,濡傛灉鏈夋晥杩斿洖null - */ - public static String getInvalidMessage(String cronExpression) - { - try - { - new CronExpression(cronExpression); - return null; - } - catch (ParseException pe) - { - return pe.getMessage(); - } - } - - /** - * 杩斿洖涓嬩竴涓墽琛屾椂闂存牴鎹粰瀹氱殑Cron琛ㄨ揪寮 - * - * @param cronExpression Cron琛ㄨ揪寮 - * @return Date 涓嬫Cron琛ㄨ揪寮忔墽琛屾椂闂 - */ - public static Date getNextExecution(String cronExpression) - { - try - { - CronExpression cron = new CronExpression(cronExpression); - return cron.getNextValidTimeAfter(new Date(System.currentTimeMillis())); - } - catch (ParseException e) - { - throw new IllegalArgumentException(e.getMessage()); - } - } -} +package com.jiajiakang.quartz.util; + +import java.text.ParseException; +import java.util.Date; +import org.quartz.CronExpression; + +/** + * cron琛ㄨ揪寮忓伐鍏风被 + * + * @author ruoyi + * + */ +public class CronUtils +{ + /** + * 杩斿洖涓涓竷灏斿间唬琛ㄤ竴涓粰瀹氱殑Cron琛ㄨ揪寮忕殑鏈夋晥鎬 + * + * @param cronExpression Cron琛ㄨ揪寮 + * @return boolean 琛ㄨ揪寮忔槸鍚︽湁鏁 + */ + public static boolean isValid(String cronExpression) + { + return CronExpression.isValidExpression(cronExpression); + } + + /** + * 杩斿洖涓涓瓧绗︿覆鍊,琛ㄧず璇ユ秷鎭棤鏁圕ron琛ㄨ揪寮忕粰鍑烘湁鏁堟 + * + * @param cronExpression Cron琛ㄨ揪寮 + * @return String 鏃犳晥鏃惰繑鍥炶〃杈惧紡閿欒鎻忚堪,濡傛灉鏈夋晥杩斿洖null + */ + public static String getInvalidMessage(String cronExpression) + { + try + { + new CronExpression(cronExpression); + return null; + } + catch (ParseException pe) + { + return pe.getMessage(); + } + } + + /** + * 杩斿洖涓嬩竴涓墽琛屾椂闂存牴鎹粰瀹氱殑Cron琛ㄨ揪寮 + * + * @param cronExpression Cron琛ㄨ揪寮 + * @return Date 涓嬫Cron琛ㄨ揪寮忔墽琛屾椂闂 + */ + public static Date getNextExecution(String cronExpression) + { + try + { + CronExpression cron = new CronExpression(cronExpression); + return cron.getNextValidTimeAfter(new Date(System.currentTimeMillis())); + } + catch (ParseException e) + { + throw new IllegalArgumentException(e.getMessage()); + } + } +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/util/JobInvokeUtil.java similarity index 94% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java rename to jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/util/JobInvokeUtil.java index 5519c672f71fd705f63a0478b47f35b42abcf9a8..5b3a81be0c179e0ce13521ba9f403496dff94efc 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java +++ b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/util/JobInvokeUtil.java @@ -1,182 +1,182 @@ -package com.ruoyi.quartz.util; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.LinkedList; -import java.util.List; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.quartz.domain.SysJob; - -/** - * 浠诲姟鎵ц宸ュ叿 - * - * @author ruoyi - */ -public class JobInvokeUtil -{ - /** - * 鎵ц鏂规硶 - * - * @param sysJob 绯荤粺浠诲姟 - */ - public static void invokeMethod(SysJob sysJob) throws Exception - { - String invokeTarget = sysJob.getInvokeTarget(); - String beanName = getBeanName(invokeTarget); - String methodName = getMethodName(invokeTarget); - List methodParams = getMethodParams(invokeTarget); - - if (!isValidClassName(beanName)) - { - Object bean = SpringUtils.getBean(beanName); - invokeMethod(bean, methodName, methodParams); - } - else - { - Object bean = Class.forName(beanName).newInstance(); - invokeMethod(bean, methodName, methodParams); - } - } - - /** - * 璋冪敤浠诲姟鏂规硶 - * - * @param bean 鐩爣瀵硅薄 - * @param methodName 鏂规硶鍚嶇О - * @param methodParams 鏂规硶鍙傛暟 - */ - private static void invokeMethod(Object bean, String methodName, List methodParams) - throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, - InvocationTargetException - { - if (StringUtils.isNotNull(methodParams) && methodParams.size() > 0) - { - Method method = bean.getClass().getDeclaredMethod(methodName, getMethodParamsType(methodParams)); - method.invoke(bean, getMethodParamsValue(methodParams)); - } - else - { - Method method = bean.getClass().getDeclaredMethod(methodName); - method.invoke(bean); - } - } - - /** - * 鏍￠獙鏄惁涓轰负class鍖呭悕 - * - * @param str 鍚嶇О - * @return true鏄 false鍚 - */ - public static boolean isValidClassName(String invokeTarget) - { - return StringUtils.countMatches(invokeTarget, ".") > 1; - } - - /** - * 鑾峰彇bean鍚嶇О - * - * @param invokeTarget 鐩爣瀛楃涓 - * @return bean鍚嶇О - */ - public static String getBeanName(String invokeTarget) - { - String beanName = StringUtils.substringBefore(invokeTarget, "("); - return StringUtils.substringBeforeLast(beanName, "."); - } - - /** - * 鑾峰彇bean鏂规硶 - * - * @param invokeTarget 鐩爣瀛楃涓 - * @return method鏂规硶 - */ - public static String getMethodName(String invokeTarget) - { - String methodName = StringUtils.substringBefore(invokeTarget, "("); - return StringUtils.substringAfterLast(methodName, "."); - } - - /** - * 鑾峰彇method鏂规硶鍙傛暟鐩稿叧鍒楄〃 - * - * @param invokeTarget 鐩爣瀛楃涓 - * @return method鏂规硶鐩稿叧鍙傛暟鍒楄〃 - */ - public static List getMethodParams(String invokeTarget) - { - String methodStr = StringUtils.substringBetween(invokeTarget, "(", ")"); - if (StringUtils.isEmpty(methodStr)) - { - return null; - } - String[] methodParams = methodStr.split(","); - List classs = new LinkedList<>(); - for (int i = 0; i < methodParams.length; i++) - { - String str = StringUtils.trimToEmpty(methodParams[i]); - // String瀛楃涓茬被鍨嬶紝鍖呭惈' - if (StringUtils.contains(str, "'")) - { - classs.add(new Object[] { StringUtils.replace(str, "'", ""), String.class }); - } - // boolean甯冨皵绫诲瀷锛岀瓑浜巘rue鎴栬協alse - else if (StringUtils.equals(str, "true") || StringUtils.equalsIgnoreCase(str, "false")) - { - classs.add(new Object[] { Boolean.valueOf(str), Boolean.class }); - } - // long闀挎暣褰紝鍖呭惈L - else if (StringUtils.containsIgnoreCase(str, "L")) - { - classs.add(new Object[] { Long.valueOf(StringUtils.replaceIgnoreCase(str, "L", "")), Long.class }); - } - // double娴偣绫诲瀷锛屽寘鍚獶 - else if (StringUtils.containsIgnoreCase(str, "D")) - { - classs.add(new Object[] { Double.valueOf(StringUtils.replaceIgnoreCase(str, "D", "")), Double.class }); - } - // 鍏朵粬绫诲瀷褰掔被涓烘暣褰 - else - { - classs.add(new Object[] { Integer.valueOf(str), Integer.class }); - } - } - return classs; - } - - /** - * 鑾峰彇鍙傛暟绫诲瀷 - * - * @param methodParams 鍙傛暟鐩稿叧鍒楄〃 - * @return 鍙傛暟绫诲瀷鍒楄〃 - */ - public static Class[] getMethodParamsType(List methodParams) - { - Class[] classs = new Class[methodParams.size()]; - int index = 0; - for (Object[] os : methodParams) - { - classs[index] = (Class) os[1]; - index++; - } - return classs; - } - - /** - * 鑾峰彇鍙傛暟鍊 - * - * @param methodParams 鍙傛暟鐩稿叧鍒楄〃 - * @return 鍙傛暟鍊煎垪琛 - */ - public static Object[] getMethodParamsValue(List methodParams) - { - Object[] classs = new Object[methodParams.size()]; - int index = 0; - for (Object[] os : methodParams) - { - classs[index] = (Object) os[0]; - index++; - } - return classs; - } -} +package com.jiajiakang.quartz.util; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.LinkedList; +import java.util.List; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.common.utils.spring.SpringUtils; +import com.jiajiakang.quartz.domain.SysJob; + +/** + * 浠诲姟鎵ц宸ュ叿 + * + * @author ruoyi + */ +public class JobInvokeUtil +{ + /** + * 鎵ц鏂规硶 + * + * @param sysJob 绯荤粺浠诲姟 + */ + public static void invokeMethod(SysJob sysJob) throws Exception + { + String invokeTarget = sysJob.getInvokeTarget(); + String beanName = getBeanName(invokeTarget); + String methodName = getMethodName(invokeTarget); + List methodParams = getMethodParams(invokeTarget); + + if (!isValidClassName(beanName)) + { + Object bean = SpringUtils.getBean(beanName); + invokeMethod(bean, methodName, methodParams); + } + else + { + Object bean = Class.forName(beanName).newInstance(); + invokeMethod(bean, methodName, methodParams); + } + } + + /** + * 璋冪敤浠诲姟鏂规硶 + * + * @param bean 鐩爣瀵硅薄 + * @param methodName 鏂规硶鍚嶇О + * @param methodParams 鏂规硶鍙傛暟 + */ + private static void invokeMethod(Object bean, String methodName, List methodParams) + throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, + InvocationTargetException + { + if (StringUtils.isNotNull(methodParams) && methodParams.size() > 0) + { + Method method = bean.getClass().getDeclaredMethod(methodName, getMethodParamsType(methodParams)); + method.invoke(bean, getMethodParamsValue(methodParams)); + } + else + { + Method method = bean.getClass().getDeclaredMethod(methodName); + method.invoke(bean); + } + } + + /** + * 鏍￠獙鏄惁涓轰负class鍖呭悕 + * + * @param str 鍚嶇О + * @return true鏄 false鍚 + */ + public static boolean isValidClassName(String invokeTarget) + { + return StringUtils.countMatches(invokeTarget, ".") > 1; + } + + /** + * 鑾峰彇bean鍚嶇О + * + * @param invokeTarget 鐩爣瀛楃涓 + * @return bean鍚嶇О + */ + public static String getBeanName(String invokeTarget) + { + String beanName = StringUtils.substringBefore(invokeTarget, "("); + return StringUtils.substringBeforeLast(beanName, "."); + } + + /** + * 鑾峰彇bean鏂规硶 + * + * @param invokeTarget 鐩爣瀛楃涓 + * @return method鏂规硶 + */ + public static String getMethodName(String invokeTarget) + { + String methodName = StringUtils.substringBefore(invokeTarget, "("); + return StringUtils.substringAfterLast(methodName, "."); + } + + /** + * 鑾峰彇method鏂规硶鍙傛暟鐩稿叧鍒楄〃 + * + * @param invokeTarget 鐩爣瀛楃涓 + * @return method鏂规硶鐩稿叧鍙傛暟鍒楄〃 + */ + public static List getMethodParams(String invokeTarget) + { + String methodStr = StringUtils.substringBetween(invokeTarget, "(", ")"); + if (StringUtils.isEmpty(methodStr)) + { + return null; + } + String[] methodParams = methodStr.split(","); + List classs = new LinkedList<>(); + for (int i = 0; i < methodParams.length; i++) + { + String str = StringUtils.trimToEmpty(methodParams[i]); + // String瀛楃涓茬被鍨嬶紝鍖呭惈' + if (StringUtils.contains(str, "'")) + { + classs.add(new Object[] { StringUtils.replace(str, "'", ""), String.class }); + } + // boolean甯冨皵绫诲瀷锛岀瓑浜巘rue鎴栬協alse + else if (StringUtils.equals(str, "true") || StringUtils.equalsIgnoreCase(str, "false")) + { + classs.add(new Object[] { Boolean.valueOf(str), Boolean.class }); + } + // long闀挎暣褰紝鍖呭惈L + else if (StringUtils.containsIgnoreCase(str, "L")) + { + classs.add(new Object[] { Long.valueOf(StringUtils.replaceIgnoreCase(str, "L", "")), Long.class }); + } + // double娴偣绫诲瀷锛屽寘鍚獶 + else if (StringUtils.containsIgnoreCase(str, "D")) + { + classs.add(new Object[] { Double.valueOf(StringUtils.replaceIgnoreCase(str, "D", "")), Double.class }); + } + // 鍏朵粬绫诲瀷褰掔被涓烘暣褰 + else + { + classs.add(new Object[] { Integer.valueOf(str), Integer.class }); + } + } + return classs; + } + + /** + * 鑾峰彇鍙傛暟绫诲瀷 + * + * @param methodParams 鍙傛暟鐩稿叧鍒楄〃 + * @return 鍙傛暟绫诲瀷鍒楄〃 + */ + public static Class[] getMethodParamsType(List methodParams) + { + Class[] classs = new Class[methodParams.size()]; + int index = 0; + for (Object[] os : methodParams) + { + classs[index] = (Class) os[1]; + index++; + } + return classs; + } + + /** + * 鑾峰彇鍙傛暟鍊 + * + * @param methodParams 鍙傛暟鐩稿叧鍒楄〃 + * @return 鍙傛暟鍊煎垪琛 + */ + public static Object[] getMethodParamsValue(List methodParams) + { + Object[] classs = new Object[methodParams.size()]; + int index = 0; + for (Object[] os : methodParams) + { + classs[index] = (Object) os[0]; + index++; + } + return classs; + } +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/util/QuartzDisallowConcurrentExecution.java similarity index 82% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java rename to jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/util/QuartzDisallowConcurrentExecution.java index 96a6dcf8e5afc98b1c6574054aed6711bb4f98d8..0934e13dd9633df6daae035241c52facfb0cd5a1 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java +++ b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/util/QuartzDisallowConcurrentExecution.java @@ -1,21 +1,21 @@ -package com.ruoyi.quartz.util; - -import org.quartz.DisallowConcurrentExecution; -import org.quartz.JobExecutionContext; -import com.ruoyi.quartz.domain.SysJob; - -/** - * 瀹氭椂浠诲姟澶勭悊锛堢姝㈠苟鍙戞墽琛岋級 - * - * @author ruoyi - * - */ -@DisallowConcurrentExecution -public class QuartzDisallowConcurrentExecution extends AbstractQuartzJob -{ - @Override - protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception - { - JobInvokeUtil.invokeMethod(sysJob); - } -} +package com.jiajiakang.quartz.util; + +import org.quartz.DisallowConcurrentExecution; +import org.quartz.JobExecutionContext; +import com.jiajiakang.quartz.domain.SysJob; + +/** + * 瀹氭椂浠诲姟澶勭悊锛堢姝㈠苟鍙戞墽琛岋級 + * + * @author ruoyi + * + */ +@DisallowConcurrentExecution +public class QuartzDisallowConcurrentExecution extends AbstractQuartzJob +{ + @Override + protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception + { + JobInvokeUtil.invokeMethod(sysJob); + } +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/util/QuartzJobExecution.java similarity index 79% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java rename to jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/util/QuartzJobExecution.java index 87a06bc13becda6a44d67d7ad7d787d193d205f5..7e50afbca8a28ca753c2cc04a717d9fae30ab43a 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java +++ b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/util/QuartzJobExecution.java @@ -1,19 +1,19 @@ -package com.ruoyi.quartz.util; - -import org.quartz.JobExecutionContext; -import com.ruoyi.quartz.domain.SysJob; - -/** - * 瀹氭椂浠诲姟澶勭悊锛堝厑璁稿苟鍙戞墽琛岋級 - * - * @author ruoyi - * - */ -public class QuartzJobExecution extends AbstractQuartzJob -{ - @Override - protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception - { - JobInvokeUtil.invokeMethod(sysJob); - } -} +package com.jiajiakang.quartz.util; + +import org.quartz.JobExecutionContext; +import com.jiajiakang.quartz.domain.SysJob; + +/** + * 瀹氭椂浠诲姟澶勭悊锛堝厑璁稿苟鍙戞墽琛岋級 + * + * @author ruoyi + * + */ +public class QuartzJobExecution extends AbstractQuartzJob +{ + @Override + protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception + { + JobInvokeUtil.invokeMethod(sysJob); + } +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/util/ScheduleUtils.java similarity index 91% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java rename to jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/util/ScheduleUtils.java index 37fe72e042f37b519291e8d558c9d535aa4094c3..4d266e234b2cce474698abe11708697c1605b65e 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java +++ b/jiajiakang-quartz/src/main/java/com/jiajiakang/quartz/util/ScheduleUtils.java @@ -1,113 +1,113 @@ -package com.ruoyi.quartz.util; - -import org.quartz.CronScheduleBuilder; -import org.quartz.CronTrigger; -import org.quartz.Job; -import org.quartz.JobBuilder; -import org.quartz.JobDetail; -import org.quartz.JobKey; -import org.quartz.Scheduler; -import org.quartz.SchedulerException; -import org.quartz.TriggerBuilder; -import org.quartz.TriggerKey; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.common.exception.job.TaskException.Code; -import com.ruoyi.quartz.domain.SysJob; - -/** - * 瀹氭椂浠诲姟宸ュ叿绫 - * - * @author ruoyi - * - */ -public class ScheduleUtils -{ - /** - * 寰楀埌quartz浠诲姟绫 - * - * @param sysJob 鎵ц璁″垝 - * @return 鍏蜂綋鎵ц浠诲姟绫 - */ - private static Class getQuartzJobClass(SysJob sysJob) - { - boolean isConcurrent = "0".equals(sysJob.getConcurrent()); - return isConcurrent ? QuartzJobExecution.class : QuartzDisallowConcurrentExecution.class; - } - - /** - * 鏋勫缓浠诲姟瑙﹀彂瀵硅薄 - */ - public static TriggerKey getTriggerKey(Long jobId, String jobGroup) - { - return TriggerKey.triggerKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup); - } - - /** - * 鏋勫缓浠诲姟閿璞 - */ - public static JobKey getJobKey(Long jobId, String jobGroup) - { - return JobKey.jobKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup); - } - - /** - * 鍒涘缓瀹氭椂浠诲姟 - */ - public static void createScheduleJob(Scheduler scheduler, SysJob job) throws SchedulerException, TaskException - { - Class jobClass = getQuartzJobClass(job); - // 鏋勫缓job淇℃伅 - Long jobId = job.getJobId(); - String jobGroup = job.getJobGroup(); - JobDetail jobDetail = JobBuilder.newJob(jobClass).withIdentity(getJobKey(jobId, jobGroup)).build(); - - // 琛ㄨ揪寮忚皟搴︽瀯寤哄櫒 - CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(job.getCronExpression()); - cronScheduleBuilder = handleCronScheduleMisfirePolicy(job, cronScheduleBuilder); - - // 鎸夋柊鐨刢ronExpression琛ㄨ揪寮忔瀯寤轰竴涓柊鐨則rigger - CronTrigger trigger = TriggerBuilder.newTrigger().withIdentity(getTriggerKey(jobId, jobGroup)) - .withSchedule(cronScheduleBuilder).build(); - - // 鏀惧叆鍙傛暟锛岃繍琛屾椂鐨勬柟娉曞彲浠ヨ幏鍙 - jobDetail.getJobDataMap().put(ScheduleConstants.TASK_PROPERTIES, job); - - // 鍒ゆ柇鏄惁瀛樺湪 - if (scheduler.checkExists(getJobKey(jobId, jobGroup))) - { - // 闃叉鍒涘缓鏃跺瓨鍦ㄦ暟鎹棶棰 鍏堢Щ闄わ紝鐒跺悗鍦ㄦ墽琛屽垱寤烘搷浣 - scheduler.deleteJob(getJobKey(jobId, jobGroup)); - } - - scheduler.scheduleJob(jobDetail, trigger); - - // 鏆傚仠浠诲姟 - if (job.getStatus().equals(ScheduleConstants.Status.PAUSE.getValue())) - { - scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup)); - } - } - - /** - * 璁剧疆瀹氭椂浠诲姟绛栫暐 - */ - public static CronScheduleBuilder handleCronScheduleMisfirePolicy(SysJob job, CronScheduleBuilder cb) - throws TaskException - { - switch (job.getMisfirePolicy()) - { - case ScheduleConstants.MISFIRE_DEFAULT: - return cb; - case ScheduleConstants.MISFIRE_IGNORE_MISFIRES: - return cb.withMisfireHandlingInstructionIgnoreMisfires(); - case ScheduleConstants.MISFIRE_FIRE_AND_PROCEED: - return cb.withMisfireHandlingInstructionFireAndProceed(); - case ScheduleConstants.MISFIRE_DO_NOTHING: - return cb.withMisfireHandlingInstructionDoNothing(); - default: - throw new TaskException("The task misfire policy '" + job.getMisfirePolicy() - + "' cannot be used in cron schedule tasks", Code.CONFIG_ERROR); - } - } -} +package com.jiajiakang.quartz.util; + +import org.quartz.CronScheduleBuilder; +import org.quartz.CronTrigger; +import org.quartz.Job; +import org.quartz.JobBuilder; +import org.quartz.JobDetail; +import org.quartz.JobKey; +import org.quartz.Scheduler; +import org.quartz.SchedulerException; +import org.quartz.TriggerBuilder; +import org.quartz.TriggerKey; +import com.jiajiakang.common.constant.ScheduleConstants; +import com.jiajiakang.common.exception.job.TaskException; +import com.jiajiakang.common.exception.job.TaskException.Code; +import com.jiajiakang.quartz.domain.SysJob; + +/** + * 瀹氭椂浠诲姟宸ュ叿绫 + * + * @author ruoyi + * + */ +public class ScheduleUtils +{ + /** + * 寰楀埌quartz浠诲姟绫 + * + * @param sysJob 鎵ц璁″垝 + * @return 鍏蜂綋鎵ц浠诲姟绫 + */ + private static Class getQuartzJobClass(SysJob sysJob) + { + boolean isConcurrent = "0".equals(sysJob.getConcurrent()); + return isConcurrent ? QuartzJobExecution.class : QuartzDisallowConcurrentExecution.class; + } + + /** + * 鏋勫缓浠诲姟瑙﹀彂瀵硅薄 + */ + public static TriggerKey getTriggerKey(Long jobId, String jobGroup) + { + return TriggerKey.triggerKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup); + } + + /** + * 鏋勫缓浠诲姟閿璞 + */ + public static JobKey getJobKey(Long jobId, String jobGroup) + { + return JobKey.jobKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup); + } + + /** + * 鍒涘缓瀹氭椂浠诲姟 + */ + public static void createScheduleJob(Scheduler scheduler, SysJob job) throws SchedulerException, TaskException + { + Class jobClass = getQuartzJobClass(job); + // 鏋勫缓job淇℃伅 + Long jobId = job.getJobId(); + String jobGroup = job.getJobGroup(); + JobDetail jobDetail = JobBuilder.newJob(jobClass).withIdentity(getJobKey(jobId, jobGroup)).build(); + + // 琛ㄨ揪寮忚皟搴︽瀯寤哄櫒 + CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(job.getCronExpression()); + cronScheduleBuilder = handleCronScheduleMisfirePolicy(job, cronScheduleBuilder); + + // 鎸夋柊鐨刢ronExpression琛ㄨ揪寮忔瀯寤轰竴涓柊鐨則rigger + CronTrigger trigger = TriggerBuilder.newTrigger().withIdentity(getTriggerKey(jobId, jobGroup)) + .withSchedule(cronScheduleBuilder).build(); + + // 鏀惧叆鍙傛暟锛岃繍琛屾椂鐨勬柟娉曞彲浠ヨ幏鍙 + jobDetail.getJobDataMap().put(ScheduleConstants.TASK_PROPERTIES, job); + + // 鍒ゆ柇鏄惁瀛樺湪 + if (scheduler.checkExists(getJobKey(jobId, jobGroup))) + { + // 闃叉鍒涘缓鏃跺瓨鍦ㄦ暟鎹棶棰 鍏堢Щ闄わ紝鐒跺悗鍦ㄦ墽琛屽垱寤烘搷浣 + scheduler.deleteJob(getJobKey(jobId, jobGroup)); + } + + scheduler.scheduleJob(jobDetail, trigger); + + // 鏆傚仠浠诲姟 + if (job.getStatus().equals(ScheduleConstants.Status.PAUSE.getValue())) + { + scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup)); + } + } + + /** + * 璁剧疆瀹氭椂浠诲姟绛栫暐 + */ + public static CronScheduleBuilder handleCronScheduleMisfirePolicy(SysJob job, CronScheduleBuilder cb) + throws TaskException + { + switch (job.getMisfirePolicy()) + { + case ScheduleConstants.MISFIRE_DEFAULT: + return cb; + case ScheduleConstants.MISFIRE_IGNORE_MISFIRES: + return cb.withMisfireHandlingInstructionIgnoreMisfires(); + case ScheduleConstants.MISFIRE_FIRE_AND_PROCEED: + return cb.withMisfireHandlingInstructionFireAndProceed(); + case ScheduleConstants.MISFIRE_DO_NOTHING: + return cb.withMisfireHandlingInstructionDoNothing(); + default: + throw new TaskException("The task misfire policy '" + job.getMisfirePolicy() + + "' cannot be used in cron schedule tasks", Code.CONFIG_ERROR); + } + } +} diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/jiajiakang-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml similarity index 96% rename from ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml rename to jiajiakang-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml index 588d17705b6f0faa603c70d8dcd51aeb5756426e..3829019b3b2912c4a59b0f46cfff71626d78ddec 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml +++ b/jiajiakang-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml @@ -1,93 +1,93 @@ - - - - - - - - - - - - - - - - - select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time - from sys_job_log - - - - - - - - - - delete from sys_job_log where job_log_id = #{jobLogId} - - - - delete from sys_job_log where job_log_id in - - #{jobLogId} - - - - - truncate table sys_job_log - - - - insert into sys_job_log( - job_log_id, - job_name, - job_group, - invoke_target, - job_message, - status, - exception_info, - create_time - )values( - #{jobLogId}, - #{jobName}, - #{jobGroup}, - #{invokeTarget}, - #{jobMessage}, - #{status}, - #{exceptionInfo}, - sysdate() - ) - - + + + + + + + + + + + + + + + + + select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time + from sys_job_log + + + + + + + + + + delete from sys_job_log where job_log_id = #{jobLogId} + + + + delete from sys_job_log where job_log_id in + + #{jobLogId} + + + + + truncate table sys_job_log + + + + insert into sys_job_log( + job_log_id, + job_name, + job_group, + invoke_target, + job_message, + status, + exception_info, + create_time + )values( + #{jobLogId}, + #{jobName}, + #{jobGroup}, + #{invokeTarget}, + #{jobMessage}, + #{status}, + #{exceptionInfo}, + sysdate() + ) + + \ No newline at end of file diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml b/jiajiakang-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml similarity index 96% rename from ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml rename to jiajiakang-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml index 69233bdf7804245e91910d95c168ea5024752197..d20e8ad470a36dfb678727a837cec8c4f9a35650 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml +++ b/jiajiakang-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml @@ -1,111 +1,111 @@ - - - - - - - - - - - - - - - - - - - - - - select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark - from sys_job - - - - - - - - - - delete from sys_job where job_id = #{jobId} - - - - delete from sys_job where job_id in - - #{jobId} - - - - - update sys_job - - job_name = #{jobName}, - job_group = #{jobGroup}, - invoke_target = #{invokeTarget}, - cron_expression = #{cronExpression}, - misfire_policy = #{misfirePolicy}, - concurrent = #{concurrent}, - status = #{status}, - remark = #{remark}, - update_by = #{updateBy}, - update_time = sysdate() - - where job_id = #{jobId} - - - - insert into sys_job( - job_id, - job_name, - job_group, - invoke_target, - cron_expression, - misfire_policy, - concurrent, - status, - remark, - create_by, - create_time - )values( - #{jobId}, - #{jobName}, - #{jobGroup}, - #{invokeTarget}, - #{cronExpression}, - #{misfirePolicy}, - #{concurrent}, - #{status}, - #{remark}, - #{createBy}, - sysdate() - ) - - + + + + + + + + + + + + + + + + + + + + + + select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark + from sys_job + + + + + + + + + + delete from sys_job where job_id = #{jobId} + + + + delete from sys_job where job_id in + + #{jobId} + + + + + update sys_job + + job_name = #{jobName}, + job_group = #{jobGroup}, + invoke_target = #{invokeTarget}, + cron_expression = #{cronExpression}, + misfire_policy = #{misfirePolicy}, + concurrent = #{concurrent}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where job_id = #{jobId} + + + + insert into sys_job( + job_id, + job_name, + job_group, + invoke_target, + cron_expression, + misfire_policy, + concurrent, + status, + remark, + create_by, + create_time + )values( + #{jobId}, + #{jobName}, + #{jobGroup}, + #{invokeTarget}, + #{cronExpression}, + #{misfirePolicy}, + #{concurrent}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + \ No newline at end of file diff --git a/ruoyi-system/pom.xml b/jiajiakang-system/pom.xml similarity index 70% rename from ruoyi-system/pom.xml rename to jiajiakang-system/pom.xml index 81eb2a28cf6185edada63c2d52d1f7b33209dde9..ec87d925ed21372fc643f9700cb797347f3746db 100644 --- a/ruoyi-system/pom.xml +++ b/jiajiakang-system/pom.xml @@ -1,28 +1,28 @@ - - - - ruoyi - com.ruoyi - 3.4.0 - - 4.0.0 - - ruoyi-system - - - system绯荤粺妯″潡 - - - - - - - com.ruoyi - ruoyi-common - - - - + + + + jiajiakang + com.jiajiakang + 3.4.0 + + 4.0.0 + + jiajiakang-system + + + system绯荤粺妯″潡 + + + + + + + com.jiajiakang + jiajiakang-common + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysConfig.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysConfig.java index c54678cc92353aca9f962b92050f318fff2004a9..66f1677c9f7d48504b35797d9f77c8bdaadb64a2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysConfig.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.domain; +package com.jiajiakang.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import com.jiajiakang.common.annotation.Excel; +import com.jiajiakang.common.annotation.Excel.ColumnType; +import com.jiajiakang.common.core.domain.BaseEntity; /** * 鍙傛暟閰嶇疆琛 sys_config diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysLogininfor.java similarity index 92% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysLogininfor.java index 7fdea30734103431665a3b473a8b5d4dea2da82d..6fb757451bc6079f363d04b046c3098f15efd6da 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysLogininfor.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.domain; +package com.jiajiakang.system.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import com.jiajiakang.common.annotation.Excel; +import com.jiajiakang.common.annotation.Excel.ColumnType; +import com.jiajiakang.common.core.domain.BaseEntity; /** * 绯荤粺璁块棶璁板綍琛 sys_logininfor diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysNotice.java similarity index 96% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysNotice.java index b43abea3b66957cce48e36fd1eb2525a174cbba4..fa6d61d17ca577e12a1251efaefc7e023e99ac6c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysNotice.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.domain; +package com.jiajiakang.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; +import com.jiajiakang.common.core.domain.BaseEntity; /** * 閫氱煡鍏憡琛 sys_notice diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysOperLog.java similarity index 96% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysOperLog.java index 175ee03f581a9e2f795095a386ab5d13b6a64461..b81042eba15a60307b999a3a86172f785a6521fa 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysOperLog.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.domain; +package com.jiajiakang.system.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import com.jiajiakang.common.annotation.Excel; +import com.jiajiakang.common.annotation.Excel.ColumnType; +import com.jiajiakang.common.core.domain.BaseEntity; /** * 鎿嶄綔鏃ュ織璁板綍琛 oper_log diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysPost.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysPost.java index 1f1fcf4c07cae9f74b0c636736a6b231cc951d88..4fc6b86a212dbe0e8176fddd993175969831f75a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysPost.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.domain; +package com.jiajiakang.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import com.jiajiakang.common.annotation.Excel; +import com.jiajiakang.common.annotation.Excel.ColumnType; +import com.jiajiakang.common.core.domain.BaseEntity; /** * 宀椾綅琛 sys_post diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysRoleDept.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysRoleDept.java index 47b21bf79394579e946ff2eb1a7b1a4d6fbc8791..2cc28e8bada3e13fc6b2f2baad8e3f23f8fb6404 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysRoleDept.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.jiajiakang.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysRoleMenu.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysRoleMenu.java index de10a74709401d3947e2a95e7844ae889b513f6d..a0ca171c6ba898288bdb5dcf61d7fed7f8dc4e2b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysRoleMenu.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.jiajiakang.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysUserOnline.java similarity index 97% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysUserOnline.java index 2bbd31888651923499e57d09c6da93f28e9ded9d..2c9909af2ced40a5f56a955762e4377114e53972 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysUserOnline.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.jiajiakang.system.domain; /** * 褰撳墠鍦ㄧ嚎浼氳瘽 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysUserPost.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysUserPost.java index 6e8c416f21e3c345c88bf565885f604da11b8cb2..5d5389b9dfb0b46c8eaa0037053ad129186432c6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysUserPost.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.jiajiakang.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysUserRole.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysUserRole.java index 4d15810144a80005af96ce5a69862ee1c7ea26bf..431b72e41a4a5e6398689a12fb937fbde8479f7c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/domain/SysUserRole.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.jiajiakang.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/domain/vo/MetaVo.java similarity index 96% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/domain/vo/MetaVo.java index af7234c15eb93d7cea75947dd6257afb41136bee..ccff388791be609853834b87122b30d47ab6447e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/domain/vo/MetaVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.vo; +package com.jiajiakang.system.domain.vo; /** * 璺敱鏄剧ず淇℃伅 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/domain/vo/RouterVo.java similarity index 98% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/domain/vo/RouterVo.java index b5501b77558a3f85d23c112dbe34a6d744c6cafd..cdde508b011ec0973af863899a8703e64ff168d2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/domain/vo/RouterVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.vo; +package com.jiajiakang.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysConfigMapper.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysConfigMapper.java index 0ed0c0af95450a6a992b20af3523b12ada1ee706..d0254eed98f90888309abfcaf3365af2561b1e14 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysConfigMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.jiajiakang.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysConfig; +import com.jiajiakang.system.domain.SysConfig; /** * 鍙傛暟閰嶇疆 鏁版嵁灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysDeptMapper.java similarity index 96% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysDeptMapper.java index 000bf6681163081eb8c906ba02a86a186a7470f2..cd7a78d8363ae813c80161cb9423a5a2358462d9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysDeptMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.mapper; +package com.jiajiakang.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.common.core.domain.entity.SysDept; +import com.jiajiakang.common.core.domain.entity.SysDept; /** * 閮ㄩ棬绠＄悊 鏁版嵁灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysDictDataMapper.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysDictDataMapper.java index a341f1e30e1dfc74942e50d504f8e56ca83f1f01..cf8bd01643a627aac6912914466ce066a1be7a12 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysDictDataMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.mapper; +package com.jiajiakang.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.common.core.domain.entity.SysDictData; +import com.jiajiakang.common.core.domain.entity.SysDictData; /** * 瀛楀吀琛 鏁版嵁灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysDictTypeMapper.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysDictTypeMapper.java index 17545cd99730347747e969269ecc52542bd779b9..f2a6dc4ffcd0b26d9337eb1255333b572a41a3aa 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysDictTypeMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.mapper; +package com.jiajiakang.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Mapper; -import com.ruoyi.common.core.domain.entity.SysDictType; +import com.jiajiakang.common.core.domain.entity.SysDictType; /** * 瀛楀吀琛 鏁版嵁灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysLogininforMapper.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysLogininforMapper.java index 629866f584f3ef00ef680f385f6642dd8593dbd7..eb8caf42844c39a617fe7569aaaafada1e2ec016 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysLogininforMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.jiajiakang.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysLogininfor; +import com.jiajiakang.system.domain.SysLogininfor; /** * 绯荤粺璁块棶鏃ュ織鎯呭喌淇℃伅 鏁版嵁灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysMenuMapper.java similarity index 96% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysMenuMapper.java index 1c2e8530e00c5dbcb4ba6e8ed6bd54124c0bee59..fb2ffb5236bed80e41ce88b68ef6a0e3fa05d799 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysMenuMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.mapper; +package com.jiajiakang.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.common.core.domain.entity.SysMenu; +import com.jiajiakang.common.core.domain.entity.SysMenu; /** * 鑿滃崟琛 鏁版嵁灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysNoticeMapper.java similarity index 92% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysNoticeMapper.java index c34f0a27926cebbb8c6b6aae9c8b4093aa306823..0b14ed9cf7dca5c872c02187de3bcfb1a31e1efd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysNoticeMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.jiajiakang.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysNotice; +import com.jiajiakang.system.domain.SysNotice; /** * 閫氱煡鍏憡琛 鏁版嵁灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysOperLogMapper.java similarity index 91% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysOperLogMapper.java index 2ae6457f78ccc9f960f398342dda1714192641ac..11996ebce9473a2c5b2c1027a617f601fb7c7775 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysOperLogMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.jiajiakang.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysOperLog; +import com.jiajiakang.system.domain.SysOperLog; /** * 鎿嶄綔鏃ュ織 鏁版嵁灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysPostMapper.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysPostMapper.java index b4287479765ae2bbb9e9d9d354464af2ff5b0364..7bd71912828b4aba411b0af5538f73982cdc1e08 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysPostMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.jiajiakang.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysPost; +import com.jiajiakang.system.domain.SysPost; /** * 宀椾綅淇℃伅 鏁版嵁灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysRoleDeptMapper.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysRoleDeptMapper.java index f9d3a2f39a84472b426175046cdffa9e8c167737..78e59add67c8d16728839ad271706f717ab9d16d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysRoleDeptMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.jiajiakang.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysRoleDept; +import com.jiajiakang.system.domain.SysRoleDept; /** * 瑙掕壊涓庨儴闂ㄥ叧鑱旇〃 鏁版嵁灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysRoleMapper.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysRoleMapper.java index 16d55943e7b2930d74dddfa333cc0c73188f77aa..460f3993fd124b8751247c99a34d919556204b57 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysRoleMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.jiajiakang.system.mapper; import java.util.List; -import com.ruoyi.common.core.domain.entity.SysRole; +import com.jiajiakang.common.core.domain.entity.SysRole; /** * 瑙掕壊琛 鏁版嵁灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysRoleMenuMapper.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysRoleMenuMapper.java index fccdbf09faacfe268b88e58cb9388d4bce66db73..9a6ddb8e754148682576d339a6910693964318c4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysRoleMenuMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.jiajiakang.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysRoleMenu; +import com.jiajiakang.system.domain.SysRoleMenu; /** * 瑙掕壊涓庤彍鍗曞叧鑱旇〃 鏁版嵁灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysUserMapper.java similarity index 96% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysUserMapper.java index 39f62bc2d1e25854fa0abdecd324586cf4dbbc88..fc563e0ad2602c470d35f424c60378fc57a09786 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysUserMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.mapper; +package com.jiajiakang.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.common.core.domain.entity.SysUser; +import com.jiajiakang.common.core.domain.entity.SysUser; /** * 鐢ㄦ埛琛 鏁版嵁灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysUserPostMapper.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysUserPostMapper.java index e08991deef03ed58d9dc50e5c5344332abe91fe0..c76409bd7b95bb229bac6d1c37da896f1d660559 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysUserPostMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.jiajiakang.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysUserPost; +import com.jiajiakang.system.domain.SysUserPost; /** * 鐢ㄦ埛涓庡矖浣嶅叧鑱旇〃 鏁版嵁灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysUserRoleMapper.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysUserRoleMapper.java index 3143ec82818581935c496d85c6b942d6e9bef770..f4cb72c6dcaf731efdeef0e013796da4cb2d99bb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/mapper/SysUserRoleMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.mapper; +package com.jiajiakang.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.system.domain.SysUserRole; +import com.jiajiakang.system.domain.SysUserRole; /** * 鐢ㄦ埛涓庤鑹插叧鑱旇〃 鏁版嵁灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysConfigService.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysConfigService.java index 9bca585bbea4237a35491b3a84866198b301b756..df12a5085b75a9f7fe4ba65f279df0a21c731a07 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysConfigService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.jiajiakang.system.service; import java.util.List; -import com.ruoyi.system.domain.SysConfig; +import com.jiajiakang.system.domain.SysConfig; /** * 鍙傛暟閰嶇疆 鏈嶅姟灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysDeptService.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysDeptService.java index bf8ab3e8ffec4277f2dc8f06ed7a1285731a96bc..dd813a37b93d7b01359a21c900176802586da695 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysDeptService.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.service; +package com.jiajiakang.system.service; import java.util.List; -import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysDept; +import com.jiajiakang.common.core.domain.TreeSelect; +import com.jiajiakang.common.core.domain.entity.SysDept; /** * 閮ㄩ棬绠＄悊 鏈嶅姟灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysDictDataService.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysDictDataService.java index 6cebd695f677c57b2774782d025a632f78f90646..afffe8a910629ae80588ad50fa7e55085c9f4f48 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysDictDataService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.jiajiakang.system.service; import java.util.List; -import com.ruoyi.common.core.domain.entity.SysDictData; +import com.jiajiakang.common.core.domain.entity.SysDictData; /** * 瀛楀吀 涓氬姟灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysDictTypeService.java similarity index 92% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysDictTypeService.java index 310809e568970859f1223cfc331eb12ef2d43eb2..d7aead7f7d569e46326877f9465506299f3ed7f4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysDictTypeService.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.service; +package com.jiajiakang.system.service; import java.util.List; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.domain.entity.SysDictType; +import com.jiajiakang.common.core.domain.entity.SysDictData; +import com.jiajiakang.common.core.domain.entity.SysDictType; /** * 瀛楀吀 涓氬姟灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysLogininforService.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysLogininforService.java index 96c4d547335f76d64e4ca57a2881ebd488f2b3f3..6ef1a5421c6fafa92cac451f87b2e77e0ef5354f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysLogininforService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.jiajiakang.system.service; import java.util.List; -import com.ruoyi.system.domain.SysLogininfor; +import com.jiajiakang.system.domain.SysLogininfor; /** * 绯荤粺璁块棶鏃ュ織鎯呭喌淇℃伅 鏈嶅姟灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysMenuService.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysMenuService.java index f64bee11062102426bef67da9717b90e618a4b1f..a89b068a52b3ec7aa8732849c3fdc5b19f5e3f08 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysMenuService.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.service; +package com.jiajiakang.system.service; import java.util.List; import java.util.Set; -import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.system.domain.vo.RouterVo; +import com.jiajiakang.common.core.domain.TreeSelect; +import com.jiajiakang.common.core.domain.entity.SysMenu; +import com.jiajiakang.system.domain.vo.RouterVo; /** * 鑿滃崟 涓氬姟灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysNoticeService.java similarity index 92% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysNoticeService.java index 47ce1b71e62fa2ca345a3ba17e126f29d075b2d3..67992b75571b6608bead11046f1cedbd7baad742 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysNoticeService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.jiajiakang.system.service; import java.util.List; -import com.ruoyi.system.domain.SysNotice; +import com.jiajiakang.system.domain.SysNotice; /** * 鍏憡 鏈嶅姟灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysOperLogService.java similarity index 91% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysOperLogService.java index 4fd8e5a851cbfe51b6536bb9e90068223f382bdc..ddc6c73f4a40cab61a76e7800cc53be29bee54e7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysOperLogService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.jiajiakang.system.service; import java.util.List; -import com.ruoyi.system.domain.SysOperLog; +import com.jiajiakang.system.domain.SysOperLog; /** * 鎿嶄綔鏃ュ織 鏈嶅姟灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysPostService.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysPostService.java index aab216d8add2651877b0de7bb25bf309c004aeb9..0d9da6beed8988824ef33394d673b6784566b464 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysPostService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.jiajiakang.system.service; import java.util.List; -import com.ruoyi.system.domain.SysPost; +import com.jiajiakang.system.domain.SysPost; /** * 宀椾綅淇℃伅 鏈嶅姟灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysRoleService.java similarity index 96% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysRoleService.java index 070a5ceedd842d11c8dab141b635a9d294ada026..4a4671f0ed18598fb48310d51dbb08ef1c81338e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysRoleService.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.service; +package com.jiajiakang.system.service; import java.util.List; import java.util.Set; -import com.ruoyi.common.core.domain.entity.SysRole; +import com.jiajiakang.common.core.domain.entity.SysRole; /** * 瑙掕壊涓氬姟灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysUserOnlineService.java similarity index 87% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysUserOnlineService.java index 8eb5448cdeacc288d9d2efec79a7395739ed285b..7165bad1f0ef92d8d4f358caa26e7d6131814c83 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysUserOnlineService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.jiajiakang.system.service; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.system.domain.SysUserOnline; +import com.jiajiakang.common.core.domain.model.LoginUser; +import com.jiajiakang.system.domain.SysUserOnline; /** * 鍦ㄧ嚎鐢ㄦ埛 鏈嶅姟灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysUserService.java similarity index 97% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysUserService.java index ea0333b545a1ed460be3380a898c5c004ce84ed5..c5e156eee174e5e2efc8fb7d7dabca5472d09acb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/ISysUserService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.jiajiakang.system.service; import java.util.List; -import com.ruoyi.common.core.domain.entity.SysUser; +import com.jiajiakang.common.core.domain.entity.SysUser; /** * 鐢ㄦ埛 涓氬姟灞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysConfigServiceImpl.java similarity index 88% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysConfigServiceImpl.java index 9cd51de0bb1d6c6a1ca95b74580cade75a5bef75..0d06f81b67a3bd6297a4c09e14d3a578dbc00030 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysConfigServiceImpl.java @@ -1,21 +1,21 @@ -package com.ruoyi.system.service.impl; +package com.jiajiakang.system.service.impl; import java.util.Collection; import java.util.List; import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.annotation.DataSource; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.enums.DataSourceType; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysConfig; -import com.ruoyi.system.mapper.SysConfigMapper; -import com.ruoyi.system.service.ISysConfigService; +import com.jiajiakang.common.annotation.DataSource; +import com.jiajiakang.common.constant.Constants; +import com.jiajiakang.common.constant.UserConstants; +import com.jiajiakang.common.core.redis.RedisCache; +import com.jiajiakang.common.core.text.Convert; +import com.jiajiakang.common.enums.DataSourceType; +import com.jiajiakang.common.exception.CustomException; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.system.domain.SysConfig; +import com.jiajiakang.system.mapper.SysConfigMapper; +import com.jiajiakang.system.service.ISysConfigService; /** * 鍙傛暟閰嶇疆 鏈嶅姟灞傚疄鐜 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysDeptServiceImpl.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysDeptServiceImpl.java index 7d6984db5388a9a0f147d84edb05a0dbdc9da13c..674f5c3ac2ab13a79fea898a912335557f3e0293 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysDeptServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.jiajiakang.system.service.impl; import java.util.ArrayList; import java.util.Iterator; @@ -6,16 +6,16 @@ import java.util.List; import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.mapper.SysDeptMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.service.ISysDeptService; +import com.jiajiakang.common.annotation.DataScope; +import com.jiajiakang.common.constant.UserConstants; +import com.jiajiakang.common.core.domain.TreeSelect; +import com.jiajiakang.common.core.domain.entity.SysDept; +import com.jiajiakang.common.core.domain.entity.SysRole; +import com.jiajiakang.common.exception.CustomException; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.system.mapper.SysDeptMapper; +import com.jiajiakang.system.mapper.SysRoleMapper; +import com.jiajiakang.system.service.ISysDeptService; /** * 閮ㄩ棬绠＄悊 鏈嶅姟瀹炵幇 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysDictDataServiceImpl.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysDictDataServiceImpl.java index 2ee7a6ce27db8cd95b7be45bee181ea356979d21..698294d779c113513fdad226b068e9cd1627d266 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysDictDataServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service.impl; +package com.jiajiakang.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.utils.DictUtils; -import com.ruoyi.system.mapper.SysDictDataMapper; -import com.ruoyi.system.service.ISysDictDataService; +import com.jiajiakang.common.core.domain.entity.SysDictData; +import com.jiajiakang.common.utils.DictUtils; +import com.jiajiakang.system.mapper.SysDictDataMapper; +import com.jiajiakang.system.service.ISysDictDataService; /** * 瀛楀吀 涓氬姟灞傚鐞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysDictTypeServiceImpl.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysDictTypeServiceImpl.java index 48ba3c62d058a65f0d1000f64897291a06f8aa22..e1751fc9b929fa6f5d74ae53e2d317a71790d1b5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysDictTypeServiceImpl.java @@ -1,19 +1,19 @@ -package com.ruoyi.system.service.impl; +package com.jiajiakang.system.service.impl; import java.util.List; import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.domain.entity.SysDictType; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.DictUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.mapper.SysDictDataMapper; -import com.ruoyi.system.mapper.SysDictTypeMapper; -import com.ruoyi.system.service.ISysDictTypeService; +import com.jiajiakang.common.constant.UserConstants; +import com.jiajiakang.common.core.domain.entity.SysDictData; +import com.jiajiakang.common.core.domain.entity.SysDictType; +import com.jiajiakang.common.exception.CustomException; +import com.jiajiakang.common.utils.DictUtils; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.system.mapper.SysDictDataMapper; +import com.jiajiakang.system.mapper.SysDictTypeMapper; +import com.jiajiakang.system.service.ISysDictTypeService; /** * 瀛楀吀 涓氬姟灞傚鐞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysLogininforServiceImpl.java similarity index 86% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysLogininforServiceImpl.java index a3b5257cf735143581ba6337f14a70ffce178464..10f271b337e0c57c462855d5342a70d6b2e96056 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysLogininforServiceImpl.java @@ -1,11 +1,11 @@ -package com.ruoyi.system.service.impl; +package com.jiajiakang.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.domain.SysLogininfor; -import com.ruoyi.system.mapper.SysLogininforMapper; -import com.ruoyi.system.service.ISysLogininforService; +import com.jiajiakang.system.domain.SysLogininfor; +import com.jiajiakang.system.mapper.SysLogininforMapper; +import com.jiajiakang.system.service.ISysLogininforService; /** * 绯荤粺璁块棶鏃ュ織鎯呭喌淇℃伅 鏈嶅姟灞傚鐞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysMenuServiceImpl.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysMenuServiceImpl.java index 09748eb4dbf60ee9ea6e44bf6abc3843ddf2d0d9..c367c9196fb7c969f295ed7af6a74e13e0afa7c8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysMenuServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.jiajiakang.system.service.impl; import java.util.ArrayList; import java.util.Arrays; @@ -10,19 +10,19 @@ import java.util.Set; import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.vo.MetaVo; -import com.ruoyi.system.domain.vo.RouterVo; -import com.ruoyi.system.mapper.SysMenuMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysRoleMenuMapper; -import com.ruoyi.system.service.ISysMenuService; +import com.jiajiakang.common.constant.UserConstants; +import com.jiajiakang.common.core.domain.TreeSelect; +import com.jiajiakang.common.core.domain.entity.SysMenu; +import com.jiajiakang.common.core.domain.entity.SysRole; +import com.jiajiakang.common.core.domain.entity.SysUser; +import com.jiajiakang.common.utils.SecurityUtils; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.system.domain.vo.MetaVo; +import com.jiajiakang.system.domain.vo.RouterVo; +import com.jiajiakang.system.mapper.SysMenuMapper; +import com.jiajiakang.system.mapper.SysRoleMapper; +import com.jiajiakang.system.mapper.SysRoleMenuMapper; +import com.jiajiakang.system.service.ISysMenuService; /** * 鑿滃崟 涓氬姟灞傚鐞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysNoticeServiceImpl.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysNoticeServiceImpl.java index 765438b8ae1f2410eb5577ebc8a483372bc91371..f3e17fd4325f699980278fcd52da219322425503 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysNoticeServiceImpl.java @@ -1,11 +1,11 @@ -package com.ruoyi.system.service.impl; +package com.jiajiakang.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.domain.SysNotice; -import com.ruoyi.system.mapper.SysNoticeMapper; -import com.ruoyi.system.service.ISysNoticeService; +import com.jiajiakang.system.domain.SysNotice; +import com.jiajiakang.system.mapper.SysNoticeMapper; +import com.jiajiakang.system.service.ISysNoticeService; /** * 鍏憡 鏈嶅姟灞傚疄鐜 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysOperLogServiceImpl.java similarity index 88% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysOperLogServiceImpl.java index 54898152e3dc4557121e3b1044f662853f9ea701..b5e14bd8735faf2ce6d42add8d078ee09593b45b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysOperLogServiceImpl.java @@ -1,11 +1,11 @@ -package com.ruoyi.system.service.impl; +package com.jiajiakang.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.domain.SysOperLog; -import com.ruoyi.system.mapper.SysOperLogMapper; -import com.ruoyi.system.service.ISysOperLogService; +import com.jiajiakang.system.domain.SysOperLog; +import com.jiajiakang.system.mapper.SysOperLogMapper; +import com.jiajiakang.system.service.ISysOperLogService; /** * 鎿嶄綔鏃ュ織 鏈嶅姟灞傚鐞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysPostServiceImpl.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysPostServiceImpl.java index c0da6d4d797485cc2e85257c7960d6351e11f815..5035c80c05154c57b413265f53f6660c7ad1701e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysPostServiceImpl.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.service.impl; +package com.jiajiakang.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.mapper.SysPostMapper; -import com.ruoyi.system.mapper.SysUserPostMapper; -import com.ruoyi.system.service.ISysPostService; +import com.jiajiakang.common.constant.UserConstants; +import com.jiajiakang.common.exception.CustomException; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.system.domain.SysPost; +import com.jiajiakang.system.mapper.SysPostMapper; +import com.jiajiakang.system.mapper.SysUserPostMapper; +import com.jiajiakang.system.service.ISysPostService; /** * 宀椾綅淇℃伅 鏈嶅姟灞傚鐞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysRoleServiceImpl.java similarity index 91% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysRoleServiceImpl.java index 2271472138bc8fc8d91ff6d8f674c455c161e3eb..28639282c8803fce95cadad9ee042ba6672c990c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysRoleServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.jiajiakang.system.service.impl; import java.util.ArrayList; import java.util.Arrays; @@ -8,19 +8,19 @@ import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.system.domain.SysRoleDept; -import com.ruoyi.system.domain.SysRoleMenu; -import com.ruoyi.system.mapper.SysRoleDeptMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysRoleMenuMapper; -import com.ruoyi.system.mapper.SysUserRoleMapper; -import com.ruoyi.system.service.ISysRoleService; +import com.jiajiakang.common.annotation.DataScope; +import com.jiajiakang.common.constant.UserConstants; +import com.jiajiakang.common.core.domain.entity.SysRole; +import com.jiajiakang.common.exception.CustomException; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.common.utils.spring.SpringUtils; +import com.jiajiakang.system.domain.SysRoleDept; +import com.jiajiakang.system.domain.SysRoleMenu; +import com.jiajiakang.system.mapper.SysRoleDeptMapper; +import com.jiajiakang.system.mapper.SysRoleMapper; +import com.jiajiakang.system.mapper.SysRoleMenuMapper; +import com.jiajiakang.system.mapper.SysUserRoleMapper; +import com.jiajiakang.system.service.ISysRoleService; /** * 瑙掕壊 涓氬姟灞傚鐞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysUserOnlineServiceImpl.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysUserOnlineServiceImpl.java index f80a877177e2faab93f8ddcbecbcb7b53bf4093e..0cd35af91e4d963cb1ab326eaccd4867d728834c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysUserOnlineServiceImpl.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.service.impl; +package com.jiajiakang.system.service.impl; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysUserOnline; -import com.ruoyi.system.service.ISysUserOnlineService; +import com.jiajiakang.common.core.domain.model.LoginUser; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.system.domain.SysUserOnline; +import com.jiajiakang.system.service.ISysUserOnlineService; /** * 鍦ㄧ嚎鐢ㄦ埛 鏈嶅姟灞傚鐞 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysUserServiceImpl.java similarity index 92% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java rename to jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysUserServiceImpl.java index b48a7de00c34716a76c85e70538d0c96b4ff857a..e37d1ea5cd58517e29390f2ace656b33f21ce0e4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/jiajiakang-system/src/main/java/com/jiajiakang/system/service/impl/SysUserServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.jiajiakang.system.service.impl; import java.util.ArrayList; import java.util.List; @@ -7,23 +7,23 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -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.ISysUserService; +import com.jiajiakang.common.annotation.DataScope; +import com.jiajiakang.common.constant.UserConstants; +import com.jiajiakang.common.core.domain.entity.SysRole; +import com.jiajiakang.common.core.domain.entity.SysUser; +import com.jiajiakang.common.exception.CustomException; +import com.jiajiakang.common.utils.SecurityUtils; +import com.jiajiakang.common.utils.StringUtils; +import com.jiajiakang.system.domain.SysPost; +import com.jiajiakang.system.domain.SysUserPost; +import com.jiajiakang.system.domain.SysUserRole; +import com.jiajiakang.system.mapper.SysPostMapper; +import com.jiajiakang.system.mapper.SysRoleMapper; +import com.jiajiakang.system.mapper.SysUserMapper; +import com.jiajiakang.system.mapper.SysUserPostMapper; +import com.jiajiakang.system.mapper.SysUserRoleMapper; +import com.jiajiakang.system.service.ISysConfigService; +import com.jiajiakang.system.service.ISysUserService; /** * 鐢ㄦ埛 涓氬姟灞傚鐞 diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/jiajiakang-system/src/main/resources/mapper/system/SysConfigMapper.xml similarity index 98% rename from ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml rename to jiajiakang-system/src/main/resources/mapper/system/SysConfigMapper.xml index 8b979061bb890190ef5eb61a1e6f9416e41c96d7..9bd139a93c4f8010743e05826e922b7daa75e032 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/jiajiakang-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/jiajiakang-system/src/main/resources/mapper/system/SysDeptMapper.xml similarity index 99% rename from ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml rename to jiajiakang-system/src/main/resources/mapper/system/SysDeptMapper.xml index 8777b406716fd92bc683a2927e272d2b949fbcc3..8b89eca76f14eefcd45867703150091b9e0e3e5b 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/jiajiakang-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/jiajiakang-system/src/main/resources/mapper/system/SysDictDataMapper.xml similarity index 98% rename from ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml rename to jiajiakang-system/src/main/resources/mapper/system/SysDictDataMapper.xml index 8da9030bf1762f19305fc099465881bf75cec64c..683ec1ff3463460b18a2324edbe5cb74f84e6301 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/jiajiakang-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/jiajiakang-system/src/main/resources/mapper/system/SysDictTypeMapper.xml similarity index 98% rename from ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml rename to jiajiakang-system/src/main/resources/mapper/system/SysDictTypeMapper.xml index 55b4075f146ec27985000b56bb46a8417e905b1c..df38363c7ae338894d1fda4262cb0d42e658362f 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/jiajiakang-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/jiajiakang-system/src/main/resources/mapper/system/SysLogininforMapper.xml similarity index 97% rename from ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml rename to jiajiakang-system/src/main/resources/mapper/system/SysLogininforMapper.xml index b8178fa3e23648ae3732d97521a50ef47b86c111..bc156eb245e85f90bdf0bd9e1d42f2bfeb260b52 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/jiajiakang-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/jiajiakang-system/src/main/resources/mapper/system/SysMenuMapper.xml similarity index 99% rename from ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml rename to jiajiakang-system/src/main/resources/mapper/system/SysMenuMapper.xml index 22a4cd10d3b7fda743c550fa61ecdfac8b9805f2..500d796803ccafbfa6f81d0776641c3a5324deb7 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/jiajiakang-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/jiajiakang-system/src/main/resources/mapper/system/SysNoticeMapper.xml similarity index 98% rename from ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml rename to jiajiakang-system/src/main/resources/mapper/system/SysNoticeMapper.xml index c51dabe764979a189edc875bf42bb5c3f423875f..aefa5a4f36a8700c4301229174ade398cc7256ba 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/jiajiakang-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/jiajiakang-system/src/main/resources/mapper/system/SysOperLogMapper.xml similarity index 98% rename from ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml rename to jiajiakang-system/src/main/resources/mapper/system/SysOperLogMapper.xml index f017ef8685c111fa98ad6293ee66114c21a356c5..134ca6e3772a5f84d1cbed87572733b7495329dc 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/jiajiakang-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/jiajiakang-system/src/main/resources/mapper/system/SysPostMapper.xml similarity index 98% rename from ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml rename to jiajiakang-system/src/main/resources/mapper/system/SysPostMapper.xml index c82d808f5a2a313a69616bee18537be918e5e011..0f1387aa4ae930e7ff10a84138e23459b3e49ae5 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/jiajiakang-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/jiajiakang-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml similarity index 93% rename from ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml rename to jiajiakang-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml index 7c4139bce277c8792d6fbd92bb9b4c67504cd4dd..7ff686d32039c0302014dc74a9af18dec9e8c932 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml +++ b/jiajiakang-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/jiajiakang-system/src/main/resources/mapper/system/SysRoleMapper.xml similarity index 99% rename from ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml rename to jiajiakang-system/src/main/resources/mapper/system/SysRoleMapper.xml index 3506de8e2a832e441797379b5bd3f2804dafdcc8..a9f88cd2a6f78cab8e1896f5214a8498761d9926 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/jiajiakang-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/jiajiakang-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml similarity index 93% rename from ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml rename to jiajiakang-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml index d3248655ced9b3a13840bf6b3cbe53adc90538de..97a4aacbaf0fe475f20c93cf1ea33a0857796d95 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ b/jiajiakang-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/jiajiakang-system/src/main/resources/mapper/system/SysUserMapper.xml similarity index 99% rename from ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml rename to jiajiakang-system/src/main/resources/mapper/system/SysUserMapper.xml index 296912d2a11349088efe2ba679c65fe9ff26a47f..d669e6a55dba0a7da4d8c49277988c4c92caec77 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/jiajiakang-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/jiajiakang-system/src/main/resources/mapper/system/SysUserPostMapper.xml similarity index 93% rename from ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml rename to jiajiakang-system/src/main/resources/mapper/system/SysUserPostMapper.xml index 2b90bc40b67418a0e2493683f7af2f27f3ddabbe..104b2819d55cdc5a5f4de7de38f2585f0d90a99d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml +++ b/jiajiakang-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/jiajiakang-system/src/main/resources/mapper/system/SysUserRoleMapper.xml similarity index 95% rename from ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml rename to jiajiakang-system/src/main/resources/mapper/system/SysUserRoleMapper.xml index dd726891a8ed42c98892b2e99479bf3aabb68630..42da439c04dc343360881ade90c3f3bb0a03524f 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/jiajiakang-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-ui/.editorconfig b/jiajiakang-ui/.editorconfig similarity index 100% rename from ruoyi-ui/.editorconfig rename to jiajiakang-ui/.editorconfig diff --git a/ruoyi-ui/.env.development b/jiajiakang-ui/.env.development similarity index 100% rename from ruoyi-ui/.env.development rename to jiajiakang-ui/.env.development diff --git a/ruoyi-ui/.env.production b/jiajiakang-ui/.env.production similarity index 100% rename from ruoyi-ui/.env.production rename to jiajiakang-ui/.env.production diff --git a/ruoyi-ui/.env.staging b/jiajiakang-ui/.env.staging similarity index 100% rename from ruoyi-ui/.env.staging rename to jiajiakang-ui/.env.staging diff --git a/ruoyi-ui/.eslintignore b/jiajiakang-ui/.eslintignore similarity index 100% rename from ruoyi-ui/.eslintignore rename to jiajiakang-ui/.eslintignore diff --git a/ruoyi-ui/.eslintrc.js b/jiajiakang-ui/.eslintrc.js similarity index 100% rename from ruoyi-ui/.eslintrc.js rename to jiajiakang-ui/.eslintrc.js diff --git a/ruoyi-ui/.gitignore b/jiajiakang-ui/.gitignore similarity index 100% rename from ruoyi-ui/.gitignore rename to jiajiakang-ui/.gitignore diff --git a/ruoyi-ui/README.md b/jiajiakang-ui/README.md similarity index 100% rename from ruoyi-ui/README.md rename to jiajiakang-ui/README.md diff --git a/ruoyi-ui/babel.config.js b/jiajiakang-ui/babel.config.js similarity index 100% rename from ruoyi-ui/babel.config.js rename to jiajiakang-ui/babel.config.js diff --git a/ruoyi-ui/bin/build.bat b/jiajiakang-ui/bin/build.bat similarity index 100% rename from ruoyi-ui/bin/build.bat rename to jiajiakang-ui/bin/build.bat diff --git a/ruoyi-ui/bin/package.bat b/jiajiakang-ui/bin/package.bat similarity index 100% rename from ruoyi-ui/bin/package.bat rename to jiajiakang-ui/bin/package.bat diff --git a/ruoyi-ui/bin/run-web.bat b/jiajiakang-ui/bin/run-web.bat similarity index 100% rename from ruoyi-ui/bin/run-web.bat rename to jiajiakang-ui/bin/run-web.bat diff --git a/ruoyi-ui/build/index.js b/jiajiakang-ui/build/index.js similarity index 100% rename from ruoyi-ui/build/index.js rename to jiajiakang-ui/build/index.js diff --git a/ruoyi-ui/package.json b/jiajiakang-ui/package.json similarity index 100% rename from ruoyi-ui/package.json rename to jiajiakang-ui/package.json diff --git a/ruoyi-ui/public/favicon.ico b/jiajiakang-ui/public/favicon.ico similarity index 100% rename from ruoyi-ui/public/favicon.ico rename to jiajiakang-ui/public/favicon.ico diff --git a/ruoyi-ui/public/index.html b/jiajiakang-ui/public/index.html similarity index 100% rename from ruoyi-ui/public/index.html rename to jiajiakang-ui/public/index.html diff --git a/ruoyi-ui/public/robots.txt b/jiajiakang-ui/public/robots.txt similarity index 96% rename from ruoyi-ui/public/robots.txt rename to jiajiakang-ui/public/robots.txt index c2aab7e03933a858d1765090928dca4013fe2526..77470cb39f05f70a5b709b68304d0756bab75a0d 100644 --- a/ruoyi-ui/public/robots.txt +++ b/jiajiakang-ui/public/robots.txt @@ -1,2 +1,2 @@ -User-agent: * +User-agent: * Disallow: / \ No newline at end of file diff --git a/ruoyi-ui/src/App.vue b/jiajiakang-ui/src/App.vue similarity index 100% rename from ruoyi-ui/src/App.vue rename to jiajiakang-ui/src/App.vue diff --git a/ruoyi-ui/src/api/login.js b/jiajiakang-ui/src/api/login.js similarity index 100% rename from ruoyi-ui/src/api/login.js rename to jiajiakang-ui/src/api/login.js diff --git a/ruoyi-ui/src/api/menu.js b/jiajiakang-ui/src/api/menu.js similarity index 100% rename from ruoyi-ui/src/api/menu.js rename to jiajiakang-ui/src/api/menu.js diff --git a/ruoyi-ui/src/api/monitor/cache.js b/jiajiakang-ui/src/api/monitor/cache.js similarity index 94% rename from ruoyi-ui/src/api/monitor/cache.js rename to jiajiakang-ui/src/api/monitor/cache.js index 2ffaf7a3f3d618d3a31a4d6fbfc59a1e4d1d0e59..59d3505a4a4a2f66ffbad7f6566ed758eda15fa0 100644 --- a/ruoyi-ui/src/api/monitor/cache.js +++ b/jiajiakang-ui/src/api/monitor/cache.js @@ -1,9 +1,9 @@ -import request from '@/utils/request' - -// 鏌ヨ缂撳瓨璇︾粏 -export function getCache() { - return request({ - url: '/monitor/cache', - method: 'get' - }) -} +import request from '@/utils/request' + +// 鏌ヨ缂撳瓨璇︾粏 +export function getCache() { + return request({ + url: '/monitor/cache', + method: 'get' + }) +} diff --git a/ruoyi-ui/src/api/monitor/job.js b/jiajiakang-ui/src/api/monitor/job.js similarity index 100% rename from ruoyi-ui/src/api/monitor/job.js rename to jiajiakang-ui/src/api/monitor/job.js diff --git a/ruoyi-ui/src/api/monitor/jobLog.js b/jiajiakang-ui/src/api/monitor/jobLog.js similarity index 100% rename from ruoyi-ui/src/api/monitor/jobLog.js rename to jiajiakang-ui/src/api/monitor/jobLog.js diff --git a/ruoyi-ui/src/api/monitor/logininfor.js b/jiajiakang-ui/src/api/monitor/logininfor.js similarity index 100% rename from ruoyi-ui/src/api/monitor/logininfor.js rename to jiajiakang-ui/src/api/monitor/logininfor.js diff --git a/ruoyi-ui/src/api/monitor/online.js b/jiajiakang-ui/src/api/monitor/online.js similarity index 100% rename from ruoyi-ui/src/api/monitor/online.js rename to jiajiakang-ui/src/api/monitor/online.js diff --git a/ruoyi-ui/src/api/monitor/operlog.js b/jiajiakang-ui/src/api/monitor/operlog.js similarity index 100% rename from ruoyi-ui/src/api/monitor/operlog.js rename to jiajiakang-ui/src/api/monitor/operlog.js diff --git a/ruoyi-ui/src/api/monitor/server.js b/jiajiakang-ui/src/api/monitor/server.js similarity index 100% rename from ruoyi-ui/src/api/monitor/server.js rename to jiajiakang-ui/src/api/monitor/server.js diff --git a/ruoyi-ui/src/api/system/config.js b/jiajiakang-ui/src/api/system/config.js similarity index 100% rename from ruoyi-ui/src/api/system/config.js rename to jiajiakang-ui/src/api/system/config.js diff --git a/ruoyi-ui/src/api/system/dept.js b/jiajiakang-ui/src/api/system/dept.js similarity index 100% rename from ruoyi-ui/src/api/system/dept.js rename to jiajiakang-ui/src/api/system/dept.js diff --git a/ruoyi-ui/src/api/system/dict/data.js b/jiajiakang-ui/src/api/system/dict/data.js similarity index 100% rename from ruoyi-ui/src/api/system/dict/data.js rename to jiajiakang-ui/src/api/system/dict/data.js diff --git a/ruoyi-ui/src/api/system/dict/type.js b/jiajiakang-ui/src/api/system/dict/type.js similarity index 100% rename from ruoyi-ui/src/api/system/dict/type.js rename to jiajiakang-ui/src/api/system/dict/type.js diff --git a/ruoyi-ui/src/api/system/menu.js b/jiajiakang-ui/src/api/system/menu.js similarity index 100% rename from ruoyi-ui/src/api/system/menu.js rename to jiajiakang-ui/src/api/system/menu.js diff --git a/ruoyi-ui/src/api/system/notice.js b/jiajiakang-ui/src/api/system/notice.js similarity index 100% rename from ruoyi-ui/src/api/system/notice.js rename to jiajiakang-ui/src/api/system/notice.js diff --git a/ruoyi-ui/src/api/system/post.js b/jiajiakang-ui/src/api/system/post.js similarity index 100% rename from ruoyi-ui/src/api/system/post.js rename to jiajiakang-ui/src/api/system/post.js diff --git a/ruoyi-ui/src/api/system/role.js b/jiajiakang-ui/src/api/system/role.js similarity index 100% rename from ruoyi-ui/src/api/system/role.js rename to jiajiakang-ui/src/api/system/role.js diff --git a/ruoyi-ui/src/api/system/user.js b/jiajiakang-ui/src/api/system/user.js similarity index 100% rename from ruoyi-ui/src/api/system/user.js rename to jiajiakang-ui/src/api/system/user.js diff --git a/ruoyi-ui/src/api/tool/gen.js b/jiajiakang-ui/src/api/tool/gen.js similarity index 100% rename from ruoyi-ui/src/api/tool/gen.js rename to jiajiakang-ui/src/api/tool/gen.js diff --git a/ruoyi-ui/src/assets/401_images/401.gif b/jiajiakang-ui/src/assets/401_images/401.gif similarity index 100% rename from ruoyi-ui/src/assets/401_images/401.gif rename to jiajiakang-ui/src/assets/401_images/401.gif diff --git a/ruoyi-ui/src/assets/404_images/404.png b/jiajiakang-ui/src/assets/404_images/404.png similarity index 100% rename from ruoyi-ui/src/assets/404_images/404.png rename to jiajiakang-ui/src/assets/404_images/404.png diff --git a/ruoyi-ui/src/assets/404_images/404_cloud.png b/jiajiakang-ui/src/assets/404_images/404_cloud.png similarity index 100% rename from ruoyi-ui/src/assets/404_images/404_cloud.png rename to jiajiakang-ui/src/assets/404_images/404_cloud.png diff --git a/ruoyi-ui/src/assets/icons/index.js b/jiajiakang-ui/src/assets/icons/index.js similarity index 100% rename from ruoyi-ui/src/assets/icons/index.js rename to jiajiakang-ui/src/assets/icons/index.js diff --git a/ruoyi-ui/src/assets/icons/svg/404.svg b/jiajiakang-ui/src/assets/icons/svg/404.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/404.svg rename to jiajiakang-ui/src/assets/icons/svg/404.svg diff --git a/ruoyi-ui/src/assets/icons/svg/bug.svg b/jiajiakang-ui/src/assets/icons/svg/bug.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/bug.svg rename to jiajiakang-ui/src/assets/icons/svg/bug.svg diff --git a/ruoyi-ui/src/assets/icons/svg/build.svg b/jiajiakang-ui/src/assets/icons/svg/build.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/build.svg rename to jiajiakang-ui/src/assets/icons/svg/build.svg diff --git a/ruoyi-ui/src/assets/icons/svg/button.svg b/jiajiakang-ui/src/assets/icons/svg/button.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/button.svg rename to jiajiakang-ui/src/assets/icons/svg/button.svg diff --git a/ruoyi-ui/src/assets/icons/svg/cascader.svg b/jiajiakang-ui/src/assets/icons/svg/cascader.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/cascader.svg rename to jiajiakang-ui/src/assets/icons/svg/cascader.svg diff --git a/ruoyi-ui/src/assets/icons/svg/chart.svg b/jiajiakang-ui/src/assets/icons/svg/chart.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/chart.svg rename to jiajiakang-ui/src/assets/icons/svg/chart.svg diff --git a/ruoyi-ui/src/assets/icons/svg/checkbox.svg b/jiajiakang-ui/src/assets/icons/svg/checkbox.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/checkbox.svg rename to jiajiakang-ui/src/assets/icons/svg/checkbox.svg diff --git a/ruoyi-ui/src/assets/icons/svg/clipboard.svg b/jiajiakang-ui/src/assets/icons/svg/clipboard.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/clipboard.svg rename to jiajiakang-ui/src/assets/icons/svg/clipboard.svg diff --git a/ruoyi-ui/src/assets/icons/svg/code.svg b/jiajiakang-ui/src/assets/icons/svg/code.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/code.svg rename to jiajiakang-ui/src/assets/icons/svg/code.svg diff --git a/ruoyi-ui/src/assets/icons/svg/color.svg b/jiajiakang-ui/src/assets/icons/svg/color.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/color.svg rename to jiajiakang-ui/src/assets/icons/svg/color.svg diff --git a/ruoyi-ui/src/assets/icons/svg/component.svg b/jiajiakang-ui/src/assets/icons/svg/component.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/component.svg rename to jiajiakang-ui/src/assets/icons/svg/component.svg diff --git a/ruoyi-ui/src/assets/icons/svg/dashboard.svg b/jiajiakang-ui/src/assets/icons/svg/dashboard.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/dashboard.svg rename to jiajiakang-ui/src/assets/icons/svg/dashboard.svg diff --git a/ruoyi-ui/src/assets/icons/svg/date-range.svg b/jiajiakang-ui/src/assets/icons/svg/date-range.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/date-range.svg rename to jiajiakang-ui/src/assets/icons/svg/date-range.svg diff --git a/ruoyi-ui/src/assets/icons/svg/date.svg b/jiajiakang-ui/src/assets/icons/svg/date.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/date.svg rename to jiajiakang-ui/src/assets/icons/svg/date.svg diff --git a/ruoyi-ui/src/assets/icons/svg/dict.svg b/jiajiakang-ui/src/assets/icons/svg/dict.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/dict.svg rename to jiajiakang-ui/src/assets/icons/svg/dict.svg diff --git a/ruoyi-ui/src/assets/icons/svg/documentation.svg b/jiajiakang-ui/src/assets/icons/svg/documentation.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/documentation.svg rename to jiajiakang-ui/src/assets/icons/svg/documentation.svg diff --git a/ruoyi-ui/src/assets/icons/svg/download.svg b/jiajiakang-ui/src/assets/icons/svg/download.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/download.svg rename to jiajiakang-ui/src/assets/icons/svg/download.svg diff --git a/ruoyi-ui/src/assets/icons/svg/drag.svg b/jiajiakang-ui/src/assets/icons/svg/drag.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/drag.svg rename to jiajiakang-ui/src/assets/icons/svg/drag.svg diff --git a/ruoyi-ui/src/assets/icons/svg/druid.svg b/jiajiakang-ui/src/assets/icons/svg/druid.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/druid.svg rename to jiajiakang-ui/src/assets/icons/svg/druid.svg diff --git a/ruoyi-ui/src/assets/icons/svg/edit.svg b/jiajiakang-ui/src/assets/icons/svg/edit.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/edit.svg rename to jiajiakang-ui/src/assets/icons/svg/edit.svg diff --git a/ruoyi-ui/src/assets/icons/svg/education.svg b/jiajiakang-ui/src/assets/icons/svg/education.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/education.svg rename to jiajiakang-ui/src/assets/icons/svg/education.svg diff --git a/ruoyi-ui/src/assets/icons/svg/email.svg b/jiajiakang-ui/src/assets/icons/svg/email.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/email.svg rename to jiajiakang-ui/src/assets/icons/svg/email.svg diff --git a/ruoyi-ui/src/assets/icons/svg/example.svg b/jiajiakang-ui/src/assets/icons/svg/example.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/example.svg rename to jiajiakang-ui/src/assets/icons/svg/example.svg diff --git a/ruoyi-ui/src/assets/icons/svg/excel.svg b/jiajiakang-ui/src/assets/icons/svg/excel.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/excel.svg rename to jiajiakang-ui/src/assets/icons/svg/excel.svg diff --git a/ruoyi-ui/src/assets/icons/svg/exit-fullscreen.svg b/jiajiakang-ui/src/assets/icons/svg/exit-fullscreen.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/exit-fullscreen.svg rename to jiajiakang-ui/src/assets/icons/svg/exit-fullscreen.svg diff --git a/ruoyi-ui/src/assets/icons/svg/eye-open.svg b/jiajiakang-ui/src/assets/icons/svg/eye-open.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/eye-open.svg rename to jiajiakang-ui/src/assets/icons/svg/eye-open.svg diff --git a/ruoyi-ui/src/assets/icons/svg/eye.svg b/jiajiakang-ui/src/assets/icons/svg/eye.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/eye.svg rename to jiajiakang-ui/src/assets/icons/svg/eye.svg diff --git a/ruoyi-ui/src/assets/icons/svg/form.svg b/jiajiakang-ui/src/assets/icons/svg/form.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/form.svg rename to jiajiakang-ui/src/assets/icons/svg/form.svg diff --git a/ruoyi-ui/src/assets/icons/svg/fullscreen.svg b/jiajiakang-ui/src/assets/icons/svg/fullscreen.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/fullscreen.svg rename to jiajiakang-ui/src/assets/icons/svg/fullscreen.svg diff --git a/ruoyi-ui/src/assets/icons/svg/github.svg b/jiajiakang-ui/src/assets/icons/svg/github.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/github.svg rename to jiajiakang-ui/src/assets/icons/svg/github.svg diff --git a/ruoyi-ui/src/assets/icons/svg/guide.svg b/jiajiakang-ui/src/assets/icons/svg/guide.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/guide.svg rename to jiajiakang-ui/src/assets/icons/svg/guide.svg diff --git a/ruoyi-ui/src/assets/icons/svg/icon.svg b/jiajiakang-ui/src/assets/icons/svg/icon.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/icon.svg rename to jiajiakang-ui/src/assets/icons/svg/icon.svg diff --git a/ruoyi-ui/src/assets/icons/svg/input.svg b/jiajiakang-ui/src/assets/icons/svg/input.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/input.svg rename to jiajiakang-ui/src/assets/icons/svg/input.svg diff --git a/ruoyi-ui/src/assets/icons/svg/international.svg b/jiajiakang-ui/src/assets/icons/svg/international.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/international.svg rename to jiajiakang-ui/src/assets/icons/svg/international.svg diff --git a/ruoyi-ui/src/assets/icons/svg/job.svg b/jiajiakang-ui/src/assets/icons/svg/job.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/job.svg rename to jiajiakang-ui/src/assets/icons/svg/job.svg diff --git a/ruoyi-ui/src/assets/icons/svg/language.svg b/jiajiakang-ui/src/assets/icons/svg/language.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/language.svg rename to jiajiakang-ui/src/assets/icons/svg/language.svg diff --git a/ruoyi-ui/src/assets/icons/svg/link.svg b/jiajiakang-ui/src/assets/icons/svg/link.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/link.svg rename to jiajiakang-ui/src/assets/icons/svg/link.svg diff --git a/ruoyi-ui/src/assets/icons/svg/list.svg b/jiajiakang-ui/src/assets/icons/svg/list.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/list.svg rename to jiajiakang-ui/src/assets/icons/svg/list.svg diff --git a/ruoyi-ui/src/assets/icons/svg/lock.svg b/jiajiakang-ui/src/assets/icons/svg/lock.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/lock.svg rename to jiajiakang-ui/src/assets/icons/svg/lock.svg diff --git a/ruoyi-ui/src/assets/icons/svg/log.svg b/jiajiakang-ui/src/assets/icons/svg/log.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/log.svg rename to jiajiakang-ui/src/assets/icons/svg/log.svg diff --git a/ruoyi-ui/src/assets/icons/svg/logininfor.svg b/jiajiakang-ui/src/assets/icons/svg/logininfor.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/logininfor.svg rename to jiajiakang-ui/src/assets/icons/svg/logininfor.svg diff --git a/ruoyi-ui/src/assets/icons/svg/message.svg b/jiajiakang-ui/src/assets/icons/svg/message.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/message.svg rename to jiajiakang-ui/src/assets/icons/svg/message.svg diff --git a/ruoyi-ui/src/assets/icons/svg/money.svg b/jiajiakang-ui/src/assets/icons/svg/money.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/money.svg rename to jiajiakang-ui/src/assets/icons/svg/money.svg diff --git a/ruoyi-ui/src/assets/icons/svg/monitor.svg b/jiajiakang-ui/src/assets/icons/svg/monitor.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/monitor.svg rename to jiajiakang-ui/src/assets/icons/svg/monitor.svg diff --git a/ruoyi-ui/src/assets/icons/svg/nested.svg b/jiajiakang-ui/src/assets/icons/svg/nested.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/nested.svg rename to jiajiakang-ui/src/assets/icons/svg/nested.svg diff --git a/ruoyi-ui/src/assets/icons/svg/number.svg b/jiajiakang-ui/src/assets/icons/svg/number.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/number.svg rename to jiajiakang-ui/src/assets/icons/svg/number.svg diff --git a/ruoyi-ui/src/assets/icons/svg/online.svg b/jiajiakang-ui/src/assets/icons/svg/online.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/online.svg rename to jiajiakang-ui/src/assets/icons/svg/online.svg diff --git a/ruoyi-ui/src/assets/icons/svg/password.svg b/jiajiakang-ui/src/assets/icons/svg/password.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/password.svg rename to jiajiakang-ui/src/assets/icons/svg/password.svg diff --git a/ruoyi-ui/src/assets/icons/svg/pdf.svg b/jiajiakang-ui/src/assets/icons/svg/pdf.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/pdf.svg rename to jiajiakang-ui/src/assets/icons/svg/pdf.svg diff --git a/ruoyi-ui/src/assets/icons/svg/people.svg b/jiajiakang-ui/src/assets/icons/svg/people.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/people.svg rename to jiajiakang-ui/src/assets/icons/svg/people.svg diff --git a/ruoyi-ui/src/assets/icons/svg/peoples.svg b/jiajiakang-ui/src/assets/icons/svg/peoples.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/peoples.svg rename to jiajiakang-ui/src/assets/icons/svg/peoples.svg diff --git a/ruoyi-ui/src/assets/icons/svg/phone.svg b/jiajiakang-ui/src/assets/icons/svg/phone.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/phone.svg rename to jiajiakang-ui/src/assets/icons/svg/phone.svg diff --git a/ruoyi-ui/src/assets/icons/svg/post.svg b/jiajiakang-ui/src/assets/icons/svg/post.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/post.svg rename to jiajiakang-ui/src/assets/icons/svg/post.svg diff --git a/ruoyi-ui/src/assets/icons/svg/qq.svg b/jiajiakang-ui/src/assets/icons/svg/qq.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/qq.svg rename to jiajiakang-ui/src/assets/icons/svg/qq.svg diff --git a/ruoyi-ui/src/assets/icons/svg/question.svg b/jiajiakang-ui/src/assets/icons/svg/question.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/question.svg rename to jiajiakang-ui/src/assets/icons/svg/question.svg diff --git a/ruoyi-ui/src/assets/icons/svg/radio.svg b/jiajiakang-ui/src/assets/icons/svg/radio.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/radio.svg rename to jiajiakang-ui/src/assets/icons/svg/radio.svg diff --git a/ruoyi-ui/src/assets/icons/svg/rate.svg b/jiajiakang-ui/src/assets/icons/svg/rate.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/rate.svg rename to jiajiakang-ui/src/assets/icons/svg/rate.svg diff --git a/ruoyi-ui/src/assets/icons/svg/redis.svg b/jiajiakang-ui/src/assets/icons/svg/redis.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/redis.svg rename to jiajiakang-ui/src/assets/icons/svg/redis.svg diff --git a/ruoyi-ui/src/assets/icons/svg/row.svg b/jiajiakang-ui/src/assets/icons/svg/row.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/row.svg rename to jiajiakang-ui/src/assets/icons/svg/row.svg diff --git a/ruoyi-ui/src/assets/icons/svg/search.svg b/jiajiakang-ui/src/assets/icons/svg/search.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/search.svg rename to jiajiakang-ui/src/assets/icons/svg/search.svg diff --git a/ruoyi-ui/src/assets/icons/svg/select.svg b/jiajiakang-ui/src/assets/icons/svg/select.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/select.svg rename to jiajiakang-ui/src/assets/icons/svg/select.svg diff --git a/ruoyi-ui/src/assets/icons/svg/server.svg b/jiajiakang-ui/src/assets/icons/svg/server.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/server.svg rename to jiajiakang-ui/src/assets/icons/svg/server.svg diff --git a/ruoyi-ui/src/assets/icons/svg/shopping.svg b/jiajiakang-ui/src/assets/icons/svg/shopping.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/shopping.svg rename to jiajiakang-ui/src/assets/icons/svg/shopping.svg diff --git a/ruoyi-ui/src/assets/icons/svg/size.svg b/jiajiakang-ui/src/assets/icons/svg/size.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/size.svg rename to jiajiakang-ui/src/assets/icons/svg/size.svg diff --git a/ruoyi-ui/src/assets/icons/svg/skill.svg b/jiajiakang-ui/src/assets/icons/svg/skill.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/skill.svg rename to jiajiakang-ui/src/assets/icons/svg/skill.svg diff --git a/ruoyi-ui/src/assets/icons/svg/slider.svg b/jiajiakang-ui/src/assets/icons/svg/slider.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/slider.svg rename to jiajiakang-ui/src/assets/icons/svg/slider.svg diff --git a/ruoyi-ui/src/assets/icons/svg/star.svg b/jiajiakang-ui/src/assets/icons/svg/star.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/star.svg rename to jiajiakang-ui/src/assets/icons/svg/star.svg diff --git a/ruoyi-ui/src/assets/icons/svg/swagger.svg b/jiajiakang-ui/src/assets/icons/svg/swagger.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/swagger.svg rename to jiajiakang-ui/src/assets/icons/svg/swagger.svg diff --git a/ruoyi-ui/src/assets/icons/svg/switch.svg b/jiajiakang-ui/src/assets/icons/svg/switch.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/switch.svg rename to jiajiakang-ui/src/assets/icons/svg/switch.svg diff --git a/ruoyi-ui/src/assets/icons/svg/system.svg b/jiajiakang-ui/src/assets/icons/svg/system.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/system.svg rename to jiajiakang-ui/src/assets/icons/svg/system.svg diff --git a/ruoyi-ui/src/assets/icons/svg/tab.svg b/jiajiakang-ui/src/assets/icons/svg/tab.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/tab.svg rename to jiajiakang-ui/src/assets/icons/svg/tab.svg diff --git a/ruoyi-ui/src/assets/icons/svg/table.svg b/jiajiakang-ui/src/assets/icons/svg/table.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/table.svg rename to jiajiakang-ui/src/assets/icons/svg/table.svg diff --git a/ruoyi-ui/src/assets/icons/svg/textarea.svg b/jiajiakang-ui/src/assets/icons/svg/textarea.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/textarea.svg rename to jiajiakang-ui/src/assets/icons/svg/textarea.svg diff --git a/ruoyi-ui/src/assets/icons/svg/theme.svg b/jiajiakang-ui/src/assets/icons/svg/theme.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/theme.svg rename to jiajiakang-ui/src/assets/icons/svg/theme.svg diff --git a/ruoyi-ui/src/assets/icons/svg/time-range.svg b/jiajiakang-ui/src/assets/icons/svg/time-range.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/time-range.svg rename to jiajiakang-ui/src/assets/icons/svg/time-range.svg diff --git a/ruoyi-ui/src/assets/icons/svg/time.svg b/jiajiakang-ui/src/assets/icons/svg/time.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/time.svg rename to jiajiakang-ui/src/assets/icons/svg/time.svg diff --git a/ruoyi-ui/src/assets/icons/svg/tool.svg b/jiajiakang-ui/src/assets/icons/svg/tool.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/tool.svg rename to jiajiakang-ui/src/assets/icons/svg/tool.svg diff --git a/ruoyi-ui/src/assets/icons/svg/tree-table.svg b/jiajiakang-ui/src/assets/icons/svg/tree-table.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/tree-table.svg rename to jiajiakang-ui/src/assets/icons/svg/tree-table.svg diff --git a/ruoyi-ui/src/assets/icons/svg/tree.svg b/jiajiakang-ui/src/assets/icons/svg/tree.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/tree.svg rename to jiajiakang-ui/src/assets/icons/svg/tree.svg diff --git a/ruoyi-ui/src/assets/icons/svg/upload.svg b/jiajiakang-ui/src/assets/icons/svg/upload.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/upload.svg rename to jiajiakang-ui/src/assets/icons/svg/upload.svg diff --git a/ruoyi-ui/src/assets/icons/svg/user.svg b/jiajiakang-ui/src/assets/icons/svg/user.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/user.svg rename to jiajiakang-ui/src/assets/icons/svg/user.svg diff --git a/ruoyi-ui/src/assets/icons/svg/validCode.svg b/jiajiakang-ui/src/assets/icons/svg/validCode.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/validCode.svg rename to jiajiakang-ui/src/assets/icons/svg/validCode.svg diff --git a/ruoyi-ui/src/assets/icons/svg/wechat.svg b/jiajiakang-ui/src/assets/icons/svg/wechat.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/wechat.svg rename to jiajiakang-ui/src/assets/icons/svg/wechat.svg diff --git a/ruoyi-ui/src/assets/icons/svg/zip.svg b/jiajiakang-ui/src/assets/icons/svg/zip.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/zip.svg rename to jiajiakang-ui/src/assets/icons/svg/zip.svg diff --git a/ruoyi-ui/src/assets/icons/svgo.yml b/jiajiakang-ui/src/assets/icons/svgo.yml similarity index 100% rename from ruoyi-ui/src/assets/icons/svgo.yml rename to jiajiakang-ui/src/assets/icons/svgo.yml diff --git a/ruoyi-ui/src/assets/images/dark.svg b/jiajiakang-ui/src/assets/images/dark.svg similarity index 98% rename from ruoyi-ui/src/assets/images/dark.svg rename to jiajiakang-ui/src/assets/images/dark.svg index 36b58b5b8f214b90daead1c1851ec120250b0cec..f646bd7ea2c452c81afa15ae2e2693cda6ffbc28 100644 --- a/ruoyi-ui/src/assets/images/dark.svg +++ b/jiajiakang-ui/src/assets/images/dark.svg @@ -1,39 +1,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/images/light.svg b/jiajiakang-ui/src/assets/images/light.svg similarity index 98% rename from ruoyi-ui/src/assets/images/light.svg rename to jiajiakang-ui/src/assets/images/light.svg index efd52c67dee82448b1ccbd7968dc0ee9e37f11d2..ab7cc088fac34b349141bba5eeeed5cf68922667 100644 --- a/ruoyi-ui/src/assets/images/light.svg +++ b/jiajiakang-ui/src/assets/images/light.svg @@ -1,39 +1,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/images/login-background.jpg b/jiajiakang-ui/src/assets/images/login-background.jpg similarity index 100% rename from ruoyi-ui/src/assets/images/login-background.jpg rename to jiajiakang-ui/src/assets/images/login-background.jpg diff --git a/ruoyi-ui/src/assets/images/profile.jpg b/jiajiakang-ui/src/assets/images/profile.jpg similarity index 100% rename from ruoyi-ui/src/assets/images/profile.jpg rename to jiajiakang-ui/src/assets/images/profile.jpg diff --git a/ruoyi-ui/src/assets/logo/logo.png b/jiajiakang-ui/src/assets/logo/logo.png similarity index 100% rename from ruoyi-ui/src/assets/logo/logo.png rename to jiajiakang-ui/src/assets/logo/logo.png diff --git a/ruoyi-ui/src/assets/styles/btn.scss b/jiajiakang-ui/src/assets/styles/btn.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/btn.scss rename to jiajiakang-ui/src/assets/styles/btn.scss diff --git a/ruoyi-ui/src/assets/styles/element-ui.scss b/jiajiakang-ui/src/assets/styles/element-ui.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/element-ui.scss rename to jiajiakang-ui/src/assets/styles/element-ui.scss diff --git a/ruoyi-ui/src/assets/styles/element-variables.scss b/jiajiakang-ui/src/assets/styles/element-variables.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/element-variables.scss rename to jiajiakang-ui/src/assets/styles/element-variables.scss diff --git a/ruoyi-ui/src/assets/styles/index.scss b/jiajiakang-ui/src/assets/styles/index.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/index.scss rename to jiajiakang-ui/src/assets/styles/index.scss diff --git a/ruoyi-ui/src/assets/styles/mixin.scss b/jiajiakang-ui/src/assets/styles/mixin.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/mixin.scss rename to jiajiakang-ui/src/assets/styles/mixin.scss diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/jiajiakang-ui/src/assets/styles/ruoyi.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/ruoyi.scss rename to jiajiakang-ui/src/assets/styles/ruoyi.scss diff --git a/ruoyi-ui/src/assets/styles/sidebar.scss b/jiajiakang-ui/src/assets/styles/sidebar.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/sidebar.scss rename to jiajiakang-ui/src/assets/styles/sidebar.scss diff --git a/ruoyi-ui/src/assets/styles/transition.scss b/jiajiakang-ui/src/assets/styles/transition.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/transition.scss rename to jiajiakang-ui/src/assets/styles/transition.scss diff --git a/ruoyi-ui/src/assets/styles/variables.scss b/jiajiakang-ui/src/assets/styles/variables.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/variables.scss rename to jiajiakang-ui/src/assets/styles/variables.scss diff --git a/ruoyi-ui/src/components/Breadcrumb/index.vue b/jiajiakang-ui/src/components/Breadcrumb/index.vue similarity index 100% rename from ruoyi-ui/src/components/Breadcrumb/index.vue rename to jiajiakang-ui/src/components/Breadcrumb/index.vue diff --git a/ruoyi-ui/src/components/Editor/index.vue b/jiajiakang-ui/src/components/Editor/index.vue similarity index 100% rename from ruoyi-ui/src/components/Editor/index.vue rename to jiajiakang-ui/src/components/Editor/index.vue diff --git a/ruoyi-ui/src/components/FileUpload/index.vue b/jiajiakang-ui/src/components/FileUpload/index.vue similarity index 96% rename from ruoyi-ui/src/components/FileUpload/index.vue rename to jiajiakang-ui/src/components/FileUpload/index.vue index d19a0122589ead1344735bfdd67f04bc79870f95..69942aa080cb0b70cb8fcd49305c43ca72bc80a4 100644 --- a/ruoyi-ui/src/components/FileUpload/index.vue +++ b/jiajiakang-ui/src/components/FileUpload/index.vue @@ -1,179 +1,179 @@ -

- - - 閫夊彇鏂囦欢 - -
- 璇蜂笂浼 - - - 鐨勬枃浠 -
- - - - -
  • - - {{ getFileName(file.name) }} - -
    - 鍒犻櫎 -
    -
    • -     -
    - - - - - \ No newline at end of file diff --git a/ruoyi-ui/src/components/Hamburger/index.vue b/jiajiakang-ui/src/components/Hamburger/index.vue similarity index 100% rename from ruoyi-ui/src/components/Hamburger/index.vue rename to jiajiakang-ui/src/components/Hamburger/index.vue diff --git a/ruoyi-ui/src/components/HeaderSearch/index.vue b/jiajiakang-ui/src/components/HeaderSearch/index.vue similarity index 100% rename from ruoyi-ui/src/components/HeaderSearch/index.vue rename to jiajiakang-ui/src/components/HeaderSearch/index.vue diff --git a/ruoyi-ui/src/components/IconSelect/index.vue b/jiajiakang-ui/src/components/IconSelect/index.vue similarity index 100% rename from ruoyi-ui/src/components/IconSelect/index.vue rename to jiajiakang-ui/src/components/IconSelect/index.vue diff --git a/ruoyi-ui/src/components/IconSelect/requireIcons.js b/jiajiakang-ui/src/components/IconSelect/requireIcons.js similarity index 100% rename from ruoyi-ui/src/components/IconSelect/requireIcons.js rename to jiajiakang-ui/src/components/IconSelect/requireIcons.js diff --git a/ruoyi-ui/src/components/ImageUpload/index.vue b/jiajiakang-ui/src/components/ImageUpload/index.vue similarity index 96% rename from ruoyi-ui/src/components/ImageUpload/index.vue rename to jiajiakang-ui/src/components/ImageUpload/index.vue index ce540eb8d53be116da271675e6d5f16694f73ccb..8996329a6d37135cdf1916d9353473b259d0244d 100644 --- a/ruoyi-ui/src/components/ImageUpload/index.vue +++ b/jiajiakang-ui/src/components/ImageUpload/index.vue @@ -1,100 +1,100 @@ - - - - - \ No newline at end of file diff --git a/ruoyi-ui/src/components/Pagination/index.vue b/jiajiakang-ui/src/components/Pagination/index.vue similarity index 100% rename from ruoyi-ui/src/components/Pagination/index.vue rename to jiajiakang-ui/src/components/Pagination/index.vue diff --git a/ruoyi-ui/src/components/PanThumb/index.vue b/jiajiakang-ui/src/components/PanThumb/index.vue similarity index 100% rename from ruoyi-ui/src/components/PanThumb/index.vue rename to jiajiakang-ui/src/components/PanThumb/index.vue diff --git a/ruoyi-ui/src/components/ParentView/index.vue b/jiajiakang-ui/src/components/ParentView/index.vue similarity index 100% rename from ruoyi-ui/src/components/ParentView/index.vue rename to jiajiakang-ui/src/components/ParentView/index.vue diff --git a/ruoyi-ui/src/components/RightPanel/index.vue b/jiajiakang-ui/src/components/RightPanel/index.vue similarity index 100% rename from ruoyi-ui/src/components/RightPanel/index.vue rename to jiajiakang-ui/src/components/RightPanel/index.vue diff --git a/ruoyi-ui/src/components/RightToolbar/index.vue b/jiajiakang-ui/src/components/RightToolbar/index.vue similarity index 96% rename from ruoyi-ui/src/components/RightToolbar/index.vue rename to jiajiakang-ui/src/components/RightToolbar/index.vue index 9bf972277854ff332b554aae23acfa2960e6a5f1..92c65a5342ec968d5bcdd22bed504ba045a2a035 100644 --- a/ruoyi-ui/src/components/RightToolbar/index.vue +++ b/jiajiakang-ui/src/components/RightToolbar/index.vue @@ -1,80 +1,80 @@ - - - + + + diff --git a/ruoyi-ui/src/components/RuoYi/Doc/index.vue b/jiajiakang-ui/src/components/RuoYi/Doc/index.vue similarity index 93% rename from ruoyi-ui/src/components/RuoYi/Doc/index.vue rename to jiajiakang-ui/src/components/RuoYi/Doc/index.vue index 3915c296506f49c89a9bf3d29ce2d91e8f49f470..a6187f30ab97a8d83785bf7afaf5963135ad5aeb 100644 --- a/ruoyi-ui/src/components/RuoYi/Doc/index.vue +++ b/jiajiakang-ui/src/components/RuoYi/Doc/index.vue @@ -1,21 +1,21 @@ - - - \ No newline at end of file diff --git a/ruoyi-ui/src/components/RuoYi/Git/index.vue b/jiajiakang-ui/src/components/RuoYi/Git/index.vue similarity index 100% rename from ruoyi-ui/src/components/RuoYi/Git/index.vue rename to jiajiakang-ui/src/components/RuoYi/Git/index.vue diff --git a/ruoyi-ui/src/components/Screenfull/index.vue b/jiajiakang-ui/src/components/Screenfull/index.vue similarity index 100% rename from ruoyi-ui/src/components/Screenfull/index.vue rename to jiajiakang-ui/src/components/Screenfull/index.vue diff --git a/ruoyi-ui/src/components/SizeSelect/index.vue b/jiajiakang-ui/src/components/SizeSelect/index.vue similarity index 100% rename from ruoyi-ui/src/components/SizeSelect/index.vue rename to jiajiakang-ui/src/components/SizeSelect/index.vue diff --git a/ruoyi-ui/src/components/SvgIcon/index.vue b/jiajiakang-ui/src/components/SvgIcon/index.vue similarity index 100% rename from ruoyi-ui/src/components/SvgIcon/index.vue rename to jiajiakang-ui/src/components/SvgIcon/index.vue diff --git a/ruoyi-ui/src/components/ThemePicker/index.vue b/jiajiakang-ui/src/components/ThemePicker/index.vue similarity index 100% rename from ruoyi-ui/src/components/ThemePicker/index.vue rename to jiajiakang-ui/src/components/ThemePicker/index.vue diff --git a/ruoyi-ui/src/directive/permission/hasPermi.js b/jiajiakang-ui/src/directive/permission/hasPermi.js similarity index 100% rename from ruoyi-ui/src/directive/permission/hasPermi.js rename to jiajiakang-ui/src/directive/permission/hasPermi.js diff --git a/ruoyi-ui/src/directive/permission/hasRole.js b/jiajiakang-ui/src/directive/permission/hasRole.js similarity index 100% rename from ruoyi-ui/src/directive/permission/hasRole.js rename to jiajiakang-ui/src/directive/permission/hasRole.js diff --git a/ruoyi-ui/src/directive/permission/index.js b/jiajiakang-ui/src/directive/permission/index.js similarity index 100% rename from ruoyi-ui/src/directive/permission/index.js rename to jiajiakang-ui/src/directive/permission/index.js diff --git a/ruoyi-ui/src/layout/components/AppMain.vue b/jiajiakang-ui/src/layout/components/AppMain.vue similarity index 100% rename from ruoyi-ui/src/layout/components/AppMain.vue rename to jiajiakang-ui/src/layout/components/AppMain.vue diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/jiajiakang-ui/src/layout/components/Navbar.vue similarity index 100% rename from ruoyi-ui/src/layout/components/Navbar.vue rename to jiajiakang-ui/src/layout/components/Navbar.vue diff --git a/ruoyi-ui/src/layout/components/Settings/index.vue b/jiajiakang-ui/src/layout/components/Settings/index.vue similarity index 100% rename from ruoyi-ui/src/layout/components/Settings/index.vue rename to jiajiakang-ui/src/layout/components/Settings/index.vue diff --git a/ruoyi-ui/src/layout/components/Sidebar/FixiOSBug.js b/jiajiakang-ui/src/layout/components/Sidebar/FixiOSBug.js similarity index 100% rename from ruoyi-ui/src/layout/components/Sidebar/FixiOSBug.js rename to jiajiakang-ui/src/layout/components/Sidebar/FixiOSBug.js diff --git a/ruoyi-ui/src/layout/components/Sidebar/Item.vue b/jiajiakang-ui/src/layout/components/Sidebar/Item.vue similarity index 100% rename from ruoyi-ui/src/layout/components/Sidebar/Item.vue rename to jiajiakang-ui/src/layout/components/Sidebar/Item.vue diff --git a/ruoyi-ui/src/layout/components/Sidebar/Link.vue b/jiajiakang-ui/src/layout/components/Sidebar/Link.vue similarity index 100% rename from ruoyi-ui/src/layout/components/Sidebar/Link.vue rename to jiajiakang-ui/src/layout/components/Sidebar/Link.vue diff --git a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue b/jiajiakang-ui/src/layout/components/Sidebar/Logo.vue similarity index 98% rename from ruoyi-ui/src/layout/components/Sidebar/Logo.vue rename to jiajiakang-ui/src/layout/components/Sidebar/Logo.vue index 57dbd3a87c6bb073bf582ccb1462d93c8ea66e91..036a76985439bebc7bcc64a92495fbd4bad89891 100644 --- a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue +++ b/jiajiakang-ui/src/layout/components/Sidebar/Logo.vue @@ -35,7 +35,7 @@ export default { }, data() { return { - title: '鑻ヤ緷绠＄悊绯荤粺', + title: '浣冲搴风鐞嗙郴缁', logo: logoImg } } diff --git a/ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue b/jiajiakang-ui/src/layout/components/Sidebar/SidebarItem.vue similarity index 100% rename from ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue rename to jiajiakang-ui/src/layout/components/Sidebar/SidebarItem.vue diff --git a/ruoyi-ui/src/layout/components/Sidebar/index.vue b/jiajiakang-ui/src/layout/components/Sidebar/index.vue similarity index 100% rename from ruoyi-ui/src/layout/components/Sidebar/index.vue rename to jiajiakang-ui/src/layout/components/Sidebar/index.vue diff --git a/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue b/jiajiakang-ui/src/layout/components/TagsView/ScrollPane.vue similarity index 100% rename from ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue rename to jiajiakang-ui/src/layout/components/TagsView/ScrollPane.vue diff --git a/ruoyi-ui/src/layout/components/TagsView/index.vue b/jiajiakang-ui/src/layout/components/TagsView/index.vue similarity index 100% rename from ruoyi-ui/src/layout/components/TagsView/index.vue rename to jiajiakang-ui/src/layout/components/TagsView/index.vue diff --git a/ruoyi-ui/src/layout/components/index.js b/jiajiakang-ui/src/layout/components/index.js similarity index 100% rename from ruoyi-ui/src/layout/components/index.js rename to jiajiakang-ui/src/layout/components/index.js diff --git a/ruoyi-ui/src/layout/index.vue b/jiajiakang-ui/src/layout/index.vue similarity index 100% rename from ruoyi-ui/src/layout/index.vue rename to jiajiakang-ui/src/layout/index.vue diff --git a/ruoyi-ui/src/layout/mixin/ResizeHandler.js b/jiajiakang-ui/src/layout/mixin/ResizeHandler.js similarity index 100% rename from ruoyi-ui/src/layout/mixin/ResizeHandler.js rename to jiajiakang-ui/src/layout/mixin/ResizeHandler.js diff --git a/ruoyi-ui/src/main.js b/jiajiakang-ui/src/main.js similarity index 100% rename from ruoyi-ui/src/main.js rename to jiajiakang-ui/src/main.js diff --git a/ruoyi-ui/src/permission.js b/jiajiakang-ui/src/permission.js similarity index 100% rename from ruoyi-ui/src/permission.js rename to jiajiakang-ui/src/permission.js diff --git a/ruoyi-ui/src/router/index.js b/jiajiakang-ui/src/router/index.js similarity index 100% rename from ruoyi-ui/src/router/index.js rename to jiajiakang-ui/src/router/index.js diff --git a/ruoyi-ui/src/settings.js b/jiajiakang-ui/src/settings.js similarity index 100% rename from ruoyi-ui/src/settings.js rename to jiajiakang-ui/src/settings.js diff --git a/ruoyi-ui/src/store/getters.js b/jiajiakang-ui/src/store/getters.js similarity index 100% rename from ruoyi-ui/src/store/getters.js rename to jiajiakang-ui/src/store/getters.js diff --git a/ruoyi-ui/src/store/index.js b/jiajiakang-ui/src/store/index.js similarity index 100% rename from ruoyi-ui/src/store/index.js rename to jiajiakang-ui/src/store/index.js diff --git a/ruoyi-ui/src/store/modules/app.js b/jiajiakang-ui/src/store/modules/app.js similarity index 100% rename from ruoyi-ui/src/store/modules/app.js rename to jiajiakang-ui/src/store/modules/app.js diff --git a/ruoyi-ui/src/store/modules/permission.js b/jiajiakang-ui/src/store/modules/permission.js similarity index 100% rename from ruoyi-ui/src/store/modules/permission.js rename to jiajiakang-ui/src/store/modules/permission.js diff --git a/ruoyi-ui/src/store/modules/settings.js b/jiajiakang-ui/src/store/modules/settings.js similarity index 100% rename from ruoyi-ui/src/store/modules/settings.js rename to jiajiakang-ui/src/store/modules/settings.js diff --git a/ruoyi-ui/src/store/modules/tagsView.js b/jiajiakang-ui/src/store/modules/tagsView.js similarity index 100% rename from ruoyi-ui/src/store/modules/tagsView.js rename to jiajiakang-ui/src/store/modules/tagsView.js diff --git a/ruoyi-ui/src/store/modules/user.js b/jiajiakang-ui/src/store/modules/user.js similarity index 100% rename from ruoyi-ui/src/store/modules/user.js rename to jiajiakang-ui/src/store/modules/user.js diff --git a/ruoyi-ui/src/utils/auth.js b/jiajiakang-ui/src/utils/auth.js similarity index 100% rename from ruoyi-ui/src/utils/auth.js rename to jiajiakang-ui/src/utils/auth.js diff --git a/ruoyi-ui/src/utils/errorCode.js b/jiajiakang-ui/src/utils/errorCode.js similarity index 100% rename from ruoyi-ui/src/utils/errorCode.js rename to jiajiakang-ui/src/utils/errorCode.js diff --git a/ruoyi-ui/src/utils/generator/config.js b/jiajiakang-ui/src/utils/generator/config.js similarity index 95% rename from ruoyi-ui/src/utils/generator/config.js rename to jiajiakang-ui/src/utils/generator/config.js index 005140a8fa4d43353405d32926f82f59024b7380..7abf227d5044f41598f7b63de6dc9d3836f5d8a4 100644 --- a/ruoyi-ui/src/utils/generator/config.js +++ b/jiajiakang-ui/src/utils/generator/config.js @@ -1,438 +1,438 @@ -export const formConf = { - formRef: 'elForm', - formModel: 'formData', - size: 'medium', - labelPosition: 'right', - labelWidth: 100, - formRules: 'rules', - gutter: 15, - disabled: false, - span: 24, - formBtns: true -} - -export const inputComponents = [ - { - label: '鍗曡鏂囨湰', - tag: 'el-input', - tagIcon: 'input', - placeholder: '璇疯緭鍏', - defaultValue: undefined, - span: 24, - labelWidth: null, - style: { width: '100%' }, - clearable: true, - prepend: '', - append: '', - 'prefix-icon': '', - 'suffix-icon': '', - maxlength: null, - 'show-word-limit': false, - readonly: false, - disabled: false, - required: true, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/input' - }, - { - label: '澶氳鏂囨湰', - tag: 'el-input', - tagIcon: 'textarea', - type: 'textarea', - placeholder: '璇疯緭鍏', - defaultValue: undefined, - span: 24, - labelWidth: null, - autosize: { - minRows: 4, - maxRows: 4 - }, - style: { width: '100%' }, - maxlength: null, - 'show-word-limit': false, - readonly: false, - disabled: false, - required: true, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/input' - }, - { - label: '瀵嗙爜', - tag: 'el-input', - tagIcon: 'password', - placeholder: '璇疯緭鍏', - defaultValue: undefined, - span: 24, - 'show-password': true, - labelWidth: null, - style: { width: '100%' }, - clearable: true, - prepend: '', - append: '', - 'prefix-icon': '', - 'suffix-icon': '', - maxlength: null, - 'show-word-limit': false, - readonly: false, - disabled: false, - required: true, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/input' - }, - { - label: '璁℃暟鍣', - tag: 'el-input-number', - tagIcon: 'number', - placeholder: '', - defaultValue: undefined, - span: 24, - labelWidth: null, - min: undefined, - max: undefined, - step: undefined, - 'step-strictly': false, - precision: undefined, - 'controls-position': '', - disabled: false, - required: true, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/input-number' - } -] - -export const selectComponents = [ - { - label: '涓嬫媺閫夋嫨', - tag: 'el-select', - tagIcon: 'select', - placeholder: '璇烽夋嫨', - defaultValue: undefined, - span: 24, - labelWidth: null, - style: { width: '100%' }, - clearable: true, - disabled: false, - required: true, - filterable: false, - multiple: false, - options: [{ - label: '閫夐」涓', - value: 1 - }, { - label: '閫夐」浜', - value: 2 - }], - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/select' - }, - { - label: '绾ц仈閫夋嫨', - tag: 'el-cascader', - tagIcon: 'cascader', - placeholder: '璇烽夋嫨', - defaultValue: [], - span: 24, - labelWidth: null, - style: { width: '100%' }, - props: { - props: { - multiple: false - } - }, - 'show-all-levels': true, - disabled: false, - clearable: true, - filterable: false, - required: true, - options: [{ - id: 1, - value: 1, - label: '閫夐」1', - children: [{ - id: 2, - value: 2, - label: '閫夐」1-1' - }] - }], - dataType: 'dynamic', - labelKey: 'label', - valueKey: 'value', - childrenKey: 'children', - separator: '/', - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/cascader' - }, - { - label: '鍗曢夋缁', - tag: 'el-radio-group', - tagIcon: 'radio', - defaultValue: undefined, - span: 24, - labelWidth: null, - style: {}, - optionType: 'default', - border: false, - size: 'medium', - disabled: false, - required: true, - options: [{ - label: '閫夐」涓', - value: 1 - }, { - label: '閫夐」浜', - value: 2 - }], - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/radio' - }, - { - label: '澶氶夋缁', - tag: 'el-checkbox-group', - tagIcon: 'checkbox', - defaultValue: [], - span: 24, - labelWidth: null, - style: {}, - optionType: 'default', - border: false, - size: 'medium', - disabled: false, - required: true, - options: [{ - label: '閫夐」涓', - value: 1 - }, { - label: '閫夐」浜', - value: 2 - }], - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/checkbox' - }, - { - label: '寮鍏', - tag: 'el-switch', - tagIcon: 'switch', - defaultValue: false, - span: 24, - labelWidth: null, - style: {}, - disabled: false, - required: true, - 'active-text': '', - 'inactive-text': '', - 'active-color': null, - 'inactive-color': null, - 'active-value': true, - 'inactive-value': false, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/switch' - }, - { - label: '婊戝潡', - tag: 'el-slider', - tagIcon: 'slider', - defaultValue: null, - span: 24, - labelWidth: null, - disabled: false, - required: true, - min: 0, - max: 100, - step: 1, - 'show-stops': false, - range: false, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/slider' - }, - { - label: '鏃堕棿閫夋嫨', - tag: 'el-time-picker', - tagIcon: 'time', - placeholder: '璇烽夋嫨', - defaultValue: null, - span: 24, - labelWidth: null, - style: { width: '100%' }, - disabled: false, - clearable: true, - required: true, - 'picker-options': { - selectableRange: '00:00:00-23:59:59' - }, - format: 'HH:mm:ss', - 'value-format': 'HH:mm:ss', - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/time-picker' - }, - { - label: '鏃堕棿鑼冨洿', - tag: 'el-time-picker', - tagIcon: 'time-range', - defaultValue: null, - span: 24, - labelWidth: null, - style: { width: '100%' }, - disabled: false, - clearable: true, - required: true, - 'is-range': true, - 'range-separator': '鑷', - 'start-placeholder': '寮濮嬫椂闂', - 'end-placeholder': '缁撴潫鏃堕棿', - format: 'HH:mm:ss', - 'value-format': 'HH:mm:ss', - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/time-picker' - }, - { - label: '鏃ユ湡閫夋嫨', - tag: 'el-date-picker', - tagIcon: 'date', - placeholder: '璇烽夋嫨', - defaultValue: null, - type: 'date', - span: 24, - labelWidth: null, - style: { width: '100%' }, - disabled: false, - clearable: true, - required: true, - format: 'yyyy-MM-dd', - 'value-format': 'yyyy-MM-dd', - readonly: false, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/date-picker' - }, - { - label: '鏃ユ湡鑼冨洿', - tag: 'el-date-picker', - tagIcon: 'date-range', - defaultValue: null, - span: 24, - labelWidth: null, - style: { width: '100%' }, - type: 'daterange', - 'range-separator': '鑷', - 'start-placeholder': '寮濮嬫棩鏈', - 'end-placeholder': '缁撴潫鏃ユ湡', - disabled: false, - clearable: true, - required: true, - format: 'yyyy-MM-dd', - 'value-format': 'yyyy-MM-dd', - readonly: false, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/date-picker' - }, - { - label: '璇勫垎', - tag: 'el-rate', - tagIcon: 'rate', - defaultValue: 0, - span: 24, - labelWidth: null, - style: {}, - max: 5, - 'allow-half': false, - 'show-text': false, - 'show-score': false, - disabled: false, - required: true, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/rate' - }, - { - label: '棰滆壊閫夋嫨', - tag: 'el-color-picker', - tagIcon: 'color', - defaultValue: null, - labelWidth: null, - 'show-alpha': false, - 'color-format': '', - disabled: false, - required: true, - size: 'medium', - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/color-picker' - }, - { - label: '涓婁紶', - tag: 'el-upload', - tagIcon: 'upload', - action: 'https://jsonplaceholder.typicode.com/posts/', - defaultValue: null, - labelWidth: null, - disabled: false, - required: true, - accept: '', - name: 'file', - 'auto-upload': true, - showTip: false, - buttonText: '鐐瑰嚮涓婁紶', - fileSize: 2, - sizeUnit: 'MB', - 'list-type': 'text', - multiple: false, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/upload' - } -] - -export const layoutComponents = [ - { - layout: 'rowFormItem', - tagIcon: 'row', - type: 'default', - justify: 'start', - align: 'top', - label: '琛屽鍣', - layoutTree: true, - children: [], - document: 'https://element.eleme.cn/#/zh-CN/component/layout' - }, - { - layout: 'colFormItem', - label: '鎸夐挳', - changeTag: true, - labelWidth: null, - tag: 'el-button', - tagIcon: 'button', - span: 24, - default: '涓昏鎸夐挳', - type: 'primary', - icon: 'el-icon-search', - size: 'medium', - disabled: false, - document: 'https://element.eleme.cn/#/zh-CN/component/button' - } -] - -// 缁勪欢rule鐨勮Е鍙戞柟寮忥紝鏃犺Е鍙戞柟寮忕殑缁勪欢涓嶇敓鎴恟ule -export const trigger = { - 'el-input': 'blur', - 'el-input-number': 'blur', - 'el-select': 'change', - 'el-radio-group': 'change', - 'el-checkbox-group': 'change', - 'el-cascader': 'change', - 'el-time-picker': 'change', - 'el-date-picker': 'change', - 'el-rate': 'change' -} +export const formConf = { + formRef: 'elForm', + formModel: 'formData', + size: 'medium', + labelPosition: 'right', + labelWidth: 100, + formRules: 'rules', + gutter: 15, + disabled: false, + span: 24, + formBtns: true +} + +export const inputComponents = [ + { + label: '鍗曡鏂囨湰', + tag: 'el-input', + tagIcon: 'input', + placeholder: '璇疯緭鍏', + defaultValue: undefined, + span: 24, + labelWidth: null, + style: { width: '100%' }, + clearable: true, + prepend: '', + append: '', + 'prefix-icon': '', + 'suffix-icon': '', + maxlength: null, + 'show-word-limit': false, + readonly: false, + disabled: false, + required: true, + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/input' + }, + { + label: '澶氳鏂囨湰', + tag: 'el-input', + tagIcon: 'textarea', + type: 'textarea', + placeholder: '璇疯緭鍏', + defaultValue: undefined, + span: 24, + labelWidth: null, + autosize: { + minRows: 4, + maxRows: 4 + }, + style: { width: '100%' }, + maxlength: null, + 'show-word-limit': false, + readonly: false, + disabled: false, + required: true, + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/input' + }, + { + label: '瀵嗙爜', + tag: 'el-input', + tagIcon: 'password', + placeholder: '璇疯緭鍏', + defaultValue: undefined, + span: 24, + 'show-password': true, + labelWidth: null, + style: { width: '100%' }, + clearable: true, + prepend: '', + append: '', + 'prefix-icon': '', + 'suffix-icon': '', + maxlength: null, + 'show-word-limit': false, + readonly: false, + disabled: false, + required: true, + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/input' + }, + { + label: '璁℃暟鍣', + tag: 'el-input-number', + tagIcon: 'number', + placeholder: '', + defaultValue: undefined, + span: 24, + labelWidth: null, + min: undefined, + max: undefined, + step: undefined, + 'step-strictly': false, + precision: undefined, + 'controls-position': '', + disabled: false, + required: true, + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/input-number' + } +] + +export const selectComponents = [ + { + label: '涓嬫媺閫夋嫨', + tag: 'el-select', + tagIcon: 'select', + placeholder: '璇烽夋嫨', + defaultValue: undefined, + span: 24, + labelWidth: null, + style: { width: '100%' }, + clearable: true, + disabled: false, + required: true, + filterable: false, + multiple: false, + options: [{ + label: '閫夐」涓', + value: 1 + }, { + label: '閫夐」浜', + value: 2 + }], + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/select' + }, + { + label: '绾ц仈閫夋嫨', + tag: 'el-cascader', + tagIcon: 'cascader', + placeholder: '璇烽夋嫨', + defaultValue: [], + span: 24, + labelWidth: null, + style: { width: '100%' }, + props: { + props: { + multiple: false + } + }, + 'show-all-levels': true, + disabled: false, + clearable: true, + filterable: false, + required: true, + options: [{ + id: 1, + value: 1, + label: '閫夐」1', + children: [{ + id: 2, + value: 2, + label: '閫夐」1-1' + }] + }], + dataType: 'dynamic', + labelKey: 'label', + valueKey: 'value', + childrenKey: 'children', + separator: '/', + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/cascader' + }, + { + label: '鍗曢夋缁', + tag: 'el-radio-group', + tagIcon: 'radio', + defaultValue: undefined, + span: 24, + labelWidth: null, + style: {}, + optionType: 'default', + border: false, + size: 'medium', + disabled: false, + required: true, + options: [{ + label: '閫夐」涓', + value: 1 + }, { + label: '閫夐」浜', + value: 2 + }], + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/radio' + }, + { + label: '澶氶夋缁', + tag: 'el-checkbox-group', + tagIcon: 'checkbox', + defaultValue: [], + span: 24, + labelWidth: null, + style: {}, + optionType: 'default', + border: false, + size: 'medium', + disabled: false, + required: true, + options: [{ + label: '閫夐」涓', + value: 1 + }, { + label: '閫夐」浜', + value: 2 + }], + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/checkbox' + }, + { + label: '寮鍏', + tag: 'el-switch', + tagIcon: 'switch', + defaultValue: false, + span: 24, + labelWidth: null, + style: {}, + disabled: false, + required: true, + 'active-text': '', + 'inactive-text': '', + 'active-color': null, + 'inactive-color': null, + 'active-value': true, + 'inactive-value': false, + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/switch' + }, + { + label: '婊戝潡', + tag: 'el-slider', + tagIcon: 'slider', + defaultValue: null, + span: 24, + labelWidth: null, + disabled: false, + required: true, + min: 0, + max: 100, + step: 1, + 'show-stops': false, + range: false, + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/slider' + }, + { + label: '鏃堕棿閫夋嫨', + tag: 'el-time-picker', + tagIcon: 'time', + placeholder: '璇烽夋嫨', + defaultValue: null, + span: 24, + labelWidth: null, + style: { width: '100%' }, + disabled: false, + clearable: true, + required: true, + 'picker-options': { + selectableRange: '00:00:00-23:59:59' + }, + format: 'HH:mm:ss', + 'value-format': 'HH:mm:ss', + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/time-picker' + }, + { + label: '鏃堕棿鑼冨洿', + tag: 'el-time-picker', + tagIcon: 'time-range', + defaultValue: null, + span: 24, + labelWidth: null, + style: { width: '100%' }, + disabled: false, + clearable: true, + required: true, + 'is-range': true, + 'range-separator': '鑷', + 'start-placeholder': '寮濮嬫椂闂', + 'end-placeholder': '缁撴潫鏃堕棿', + format: 'HH:mm:ss', + 'value-format': 'HH:mm:ss', + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/time-picker' + }, + { + label: '鏃ユ湡閫夋嫨', + tag: 'el-date-picker', + tagIcon: 'date', + placeholder: '璇烽夋嫨', + defaultValue: null, + type: 'date', + span: 24, + labelWidth: null, + style: { width: '100%' }, + disabled: false, + clearable: true, + required: true, + format: 'yyyy-MM-dd', + 'value-format': 'yyyy-MM-dd', + readonly: false, + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/date-picker' + }, + { + label: '鏃ユ湡鑼冨洿', + tag: 'el-date-picker', + tagIcon: 'date-range', + defaultValue: null, + span: 24, + labelWidth: null, + style: { width: '100%' }, + type: 'daterange', + 'range-separator': '鑷', + 'start-placeholder': '寮濮嬫棩鏈', + 'end-placeholder': '缁撴潫鏃ユ湡', + disabled: false, + clearable: true, + required: true, + format: 'yyyy-MM-dd', + 'value-format': 'yyyy-MM-dd', + readonly: false, + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/date-picker' + }, + { + label: '璇勫垎', + tag: 'el-rate', + tagIcon: 'rate', + defaultValue: 0, + span: 24, + labelWidth: null, + style: {}, + max: 5, + 'allow-half': false, + 'show-text': false, + 'show-score': false, + disabled: false, + required: true, + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/rate' + }, + { + label: '棰滆壊閫夋嫨', + tag: 'el-color-picker', + tagIcon: 'color', + defaultValue: null, + labelWidth: null, + 'show-alpha': false, + 'color-format': '', + disabled: false, + required: true, + size: 'medium', + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/color-picker' + }, + { + label: '涓婁紶', + tag: 'el-upload', + tagIcon: 'upload', + action: 'https://jsonplaceholder.typicode.com/posts/', + defaultValue: null, + labelWidth: null, + disabled: false, + required: true, + accept: '', + name: 'file', + 'auto-upload': true, + showTip: false, + buttonText: '鐐瑰嚮涓婁紶', + fileSize: 2, + sizeUnit: 'MB', + 'list-type': 'text', + multiple: false, + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/upload' + } +] + +export const layoutComponents = [ + { + layout: 'rowFormItem', + tagIcon: 'row', + type: 'default', + justify: 'start', + align: 'top', + label: '琛屽鍣', + layoutTree: true, + children: [], + document: 'https://element.eleme.cn/#/zh-CN/component/layout' + }, + { + layout: 'colFormItem', + label: '鎸夐挳', + changeTag: true, + labelWidth: null, + tag: 'el-button', + tagIcon: 'button', + span: 24, + default: '涓昏鎸夐挳', + type: 'primary', + icon: 'el-icon-search', + size: 'medium', + disabled: false, + document: 'https://element.eleme.cn/#/zh-CN/component/button' + } +] + +// 缁勪欢rule鐨勮Е鍙戞柟寮忥紝鏃犺Е鍙戞柟寮忕殑缁勪欢涓嶇敓鎴恟ule +export const trigger = { + 'el-input': 'blur', + 'el-input-number': 'blur', + 'el-select': 'change', + 'el-radio-group': 'change', + 'el-checkbox-group': 'change', + 'el-cascader': 'change', + 'el-time-picker': 'change', + 'el-date-picker': 'change', + 'el-rate': 'change' +} diff --git a/ruoyi-ui/src/utils/generator/css.js b/jiajiakang-ui/src/utils/generator/css.js similarity index 96% rename from ruoyi-ui/src/utils/generator/css.js rename to jiajiakang-ui/src/utils/generator/css.js index 0d7f07526ce67297724106dca5ec6b303938fc8e..c1c62e607772c1458171aa839833275f60c6f9f2 100644 --- a/ruoyi-ui/src/utils/generator/css.js +++ b/jiajiakang-ui/src/utils/generator/css.js @@ -1,18 +1,18 @@ -const styles = { - 'el-rate': '.el-rate{display: inline-block; vertical-align: text-top;}', - 'el-upload': '.el-upload__tip{line-height: 1.2;}' -} - -function addCss(cssList, el) { - const css = styles[el.tag] - css && cssList.indexOf(css) === -1 && cssList.push(css) - if (el.children) { - el.children.forEach(el2 => addCss(cssList, el2)) - } -} - -export function makeUpCss(conf) { - const cssList = [] - conf.fields.forEach(el => addCss(cssList, el)) - return cssList.join('\n') -} +const styles = { + 'el-rate': '.el-rate{display: inline-block; vertical-align: text-top;}', + 'el-upload': '.el-upload__tip{line-height: 1.2;}' +} + +function addCss(cssList, el) { + const css = styles[el.tag] + css && cssList.indexOf(css) === -1 && cssList.push(css) + if (el.children) { + el.children.forEach(el2 => addCss(cssList, el2)) + } +} + +export function makeUpCss(conf) { + const cssList = [] + conf.fields.forEach(el => addCss(cssList, el)) + return cssList.join('\n') +} diff --git a/ruoyi-ui/src/utils/generator/drawingDefalut.js b/jiajiakang-ui/src/utils/generator/drawingDefalut.js similarity index 95% rename from ruoyi-ui/src/utils/generator/drawingDefalut.js rename to jiajiakang-ui/src/utils/generator/drawingDefalut.js index 5f7d1c4ae033ded79682cd2d9320faada12f244a..09f133ca113955f33ac9ccfac572026d051ec302 100644 --- a/ruoyi-ui/src/utils/generator/drawingDefalut.js +++ b/jiajiakang-ui/src/utils/generator/drawingDefalut.js @@ -1,29 +1,29 @@ -export default [ - { - layout: 'colFormItem', - tagIcon: 'input', - label: '鎵嬫満鍙', - vModel: 'mobile', - formId: 6, - tag: 'el-input', - placeholder: '璇疯緭鍏ユ墜鏈哄彿', - defaultValue: '', - span: 24, - style: { width: '100%' }, - clearable: true, - prepend: '', - append: '', - 'prefix-icon': 'el-icon-mobile', - 'suffix-icon': '', - maxlength: 11, - 'show-word-limit': true, - readonly: false, - disabled: false, - required: true, - changeTag: true, - regList: [{ - pattern: '/^1(3|4|5|7|8|9)\\d{9}$/', - message: '鎵嬫満鍙锋牸寮忛敊璇' - }] - } -] +export default [ + { + layout: 'colFormItem', + tagIcon: 'input', + label: '鎵嬫満鍙', + vModel: 'mobile', + formId: 6, + tag: 'el-input', + placeholder: '璇疯緭鍏ユ墜鏈哄彿', + defaultValue: '', + span: 24, + style: { width: '100%' }, + clearable: true, + prepend: '', + append: '', + 'prefix-icon': 'el-icon-mobile', + 'suffix-icon': '', + maxlength: 11, + 'show-word-limit': true, + readonly: false, + disabled: false, + required: true, + changeTag: true, + regList: [{ + pattern: '/^1(3|4|5|7|8|9)\\d{9}$/', + message: '鎵嬫満鍙锋牸寮忛敊璇' + }] + } +] diff --git a/ruoyi-ui/src/utils/generator/html.js b/jiajiakang-ui/src/utils/generator/html.js similarity index 97% rename from ruoyi-ui/src/utils/generator/html.js rename to jiajiakang-ui/src/utils/generator/html.js index 340dfb43980f839b38b508677714505297478946..ebf628d2bd57f24122da8a025bae0245adf0446a 100644 --- a/ruoyi-ui/src/utils/generator/html.js +++ b/jiajiakang-ui/src/utils/generator/html.js @@ -1,359 +1,359 @@ -/* eslint-disable max-len */ -import { trigger } from './config' - -let confGlobal -let someSpanIsNot24 - -export function dialogWrapper(str) { - return ` - ${str} -
    - 鍙栨秷 - 纭畾 -
    -     ` -} - -export function vueTemplate(str) { - return `` -} - -export function vueScript(str) { - return `` -} - -export function cssStyle(cssStr) { - return `` -} - -function buildFormTemplate(conf, child, type) { - let labelPosition = '' - if (conf.labelPosition !== 'right') { - labelPosition = `label-position="${conf.labelPosition}"` - } - const disabled = conf.disabled ? `:disabled="${conf.disabled}"` : '' - let str = ` - ${child} - ${buildFromBtns(conf, type)} - ` - if (someSpanIsNot24) { - str = ` - ${str} - ` - } - return str -} - -function buildFromBtns(conf, type) { - let str = '' - if (conf.formBtns && type === 'file') { - str = ` - 鎻愪氦 - 閲嶇疆 - ` - if (someSpanIsNot24) { - str = ` - ${str} - ` - } - } - return str -} - -// span涓嶄负24鐨勭敤el-col鍖呰９ -function colWrapper(element, str) { - if (someSpanIsNot24 || element.span !== 24) { - return ` - ${str} - ` - } - return str -} - -const layouts = { - colFormItem(element) { - let labelWidth = '' - if (element.labelWidth && element.labelWidth !== confGlobal.labelWidth) { - labelWidth = `label-width="${element.labelWidth}px"` - } - const required = !trigger[element.tag] && element.required ? 'required' : '' - const tagDom = tags[element.tag] ? tags[element.tag](element) : null - let str = ` - ${tagDom} - ` - str = colWrapper(element, str) - return str - }, - rowFormItem(element) { - const type = element.type === 'default' ? '' : `type="${element.type}"` - const justify = element.type === 'default' ? '' : `justify="${element.justify}"` - const align = element.type === 'default' ? '' : `align="${element.align}"` - const gutter = element.gutter ? `gutter="${element.gutter}"` : '' - const children = element.children.map(el => layouts[el.layout](el)) - let str = ` - ${children.join('\n')} - ` - str = colWrapper(element, str) - return str - } -} - -const tags = { - 'el-button': el => { - const { - tag, disabled - } = attrBuilder(el) - const type = el.type ? `type="${el.type}"` : '' - const icon = el.icon ? `icon="${el.icon}"` : '' - const size = el.size ? `size="${el.size}"` : '' - let child = buildElButtonChild(el) - - if (child) child = `\n${child}\n` // 鎹㈣ - return `<${el.tag} ${type} ${icon} ${size} ${disabled}>${child}` - }, - 'el-input': el => { - const { - disabled, vModel, clearable, placeholder, width - } = attrBuilder(el) - const maxlength = el.maxlength ? `:maxlength="${el.maxlength}"` : '' - const showWordLimit = el['show-word-limit'] ? 'show-word-limit' : '' - const readonly = el.readonly ? 'readonly' : '' - const prefixIcon = el['prefix-icon'] ? `prefix-icon='${el['prefix-icon']}'` : '' - const suffixIcon = el['suffix-icon'] ? `suffix-icon='${el['suffix-icon']}'` : '' - const showPassword = el['show-password'] ? 'show-password' : '' - const type = el.type ? `type="${el.type}"` : '' - const autosize = el.autosize && el.autosize.minRows - ? `:autosize="{minRows: ${el.autosize.minRows}, maxRows: ${el.autosize.maxRows}}"` - : '' - let child = buildElInputChild(el) - - if (child) child = `\n${child}\n` // 鎹㈣ - return `<${el.tag} ${vModel} ${type} ${placeholder} ${maxlength} ${showWordLimit} ${readonly} ${disabled} ${clearable} ${prefixIcon} ${suffixIcon} ${showPassword} ${autosize} ${width}>${child}` - }, - 'el-input-number': el => { - const { disabled, vModel, placeholder } = attrBuilder(el) - const controlsPosition = el['controls-position'] ? `controls-position=${el['controls-position']}` : '' - const min = el.min ? `:min='${el.min}'` : '' - const max = el.max ? `:max='${el.max}'` : '' - const step = el.step ? `:step='${el.step}'` : '' - const stepStrictly = el['step-strictly'] ? 'step-strictly' : '' - const precision = el.precision ? `:precision='${el.precision}'` : '' - - return `<${el.tag} ${vModel} ${placeholder} ${step} ${stepStrictly} ${precision} ${controlsPosition} ${min} ${max} ${disabled}>` - }, - 'el-select': el => { - const { - disabled, vModel, clearable, placeholder, width - } = attrBuilder(el) - const filterable = el.filterable ? 'filterable' : '' - const multiple = el.multiple ? 'multiple' : '' - let child = buildElSelectChild(el) - - if (child) child = `\n${child}\n` // 鎹㈣ - return `<${el.tag} ${vModel} ${placeholder} ${disabled} ${multiple} ${filterable} ${clearable} ${width}>${child}` - }, - 'el-radio-group': el => { - const { disabled, vModel } = attrBuilder(el) - const size = `size="${el.size}"` - let child = buildElRadioGroupChild(el) - - if (child) child = `\n${child}\n` // 鎹㈣ - return `<${el.tag} ${vModel} ${size} ${disabled}>${child}` - }, - 'el-checkbox-group': el => { - const { disabled, vModel } = attrBuilder(el) - const size = `size="${el.size}"` - const min = el.min ? `:min="${el.min}"` : '' - const max = el.max ? `:max="${el.max}"` : '' - let child = buildElCheckboxGroupChild(el) - - if (child) child = `\n${child}\n` // 鎹㈣ - return `<${el.tag} ${vModel} ${min} ${max} ${size} ${disabled}>${child}` - }, - 'el-switch': el => { - const { disabled, vModel } = attrBuilder(el) - const activeText = el['active-text'] ? `active-text="${el['active-text']}"` : '' - const inactiveText = el['inactive-text'] ? `inactive-text="${el['inactive-text']}"` : '' - const activeColor = el['active-color'] ? `active-color="${el['active-color']}"` : '' - const inactiveColor = el['inactive-color'] ? `inactive-color="${el['inactive-color']}"` : '' - const activeValue = el['active-value'] !== true ? `:active-value='${JSON.stringify(el['active-value'])}'` : '' - const inactiveValue = el['inactive-value'] !== false ? `:inactive-value='${JSON.stringify(el['inactive-value'])}'` : '' - - return `<${el.tag} ${vModel} ${activeText} ${inactiveText} ${activeColor} ${inactiveColor} ${activeValue} ${inactiveValue} ${disabled}>` - }, - 'el-cascader': el => { - const { - disabled, vModel, clearable, placeholder, width - } = attrBuilder(el) - const options = el.options ? `:options="${el.vModel}Options"` : '' - const props = el.props ? `:props="${el.vModel}Props"` : '' - const showAllLevels = el['show-all-levels'] ? '' : ':show-all-levels="false"' - const filterable = el.filterable ? 'filterable' : '' - const separator = el.separator === '/' ? '' : `separator="${el.separator}"` - - return `<${el.tag} ${vModel} ${options} ${props} ${width} ${showAllLevels} ${placeholder} ${separator} ${filterable} ${clearable} ${disabled}>` - }, - 'el-slider': el => { - const { disabled, vModel } = attrBuilder(el) - const min = el.min ? `:min='${el.min}'` : '' - const max = el.max ? `:max='${el.max}'` : '' - const step = el.step ? `:step='${el.step}'` : '' - const range = el.range ? 'range' : '' - const showStops = el['show-stops'] ? `:show-stops="${el['show-stops']}"` : '' - - return `<${el.tag} ${min} ${max} ${step} ${vModel} ${range} ${showStops} ${disabled}>` - }, - 'el-time-picker': el => { - const { - disabled, vModel, clearable, placeholder, width - } = attrBuilder(el) - const startPlaceholder = el['start-placeholder'] ? `start-placeholder="${el['start-placeholder']}"` : '' - const endPlaceholder = el['end-placeholder'] ? `end-placeholder="${el['end-placeholder']}"` : '' - const rangeSeparator = el['range-separator'] ? `range-separator="${el['range-separator']}"` : '' - const isRange = el['is-range'] ? 'is-range' : '' - const format = el.format ? `format="${el.format}"` : '' - const valueFormat = el['value-format'] ? `value-format="${el['value-format']}"` : '' - const pickerOptions = el['picker-options'] ? `:picker-options='${JSON.stringify(el['picker-options'])}'` : '' - - return `<${el.tag} ${vModel} ${isRange} ${format} ${valueFormat} ${pickerOptions} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${disabled}>` - }, - 'el-date-picker': el => { - const { - disabled, vModel, clearable, placeholder, width - } = attrBuilder(el) - const startPlaceholder = el['start-placeholder'] ? `start-placeholder="${el['start-placeholder']}"` : '' - const endPlaceholder = el['end-placeholder'] ? `end-placeholder="${el['end-placeholder']}"` : '' - const rangeSeparator = el['range-separator'] ? `range-separator="${el['range-separator']}"` : '' - const format = el.format ? `format="${el.format}"` : '' - const valueFormat = el['value-format'] ? `value-format="${el['value-format']}"` : '' - const type = el.type === 'date' ? '' : `type="${el.type}"` - const readonly = el.readonly ? 'readonly' : '' - - return `<${el.tag} ${type} ${vModel} ${format} ${valueFormat} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${readonly} ${disabled}>` - }, - 'el-rate': el => { - const { disabled, vModel } = attrBuilder(el) - const max = el.max ? `:max='${el.max}'` : '' - const allowHalf = el['allow-half'] ? 'allow-half' : '' - const showText = el['show-text'] ? 'show-text' : '' - const showScore = el['show-score'] ? 'show-score' : '' - - return `<${el.tag} ${vModel} ${allowHalf} ${showText} ${showScore} ${disabled}>` - }, - 'el-color-picker': el => { - const { disabled, vModel } = attrBuilder(el) - const size = `size="${el.size}"` - const showAlpha = el['show-alpha'] ? 'show-alpha' : '' - const colorFormat = el['color-format'] ? `color-format="${el['color-format']}"` : '' - - return `<${el.tag} ${vModel} ${size} ${showAlpha} ${colorFormat} ${disabled}>` - }, - 'el-upload': el => { - const disabled = el.disabled ? ':disabled=\'true\'' : '' - const action = el.action ? `:action="${el.vModel}Action"` : '' - const multiple = el.multiple ? 'multiple' : '' - const listType = el['list-type'] !== 'text' ? `list-type="${el['list-type']}"` : '' - const accept = el.accept ? `accept="${el.accept}"` : '' - const name = el.name !== 'file' ? `name="${el.name}"` : '' - const autoUpload = el['auto-upload'] === false ? ':auto-upload="false"' : '' - const beforeUpload = `:before-upload="${el.vModel}BeforeUpload"` - const fileList = `:file-list="${el.vModel}fileList"` - const ref = `ref="${el.vModel}"` - let child = buildElUploadChild(el) - - if (child) child = `\n${child}\n` // 鎹㈣ - return `<${el.tag} ${ref} ${fileList} ${action} ${autoUpload} ${multiple} ${beforeUpload} ${listType} ${accept} ${name} ${disabled}>${child}` - } -} - -function attrBuilder(el) { - return { - vModel: `v-model="${confGlobal.formModel}.${el.vModel}"`, - clearable: el.clearable ? 'clearable' : '', - placeholder: el.placeholder ? `placeholder="${el.placeholder}"` : '', - width: el.style && el.style.width ? ':style="{width: \'100%\'}"' : '', - disabled: el.disabled ? ':disabled=\'true\'' : '' - } -} - -// el-buttin 瀛愮骇 -function buildElButtonChild(conf) { - const children = [] - if (conf.default) { - children.push(conf.default) - } - return children.join('\n') -} - -// el-input innerHTML -function buildElInputChild(conf) { - const children = [] - if (conf.prepend) { - children.push(``) - } - if (conf.append) { - children.push(``) - } - return children.join('\n') -} - -function buildElSelectChild(conf) { - const children = [] - if (conf.options && conf.options.length) { - children.push(``) - } - return children.join('\n') -} - -function buildElRadioGroupChild(conf) { - const children = [] - if (conf.options && conf.options.length) { - const tag = conf.optionType === 'button' ? 'el-radio-button' : 'el-radio' - const border = conf.border ? 'border' : '' - children.push(`<${tag} v-for="(item, index) in ${conf.vModel}Options" :key="index" :label="item.value" :disabled="item.disabled" ${border}>{{item.label}}`) - } - return children.join('\n') -} - -function buildElCheckboxGroupChild(conf) { - const children = [] - if (conf.options && conf.options.length) { - const tag = conf.optionType === 'button' ? 'el-checkbox-button' : 'el-checkbox' - const border = conf.border ? 'border' : '' - children.push(`<${tag} v-for="(item, index) in ${conf.vModel}Options" :key="index" :label="item.value" :disabled="item.disabled" ${border}>{{item.label}}`) - } - return children.join('\n') -} - -function buildElUploadChild(conf) { - const list = [] - if (conf['list-type'] === 'picture-card') list.push('') - else list.push(`${conf.buttonText}`) - if (conf.showTip) list.push(`
    鍙兘涓婁紶涓嶈秴杩 ${conf.fileSize}${conf.sizeUnit} 鐨${conf.accept}鏂囦欢
    `) - return list.join('\n') -} - -export function makeUpHtml(conf, type) { - const htmlList = [] - confGlobal = conf - someSpanIsNot24 = conf.fields.some(item => item.span !== 24) - conf.fields.forEach(el => { - htmlList.push(layouts[el.layout](el)) - }) - const htmlStr = htmlList.join('\n') - - let temp = buildFormTemplate(conf, htmlStr, type) - if (type === 'dialog') { - temp = dialogWrapper(temp) - } - confGlobal = null - return temp -} +/* eslint-disable max-len */ +import { trigger } from './config' + +let confGlobal +let someSpanIsNot24 + +export function dialogWrapper(str) { + return ` + ${str} +
    + 鍙栨秷 + 纭畾 +
    +     ` +} + +export function vueTemplate(str) { + return `` +} + +export function vueScript(str) { + return `` +} + +export function cssStyle(cssStr) { + return `` +} + +function buildFormTemplate(conf, child, type) { + let labelPosition = '' + if (conf.labelPosition !== 'right') { + labelPosition = `label-position="${conf.labelPosition}"` + } + const disabled = conf.disabled ? `:disabled="${conf.disabled}"` : '' + let str = ` + ${child} + ${buildFromBtns(conf, type)} + ` + if (someSpanIsNot24) { + str = ` + ${str} + ` + } + return str +} + +function buildFromBtns(conf, type) { + let str = '' + if (conf.formBtns && type === 'file') { + str = ` + 鎻愪氦 + 閲嶇疆 + ` + if (someSpanIsNot24) { + str = ` + ${str} + ` + } + } + return str +} + +// span涓嶄负24鐨勭敤el-col鍖呰９ +function colWrapper(element, str) { + if (someSpanIsNot24 || element.span !== 24) { + return ` + ${str} + ` + } + return str +} + +const layouts = { + colFormItem(element) { + let labelWidth = '' + if (element.labelWidth && element.labelWidth !== confGlobal.labelWidth) { + labelWidth = `label-width="${element.labelWidth}px"` + } + const required = !trigger[element.tag] && element.required ? 'required' : '' + const tagDom = tags[element.tag] ? tags[element.tag](element) : null + let str = ` + ${tagDom} + ` + str = colWrapper(element, str) + return str + }, + rowFormItem(element) { + const type = element.type === 'default' ? '' : `type="${element.type}"` + const justify = element.type === 'default' ? '' : `justify="${element.justify}"` + const align = element.type === 'default' ? '' : `align="${element.align}"` + const gutter = element.gutter ? `gutter="${element.gutter}"` : '' + const children = element.children.map(el => layouts[el.layout](el)) + let str = ` + ${children.join('\n')} + ` + str = colWrapper(element, str) + return str + } +} + +const tags = { + 'el-button': el => { + const { + tag, disabled + } = attrBuilder(el) + const type = el.type ? `type="${el.type}"` : '' + const icon = el.icon ? `icon="${el.icon}"` : '' + const size = el.size ? `size="${el.size}"` : '' + let child = buildElButtonChild(el) + + if (child) child = `\n${child}\n` // 鎹㈣ + return `<${el.tag} ${type} ${icon} ${size} ${disabled}>${child}` + }, + 'el-input': el => { + const { + disabled, vModel, clearable, placeholder, width + } = attrBuilder(el) + const maxlength = el.maxlength ? `:maxlength="${el.maxlength}"` : '' + const showWordLimit = el['show-word-limit'] ? 'show-word-limit' : '' + const readonly = el.readonly ? 'readonly' : '' + const prefixIcon = el['prefix-icon'] ? `prefix-icon='${el['prefix-icon']}'` : '' + const suffixIcon = el['suffix-icon'] ? `suffix-icon='${el['suffix-icon']}'` : '' + const showPassword = el['show-password'] ? 'show-password' : '' + const type = el.type ? `type="${el.type}"` : '' + const autosize = el.autosize && el.autosize.minRows + ? `:autosize="{minRows: ${el.autosize.minRows}, maxRows: ${el.autosize.maxRows}}"` + : '' + let child = buildElInputChild(el) + + if (child) child = `\n${child}\n` // 鎹㈣ + return `<${el.tag} ${vModel} ${type} ${placeholder} ${maxlength} ${showWordLimit} ${readonly} ${disabled} ${clearable} ${prefixIcon} ${suffixIcon} ${showPassword} ${autosize} ${width}>${child}` + }, + 'el-input-number': el => { + const { disabled, vModel, placeholder } = attrBuilder(el) + const controlsPosition = el['controls-position'] ? `controls-position=${el['controls-position']}` : '' + const min = el.min ? `:min='${el.min}'` : '' + const max = el.max ? `:max='${el.max}'` : '' + const step = el.step ? `:step='${el.step}'` : '' + const stepStrictly = el['step-strictly'] ? 'step-strictly' : '' + const precision = el.precision ? `:precision='${el.precision}'` : '' + + return `<${el.tag} ${vModel} ${placeholder} ${step} ${stepStrictly} ${precision} ${controlsPosition} ${min} ${max} ${disabled}>` + }, + 'el-select': el => { + const { + disabled, vModel, clearable, placeholder, width + } = attrBuilder(el) + const filterable = el.filterable ? 'filterable' : '' + const multiple = el.multiple ? 'multiple' : '' + let child = buildElSelectChild(el) + + if (child) child = `\n${child}\n` // 鎹㈣ + return `<${el.tag} ${vModel} ${placeholder} ${disabled} ${multiple} ${filterable} ${clearable} ${width}>${child}` + }, + 'el-radio-group': el => { + const { disabled, vModel } = attrBuilder(el) + const size = `size="${el.size}"` + let child = buildElRadioGroupChild(el) + + if (child) child = `\n${child}\n` // 鎹㈣ + return `<${el.tag} ${vModel} ${size} ${disabled}>${child}` + }, + 'el-checkbox-group': el => { + const { disabled, vModel } = attrBuilder(el) + const size = `size="${el.size}"` + const min = el.min ? `:min="${el.min}"` : '' + const max = el.max ? `:max="${el.max}"` : '' + let child = buildElCheckboxGroupChild(el) + + if (child) child = `\n${child}\n` // 鎹㈣ + return `<${el.tag} ${vModel} ${min} ${max} ${size} ${disabled}>${child}` + }, + 'el-switch': el => { + const { disabled, vModel } = attrBuilder(el) + const activeText = el['active-text'] ? `active-text="${el['active-text']}"` : '' + const inactiveText = el['inactive-text'] ? `inactive-text="${el['inactive-text']}"` : '' + const activeColor = el['active-color'] ? `active-color="${el['active-color']}"` : '' + const inactiveColor = el['inactive-color'] ? `inactive-color="${el['inactive-color']}"` : '' + const activeValue = el['active-value'] !== true ? `:active-value='${JSON.stringify(el['active-value'])}'` : '' + const inactiveValue = el['inactive-value'] !== false ? `:inactive-value='${JSON.stringify(el['inactive-value'])}'` : '' + + return `<${el.tag} ${vModel} ${activeText} ${inactiveText} ${activeColor} ${inactiveColor} ${activeValue} ${inactiveValue} ${disabled}>` + }, + 'el-cascader': el => { + const { + disabled, vModel, clearable, placeholder, width + } = attrBuilder(el) + const options = el.options ? `:options="${el.vModel}Options"` : '' + const props = el.props ? `:props="${el.vModel}Props"` : '' + const showAllLevels = el['show-all-levels'] ? '' : ':show-all-levels="false"' + const filterable = el.filterable ? 'filterable' : '' + const separator = el.separator === '/' ? '' : `separator="${el.separator}"` + + return `<${el.tag} ${vModel} ${options} ${props} ${width} ${showAllLevels} ${placeholder} ${separator} ${filterable} ${clearable} ${disabled}>` + }, + 'el-slider': el => { + const { disabled, vModel } = attrBuilder(el) + const min = el.min ? `:min='${el.min}'` : '' + const max = el.max ? `:max='${el.max}'` : '' + const step = el.step ? `:step='${el.step}'` : '' + const range = el.range ? 'range' : '' + const showStops = el['show-stops'] ? `:show-stops="${el['show-stops']}"` : '' + + return `<${el.tag} ${min} ${max} ${step} ${vModel} ${range} ${showStops} ${disabled}>` + }, + 'el-time-picker': el => { + const { + disabled, vModel, clearable, placeholder, width + } = attrBuilder(el) + const startPlaceholder = el['start-placeholder'] ? `start-placeholder="${el['start-placeholder']}"` : '' + const endPlaceholder = el['end-placeholder'] ? `end-placeholder="${el['end-placeholder']}"` : '' + const rangeSeparator = el['range-separator'] ? `range-separator="${el['range-separator']}"` : '' + const isRange = el['is-range'] ? 'is-range' : '' + const format = el.format ? `format="${el.format}"` : '' + const valueFormat = el['value-format'] ? `value-format="${el['value-format']}"` : '' + const pickerOptions = el['picker-options'] ? `:picker-options='${JSON.stringify(el['picker-options'])}'` : '' + + return `<${el.tag} ${vModel} ${isRange} ${format} ${valueFormat} ${pickerOptions} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${disabled}>` + }, + 'el-date-picker': el => { + const { + disabled, vModel, clearable, placeholder, width + } = attrBuilder(el) + const startPlaceholder = el['start-placeholder'] ? `start-placeholder="${el['start-placeholder']}"` : '' + const endPlaceholder = el['end-placeholder'] ? `end-placeholder="${el['end-placeholder']}"` : '' + const rangeSeparator = el['range-separator'] ? `range-separator="${el['range-separator']}"` : '' + const format = el.format ? `format="${el.format}"` : '' + const valueFormat = el['value-format'] ? `value-format="${el['value-format']}"` : '' + const type = el.type === 'date' ? '' : `type="${el.type}"` + const readonly = el.readonly ? 'readonly' : '' + + return `<${el.tag} ${type} ${vModel} ${format} ${valueFormat} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${readonly} ${disabled}>` + }, + 'el-rate': el => { + const { disabled, vModel } = attrBuilder(el) + const max = el.max ? `:max='${el.max}'` : '' + const allowHalf = el['allow-half'] ? 'allow-half' : '' + const showText = el['show-text'] ? 'show-text' : '' + const showScore = el['show-score'] ? 'show-score' : '' + + return `<${el.tag} ${vModel} ${allowHalf} ${showText} ${showScore} ${disabled}>` + }, + 'el-color-picker': el => { + const { disabled, vModel } = attrBuilder(el) + const size = `size="${el.size}"` + const showAlpha = el['show-alpha'] ? 'show-alpha' : '' + const colorFormat = el['color-format'] ? `color-format="${el['color-format']}"` : '' + + return `<${el.tag} ${vModel} ${size} ${showAlpha} ${colorFormat} ${disabled}>` + }, + 'el-upload': el => { + const disabled = el.disabled ? ':disabled=\'true\'' : '' + const action = el.action ? `:action="${el.vModel}Action"` : '' + const multiple = el.multiple ? 'multiple' : '' + const listType = el['list-type'] !== 'text' ? `list-type="${el['list-type']}"` : '' + const accept = el.accept ? `accept="${el.accept}"` : '' + const name = el.name !== 'file' ? `name="${el.name}"` : '' + const autoUpload = el['auto-upload'] === false ? ':auto-upload="false"' : '' + const beforeUpload = `:before-upload="${el.vModel}BeforeUpload"` + const fileList = `:file-list="${el.vModel}fileList"` + const ref = `ref="${el.vModel}"` + let child = buildElUploadChild(el) + + if (child) child = `\n${child}\n` // 鎹㈣ + return `<${el.tag} ${ref} ${fileList} ${action} ${autoUpload} ${multiple} ${beforeUpload} ${listType} ${accept} ${name} ${disabled}>${child}` + } +} + +function attrBuilder(el) { + return { + vModel: `v-model="${confGlobal.formModel}.${el.vModel}"`, + clearable: el.clearable ? 'clearable' : '', + placeholder: el.placeholder ? `placeholder="${el.placeholder}"` : '', + width: el.style && el.style.width ? ':style="{width: \'100%\'}"' : '', + disabled: el.disabled ? ':disabled=\'true\'' : '' + } +} + +// el-buttin 瀛愮骇 +function buildElButtonChild(conf) { + const children = [] + if (conf.default) { + children.push(conf.default) + } + return children.join('\n') +} + +// el-input innerHTML +function buildElInputChild(conf) { + const children = [] + if (conf.prepend) { + children.push(``) + } + if (conf.append) { + children.push(``) + } + return children.join('\n') +} + +function buildElSelectChild(conf) { + const children = [] + if (conf.options && conf.options.length) { + children.push(``) + } + return children.join('\n') +} + +function buildElRadioGroupChild(conf) { + const children = [] + if (conf.options && conf.options.length) { + const tag = conf.optionType === 'button' ? 'el-radio-button' : 'el-radio' + const border = conf.border ? 'border' : '' + children.push(`<${tag} v-for="(item, index) in ${conf.vModel}Options" :key="index" :label="item.value" :disabled="item.disabled" ${border}>{{item.label}}`) + } + return children.join('\n') +} + +function buildElCheckboxGroupChild(conf) { + const children = [] + if (conf.options && conf.options.length) { + const tag = conf.optionType === 'button' ? 'el-checkbox-button' : 'el-checkbox' + const border = conf.border ? 'border' : '' + children.push(`<${tag} v-for="(item, index) in ${conf.vModel}Options" :key="index" :label="item.value" :disabled="item.disabled" ${border}>{{item.label}}`) + } + return children.join('\n') +} + +function buildElUploadChild(conf) { + const list = [] + if (conf['list-type'] === 'picture-card') list.push('') + else list.push(`${conf.buttonText}`) + if (conf.showTip) list.push(`
    鍙兘涓婁紶涓嶈秴杩 ${conf.fileSize}${conf.sizeUnit} 鐨${conf.accept}鏂囦欢
    `) + return list.join('\n') +} + +export function makeUpHtml(conf, type) { + const htmlList = [] + confGlobal = conf + someSpanIsNot24 = conf.fields.some(item => item.span !== 24) + conf.fields.forEach(el => { + htmlList.push(layouts[el.layout](el)) + }) + const htmlStr = htmlList.join('\n') + + let temp = buildFormTemplate(conf, htmlStr, type) + if (type === 'dialog') { + temp = dialogWrapper(temp) + } + confGlobal = null + return temp +} diff --git a/ruoyi-ui/src/utils/generator/icon.json b/jiajiakang-ui/src/utils/generator/icon.json similarity index 100% rename from ruoyi-ui/src/utils/generator/icon.json rename to jiajiakang-ui/src/utils/generator/icon.json diff --git a/ruoyi-ui/src/utils/generator/js.js b/jiajiakang-ui/src/utils/generator/js.js similarity index 96% rename from ruoyi-ui/src/utils/generator/js.js rename to jiajiakang-ui/src/utils/generator/js.js index 81afc7004b8ea6b85602a9437963d840fb880a82..c6c06a9960d6b9f3062130e0b3317d3016b73a77 100644 --- a/ruoyi-ui/src/utils/generator/js.js +++ b/jiajiakang-ui/src/utils/generator/js.js @@ -1,236 +1,236 @@ -import { isArray } from 'util' -import { exportDefault, titleCase } from '@/utils/index' -import { trigger } from './config' - -const units = { - KB: '1024', - MB: '1024 / 1024', - GB: '1024 / 1024 / 1024' -} -let confGlobal -const inheritAttrs = { - file: '', - dialog: 'inheritAttrs: false,' -} - - -export function makeUpJs(conf, type) { - confGlobal = conf = JSON.parse(JSON.stringify(conf)) - const dataList = [] - const ruleList = [] - const optionsList = [] - const propsList = [] - const methodList = mixinMethod(type) - const uploadVarList = [] - - conf.fields.forEach(el => { - buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) - }) - - const script = buildexport( - conf, - type, - dataList.join('\n'), - ruleList.join('\n'), - optionsList.join('\n'), - uploadVarList.join('\n'), - propsList.join('\n'), - methodList.join('\n') - ) - confGlobal = null - return script -} - -function buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) { - buildData(el, dataList) - buildRules(el, ruleList) - - if (el.options && el.options.length) { - buildOptions(el, optionsList) - if (el.dataType === 'dynamic') { - const model = `${el.vModel}Options` - const options = titleCase(model) - buildOptionMethod(`get${options}`, model, methodList) - } - } - - if (el.props && el.props.props) { - buildProps(el, propsList) - } - - if (el.action && el.tag === 'el-upload') { - uploadVarList.push( - `${el.vModel}Action: '${el.action}', - ${el.vModel}fileList: [],` - ) - methodList.push(buildBeforeUpload(el)) - if (!el['auto-upload']) { - methodList.push(buildSubmitUpload(el)) - } - } - - if (el.children) { - el.children.forEach(el2 => { - buildAttributes(el2, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) - }) - } -} - -function mixinMethod(type) { - const list = []; const - minxins = { - file: confGlobal.formBtns ? { - submitForm: `submitForm() { - this.$refs['${confGlobal.formRef}'].validate(valid => { - if(!valid) return - // TODO 鎻愪氦琛ㄥ崟 - }) - },`, - resetForm: `resetForm() { - this.$refs['${confGlobal.formRef}'].resetFields() - },` - } : null, - dialog: { - onOpen: 'onOpen() {},', - onClose: `onClose() { - this.$refs['${confGlobal.formRef}'].resetFields() - },`, - close: `close() { - this.$emit('update:visible', false) - },`, - handelConfirm: `handelConfirm() { - this.$refs['${confGlobal.formRef}'].validate(valid => { - if(!valid) return - this.close() - }) - },` - } - } - - const methods = minxins[type] - if (methods) { - Object.keys(methods).forEach(key => { - list.push(methods[key]) - }) - } - - return list -} - -function buildData(conf, dataList) { - if (conf.vModel === undefined) return - let defaultValue - if (typeof (conf.defaultValue) === 'string' && !conf.multiple) { - defaultValue = `'${conf.defaultValue}'` - } else { - defaultValue = `${JSON.stringify(conf.defaultValue)}` - } - dataList.push(`${conf.vModel}: ${defaultValue},`) -} - -function buildRules(conf, ruleList) { - if (conf.vModel === undefined) return - const rules = [] - if (trigger[conf.tag]) { - if (conf.required) { - const type = isArray(conf.defaultValue) ? 'type: \'array\',' : '' - let message = isArray(conf.defaultValue) ? `璇疯嚦灏戦夋嫨涓涓${conf.vModel}` : conf.placeholder - if (message === undefined) message = `${conf.label}涓嶈兘涓虹┖` - rules.push(`{ required: true, ${type} message: '${message}', trigger: '${trigger[conf.tag]}' }`) - } - if (conf.regList && isArray(conf.regList)) { - conf.regList.forEach(item => { - if (item.pattern) { - rules.push(`{ pattern: ${eval(item.pattern)}, message: '${item.message}', trigger: '${trigger[conf.tag]}' }`) - } - }) - } - ruleList.push(`${conf.vModel}: [${rules.join(',')}],`) - } -} - -function buildOptions(conf, optionsList) { - if (conf.vModel === undefined) return - if (conf.dataType === 'dynamic') { conf.options = [] } - const str = `${conf.vModel}Options: ${JSON.stringify(conf.options)},` - optionsList.push(str) -} - -function buildProps(conf, propsList) { - if (conf.dataType === 'dynamic') { - conf.valueKey !== 'value' && (conf.props.props.value = conf.valueKey) - conf.labelKey !== 'label' && (conf.props.props.label = conf.labelKey) - conf.childrenKey !== 'children' && (conf.props.props.children = conf.childrenKey) - } - const str = `${conf.vModel}Props: ${JSON.stringify(conf.props.props)},` - propsList.push(str) -} - -function buildBeforeUpload(conf) { - const unitNum = units[conf.sizeUnit]; let rightSizeCode = ''; let acceptCode = ''; const - returnList = [] - if (conf.fileSize) { - rightSizeCode = `let isRightSize = file.size / ${unitNum} < ${conf.fileSize} - if(!isRightSize){ - this.$message.error('鏂囦欢澶у皬瓒呰繃 ${conf.fileSize}${conf.sizeUnit}') - }` - returnList.push('isRightSize') - } - if (conf.accept) { - acceptCode = `let isAccept = new RegExp('${conf.accept}').test(file.type) - if(!isAccept){ - this.$message.error('搴旇閫夋嫨${conf.accept}绫诲瀷鐨勬枃浠') - }` - returnList.push('isAccept') - } - const str = `${conf.vModel}BeforeUpload(file) { - ${rightSizeCode} - ${acceptCode} - return ${returnList.join('&&')} - },` - return returnList.length ? str : '' -} - -function buildSubmitUpload(conf) { - const str = `submitUpload() { - this.$refs['${conf.vModel}'].submit() - },` - return str -} - -function buildOptionMethod(methodName, model, methodList) { - const str = `${methodName}() { - // TODO 鍙戣捣璇锋眰鑾峰彇鏁版嵁 - this.${model} - },` - methodList.push(str) -} - -function buildexport(conf, type, data, rules, selectOptions, uploadVar, props, methods) { - const str = `${exportDefault}{ - ${inheritAttrs[type]} - components: {}, - props: [], - data () { - return { - ${conf.formModel}: { - ${data} - }, - ${conf.formRules}: { - ${rules} - }, - ${uploadVar} - ${selectOptions} - ${props} - } - }, - computed: {}, - watch: {}, - created () {}, - mounted () {}, - methods: { - ${methods} - } -}` - return str -} +import { isArray } from 'util' +import { exportDefault, titleCase } from '@/utils/index' +import { trigger } from './config' + +const units = { + KB: '1024', + MB: '1024 / 1024', + GB: '1024 / 1024 / 1024' +} +let confGlobal +const inheritAttrs = { + file: '', + dialog: 'inheritAttrs: false,' +} + + +export function makeUpJs(conf, type) { + confGlobal = conf = JSON.parse(JSON.stringify(conf)) + const dataList = [] + const ruleList = [] + const optionsList = [] + const propsList = [] + const methodList = mixinMethod(type) + const uploadVarList = [] + + conf.fields.forEach(el => { + buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) + }) + + const script = buildexport( + conf, + type, + dataList.join('\n'), + ruleList.join('\n'), + optionsList.join('\n'), + uploadVarList.join('\n'), + propsList.join('\n'), + methodList.join('\n') + ) + confGlobal = null + return script +} + +function buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) { + buildData(el, dataList) + buildRules(el, ruleList) + + if (el.options && el.options.length) { + buildOptions(el, optionsList) + if (el.dataType === 'dynamic') { + const model = `${el.vModel}Options` + const options = titleCase(model) + buildOptionMethod(`get${options}`, model, methodList) + } + } + + if (el.props && el.props.props) { + buildProps(el, propsList) + } + + if (el.action && el.tag === 'el-upload') { + uploadVarList.push( + `${el.vModel}Action: '${el.action}', + ${el.vModel}fileList: [],` + ) + methodList.push(buildBeforeUpload(el)) + if (!el['auto-upload']) { + methodList.push(buildSubmitUpload(el)) + } + } + + if (el.children) { + el.children.forEach(el2 => { + buildAttributes(el2, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) + }) + } +} + +function mixinMethod(type) { + const list = []; const + minxins = { + file: confGlobal.formBtns ? { + submitForm: `submitForm() { + this.$refs['${confGlobal.formRef}'].validate(valid => { + if(!valid) return + // TODO 鎻愪氦琛ㄥ崟 + }) + },`, + resetForm: `resetForm() { + this.$refs['${confGlobal.formRef}'].resetFields() + },` + } : null, + dialog: { + onOpen: 'onOpen() {},', + onClose: `onClose() { + this.$refs['${confGlobal.formRef}'].resetFields() + },`, + close: `close() { + this.$emit('update:visible', false) + },`, + handelConfirm: `handelConfirm() { + this.$refs['${confGlobal.formRef}'].validate(valid => { + if(!valid) return + this.close() + }) + },` + } + } + + const methods = minxins[type] + if (methods) { + Object.keys(methods).forEach(key => { + list.push(methods[key]) + }) + } + + return list +} + +function buildData(conf, dataList) { + if (conf.vModel === undefined) return + let defaultValue + if (typeof (conf.defaultValue) === 'string' && !conf.multiple) { + defaultValue = `'${conf.defaultValue}'` + } else { + defaultValue = `${JSON.stringify(conf.defaultValue)}` + } + dataList.push(`${conf.vModel}: ${defaultValue},`) +} + +function buildRules(conf, ruleList) { + if (conf.vModel === undefined) return + const rules = [] + if (trigger[conf.tag]) { + if (conf.required) { + const type = isArray(conf.defaultValue) ? 'type: \'array\',' : '' + let message = isArray(conf.defaultValue) ? `璇疯嚦灏戦夋嫨涓涓${conf.vModel}` : conf.placeholder + if (message === undefined) message = `${conf.label}涓嶈兘涓虹┖` + rules.push(`{ required: true, ${type} message: '${message}', trigger: '${trigger[conf.tag]}' }`) + } + if (conf.regList && isArray(conf.regList)) { + conf.regList.forEach(item => { + if (item.pattern) { + rules.push(`{ pattern: ${eval(item.pattern)}, message: '${item.message}', trigger: '${trigger[conf.tag]}' }`) + } + }) + } + ruleList.push(`${conf.vModel}: [${rules.join(',')}],`) + } +} + +function buildOptions(conf, optionsList) { + if (conf.vModel === undefined) return + if (conf.dataType === 'dynamic') { conf.options = [] } + const str = `${conf.vModel}Options: ${JSON.stringify(conf.options)},` + optionsList.push(str) +} + +function buildProps(conf, propsList) { + if (conf.dataType === 'dynamic') { + conf.valueKey !== 'value' && (conf.props.props.value = conf.valueKey) + conf.labelKey !== 'label' && (conf.props.props.label = conf.labelKey) + conf.childrenKey !== 'children' && (conf.props.props.children = conf.childrenKey) + } + const str = `${conf.vModel}Props: ${JSON.stringify(conf.props.props)},` + propsList.push(str) +} + +function buildBeforeUpload(conf) { + const unitNum = units[conf.sizeUnit]; let rightSizeCode = ''; let acceptCode = ''; const + returnList = [] + if (conf.fileSize) { + rightSizeCode = `let isRightSize = file.size / ${unitNum} < ${conf.fileSize} + if(!isRightSize){ + this.$message.error('鏂囦欢澶у皬瓒呰繃 ${conf.fileSize}${conf.sizeUnit}') + }` + returnList.push('isRightSize') + } + if (conf.accept) { + acceptCode = `let isAccept = new RegExp('${conf.accept}').test(file.type) + if(!isAccept){ + this.$message.error('搴旇閫夋嫨${conf.accept}绫诲瀷鐨勬枃浠') + }` + returnList.push('isAccept') + } + const str = `${conf.vModel}BeforeUpload(file) { + ${rightSizeCode} + ${acceptCode} + return ${returnList.join('&&')} + },` + return returnList.length ? str : '' +} + +function buildSubmitUpload(conf) { + const str = `submitUpload() { + this.$refs['${conf.vModel}'].submit() + },` + return str +} + +function buildOptionMethod(methodName, model, methodList) { + const str = `${methodName}() { + // TODO 鍙戣捣璇锋眰鑾峰彇鏁版嵁 + this.${model} + },` + methodList.push(str) +} + +function buildexport(conf, type, data, rules, selectOptions, uploadVar, props, methods) { + const str = `${exportDefault}{ + ${inheritAttrs[type]} + components: {}, + props: [], + data () { + return { + ${conf.formModel}: { + ${data} + }, + ${conf.formRules}: { + ${rules} + }, + ${uploadVar} + ${selectOptions} + ${props} + } + }, + computed: {}, + watch: {}, + created () {}, + mounted () {}, + methods: { + ${methods} + } +}` + return str +} diff --git a/ruoyi-ui/src/utils/generator/render.js b/jiajiakang-ui/src/utils/generator/render.js similarity index 96% rename from ruoyi-ui/src/utils/generator/render.js rename to jiajiakang-ui/src/utils/generator/render.js index f187029d2dd62a6fa7a1192812691a241e558ce8..e8640f0a291e8d6491b8ee2a0ae58f56b4d8915f 100644 --- a/ruoyi-ui/src/utils/generator/render.js +++ b/jiajiakang-ui/src/utils/generator/render.js @@ -1,126 +1,126 @@ -import { makeMap } from '@/utils/index' - -// 鍙傝僪ttps://github.com/vuejs/vue/blob/v2.6.10/src/platforms/web/server/util.js -const isAttr = makeMap( - 'accept,accept-charset,accesskey,action,align,alt,async,autocomplete,' - + 'autofocus,autoplay,autosave,bgcolor,border,buffered,challenge,charset,' - + 'checked,cite,class,code,codebase,color,cols,colspan,content,http-equiv,' - + 'name,contenteditable,contextmenu,controls,coords,data,datetime,default,' - + 'defer,dir,dirname,disabled,download,draggable,dropzone,enctype,method,for,' - + 'form,formaction,headers,height,hidden,high,href,hreflang,http-equiv,' - + 'icon,id,ismap,itemprop,keytype,kind,label,lang,language,list,loop,low,' - + 'manifest,max,maxlength,media,method,GET,POST,min,multiple,email,file,' - + 'muted,name,novalidate,open,optimum,pattern,ping,placeholder,poster,' - + 'preload,radiogroup,readonly,rel,required,reversed,rows,rowspan,sandbox,' - + 'scope,scoped,seamless,selected,shape,size,type,text,password,sizes,span,' - + 'spellcheck,src,srcdoc,srclang,srcset,start,step,style,summary,tabindex,' - + 'target,title,type,usemap,value,width,wrap' -) - -function vModel(self, dataObject, defaultValue) { - dataObject.props.value = defaultValue - - dataObject.on.input = val => { - self.$emit('input', val) - } -} - -const componentChild = { - 'el-button': { - default(h, conf, key) { - return conf[key] - }, - }, - 'el-input': { - prepend(h, conf, key) { - return - }, - append(h, conf, key) { - return - } - }, - 'el-select': { - options(h, conf, key) { - const list = [] - conf.options.forEach(item => { - list.push() - }) - return list - } - }, - 'el-radio-group': { - options(h, conf, key) { - const list = [] - conf.options.forEach(item => { - if (conf.optionType === 'button') list.push({item.label}) - else list.push({item.label}) - }) - return list - } - }, - 'el-checkbox-group': { - options(h, conf, key) { - const list = [] - conf.options.forEach(item => { - if (conf.optionType === 'button') { - list.push({item.label}) - } else { - list.push({item.label}) - } - }) - return list - } - }, - 'el-upload': { - 'list-type': (h, conf, key) => { - const list = [] - if (conf['list-type'] === 'picture-card') { - list.push() - } else { - list.push({conf.buttonText}) - } - if (conf.showTip) { - list.push(
    鍙兘涓婁紶涓嶈秴杩 {conf.fileSize}{conf.sizeUnit} 鐨剓conf.accept}鏂囦欢
    ) - } - return list - } - } -} - -export default { - render(h) { - const dataObject = { - attrs: {}, - props: {}, - on: {}, - style: {} - } - const confClone = JSON.parse(JSON.stringify(this.conf)) - const children = [] - - const childObjs = componentChild[confClone.tag] - if (childObjs) { - Object.keys(childObjs).forEach(key => { - const childFunc = childObjs[key] - if (confClone[key]) { - children.push(childFunc(h, confClone, key)) - } - }) - } - - Object.keys(confClone).forEach(key => { - const val = confClone[key] - if (key === 'vModel') { - vModel(this, dataObject, confClone.defaultValue) - } else if (dataObject[key]) { - dataObject[key] = val - } else if (!isAttr(key)) { - dataObject.props[key] = val - } else { - dataObject.attrs[key] = val - } - }) - return h(this.conf.tag, dataObject, children) - }, - props: ['conf'] -} +import { makeMap } from '@/utils/index' + +// 鍙傝僪ttps://github.com/vuejs/vue/blob/v2.6.10/src/platforms/web/server/util.js +const isAttr = makeMap( + 'accept,accept-charset,accesskey,action,align,alt,async,autocomplete,' + + 'autofocus,autoplay,autosave,bgcolor,border,buffered,challenge,charset,' + + 'checked,cite,class,code,codebase,color,cols,colspan,content,http-equiv,' + + 'name,contenteditable,contextmenu,controls,coords,data,datetime,default,' + + 'defer,dir,dirname,disabled,download,draggable,dropzone,enctype,method,for,' + + 'form,formaction,headers,height,hidden,high,href,hreflang,http-equiv,' + + 'icon,id,ismap,itemprop,keytype,kind,label,lang,language,list,loop,low,' + + 'manifest,max,maxlength,media,method,GET,POST,min,multiple,email,file,' + + 'muted,name,novalidate,open,optimum,pattern,ping,placeholder,poster,' + + 'preload,radiogroup,readonly,rel,required,reversed,rows,rowspan,sandbox,' + + 'scope,scoped,seamless,selected,shape,size,type,text,password,sizes,span,' + + 'spellcheck,src,srcdoc,srclang,srcset,start,step,style,summary,tabindex,' + + 'target,title,type,usemap,value,width,wrap' +) + +function vModel(self, dataObject, defaultValue) { + dataObject.props.value = defaultValue + + dataObject.on.input = val => { + self.$emit('input', val) + } +} + +const componentChild = { + 'el-button': { + default(h, conf, key) { + return conf[key] + }, + }, + 'el-input': { + prepend(h, conf, key) { + return + }, + append(h, conf, key) { + return + } + }, + 'el-select': { + options(h, conf, key) { + const list = [] + conf.options.forEach(item => { + list.push() + }) + return list + } + }, + 'el-radio-group': { + options(h, conf, key) { + const list = [] + conf.options.forEach(item => { + if (conf.optionType === 'button') list.push({item.label}) + else list.push({item.label}) + }) + return list + } + }, + 'el-checkbox-group': { + options(h, conf, key) { + const list = [] + conf.options.forEach(item => { + if (conf.optionType === 'button') { + list.push({item.label}) + } else { + list.push({item.label}) + } + }) + return list + } + }, + 'el-upload': { + 'list-type': (h, conf, key) => { + const list = [] + if (conf['list-type'] === 'picture-card') { + list.push() + } else { + list.push({conf.buttonText}) + } + if (conf.showTip) { + list.push(
    鍙兘涓婁紶涓嶈秴杩 {conf.fileSize}{conf.sizeUnit} 鐨剓conf.accept}鏂囦欢
    ) + } + return list + } + } +} + +export default { + render(h) { + const dataObject = { + attrs: {}, + props: {}, + on: {}, + style: {} + } + const confClone = JSON.parse(JSON.stringify(this.conf)) + const children = [] + + const childObjs = componentChild[confClone.tag] + if (childObjs) { + Object.keys(childObjs).forEach(key => { + const childFunc = childObjs[key] + if (confClone[key]) { + children.push(childFunc(h, confClone, key)) + } + }) + } + + Object.keys(confClone).forEach(key => { + const val = confClone[key] + if (key === 'vModel') { + vModel(this, dataObject, confClone.defaultValue) + } else if (dataObject[key]) { + dataObject[key] = val + } else if (!isAttr(key)) { + dataObject.props[key] = val + } else { + dataObject.attrs[key] = val + } + }) + return h(this.conf.tag, dataObject, children) + }, + props: ['conf'] +} diff --git a/ruoyi-ui/src/utils/index.js b/jiajiakang-ui/src/utils/index.js similarity index 100% rename from ruoyi-ui/src/utils/index.js rename to jiajiakang-ui/src/utils/index.js diff --git a/ruoyi-ui/src/utils/jsencrypt.js b/jiajiakang-ui/src/utils/jsencrypt.js similarity index 100% rename from ruoyi-ui/src/utils/jsencrypt.js rename to jiajiakang-ui/src/utils/jsencrypt.js diff --git a/ruoyi-ui/src/utils/permission.js b/jiajiakang-ui/src/utils/permission.js similarity index 100% rename from ruoyi-ui/src/utils/permission.js rename to jiajiakang-ui/src/utils/permission.js diff --git a/ruoyi-ui/src/utils/request.js b/jiajiakang-ui/src/utils/request.js similarity index 100% rename from ruoyi-ui/src/utils/request.js rename to jiajiakang-ui/src/utils/request.js diff --git a/ruoyi-ui/src/utils/ruoyi.js b/jiajiakang-ui/src/utils/ruoyi.js similarity index 100% rename from ruoyi-ui/src/utils/ruoyi.js rename to jiajiakang-ui/src/utils/ruoyi.js diff --git a/ruoyi-ui/src/utils/scroll-to.js b/jiajiakang-ui/src/utils/scroll-to.js similarity index 100% rename from ruoyi-ui/src/utils/scroll-to.js rename to jiajiakang-ui/src/utils/scroll-to.js diff --git a/ruoyi-ui/src/utils/validate.js b/jiajiakang-ui/src/utils/validate.js similarity index 100% rename from ruoyi-ui/src/utils/validate.js rename to jiajiakang-ui/src/utils/validate.js diff --git a/ruoyi-ui/src/utils/zipdownload.js b/jiajiakang-ui/src/utils/zipdownload.js similarity index 100% rename from ruoyi-ui/src/utils/zipdownload.js rename to jiajiakang-ui/src/utils/zipdownload.js diff --git a/ruoyi-ui/src/views/components/icons/element-icons.js b/jiajiakang-ui/src/views/components/icons/element-icons.js similarity index 100% rename from ruoyi-ui/src/views/components/icons/element-icons.js rename to jiajiakang-ui/src/views/components/icons/element-icons.js diff --git a/ruoyi-ui/src/views/components/icons/index.vue b/jiajiakang-ui/src/views/components/icons/index.vue similarity index 100% rename from ruoyi-ui/src/views/components/icons/index.vue rename to jiajiakang-ui/src/views/components/icons/index.vue diff --git a/ruoyi-ui/src/views/components/icons/svg-icons.js b/jiajiakang-ui/src/views/components/icons/svg-icons.js similarity index 100% rename from ruoyi-ui/src/views/components/icons/svg-icons.js rename to jiajiakang-ui/src/views/components/icons/svg-icons.js diff --git a/ruoyi-ui/src/views/dashboard/BarChart.vue b/jiajiakang-ui/src/views/dashboard/BarChart.vue similarity index 100% rename from ruoyi-ui/src/views/dashboard/BarChart.vue rename to jiajiakang-ui/src/views/dashboard/BarChart.vue diff --git a/ruoyi-ui/src/views/dashboard/LineChart.vue b/jiajiakang-ui/src/views/dashboard/LineChart.vue similarity index 100% rename from ruoyi-ui/src/views/dashboard/LineChart.vue rename to jiajiakang-ui/src/views/dashboard/LineChart.vue diff --git a/ruoyi-ui/src/views/dashboard/PanelGroup.vue b/jiajiakang-ui/src/views/dashboard/PanelGroup.vue similarity index 100% rename from ruoyi-ui/src/views/dashboard/PanelGroup.vue rename to jiajiakang-ui/src/views/dashboard/PanelGroup.vue diff --git a/ruoyi-ui/src/views/dashboard/PieChart.vue b/jiajiakang-ui/src/views/dashboard/PieChart.vue similarity index 100% rename from ruoyi-ui/src/views/dashboard/PieChart.vue rename to jiajiakang-ui/src/views/dashboard/PieChart.vue diff --git a/ruoyi-ui/src/views/dashboard/RaddarChart.vue b/jiajiakang-ui/src/views/dashboard/RaddarChart.vue similarity index 100% rename from ruoyi-ui/src/views/dashboard/RaddarChart.vue rename to jiajiakang-ui/src/views/dashboard/RaddarChart.vue diff --git a/ruoyi-ui/src/views/dashboard/mixins/resize.js b/jiajiakang-ui/src/views/dashboard/mixins/resize.js similarity index 100% rename from ruoyi-ui/src/views/dashboard/mixins/resize.js rename to jiajiakang-ui/src/views/dashboard/mixins/resize.js diff --git a/ruoyi-ui/src/views/error/401.vue b/jiajiakang-ui/src/views/error/401.vue similarity index 100% rename from ruoyi-ui/src/views/error/401.vue rename to jiajiakang-ui/src/views/error/401.vue diff --git a/ruoyi-ui/src/views/error/404.vue b/jiajiakang-ui/src/views/error/404.vue similarity index 100% rename from ruoyi-ui/src/views/error/404.vue rename to jiajiakang-ui/src/views/error/404.vue diff --git a/ruoyi-ui/src/views/index.vue b/jiajiakang-ui/src/views/index.vue similarity index 100% rename from ruoyi-ui/src/views/index.vue rename to jiajiakang-ui/src/views/index.vue diff --git a/ruoyi-ui/src/views/index_v1.vue b/jiajiakang-ui/src/views/index_v1.vue similarity index 95% rename from ruoyi-ui/src/views/index_v1.vue rename to jiajiakang-ui/src/views/index_v1.vue index 4828d8806ca18af9327564496c8b876ecbcf7be2..d2d2ec6338745de5d954e54103264e9844f1e842 100644 --- a/ruoyi-ui/src/views/index_v1.vue +++ b/jiajiakang-ui/src/views/index_v1.vue @@ -1,98 +1,98 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/views/login.vue b/jiajiakang-ui/src/views/login.vue similarity index 100% rename from ruoyi-ui/src/views/login.vue rename to jiajiakang-ui/src/views/login.vue diff --git a/ruoyi-ui/src/views/monitor/cache/index.vue b/jiajiakang-ui/src/views/monitor/cache/index.vue similarity index 97% rename from ruoyi-ui/src/views/monitor/cache/index.vue rename to jiajiakang-ui/src/views/monitor/cache/index.vue index 98eed22ec721ded65daa2a7bd12d5b35a67f8a6f..df0cb1e45e7a645696fa3adf6fc0d6152a298a33 100644 --- a/ruoyi-ui/src/views/monitor/cache/index.vue +++ b/jiajiakang-ui/src/views/monitor/cache/index.vue @@ -1,153 +1,153 @@ - - - + + + diff --git a/ruoyi-ui/src/views/monitor/druid/index.vue b/jiajiakang-ui/src/views/monitor/druid/index.vue similarity index 100% rename from ruoyi-ui/src/views/monitor/druid/index.vue rename to jiajiakang-ui/src/views/monitor/druid/index.vue diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/jiajiakang-ui/src/views/monitor/job/index.vue similarity index 100% rename from ruoyi-ui/src/views/monitor/job/index.vue rename to jiajiakang-ui/src/views/monitor/job/index.vue diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/jiajiakang-ui/src/views/monitor/job/log.vue similarity index 100% rename from ruoyi-ui/src/views/monitor/job/log.vue rename to jiajiakang-ui/src/views/monitor/job/log.vue diff --git a/ruoyi-ui/src/views/monitor/logininfor/index.vue b/jiajiakang-ui/src/views/monitor/logininfor/index.vue similarity index 100% rename from ruoyi-ui/src/views/monitor/logininfor/index.vue rename to jiajiakang-ui/src/views/monitor/logininfor/index.vue diff --git a/ruoyi-ui/src/views/monitor/online/index.vue b/jiajiakang-ui/src/views/monitor/online/index.vue similarity index 100% rename from ruoyi-ui/src/views/monitor/online/index.vue rename to jiajiakang-ui/src/views/monitor/online/index.vue diff --git a/ruoyi-ui/src/views/monitor/operlog/index.vue b/jiajiakang-ui/src/views/monitor/operlog/index.vue similarity index 100% rename from ruoyi-ui/src/views/monitor/operlog/index.vue rename to jiajiakang-ui/src/views/monitor/operlog/index.vue diff --git a/ruoyi-ui/src/views/monitor/server/index.vue b/jiajiakang-ui/src/views/monitor/server/index.vue similarity index 100% rename from ruoyi-ui/src/views/monitor/server/index.vue rename to jiajiakang-ui/src/views/monitor/server/index.vue diff --git a/ruoyi-ui/src/views/redirect.vue b/jiajiakang-ui/src/views/redirect.vue similarity index 100% rename from ruoyi-ui/src/views/redirect.vue rename to jiajiakang-ui/src/views/redirect.vue diff --git a/ruoyi-ui/src/views/system/config/index.vue b/jiajiakang-ui/src/views/system/config/index.vue similarity index 100% rename from ruoyi-ui/src/views/system/config/index.vue rename to jiajiakang-ui/src/views/system/config/index.vue diff --git a/ruoyi-ui/src/views/system/dept/index.vue b/jiajiakang-ui/src/views/system/dept/index.vue similarity index 100% rename from ruoyi-ui/src/views/system/dept/index.vue rename to jiajiakang-ui/src/views/system/dept/index.vue diff --git a/ruoyi-ui/src/views/system/dict/data.vue b/jiajiakang-ui/src/views/system/dict/data.vue similarity index 100% rename from ruoyi-ui/src/views/system/dict/data.vue rename to jiajiakang-ui/src/views/system/dict/data.vue diff --git a/ruoyi-ui/src/views/system/dict/index.vue b/jiajiakang-ui/src/views/system/dict/index.vue similarity index 100% rename from ruoyi-ui/src/views/system/dict/index.vue rename to jiajiakang-ui/src/views/system/dict/index.vue diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/jiajiakang-ui/src/views/system/menu/index.vue similarity index 100% rename from ruoyi-ui/src/views/system/menu/index.vue rename to jiajiakang-ui/src/views/system/menu/index.vue diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/jiajiakang-ui/src/views/system/notice/index.vue similarity index 100% rename from ruoyi-ui/src/views/system/notice/index.vue rename to jiajiakang-ui/src/views/system/notice/index.vue diff --git a/ruoyi-ui/src/views/system/post/index.vue b/jiajiakang-ui/src/views/system/post/index.vue similarity index 100% rename from ruoyi-ui/src/views/system/post/index.vue rename to jiajiakang-ui/src/views/system/post/index.vue diff --git a/ruoyi-ui/src/views/system/role/index.vue b/jiajiakang-ui/src/views/system/role/index.vue similarity index 100% rename from ruoyi-ui/src/views/system/role/index.vue rename to jiajiakang-ui/src/views/system/role/index.vue diff --git a/ruoyi-ui/src/views/system/user/index.vue b/jiajiakang-ui/src/views/system/user/index.vue similarity index 100% rename from ruoyi-ui/src/views/system/user/index.vue rename to jiajiakang-ui/src/views/system/user/index.vue diff --git a/ruoyi-ui/src/views/system/user/profile/index.vue b/jiajiakang-ui/src/views/system/user/profile/index.vue similarity index 100% rename from ruoyi-ui/src/views/system/user/profile/index.vue rename to jiajiakang-ui/src/views/system/user/profile/index.vue diff --git a/ruoyi-ui/src/views/system/user/profile/resetPwd.vue b/jiajiakang-ui/src/views/system/user/profile/resetPwd.vue similarity index 100% rename from ruoyi-ui/src/views/system/user/profile/resetPwd.vue rename to jiajiakang-ui/src/views/system/user/profile/resetPwd.vue diff --git a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue b/jiajiakang-ui/src/views/system/user/profile/userAvatar.vue similarity index 100% rename from ruoyi-ui/src/views/system/user/profile/userAvatar.vue rename to jiajiakang-ui/src/views/system/user/profile/userAvatar.vue diff --git a/ruoyi-ui/src/views/system/user/profile/userInfo.vue b/jiajiakang-ui/src/views/system/user/profile/userInfo.vue similarity index 100% rename from ruoyi-ui/src/views/system/user/profile/userInfo.vue rename to jiajiakang-ui/src/views/system/user/profile/userInfo.vue diff --git a/ruoyi-ui/src/views/tool/build/CodeTypeDialog.vue b/jiajiakang-ui/src/views/tool/build/CodeTypeDialog.vue similarity index 95% rename from ruoyi-ui/src/views/tool/build/CodeTypeDialog.vue rename to jiajiakang-ui/src/views/tool/build/CodeTypeDialog.vue index 99f9eb2dc5b925895380e9e48220cd15c1ba175e..941ec3625f56bcab75f39a356ba356b62b23d1c4 100644 --- a/ruoyi-ui/src/views/tool/build/CodeTypeDialog.vue +++ b/jiajiakang-ui/src/views/tool/build/CodeTypeDialog.vue @@ -1,106 +1,106 @@ - - + + diff --git a/ruoyi-ui/src/views/tool/build/DraggableItem.vue b/jiajiakang-ui/src/views/tool/build/DraggableItem.vue similarity index 96% rename from ruoyi-ui/src/views/tool/build/DraggableItem.vue rename to jiajiakang-ui/src/views/tool/build/DraggableItem.vue index f669ac0e69cae1d74284857fa8ac514de590e6be..e881778f05ad81e1da4097d32b665fcdb362438a 100644 --- a/ruoyi-ui/src/views/tool/build/DraggableItem.vue +++ b/jiajiakang-ui/src/views/tool/build/DraggableItem.vue @@ -1,100 +1,100 @@ - + diff --git a/ruoyi-ui/src/views/tool/build/IconsDialog.vue b/jiajiakang-ui/src/views/tool/build/IconsDialog.vue similarity index 95% rename from ruoyi-ui/src/views/tool/build/IconsDialog.vue rename to jiajiakang-ui/src/views/tool/build/IconsDialog.vue index 0d1277835e54526c6d56051c685b1146bce9dd95..958be50c56f1897854da18498db9788a4a3f5a53 100644 --- a/ruoyi-ui/src/views/tool/build/IconsDialog.vue +++ b/jiajiakang-ui/src/views/tool/build/IconsDialog.vue @@ -1,123 +1,123 @@ - - - + + + diff --git a/ruoyi-ui/src/views/tool/build/RightPanel.vue b/jiajiakang-ui/src/views/tool/build/RightPanel.vue similarity index 97% rename from ruoyi-ui/src/views/tool/build/RightPanel.vue rename to jiajiakang-ui/src/views/tool/build/RightPanel.vue index 1acdc5794e8530ddaff15771289f2fb8eff6f20d..abaec431e64c8ad825510eef3357170573a12193 100644 --- a/ruoyi-ui/src/views/tool/build/RightPanel.vue +++ b/jiajiakang-ui/src/views/tool/build/RightPanel.vue @@ -1,944 +1,944 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue b/jiajiakang-ui/src/views/tool/build/TreeNodeDialog.vue similarity index 95% rename from ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue rename to jiajiakang-ui/src/views/tool/build/TreeNodeDialog.vue index 477c010b9ddb9ffa9cbe6651d9f57698bfee3fde..c225c4cc8354044b1727d2c619c75e48a45ef65b 100644 --- a/ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue +++ b/jiajiakang-ui/src/views/tool/build/TreeNodeDialog.vue @@ -1,149 +1,149 @@ - - + + diff --git a/ruoyi-ui/src/views/tool/build/index.vue b/jiajiakang-ui/src/views/tool/build/index.vue similarity index 100% rename from ruoyi-ui/src/views/tool/build/index.vue rename to jiajiakang-ui/src/views/tool/build/index.vue diff --git a/ruoyi-ui/src/views/tool/gen/basicInfoForm.vue b/jiajiakang-ui/src/views/tool/gen/basicInfoForm.vue similarity index 100% rename from ruoyi-ui/src/views/tool/gen/basicInfoForm.vue rename to jiajiakang-ui/src/views/tool/gen/basicInfoForm.vue diff --git a/ruoyi-ui/src/views/tool/gen/editTable.vue b/jiajiakang-ui/src/views/tool/gen/editTable.vue similarity index 100% rename from ruoyi-ui/src/views/tool/gen/editTable.vue rename to jiajiakang-ui/src/views/tool/gen/editTable.vue diff --git a/ruoyi-ui/src/views/tool/gen/genInfoForm.vue b/jiajiakang-ui/src/views/tool/gen/genInfoForm.vue similarity index 100% rename from ruoyi-ui/src/views/tool/gen/genInfoForm.vue rename to jiajiakang-ui/src/views/tool/gen/genInfoForm.vue diff --git a/ruoyi-ui/src/views/tool/gen/importTable.vue b/jiajiakang-ui/src/views/tool/gen/importTable.vue similarity index 100% rename from ruoyi-ui/src/views/tool/gen/importTable.vue rename to jiajiakang-ui/src/views/tool/gen/importTable.vue diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/jiajiakang-ui/src/views/tool/gen/index.vue similarity index 100% rename from ruoyi-ui/src/views/tool/gen/index.vue rename to jiajiakang-ui/src/views/tool/gen/index.vue diff --git a/ruoyi-ui/src/views/tool/swagger/index.vue b/jiajiakang-ui/src/views/tool/swagger/index.vue similarity index 100% rename from ruoyi-ui/src/views/tool/swagger/index.vue rename to jiajiakang-ui/src/views/tool/swagger/index.vue diff --git a/ruoyi-ui/vue.config.js b/jiajiakang-ui/vue.config.js similarity index 99% rename from ruoyi-ui/vue.config.js rename to jiajiakang-ui/vue.config.js index c68960b18b47766bcfca36c774113ef735f4be6a..414609d86162825018d8c6d0239b0c3631d167aa 100644 --- a/ruoyi-ui/vue.config.js +++ b/jiajiakang-ui/vue.config.js @@ -34,7 +34,7 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://localhost:8080`, + target: `http://localhost:8888`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: '' diff --git a/pom.xml b/pom.xml index f0e37d7929ffa47fa0e4f6952db3b0e4c9ce9973..c5c0ae5bcf4bfc1bc4c9ebd9e45a783c5a68fcb2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,16 +4,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.ruoyi - ruoyi + com.jiajiakang + jiajiakang 3.4.0 - ruoyi - http://www.ruoyi.vip - 鑻ヤ緷绠＄悊绯荤粺 + jiajiakang + http://47.104.16.231 + 浣冲搴风鐞嗙郴缁 - 3.4.0 + 3.4.0 UTF-8 UTF-8 1.8 @@ -191,57 +191,57 @@ - com.ruoyi - ruoyi-quartz - ${ruoyi.version} + com.jiajiakang + jiajiakang-quartz + ${jiajiakang.version} - com.ruoyi - ruoyi-generator - ${ruoyi.version} + com.jiajiakang + jiajiakang-generator + ${jiajiakang.version} - com.ruoyi - ruoyi-framework - ${ruoyi.version} + com.jiajiakang + jiajiakang-framework + ${jiajiakang.version} - com.ruoyi - ruoyi-system - ${ruoyi.version} + com.jiajiakang + jiajiakang-system + ${jiajiakang.version} - com.ruoyi - ruoyi-common - ${ruoyi.version} + com.jiajiakang + jiajiakang-common + ${jiajiakang.version} - com.ruoyi - ruoyi-demo - ${ruoyi.version} + com.jiajiakang + jiajiakang-demo + ${jiajiakang.version} - ruoyi-admin - ruoyi-framework - ruoyi-system - ruoyi-quartz - ruoyi-generator - ruoyi-common - ruoyi-demo + jiajiakang-admin + jiajiakang-framework + jiajiakang-system + jiajiakang-quartz + jiajiakang-generator + jiajiakang-common + jiajiakang-demo pom diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/package-info.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/package-info.java deleted file mode 100644 index 4239668a604d30929fa2df9da16815a4223391e8..0000000000000000000000000000000000000000 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.ruoyi.demo.controller; \ No newline at end of file diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/package-info.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/package-info.java deleted file mode 100644 index e2da76563cdf91cde2d2e61151d2813efbbedcec..0000000000000000000000000000000000000000 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.ruoyi.demo.domain; \ No newline at end of file diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/package-info.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/package-info.java deleted file mode 100644 index 47983a0e14ec46b0cc2a15c82487d2f0c73cc640..0000000000000000000000000000000000000000 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.ruoyi.demo.feign.fallback; \ No newline at end of file diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/package-info.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/package-info.java deleted file mode 100644 index 91e4b4a5bf33790f02e0a87f958b36352f7b461f..0000000000000000000000000000000000000000 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.ruoyi.demo.feign; \ No newline at end of file diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/package-info.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/package-info.java deleted file mode 100644 index 7243da910e601ffb67f7162245b4adc1a6c76367..0000000000000000000000000000000000000000 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.ruoyi.demo.mapper; \ No newline at end of file diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/package-info.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/package-info.java deleted file mode 100644 index 6060849c93963e11a868dae7eb45c841d4e97c3a..0000000000000000000000000000000000000000 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.ruoyi.demo.service.impl; \ No newline at end of file diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/package-info.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/package-info.java deleted file mode 100644 index d6a44c9894f59b265a7838bae094f70b0b847470..0000000000000000000000000000000000000000 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.ruoyi.demo.service; \ No newline at end of file