From 58a14e31c20f582ce11d1f19403f7085c3778d07 Mon Sep 17 00:00:00 2001 From: 1iyc <5212514+liycone@user.noreply.gitee.com> Date: Wed, 30 Oct 2024 14:18:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E6=88=90MP=20+=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=E6=B3=A8=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 28 +++-- sync-admin/pom.xml | 6 ++ .../monitor/SysLogininforController.java | 1 - .../monitor/SysOperlogController.java | 2 +- .../system/SysConfigController.java | 2 +- .../system/SysDictDataController.java | 2 +- .../system/SysDictTypeController.java | 2 +- .../system/SysNoticeController.java | 2 +- .../controller/system/SysPostController.java | 2 +- .../controller/system/SysRoleController.java | 6 +- .../controller/system/SysUserController.java | 2 +- .../tool/DataSourceManagerController.java | 19 ++++ sync-admin/src/main/resources/application.yml | 24 ++--- sync-admin/target/classes/application.yml | 24 ++--- .../monitor/SysLogininforController.class | Bin 3851 -> 3821 bytes .../monitor/SysOperlogController.class | Bin 3238 -> 3208 bytes .../system/SysConfigController.class | Bin 5316 -> 5286 bytes .../system/SysDictDataController.class | Bin 5175 -> 5145 bytes .../system/SysDictTypeController.class | Bin 5414 -> 5384 bytes .../system/SysNoticeController.class | Bin 3560 -> 3530 bytes .../controller/system/SysPostController.class | Bin 5163 -> 5133 bytes .../controller/system/SysRoleController.class | Bin 9888 -> 9842 bytes .../controller/system/SysUserController.class | Bin 11993 -> 11963 bytes sync-common/pom.xml | 5 - .../core/controller/BaseController.java | 33 +----- .../java/com/lyr/common/utils/PageUtils.java | 32 ------ .../core/controller/BaseController$1.class | Bin 957 -> 957 bytes .../core/controller/BaseController.class | Bin 4550 -> 3668 bytes .../lyr/common/core/redis/RedisCache.class | Bin 8793 -> 8793 bytes .../com/lyr/common/utils/PageUtils.class | Bin 1372 -> 0 bytes sync-framework/pom.xml | 16 +++ .../com/lyr/framework/config/DruidConfig.java | 15 ++- .../lyr/framework/config/MyBatisConfig.java | 100 ++---------------- .../lyr/framework/config/SecurityConfig.java | 1 + .../datasource/DynamicDataSource.java | 47 +++++++- .../manager/DataSourceManagerService.java | 57 ++++++++++ .../web/service/SysLoginService.java | 1 + .../lyr/framework/config/DruidConfig$1.class | Bin 2097 -> 2097 bytes .../lyr/framework/config/DruidConfig.class | Bin 4749 -> 4830 bytes .../lyr/framework/config/MyBatisConfig.class | Bin 6404 -> 1122 bytes .../lyr/framework/config/SecurityConfig.class | Bin 11045 -> 11103 bytes .../datasource/DynamicDataSource.class | Bin 1145 -> 3513 bytes .../web/service/SysLoginService.class | Bin 6424 -> 6424 bytes sync-gather/pom.xml | 40 +++++++ .../DataSourceConfigController.java | 34 ++++++ .../gather/domain/vo/DataSourceConfig.java | 68 ++++++++++++ .../gather/mapper/DataSourceConfigMapper.java | 7 ++ .../service/DataSourceConfigService.java | 11 ++ .../impl/DataSourceConfigServiceImpl.java | 48 +++++++++ .../generator/controller/GenController.java | 4 +- .../main/resources/vm/java/controller.java.vm | 2 +- .../generator/controller/GenController.class | Bin 9963 -> 9925 bytes .../target/classes/vm/java/controller.java.vm | 2 +- .../quartz/controller/SysJobController.java | 2 +- .../controller/SysJobLogController.java | 2 +- .../quartz/controller/SysJobController.class | Bin 6868 -> 6838 bytes .../controller/SysJobLogController.class | Bin 3681 -> 3651 bytes sync-system/pom.xml | 10 ++ .../java/com/lyr/system/domain/SysCache.java | 1 + .../com/lyr/system/mapper/SysDeptMapper.java | 3 +- .../service/impl/SysDictDataServiceImpl.java | 1 + .../resources/mapper/system/SysDeptMapper.xml | 52 +++++++-- .../com/lyr/system/domain/SysCache.class | Bin 1752 -> 1752 bytes .../com/lyr/system/mapper/SysDeptMapper.class | Bin 1478 -> 1656 bytes .../service/impl/SysDictDataServiceImpl.class | Bin 2719 -> 2719 bytes .../classes/mapper/system/SysDeptMapper.xml | 52 +++++++-- 66 files changed, 529 insertions(+), 239 deletions(-) create mode 100644 sync-admin/src/main/java/com/lyr/web/controller/tool/DataSourceManagerController.java delete mode 100644 sync-common/src/main/java/com/lyr/common/utils/PageUtils.java delete mode 100644 sync-common/target/classes/com/lyr/common/utils/PageUtils.class create mode 100644 sync-framework/src/main/java/com/lyr/framework/manager/DataSourceManagerService.java create mode 100644 sync-gather/pom.xml create mode 100644 sync-gather/src/main/java/com/lyr/gather/controller/DataSourceConfigController.java create mode 100644 sync-gather/src/main/java/com/lyr/gather/domain/vo/DataSourceConfig.java create mode 100644 sync-gather/src/main/java/com/lyr/gather/mapper/DataSourceConfigMapper.java create mode 100644 sync-gather/src/main/java/com/lyr/gather/service/DataSourceConfigService.java create mode 100644 sync-gather/src/main/java/com/lyr/gather/service/impl/DataSourceConfigServiceImpl.java diff --git a/pom.xml b/pom.xml index b6c9087..479a474 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,7 @@ 5.3.33 5.7.12 1.2.23 + 3.4.1 1.21 3.0.0 2.3.3 @@ -70,6 +71,20 @@ ${druid.version} + + + com.baomidou + mybatis-plus-boot-starter + ${mp.version} + + + + + com.baomidou + mybatis-plus-extension + ${mp.version} + + eu.bitwalker @@ -77,12 +92,6 @@ ${bitwalker.version} - - - com.github.pagehelper - pagehelper-spring-boot-starter - ${pagehelper.boot.version} - @@ -181,6 +190,12 @@ ${sync.version} + + com.lyr + sync-gather + ${sync.version} + + @@ -191,6 +206,7 @@ sync-quartz sync-generator sync-common + sync-gather pom diff --git a/sync-admin/pom.xml b/sync-admin/pom.xml index ddaef56..1bc6ce7 100644 --- a/sync-admin/pom.xml +++ b/sync-admin/pom.xml @@ -61,6 +61,12 @@ sync-generator + + + com.lyr + sync-gather + + diff --git a/sync-admin/src/main/java/com/lyr/web/controller/monitor/SysLogininforController.java b/sync-admin/src/main/java/com/lyr/web/controller/monitor/SysLogininforController.java index f76d7e9..cda2985 100644 --- a/sync-admin/src/main/java/com/lyr/web/controller/monitor/SysLogininforController.java +++ b/sync-admin/src/main/java/com/lyr/web/controller/monitor/SysLogininforController.java @@ -33,7 +33,6 @@ public class SysLogininforController extends BaseController { @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')") @GetMapping("/list") public TableDataInfo list(SysLogininfor logininfor) { - startPage(); List list = logininforService.selectLogininforList(logininfor); return getDataTable(list); } diff --git a/sync-admin/src/main/java/com/lyr/web/controller/monitor/SysOperlogController.java b/sync-admin/src/main/java/com/lyr/web/controller/monitor/SysOperlogController.java index a06f70e..9c43907 100644 --- a/sync-admin/src/main/java/com/lyr/web/controller/monitor/SysOperlogController.java +++ b/sync-admin/src/main/java/com/lyr/web/controller/monitor/SysOperlogController.java @@ -29,7 +29,7 @@ public class SysOperlogController extends BaseController { @PreAuthorize("@ss.hasPermi('monitor:operlog:list')") @GetMapping("/list") public TableDataInfo list(SysOperLog operLog) { - startPage(); + List list = operLogService.selectOperLogList(operLog); return getDataTable(list); } diff --git a/sync-admin/src/main/java/com/lyr/web/controller/system/SysConfigController.java b/sync-admin/src/main/java/com/lyr/web/controller/system/SysConfigController.java index b113671..c3cd4d7 100644 --- a/sync-admin/src/main/java/com/lyr/web/controller/system/SysConfigController.java +++ b/sync-admin/src/main/java/com/lyr/web/controller/system/SysConfigController.java @@ -33,7 +33,7 @@ public class SysConfigController extends BaseController { @PreAuthorize("@ss.hasPermi('system:config:list')") @GetMapping("/list") public TableDataInfo list(SysConfig config) { - startPage(); + List list = configService.selectConfigList(config); return getDataTable(list); } diff --git a/sync-admin/src/main/java/com/lyr/web/controller/system/SysDictDataController.java b/sync-admin/src/main/java/com/lyr/web/controller/system/SysDictDataController.java index 41a927f..efeb7f1 100644 --- a/sync-admin/src/main/java/com/lyr/web/controller/system/SysDictDataController.java +++ b/sync-admin/src/main/java/com/lyr/web/controller/system/SysDictDataController.java @@ -36,7 +36,7 @@ public class SysDictDataController extends BaseController { @PreAuthorize("@ss.hasPermi('system:dict:list')") @GetMapping("/list") public TableDataInfo list(SysDictData dictData) { - startPage(); + List list = dictDataService.selectDictDataList(dictData); return getDataTable(list); } diff --git a/sync-admin/src/main/java/com/lyr/web/controller/system/SysDictTypeController.java b/sync-admin/src/main/java/com/lyr/web/controller/system/SysDictTypeController.java index bdfe66f..2fddf4d 100644 --- a/sync-admin/src/main/java/com/lyr/web/controller/system/SysDictTypeController.java +++ b/sync-admin/src/main/java/com/lyr/web/controller/system/SysDictTypeController.java @@ -30,7 +30,7 @@ public class SysDictTypeController extends BaseController { @PreAuthorize("@ss.hasPermi('system:dict:list')") @GetMapping("/list") public TableDataInfo list(SysDictType dictType) { - startPage(); + List list = dictTypeService.selectDictTypeList(dictType); return getDataTable(list); } diff --git a/sync-admin/src/main/java/com/lyr/web/controller/system/SysNoticeController.java b/sync-admin/src/main/java/com/lyr/web/controller/system/SysNoticeController.java index 292e332..036afd9 100644 --- a/sync-admin/src/main/java/com/lyr/web/controller/system/SysNoticeController.java +++ b/sync-admin/src/main/java/com/lyr/web/controller/system/SysNoticeController.java @@ -31,7 +31,7 @@ public class SysNoticeController extends BaseController { @PreAuthorize("@ss.hasPermi('system:notice:list')") @GetMapping("/list") public TableDataInfo list(SysNotice notice) { - startPage(); + List list = noticeService.selectNoticeList(notice); return getDataTable(list); } diff --git a/sync-admin/src/main/java/com/lyr/web/controller/system/SysPostController.java b/sync-admin/src/main/java/com/lyr/web/controller/system/SysPostController.java index 41517c2..6625251 100644 --- a/sync-admin/src/main/java/com/lyr/web/controller/system/SysPostController.java +++ b/sync-admin/src/main/java/com/lyr/web/controller/system/SysPostController.java @@ -33,7 +33,7 @@ public class SysPostController extends BaseController { @PreAuthorize("@ss.hasPermi('system:post:list')") @GetMapping("/list") public TableDataInfo list(SysPost post) { - startPage(); + List list = postService.selectPostList(post); return getDataTable(list); } diff --git a/sync-admin/src/main/java/com/lyr/web/controller/system/SysRoleController.java b/sync-admin/src/main/java/com/lyr/web/controller/system/SysRoleController.java index 82c726f..83ed625 100644 --- a/sync-admin/src/main/java/com/lyr/web/controller/system/SysRoleController.java +++ b/sync-admin/src/main/java/com/lyr/web/controller/system/SysRoleController.java @@ -51,7 +51,7 @@ public class SysRoleController extends BaseController { @PreAuthorize("@ss.hasPermi('system:role:list')") @GetMapping("/list") public TableDataInfo list(SysRole role) { - startPage(); + List list = roleService.selectRoleList(role); return getDataTable(list); } @@ -171,7 +171,7 @@ public class SysRoleController extends BaseController { @PreAuthorize("@ss.hasPermi('system:role:list')") @GetMapping("/authUser/allocatedList") public TableDataInfo allocatedList(SysUser user) { - startPage(); + List list = userService.selectAllocatedList(user); return getDataTable(list); } @@ -182,7 +182,7 @@ public class SysRoleController extends BaseController { @PreAuthorize("@ss.hasPermi('system:role:list')") @GetMapping("/authUser/unallocatedList") public TableDataInfo unallocatedList(SysUser user) { - startPage(); + List list = userService.selectUnallocatedList(user); return getDataTable(list); } diff --git a/sync-admin/src/main/java/com/lyr/web/controller/system/SysUserController.java b/sync-admin/src/main/java/com/lyr/web/controller/system/SysUserController.java index 8b53f93..4921eb9 100644 --- a/sync-admin/src/main/java/com/lyr/web/controller/system/SysUserController.java +++ b/sync-admin/src/main/java/com/lyr/web/controller/system/SysUserController.java @@ -52,7 +52,7 @@ public class SysUserController extends BaseController { @PreAuthorize("@ss.hasPermi('system:user:list')") @GetMapping("/list") public TableDataInfo list(SysUser user) { - startPage(); + List list = userService.selectUserList(user); return getDataTable(list); } diff --git a/sync-admin/src/main/java/com/lyr/web/controller/tool/DataSourceManagerController.java b/sync-admin/src/main/java/com/lyr/web/controller/tool/DataSourceManagerController.java new file mode 100644 index 0000000..0fb2229 --- /dev/null +++ b/sync-admin/src/main/java/com/lyr/web/controller/tool/DataSourceManagerController.java @@ -0,0 +1,19 @@ +package com.lyr.web.controller.tool; + +import com.lyr.framework.manager.DataSourceManagerService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * @author liyc + * @date 2024/10/30 + * @description TODO + **/ +@RestController("/dataSourceManager") +public class DataSourceManagerController { + + + +} diff --git a/sync-admin/src/main/resources/application.yml b/sync-admin/src/main/resources/application.yml index e539dc3..5c45fe6 100644 --- a/sync-admin/src/main/resources/application.yml +++ b/sync-admin/src/main/resources/application.yml @@ -100,25 +100,23 @@ token: # 令牌有效期（默认30分钟） expireTime: 30 -# MyBatis配置 -mybatis: - # 搜索指定包别名 + +mybatis-plus: typeAliasesPackage: com.lyr.**.domain - # 配置mapper的扫描，找到所有的mapper.xml映射文件 mapperLocations: classpath*:mapper/**/*Mapper.xml - # 加载全局的配置文件 - configLocation: classpath:mybatis/mybatis-config.xml - -# PageHelper分页插件 -pagehelper: - helperDialect: mysql - supportMethodsArguments: true - params: count=countSql + mapperPackage: com.lyr.**.mapper + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + map-underscore-to-camel-case: true + global-config: + db-config: + id-type: AUTO + banner: off # Swagger配置 swagger: # 是否开启swagger - enabled: true + enabled: false # 请求前缀 pathMapping: /dev-api diff --git a/sync-admin/target/classes/application.yml b/sync-admin/target/classes/application.yml index c133c49..2d6cc3d 100644 --- a/sync-admin/target/classes/application.yml +++ b/sync-admin/target/classes/application.yml @@ -100,25 +100,23 @@ token: # 令牌有效期（默认30分钟） expireTime: 30 -# MyBatis配置 -mybatis: - # 搜索指定包别名 + +mybatis-plus: typeAliasesPackage: com.lyr.**.domain - # 配置mapper的扫描，找到所有的mapper.xml映射文件 mapperLocations: classpath*:mapper/**/*Mapper.xml - # 加载全局的配置文件 - configLocation: classpath:mybatis/mybatis-config.xml - -# PageHelper分页插件 -pagehelper: - helperDialect: mysql - supportMethodsArguments: true - params: count=countSql + mapperPackage: com.lyr.**.mapper + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + map-underscore-to-camel-case: true + global-config: + db-config: + id-type: AUTO + banner: off # Swagger配置 swagger: # 是否开启swagger - enabled: true + enabled: false # 请求前缀 pathMapping: /dev-api diff --git a/sync-admin/target/classes/com/lyr/web/controller/monitor/SysLogininforController.class b/sync-admin/target/classes/com/lyr/web/controller/monitor/SysLogininforController.class index e01dd35fc0581847edfb7e4db0e6f74139902ec1..53a2e179655bbc508625f9f5182a062b12dca6a6 100644 GIT binary patch delta 1091 zcmaiy*HTkq6otQ>1Ww8cB}!9~NGG9Kz=GHT3xW+)z^>S^$9k0q&^zvY3K^X+=!_5G zJNO7*dFhPf+UJD8aO0erv-iKtT5IqBf4}utcVy+pcIwj!wGFnI)7Xlb4&NTUk@|k%%q?(k7_e7c}vWvguU$67FE6A(HJ$MGM4i z(m-EI9jHG+kM`Ru4Sl}O{s5<>Gp&5DxPU@iUYBgpb+XZFfYb7Q~wv}=_ zl(R896xpf#uAJW2z#O~Tvoh9R_6a{2Yf#>PhE!}*9h0>!R%VKOjyn`c*pi*RzvbY* z27Kj4uiBFGN)B*Pcq{b9Ego8@<1j}`^hZSru04%mIUz zlD?KT7d}Kxw5!jjqA2G-B95;SaY8&NIaS=ji1=-;q-UmwIRB=IpNg)R}H}wzJ C(Pmfx delta 1102 zcmaJV%3FX|rc{dE4DBLj7b`U@DzckhgznAIdyl;J(qG7_ zp|NKA0sWVrdT(0aK7bC>G-u{~-`?N;)>_}%`&Y;N&iS8zzWo3>s=rxNM^tSA6`< z`7w_LSzfiUXyKX-53YMLEb)dEb5gu1*)7R#OIO~;9V}V6YvJDN>~E_riZ+G&^4p9p z79J=(#InL8JT5PKv&kr)C_KfALIFjEXLzpgLQcQLq(UpUT6m@K8gC4w%I}O+S@{NS zU!j;=DbD1U@}JYbK6A90!U2;XIba~dm4~rK?-Hb8PioY~e|!0(zooRTdLG>CV6IpJ zn$U^uj0R%ZLF{(s%Zx6@NW20w{speY8r&wb@ni)}pIC4~z=HZv7u@JZ2t67!<}_A8 z34xv1Meq?bCyTt6HsxBu;IRHMx&o?(AoMsDNRl@;HElwW&&nFhYE1tWjoZjPbOL zHO^=JT{U$0<;8JABwF}7C{e+tf6->(rBtDHTnN-%2w)0X0yYSkuDNg)6Z$%4HoUEK+6CpfpkLk;C7dU^ Si3=Jj%ljoWKzTaTak_)O{WxTld-d0IsE^LZMY| zT>K2KTodB*d0&6^+Y=Y`KpUirM{jn7-& z`K(#@duAQ#?Qy5x{_RbD^Aa0QDOO;I&a zwDg16N-n;MHytfRE45srL((=4_2o1IV`3`{q9O&=Kxe~%q$S+iyfJmyRf>UPR}=X_ zaYS<|O;&|eRDFQfcCjRquvk;k))-Z0TxutpOmcFKDeBv6H8>^waIMqw&TuvuhdEih zVz%5pbjqbe+K&AH=b8$H58$?}cSm`ab4&}bH~sl-`WY_l&|l<|AUyjuF3WMa!ff}% zGm7jA8I!Vw?@;crXIF}S?~jNwDbn5FC)1VFTf|&15m$wDO-wG=1MN9^Hx%C#e|V)^ F{{ZVUPxk-- delta 929 zcmZvaOH&h35QV>)JcdlhM57U-K|>VL1Vj)YAU^SdB8YDhUr`aX$|}pS&sNv$`~j|| zv_hd(Zru52{0Ek&X9BuNP1Wu0+ui4!?z!&^p9(X-{(SoZ4D;G&Gm}19uBCKLrJ3fs zg)<&EJZ}0Vxz)j-+1r-9W68Vb-81jL$E?SLmC2vUt~}cV=Iq!)&f{UgBOV7l;i*G; zc_mg}p745#d1?XAcpmVA`GA)!1T0$9E5?^Uc#D3jzEpd+G*erc|MJ^wI*qIpf`eTID3gWc>AdRE*;N`r109)kFC?6;`9dn8O{pAvnO&+j>CCri2nVUBHKd7q^z;YL60C4NqK8e$Pej9 lNQw5}Gs?8&v=?!qorsG9x+FlC%c1t1ya~lu#2;R%OLSLy%& diff --git a/sync-admin/target/classes/com/lyr/web/controller/system/SysConfigController.class b/sync-admin/target/classes/com/lyr/web/controller/system/SysConfigController.class index e1424a728eb525e00ee1c4ff6bfae3cd6fa55160..cc05cf122868ced6ad331e3f4c1e93f529533805 100644 GIT binary patch delta 1758 zcma)6_fr&E5dLNs*k$&y=qecQJU~!j7mVnsr)L1O;F(3t3g)=#1-%{|5N}CVmd9RGqRi&`#I6h`w{o!LTgiHdR8Hd6!KBv$3=xpxU6sm zSK}dL`jA3g)1W?_Ir#Bni+l~u3fFN%;U;b=+{PV+yZBeMc?$P%KVEN?1RkJKp$QM; z9Y(?A|L{=Ze>r|6+G9LXXvR~87PM-}c>kvPX-K1clC|(e( z(~8b@6g__vtoNCDtR|pA7toXgxJ#oPNSRJaK3t2r8%(KDrbgPJwNlX$;VRBRUqrbo z#{nfMgko z%3FiXIS9k(J)B;W)3KD%BJg`rj-Yj93_oL(C^gVx7)@;qe&M08xrP)@2~6Y)q7oZX zRR>b5!)a~sk4fp15-kk}ETjul2Va;WAhRH|XOmeD@d(Z`xrk^T)}oEYI3^QK5bKP{ zvJv|jXW&1+i;qDf~ zQ42jN!accI$g+^#5{+2sWuZ4~WZKi%M}YS2nnb75Gmyc$ma-xvP~`z#(TTajoyclZ z@j)xK3ztLH9ls?>4Xk0`V6zFzi(4x5x6H2M^6#be!#64Ym}q;yFEUz8M%83gLx4+d zMkZ%~0KT8niX=)au_}p@%V;&$xJ{bM6wXXKZ~rGwqJSe>-hB&TlQ` iwmtDSzXD>j2gDX;+{#Qkw%MZ*rna5?9i1?>ou2_*jOC92 delta 1796 zcmbVM`&U#|6#nkaz@52sn6V-7Q3xRgGXo(CX=LVu)HLuB7DQI4NDnP#(DKDKU!{ds zqm}mZNe_~SN0)%L?3aG(?oB3(mSL)@r%d%-Q>#z0cm?xA#7`FaBrT{Oiv6 zZ2+|xH?RQR21>C%#N|L3@8Nyf9@KG2$6*7xI1iA;tT4SiF z0&#^eWhuj>I=)i4gv$zF;~Nd7>3{vD>9|q0umay|Q2(4iK6x=Czup0b@9@3C6 z3%H1a4K(ZqP3DsIfG;wEh76GjBCWvf_|I#xwG?O<-0u2+LQkuTHchgM}5u9&Jjer=ux zzQVr2W@Cos>22fgRsJ=+_J1ioJR>DxR5ZnC{(mxRA){8JZ$r8yKVaSurPn=_+OgfG z{0K z$$1uUd57k0>}D2uBg^O{uhWdk)QsT~e&+;_2hKiz2fJ)I&gU)Swtebt&H!Rh7KnG4 X@m)LYUVAiR-0$PQ%Z8aFU!~Mt%S!Kw diff --git a/sync-admin/target/classes/com/lyr/web/controller/system/SysDictDataController.class b/sync-admin/target/classes/com/lyr/web/controller/system/SysDictDataController.class index 7f499e08de868af3b923d0e4a1bb344aff3a4cce..2dfba68494e6e8ebe822cc3062466450a24e183b 100644 GIT binary patch delta 1575 zcmaJ>_fr#L5Pf$EIlMcKMkRuUfDJ=5D%iWA*uY+}As{LmMH3XUoxNZ;Hn8_!b#xNT zjDLWClRCb=OJdBZ!*JiX-|oJB`*tB&)?H?O`}z4RfJ(g4QG`e@6k@M|eQ48p+ppn( zhNzA_#PTsq&USGg6z3s{?J#f{ojQ)-sD@)YyoiYJxDF3aNT?;|Nik1}d0IYaFNIFotNjXyOvOOkBnl1*P!@cWHd9KG7<{RTI~6-NX&t zG;s@Y6U7KIAZ@B`HHPjIQI4TchMzvZI~f}}GB%rTfHXaT-6A%!NlAj*kqux1%T zj2=tB)O23P@kLtl^Axh8gsSsOSx* zbk3>%AzqG(i?UQ)j3rFbWEGb3qF@ROy6lqv#x6p?fzvsWo%B8*KOZ2TvufoV`zCv*aPx-P#zCS>|r;K;HZvcIIiJ@j%*vp)S;n6LQhKQDREDW+bPEx zxjXC9a8ASdPaOwc%7xFrU3m_F9!40rD8~>C)o{tcWn3|E71ttV`pWz~TsLq7Hw{E^ z%fM~iF%ZOX4R;OPLzjm81|HyH|4u6NEKV87X5&$(W}LfKG`|QSybZ9h(ec+ZH``M zfXHr?BbU$tf(y?|8z;##hzXd;TEw;(n<`UsEXoch>X?Mdgc9<(BxApov55Uv#W!gq zpEpzZJ~fPLOl!e(%t*8~6E(!QyQ<~aEX-!GbX7yE(t1L1t=-f=3PY4uEv4sgwc`v-mv4OR>yy(Oa$4IbC$le7eOkHXTa#RN_g=APY-FE_4Uhj&Hzl}iwpYCcTNq?-cx&&u Usf3ng-ezHV`L&(?j%4`Gf1Hx8+yDRo diff --git a/sync-admin/target/classes/com/lyr/web/controller/system/SysDictTypeController.class b/sync-admin/target/classes/com/lyr/web/controller/system/SysDictTypeController.class index eb5b8106a0f6666c42e01741ca618b13eb4b8acd..08b29ab3050abdda72d2e6a8d670c2a8086dd106 100644 GIT binary patch delta 1706 zcmbW1XHyhG5Qg8~1Mb*e(kWmD71JJ=z?@Jqp_mh5Rxpc-IjuS8Gh)V^549H2D*f*7 zP(S(;EZ^SUJI^aEtNgIjJv}|sPxtiBL-Uwveg5(OBY+aT)zA?eQ<0BNI_j`lqqfD5 zt$u9Nkc{mCj1sv+7I(_xF41=Tu}4E1HU_X)q@^JR`vTZ6lLO**P=-TdJ}euK$n}U2)mK z6QvH9zZD_;-4W2_gl{8E-*AtJ}t7-$rT*LV}o(pM_x`FG}_VAJNp_CiIqOBKP$rvAP#USI=)qB(fi^HX8mY zkE(a`vl41InZVW^P>&GwfOsAgvH+dOZ$1XT#~@D6wB!3 zw%_u^eyBzbqe(ByKOldBl`aj@j1G#+lYmphcV>ly<31nh-W^B(fxkekh=W+kIICiD z=XrI=bi?LZ3MQHCJm)Wne`;!3hz)Ut$n+x1%f6Zqj1qfbTuU)6LX}SW>s?vHaBH2M T);X&|&ewBZOE0HJDmMHC#TD3I delta 1764 zcmb7F`&$%c6nfesBH zhVYSWK9;mWSq{tb5qV%pwnsxarkC^RxEy^V%LzIERJ_k*`CP*n8onGk+Z>*oz(NDI zEajN5;iQ4D@U?+c_(nmQ9SfG(bM)%s1Wp?`gKrIdhqDI0$2kM%@q>aQ`|rFW+tTBq zA92CJMO?B^>+@SKf+BQ~h0i{cT-6-M4xpvxA9JG7BhB1v~Ad+~v|P zpbgVF&6a6z?>Bey-SjUu!(I4hW}jE5cQBh2wI#`y$@ zHUfJ*U$+Eetyf|aVhNU`j%`@h1*&7yBD+8ERnX04-RDOisUe(w{0?o=Sep&2dEAM-hwXJ9r@J zAWjp1kc)$d925*Esfj`dMQOkf3*cE9QFw&cBM&R6s|G@E%z(GhG>N_mFS^QjiMRq# zD%~;W(e+jE@-#YMA&YRwiHP1`<))oK1snhCM8%HvZzIi4k2Gh-kyMZeu%;@c6R*uY((Bmdzob2cwBADO8C)~)nS@!#=u z5N~CHc$;oZb%ZcQVW4=)L=mU*nYk diff --git a/sync-admin/target/classes/com/lyr/web/controller/system/SysNoticeController.class b/sync-admin/target/classes/com/lyr/web/controller/system/SysNoticeController.class index 54861175122d209c76b767806e476cdcd104f163..ac7fd475c0e022bd8ef36737200cc6ba53934d42 100644 GIT binary patch delta 988 zcmZ{i*-{fx5Qe{*2osW#2x_861&x}R;J)C#5OF~x;(`l`Yfy1F4=~SQ@giDUsnQE? zyyM2#@F^_+&P*W0P*XF#%;~?s)93uj&Sxj)|Ni(19Hf>Y#g!g$tkVO&{y-P&*&yqXWutV`@~g5j*}md8+|qYqE|ua?ofV&zjA23vErA?K zwl%~C!-7amrEFreM3chFGN9GLpbD&KnA)P0(Pm_~Dx0fGX}dX7I5l?2%Tti50hMK~ zU#b`pb-C2(HXOHsV|#{O4U}}abO9yBPKr1|d%IFgyCKzr=SXI^9EUyZje3tqy)&g^ z9j{Kj$7l6J61 z<*RK!(L4mFiH$dwvYW{Dqt0+Br&Dh^+K!;lPZ=XHC`~|qx1x&H53<* zwD`3gH_~uih67?{>Fh=&F*ryzIGY(F72hzCma#;u#5NdgWr)`qY`-i=l%owCi5f>D z9Eo!Di+gzOF%C)Nc!|RtDUy@sV^W|zaeeXQdjAtX)X7GuCMIWtY12QMCWUG0f0#}+ zF;#M$W}*cuWIDsya8Q4}QD+N_{;`m6;BafRahVjt;EjgsvpMH;OxK5Vo@uEH{*epK Xk7jaF>`gBD58Wl%Wzkn^`SpyOC&!cv_w(ysAXD%X=)#2 zHJC|>AEkX*2I(3WvC5_0^((v}*7D99Z(BWkX29cNv0QpF@80j;``!E5`+erUP}xyw z|MTA;e*vgLuYrfr8bJxRMzIas4Qg!~c4$Z$$ihw?yF~65=iB0ZN3=Z}-Zcdph2ijV)pA61HE*2eLUJ?t^0aP_~EkNjNN~BVzhUmXBrmM8l^VI(koc>EkOf z)kG=EG<;^_C_Xpw1-?{J>f8vGI(s6e6%}w4nE(EMeDKeXp<_Km9T!b>;+ToAaNNY# zIANj--#AwzN&Q=#G|`Py&aFs!>@-f9ID@k$zN5RsD6joqEa!0E#1Ht<#83EHL2U5K z#i7oAKRuCL5ce353=M>t4sz#0xo8O~okKu8q z7ESP}M3e8~3!wl8=3zcd3DSZQUo|uOz6JCN=BcziLI0B}EX1M>cnVJs_plhxFun9( zr|>M*=kPqErHMt9GP4{j7^|VeMN~$bemQmCIHf#8M}X(x1uS8@jFBx(8(BS;@rWk( z{vs7y!Ap2KsQq_PyDcbfs+?(=HGo({AI8OVT;wKPHxVG}adIWH}*+p;jfm7K@2DV8x1zQLp5L;k6o- zAK?{lUgf7?)!n+ahufWaFYTrWk8XF;aJvtscS}4)v@_|}GzQ()VqHKtVS8{F>oah?jwS~Af9xA~(oaFN z_l^kjSM#2P&biiQ8)`p_6)dsHH;?=2&q)h^!Odxaas!&k3%-$$h%)ks_?GGb;yB9N bZ^xS~_7=;j*yNEZPOXLe&5Y7~uv`8I-X!lo delta 1763 zcma)7TXz#x6#izCc9O|SQ=@GqfNiC;WzwQZL~aU}O927F8@9-$l>!z)OUgw-2So)h zMKN5og`ySkf|L}xrmM2l2jBc1&=+3(1unlmGflGsuEj&nKKpX^{=R+one^0Oski_B z_qRU)q%dsaQS32Mjkm&F-j1LPdqqtf=r*v=L^1Y^keJ;xvvh)}@Vc^T5zTQxx z4)qFO$ubQ!22Lt`jf}!6oX)HYH_xcU84c?8^|QBr?-@It9qSoXIE!x-zD2J>AI>S9 zN56)O%s;9kp&>eUCVP9J-#bvJZ~@;be2;<5op4R`2Mj1hBx=+8_sYv%kYmY?vm z!Y{a@@GGt|#jQUF$4-srQVfdwnz*wVQn-#Anf>OrXgJ;7wzqp-+l~$mwI{FE-q0d_ z0lS*51~lkGhjKc#V#->|5GCnyok8s}N{zC}8i6*%jSh>e1Oo{qxhgLJ4QQmMVI~jh z?%~~(0ouwe2f8(kKynm89cyf>!9h`$o`9RJ#Eq&!kU(MtAz7=ulYUm_z~h+3>@n7! zi6@wOHlw7rXGzf_G%6^cq;*ajPhqZXHbP5d9(VJxfKIZq(aTyzQbkZTxTx0NL~%>p z7(r-$a8fYY7!Nxzg|UY*&J!TR2&)fagp+ zgGI1|F8Fey@ti3Z@tlj@CV)2(z_au>rLhD{JFpDP$7wZV1@n8fR&uur&oNjoYYC-J z8MFLmM|3z)(&+qan`^tsr95ME$YWTIHOyDg#kF}|d>-p~#E_9#&y9u`@SLogZ&>I_E@|C3GkI>5nm+%TR z!EHiBUe5+9ukxp%<$fD6g>*LMIx)fR-i?sx@!-1~F?GBVkK{KZ(;2U{^Xc9<+tvcM z8}Zt`*>1vS|Jv^wxk?v`T{v^?c^8mBa$B&~A32$Lzw2!UINI?#gS?5~Rycwk*v^}f z@o%M+kuJ4{Z3IS9rD3(j?zs=Zd&Q<3(8+hWD-Teq{|4l*We2}4TJGE8SyDd463U5B a%1-8bgXMH|x?>aPZWr}88D)52cmD^;SN?eb diff --git a/sync-admin/target/classes/com/lyr/web/controller/system/SysRoleController.class b/sync-admin/target/classes/com/lyr/web/controller/system/SysRoleController.class index 73d0a8b0dc3c728b1934f1ea8b337ab3b5b76f5a..73a77bebb1da61096fd32face5bfca42c7cca6f7 100644 GIT binary patch delta 3576 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 delta 4515 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 - - - com.github.pagehelper - pagehelper-spring-boot-starter - diff --git a/sync-common/src/main/java/com/lyr/common/core/controller/BaseController.java b/sync-common/src/main/java/com/lyr/common/core/controller/BaseController.java index a4d6519..3decce2 100644 --- a/sync-common/src/main/java/com/lyr/common/core/controller/BaseController.java +++ b/sync-common/src/main/java/com/lyr/common/core/controller/BaseController.java @@ -1,18 +1,12 @@ package com.lyr.common.core.controller; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.lyr.common.constant.HttpStatus; import com.lyr.common.core.domain.AjaxResult; import com.lyr.common.core.domain.model.LoginUser; -import com.lyr.common.core.page.PageDomain; import com.lyr.common.core.page.TableDataInfo; -import com.lyr.common.core.page.TableSupport; import com.lyr.common.utils.DateUtils; -import com.lyr.common.utils.PageUtils; import com.lyr.common.utils.SecurityUtils; import com.lyr.common.utils.StringUtils; -import com.lyr.common.utils.sql.SqlUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.WebDataBinder; @@ -44,31 +38,6 @@ public class BaseController { }); } - /** - * 设置请求分页数据 - */ - protected void startPage() { - PageUtils.startPage(); - } - - /** - * 设置请求排序数据 - */ - protected void startOrderBy() { - PageDomain pageDomain = TableSupport.buildPageRequest(); - if (StringUtils.isNotEmpty(pageDomain.getOrderBy())) { - String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy()); - PageHelper.orderBy(orderBy); - } - } - - /** - * 清理分页的线程变量 - */ - protected void clearPage() { - PageUtils.clearPage(); - } - /** * 响应请求分页数据 */ @@ -78,7 +47,7 @@ public class BaseController { rspData.setCode(HttpStatus.SUCCESS); rspData.setMsg("查询成功"); rspData.setRows(list); - rspData.setTotal(new PageInfo(list).getTotal()); + // rspData.setTotal(new Page(list).getTotal()); return rspData; } diff --git a/sync-common/src/main/java/com/lyr/common/utils/PageUtils.java b/sync-common/src/main/java/com/lyr/common/utils/PageUtils.java deleted file mode 100644 index 1d53d5a..0000000 --- a/sync-common/src/main/java/com/lyr/common/utils/PageUtils.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.lyr.common.utils; - -import com.github.pagehelper.PageHelper; -import com.lyr.common.core.page.PageDomain; -import com.lyr.common.core.page.TableSupport; -import com.lyr.common.utils.sql.SqlUtil; - -/** - * 分页工具类 - * - * @author ruoyi - */ -public class PageUtils extends PageHelper { - /** - * 设置请求分页数据 - */ - public static void startPage() { - PageDomain pageDomain = TableSupport.buildPageRequest(); - Integer pageNum = pageDomain.getPageNum(); - Integer pageSize = pageDomain.getPageSize(); - String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy()); - Boolean reasonable = pageDomain.getReasonable(); - PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable); - } - - /** - * 清理分页的线程变量 - */ - public static void clearPage() { - PageHelper.clearPage(); - } -} diff --git a/sync-common/target/classes/com/lyr/common/core/controller/BaseController$1.class b/sync-common/target/classes/com/lyr/common/core/controller/BaseController$1.class index c4350f8ff4a82e94eccdc69503f7710b25aa95b0..264a2dcddffb657f6452fefa55363d9dd5aa1049 100644 GIT binary patch delta 23 ecmdnXzL$N2E;FOzWIbjtRuu*g2Gz;6%nkrZM+HIv delta 23 ecmdnXzL$N2E;FP0WIbjtRxJh&2JOkU%nkrZ^#xP_ diff --git a/sync-common/target/classes/com/lyr/common/core/controller/BaseController.class b/sync-common/target/classes/com/lyr/common/core/controller/BaseController.class index 68df8e1cf45587c279c4fd5c6b718b16b8297dfd..839b1e7bdf2d91dcbe06813ec8cc1ec9383c87ae 100644 GIT binary patch literal 3668 zcmb7GU31iA6n@ffo9zXl^XaD~1_dfyj z;@cG3F(JhH6yC;#26W&Z8Slz?FNJz&DP)n8kx!uk6EbwMP9{+h>qQ}q6sB-V2vdln z5S9?O5Tz9P__YIO5|?E-DY)=bDC3IQq?pE4A!dYlU&b{F%8+I0&Y-EeuI@^xH|;_} zcO_yoZ|!@1j8qY9?nFRddEsxfX4Ui=$Imo@1M)?x+Krs}ELQX*DH`4j5Km_@#CR zj+Gq4Doi?BQJ=P*OX{?qRkKu4&*|ACnx_ToeZtFnu`i%KPlA-tK2o+kqo|J=uEA6E zTbAu6CWQ*g#&{fy zT%=)!SJbSZi)xw(`N`~*o?9+QapZ}-pM`4Xkb~)))*Oq)>Dl5`64ISRt3P|fv8Nd> zX-LA_QBTWV8rDjFeaN^js3ulVRqyx#CE0|8q@(8zhliA~D>ke#A*wAqW>DE|6NYux z6<2M~%84wpZ?NL$^+i4LW(ep|o|zzc!BEC#LIZ^(ddU+CYeHpv|KmYjn_Pu}Z+*fcL zUnsbPFPVM?eK@G#kPv-1EJVL}<83kvB7{fUUyO+4RQUjN;GfscWePQ)6t^Oclz82-w-((GJjEp? zDMfSDl^a02;)dD2`0lv;Bof0U?Ypq5;ls*w^a7hS$7|X3?Bdb9L2vyLwh;Ef!Jyu= zx@NiRDaS79jyDsi`y)(t85w`pCfFv#OykC|Tad7!`mpoej|u`Y;x~!bP@`(d@Owuj zC*rFcw$HQTnKmYEr>LiqRFfl~2ul=1r#D#ka$#;S+b$4xaEE;>dXVKL23%}R;j}Hv#6(m@Cr4yY)brr_VL>8(K&36#^P!fdA0AS z!US^=g?v@@xh2YS(`N~4e4#!$yh7|guA+{UJm1z?JQc;?s=_BL_072#kAFIfzZ;9^ d$c)E76UBcQgRj9`^tcA&Y literal 4550 zcmb7G`+F4S6@Dk#WWq2eF_BP7izq0$$sp2;1k;iLC72LM01fuy>}Ik|n4MW>W{s)Z zyO-JvXfH}H(ArXZu~lmgt5kdWsZalp`t*osYzKie4azU1hvb-qEOR{`l zqZ0huj|(mMfr=lBz#nON8L!ACmrMAuEI*Ourz(D?Kp%Bo%O7#fAg}@j&5l;N6 zZ@a}=-z-`4o`24mxAI1wB*w#5{-7C}G5Mfq*(~?MI`CmQ72G~qaYMUgowfs;Rvd6$ zFEm5jb7{ohn?sp3T4S`PJ1yA|gr*-JH;eR<9-SwAsy4i!K=qbR9buk;pP00QiW5?UCd>Cd=Gb5& zy*_&DM^Q@@9A(D}oQeFLRah$=S=!`gB8S&!Qi8!q&6_@Rs5$h+00n(Lqw7~N=X>+? zj54a?im;wpKWnoe`HIYE6twu(jP27X1@~lnETaS(E55_BVbZc6+3u-8YI@hrV^m^; zVlpq$ORA7xSVw2rrpUZ3Xv~W$O$ZKJUbS*sCZMypJ1wZOUDrYtm7bd)BjmAqh7M2#uePPiqK^X zb3@}u7?#;-!b+gyZ7ecIA6&WmpVwdg;Q5RHe&LFa>msX)cNAg_6an^Fm z?D*1-q>qR>@920JH+1|3?=i=8OyIbV6S7QTQkIkQm#2p@$p9_o(Y`02X7^bRW}NOi z-p5~6{7pvzGb;YB!@{hNqAX`&E4X)+O*flG3btp_N6r!(YW+EjYE_-G3YcEeLu@y&RcX!MN`7mgxq@ao=MWgbOiwG_#{bse2CTe4)+$tdJ6uSd+n4fx^lVIuD%Iw3Cttfe_)KR;N~h(ilV^5e zuJ`fZ5E^&_+WW3U>FZlWLlup0Bljln8nB0}#vRy-9PYsVJn1n#AO0WbKLww_CrKe# zpG8wd+t%OFbOX)Pgj5&Nl7`xeR;nUUT`_qA1+?K)cz}@m_^p}yAorX!a-Kzis3Xee zs@RZ5y&sLlSynKYpyu#kjenlpjpXmHLL2K}#KtQ0OK6Kvw~P-|(JHWwk)SSG1FDjv z8m&~Ki$GiO=}5#j(sc355dVvJx@*EV<1;uwF~huVf%0E$Q87YF4w%(Ow55$WMBKxf zMjYaO?BxqY6C?U>pndu}ZXF-E75`jB=Rn78i`XTK9z zGqDL%jH0N^iJAekH4Wpg0doqcBN)!)446C8FqJi6mbBqi&w$yMhI#6yFgZLzf5+7` z!CidQ+I<-ts_4Fk<|-l&$GH(l=h-^E)|!)AaR!f)U(#AdgEp+@c9J%L;~L4 zeF+-d$eq`qa=S~^t%tu@2j5rTO2=;BUYjHEzH;3~<+oBz=It{{ydFF!}%h diff --git a/sync-common/target/classes/com/lyr/common/core/redis/RedisCache.class b/sync-common/target/classes/com/lyr/common/core/redis/RedisCache.class index bdc2216095f91b330d0dece4c7748542244a9c95..0192864787df6ec5f082169f33b200c35821c2bc 100644 GIT binary patch delta 152 zcmV;J0B8T%MA<~J%Nr4F00sbU015zZ01NleHaw5vBkM0H**E0H^>P0I2{o0IQQk9<2ejlhhw0lNBF13BLdY0Kfne z0K$`3AAAAJlhhws1=au$0N0Z;Abe9<2edlhhw0lNBF13Aq3S0J;DY z0KAh|AAAADlhhws1<(Kw0MU~&Abr&G|6#lj?god=`DuRk20_7S(yaA#DA{{F-RPlExJ0(tw$B555{m{#13j#!=i?V0`04|YX@rr(e%{5Ky1T1lme-&?aG}>@j&_?tOJLVo~)O*oPEo; z)wwQ=1xI#SU?iLOil%eoo7{_@YgPi=DVw`iL4H)+ia@*^Sbm@+0(yztrdPCVS77|2 zZQk>xsWd|Sni>H#C1OMZz1h#!7t3@kw_s-6Ko+FW`wn%Vv%eBw^ZY~Uub-%(o2t3M zx7`9YbzfR#&#k4^3byWfj13JITelw-%&>Wv47419RwdL5%DLQ7k=BkJf#!jJsYPuPQ zM)MxT2p%VVlHfP^-^KvuaWizkL>Dp4P&yF0pP+n@Atjm95V;6%262lvQLbLx!7%mX g>UB{|druid-spring-boot-starter + + com.baomidou + mybatis-plus-boot-starter + + + + com.baomidou + mybatis-plus-extension + + + + com.microsoft.sqlserver + mssql-jdbc + 12.8.1.jre8 + + pro.fessional diff --git a/sync-framework/src/main/java/com/lyr/framework/config/DruidConfig.java b/sync-framework/src/main/java/com/lyr/framework/config/DruidConfig.java index 54009a0..46b4ca5 100644 --- a/sync-framework/src/main/java/com/lyr/framework/config/DruidConfig.java +++ b/sync-framework/src/main/java/com/lyr/framework/config/DruidConfig.java @@ -18,7 +18,6 @@ import org.springframework.context.annotation.Primary; import javax.servlet.*; import javax.sql.DataSource; import java.io.IOException; -import java.util.HashMap; import java.util.Map; /** @@ -46,10 +45,15 @@ public class DruidConfig { @Bean(name = "dynamicDataSource") @Primary public DynamicDataSource dataSource(DataSource masterDataSource) { - Map targetDataSources = new HashMap<>(); + DynamicDataSource dynamicDataSource = new DynamicDataSource(); + dynamicDataSource.setDefaultTargetDataSource(masterDataSource); + dynamicDataSource.addTargetDataSource(DataSourceType.MASTER.name(), masterDataSource); + dynamicDataSource.addTargetDataSource(DataSourceType.SLAVE.name(), "slaveDataSource"); + return dynamicDataSource; + /* Map targetDataSources = new HashMap<>(); targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource); setDataSource(targetDataSources, DataSourceType.SLAVE.name(), "slaveDataSource"); - return new DynamicDataSource(masterDataSource, targetDataSources); + return new DynamicDataSource(masterDataSource, targetDataSources);*/ } /** @@ -87,8 +91,7 @@ public class DruidConfig { } @Override - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) - throws IOException, ServletException { + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { chain.doFilter(request, response); // 重置缓冲区，响应头不会被重置 response.resetBuffer(); @@ -109,4 +112,6 @@ public class DruidConfig { registrationBean.addUrlPatterns(commonJsPattern); return registrationBean; } + + } diff --git a/sync-framework/src/main/java/com/lyr/framework/config/MyBatisConfig.java b/sync-framework/src/main/java/com/lyr/framework/config/MyBatisConfig.java index 8c39c6d..a74847f 100644 --- a/sync-framework/src/main/java/com/lyr/framework/config/MyBatisConfig.java +++ b/sync-framework/src/main/java/com/lyr/framework/config/MyBatisConfig.java @@ -1,29 +1,10 @@ package com.lyr.framework.config; -import com.lyr.common.utils.StringUtils; -import org.apache.ibatis.io.VFS; -import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionFactoryBean; -import org.mybatis.spring.boot.autoconfigure.SpringBootVFS; -import org.springframework.beans.factory.annotation.Autowired; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.core.env.Environment; -import org.springframework.core.io.DefaultResourceLoader; -import org.springframework.core.io.Resource; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import org.springframework.core.io.support.ResourcePatternResolver; -import org.springframework.core.type.classreading.CachingMetadataReaderFactory; -import org.springframework.core.type.classreading.MetadataReader; -import org.springframework.core.type.classreading.MetadataReaderFactory; -import org.springframework.util.ClassUtils; - -import javax.sql.DataSource; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; +import org.springframework.transaction.annotation.EnableTransactionManagement; /** * Mybatis支持*匹配扫描包 @@ -31,79 +12,14 @@ import java.util.List; * @author ruoyi */ @Configuration +@EnableTransactionManagement(proxyTargetClass = true) public class MyBatisConfig { - static final String DEFAULT_RESOURCE_PATTERN = "**/*.class"; - @Autowired - private Environment env; - public static String setTypeAliasesPackage(String typeAliasesPackage) { - ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); - MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver); - List allResult = new ArrayList(); - try { - for (String aliasesPackage : typeAliasesPackage.split(",")) { - List result = new ArrayList(); - aliasesPackage = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX - + ClassUtils.convertClassNameToResourcePath(aliasesPackage.trim()) + "/" + DEFAULT_RESOURCE_PATTERN; - Resource[] resources = resolver.getResources(aliasesPackage); - if (resources != null && resources.length > 0) { - MetadataReader metadataReader = null; - for (Resource resource : resources) { - if (resource.isReadable()) { - metadataReader = metadataReaderFactory.getMetadataReader(resource); - try { - result.add(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName()); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } - } - } - } - if (result.size() > 0) { - HashSet hashResult = new HashSet(result); - allResult.addAll(hashResult); - } - } - if (allResult.size() > 0) { - typeAliasesPackage = String.join(",", allResult.toArray(new String[0])); - } else { - throw new RuntimeException("mybatis typeAliasesPackage 路径扫描错误,参数typeAliasesPackage:" + typeAliasesPackage + "未找到任何包"); - } - } catch (IOException e) { - e.printStackTrace(); - } - return typeAliasesPackage; - } - - public Resource[] resolveMapperLocations(String[] mapperLocations) { - ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver(); - List resources = new ArrayList(); - if (mapperLocations != null) { - for (String mapperLocation : mapperLocations) { - try { - Resource[] mappers = resourceResolver.getResources(mapperLocation); - resources.addAll(Arrays.asList(mappers)); - } catch (IOException e) { - // ignore - } - } - } - return resources.toArray(new Resource[resources.size()]); - } @Bean - public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception { - String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage"); - String mapperLocations = env.getProperty("mybatis.mapperLocations"); - String configLocation = env.getProperty("mybatis.configLocation"); - typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage); - VFS.addImplClass(SpringBootVFS.class); - - final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean(); - sessionFactory.setDataSource(dataSource); - sessionFactory.setTypeAliasesPackage(typeAliasesPackage); - sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ","))); - sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation)); - return sessionFactory.getObject(); + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor()); + return interceptor; } } \ No newline at end of file diff --git a/sync-framework/src/main/java/com/lyr/framework/config/SecurityConfig.java b/sync-framework/src/main/java/com/lyr/framework/config/SecurityConfig.java index 8e54f30..ab8e7a4 100644 --- a/sync-framework/src/main/java/com/lyr/framework/config/SecurityConfig.java +++ b/sync-framework/src/main/java/com/lyr/framework/config/SecurityConfig.java @@ -112,6 +112,7 @@ public class SecurityConfig { // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() + .antMatchers("/gather/*", "/gather/**").permitAll() // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated(); }) diff --git a/sync-framework/src/main/java/com/lyr/framework/datasource/DynamicDataSource.java b/sync-framework/src/main/java/com/lyr/framework/datasource/DynamicDataSource.java index 33f2e8a..f0f9e6f 100644 --- a/sync-framework/src/main/java/com/lyr/framework/datasource/DynamicDataSource.java +++ b/sync-framework/src/main/java/com/lyr/framework/datasource/DynamicDataSource.java @@ -1,9 +1,12 @@ package com.lyr.framework.datasource; +import com.alibaba.druid.pool.DruidDataSource; +import com.lyr.common.utils.spring.SpringUtils; import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; import javax.sql.DataSource; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; /** * 动态数据源 @@ -11,14 +14,52 @@ import java.util.Map; * @author ruoyi */ public class DynamicDataSource extends AbstractRoutingDataSource { + + private static Map targetDataSources = new ConcurrentHashMap<>(); + + @Override + protected Object determineCurrentLookupKey() { + return DynamicDataSourceContextHolder.getDataSourceType(); + } + + + public DynamicDataSource() { + super.setTargetDataSources(targetDataSources); + } + + public DynamicDataSource(DataSource defaultTargetDataSource, Map targetDataSources) { super.setDefaultTargetDataSource(defaultTargetDataSource); super.setTargetDataSources(targetDataSources); super.afterPropertiesSet(); } - @Override - protected Object determineCurrentLookupKey() { - return DynamicDataSourceContextHolder.getDataSourceType(); + public void addTargetDataSource(Object key, Object dataSource) { + if (dataSource instanceof String) { + try { + SpringUtils.getBean(dataSource.toString()); + this.targetDataSources.put(key, dataSource); + } catch (Exception e) { + } + } else { + this.targetDataSources.put(key, dataSource); + } + super.afterPropertiesSet(); // 重新初始化数据源 + } + + + public void removeTargetDataSource(Object key) { + this.targetDataSources.remove(key); + super.afterPropertiesSet(); // 重新初始化数据源 + } + + public void print() { + DruidDataSource resolvedDefaultDataSource = (DruidDataSource) getResolvedDefaultDataSource(); + System.out.println("主数据源:" + resolvedDefaultDataSource.getUrl()); + Map resolvedDataSources = getResolvedDataSources(); + for (Map.Entry entry : resolvedDataSources.entrySet()) { + DruidDataSource value = (DruidDataSource) entry.getValue(); + System.out.println("数据源[" + entry.getKey() + "]:" + value.getUrl()); + } } } \ No newline at end of file diff --git a/sync-framework/src/main/java/com/lyr/framework/manager/DataSourceManagerService.java b/sync-framework/src/main/java/com/lyr/framework/manager/DataSourceManagerService.java new file mode 100644 index 0000000..df1fe2a --- /dev/null +++ b/sync-framework/src/main/java/com/lyr/framework/manager/DataSourceManagerService.java @@ -0,0 +1,57 @@ +package com.lyr.framework.manager; + +import com.lyr.framework.datasource.DynamicDataSource; +import org.springframework.beans.BeansException; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.sql.DataSource; + +/** + * @author liyc + * @date 2024/10/30 + * @description TODO + **/ +@Component +public class DataSourceManagerService implements ApplicationContextAware { + + private ApplicationContext applicationContext; + @Resource + private DynamicDataSource dynamicDataSource; + + + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + this.applicationContext = applicationContext; + } + + public void print() { + dynamicDataSource.print(); + } + + + public void registerDataSources(String beanName, DataSource dataSource) { + DataSource resolvedDefaultDataSource = dynamicDataSource.getResolvedDefaultDataSource(); + dynamicDataSource.setDefaultTargetDataSource(resolvedDefaultDataSource); + dynamicDataSource.addTargetDataSource(beanName, dataSource); + } + + public void add() { + /* // 构建数据源 + DruidDataSource dataSource = new DruidDataSource(); + dataSource.setUrl("jdbc:sqlserver://192.168.3.28:1433;DatabaseName=BiDataDeYue;encrypt=true;trustServerCertificate=true;"); + dataSource.setUsername("sa"); + dataSource.setPassword("mssql_whdZeB"); + dataSource.setDriverClassName("com.microsoft.sqlserver.jdbc.SQLServerDriver"); + try { + DataSource resolvedDefaultDataSource = dynamicDataSource.getResolvedDefaultDataSource(); + dynamicDataSource.setDefaultTargetDataSource(resolvedDefaultDataSource); + dynamicDataSource.addTargetDataSource("deYueMssql", dataSource); + } catch (BeansException e) { + }*/ + } + + +} diff --git a/sync-framework/src/main/java/com/lyr/framework/web/service/SysLoginService.java b/sync-framework/src/main/java/com/lyr/framework/web/service/SysLoginService.java index fed18eb..778e749 100644 --- a/sync-framework/src/main/java/com/lyr/framework/web/service/SysLoginService.java +++ b/sync-framework/src/main/java/com/lyr/framework/web/service/SysLoginService.java @@ -13,6 +13,7 @@ import com.lyr.common.utils.MessageUtils; import com.lyr.common.utils.StringUtils; import com.lyr.common.utils.ip.IpUtils; import com.lyr.framework.manager.AsyncManager; +import com.lyr.framework.manager.DataSourceManagerService; import com.lyr.framework.manager.factory.AsyncFactory; import com.lyr.framework.security.context.AuthenticationContextHolder; import com.lyr.system.service.ISysConfigService; diff --git a/sync-framework/target/classes/com/lyr/framework/config/DruidConfig$1.class b/sync-framework/target/classes/com/lyr/framework/config/DruidConfig$1.class index b34799ae7c1d302c24ed538f29368bc50e486338..d55f4e9c5061447ada15cbc6c803b125d0400e54 100644 GIT binary patch delta 55 zcmdleuu)*cdN#(0$s5?57^5eDW^0m+XW(E+WZ+{+W)NjaWl&&9W6)+uXE0;PnB2#n L!4+Ja$AX4@Eea@VSTt|~PZ>yJ zNykYYPwO~kpdHWXcviz{13r{AJZGQ{X}LVF;RR`5)Nn?_OA5?`xm+f{KWi5XnSuh> z-kIFW^{tNPsgpVT_)L1pF51bt#e6!WU}r*{(sw8WBB7oZKRJTprWz4{IK~=0$)cS; zHfqnO?8$6~q*it38AUm}y6mb~)UzxpE^EuaZMZ|j%O+mIITPpcs)pB0M6fKD^uEE@ z@rH&sOK;j(Y!sefpBPYHj^$6gvP~6?R;yaJvH^; zgl^Gq2HoQdoXN!C_^`NY9u*zt*lLaElG1oP0-OQB1qBp}Yp3|KuBE%HdImmfkiN+q za3H#|omN2zJ*Z*qZ!&{uNPtFX{;2%4n{|LUr)P}_DPvca5v%w46s}Tdu1QwP-KMU99)BQ z;s#u!;ZkoITKH?|Ww_}YbZhB)P3eEd&>BdFEtCbUrn3zXc5(Fk2pHSMHh4>hAceb! zWp((m5BFAO@K$6{s@(SBKH@1DEaCntw<}~Oi&&9w;Q0}CakV#Wso$dBfg{)8jH@e* z2O7y`3)D@lhTz69&mZ8;2$>zIu!<4P%_obHiz;Dn@w2cWLlrCw!+xg7SGAZvLIwxu zug`%DJ1D{pfs$12Z^G%chbU6RXt)gT&lHG;)Vz%kMZ8Vk<}zC1s<$=nT!U|-=LW2} zYYlDG`L?)bX_l*ut(K;KkM;?Nr6$YpTbfkZQRyW}w!mSQNwJSdI9%gY_)(5gdk%Xr zM=9r#z(S?D!|PmROXBy2_GZaEz-c?e9#p3FGI2z-c|#A%32d!M56(wTRsN&vqv604 cysm*=8C3c6nB=~LU-?=-TKP%xZ!iV-znAadegFUf delta 1386 zcmb7ET~ixX7=AXp$=Pf-(kunKA~lp!3P}hRT1(Kj(4wf&O2f1=j#IY`(^5j9BvkyU z@q=2cqHT|#^{dve@lIqWpiG@!dEu2;Ug}@aKj8SBO$K`7g_+5|=RNzL=Xu`eyvZNU zi_MW=|M}@>0A2XTLgUqlI~B%ROj>+oH(?4nl}?-3VHe>aBZ zZM{}T11++{$jI-EWHgc~cw>`8-pq)1DmzZD<$b{gO}n&wD^#T!mxv^P6N`^EVTZu$ zHZJ208*kz*fkhkbcw0mCtasi^%@roHsR1v4hDZYM*tmkLHo9?5K-zd0@7Z`??eyaz zIcIkEH{k<;4{dye>l(Hwi1}3hTsC#sD|ngdx!JLC4b?t!*2|qv_0Nxu&lD!6a{?dR z_ynKY_zc&i9d6V=#|_yL9u76(3k^N8H{i+};T`oi@uh~%8wi=g>_qOgjj!Wq<91WM3{;)xQB@3~P1u^55v z5aeqqav3XESCDuP2_%UqD5{-O0_b2>72|Hk`}n3a&#BX}=l@Z*5i#y--(V~%@&85H zOksCW?#2Dw*q6s%bUz6#k2HGncz{CM@gUWy-Y>)OyGgDgIJ$z+P~r!O63qCI2E-bkd@(I}|6^JxbE={bV-DdH@H>-ph09 zPRcud71tc!HLW7}5Dv3SQ}bHUTf9l)AUECQDynW{bJ~a}T%)Y^TLja_66=9#s)>VBYAU+;E)0u~?Dsoy*A=_IPKD*-VGNL8t!f_OQePLZwho|A zUWmqu%Fe$DXEGj*m*5O>j;eowr2?fnTaF~18mG2|y0qbJO$XQDj&fe_PKVY|PxJ3d z3s<!WI5>wN1$lt9J)ljV8Q@ibot;Q4c{et4&t SZ|7ItmdmI<8U8ztAp9?EiqYi& diff --git a/sync-framework/target/classes/com/lyr/framework/config/MyBatisConfig.class b/sync-framework/target/classes/com/lyr/framework/config/MyBatisConfig.class index 8f720265b4930b90f21bd84549e710ee1bb40b1e..bbee8825dfdde742e33927ae5b204ab753159929 100644 GIT binary patch literal 1122 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 L*Y{*cZv_4eQe;l) diff --git a/sync-framework/target/classes/com/lyr/framework/config/SecurityConfig.class b/sync-framework/target/classes/com/lyr/framework/config/SecurityConfig.class index ef45f1495bc38a9bc354dab63f896bc18c509a2c..130c78720fe76a852d7d0e767bb9d982cca386d4 100644 GIT binary patch delta 2284 zcmah~d0bRg6#mXI%zN{^#>`^?QBY739TilxTyoz)9Z*peH$WXxQ!p?y%_hq-Gt<1e zmZh1rSuSH^VVId^*=l8rE!w_sR<>*B&b)N|(eKwE^X_-gx#!&PY0!FI;dPft>KV5`b;3d4Qj=ZAK zs|p=8@ETq>;lP^>@D|?I@Q#k-I^Naso`HFIU&9FlS@_V2kMOaMPjq~$<1-zf>-a*) zm+H({I=!Lzab$!-w5a&xLTI7i!Srv|~+!cHWD?HjJM zIVNHfAy0NpY9~*}HA^VKa6t{}B7sWG5fn!*LXWVv$W;_Gk=$~JD{;K(qWCxmd0f~a zD1j0MHc}D`8o97cP%>kU8oO|VQZ^Bk5>}?Vuvk#ju(Fv8R|!fB<8&9Q1ga@XU<}5} zGL{oa<;X*3cV}nnqS3{KS+Z|xxvYp!YH$g4)u@}G?$krBitiWG znJ$&b;tK-=XLfnn-0A+RY%jq$hxvk@lp&~>vg<9V5B1fkpP>FUK%fw#G#V&q5DjJu zxh|~HC{NH38p_*YF02&fqoIQGsX)+hD$rWNjmalz!|3Y)`6<5?`z8+(FVn$*Pdega{*Jety5 z<|n%4ru6lERmQ8aNMJSA2;72| za%qb$G*#BMIBxe7GGuzoB)Pj~r+|+K9XvlaaJ%vNjtK7vBYCx{9M+R@k?YC0S?bBS zXX?qgEiRM^G-LrcK7UJOWkzCVsYL)h^<|6&YryZtWK7|eFcp3#RwB1&bjvGciF#Fl zJf6ZKaA7DK@x!6)68RL++OpG;hG{5g`+ozR&RRQWU?#s$B{Hj3IhD$_tqgXMqJH2pGi1z9j*sB4Llu|gI?@Fu`t>OynE0;gaP$jOpjt? zoD0d|A}tNG;d!&1^|jcF0O^ZpLyZXQ<({ z{B__}wS&VOLSB@MNND~ja|c%8wy-tN_kUOq`5)`GSQiMJ^9y2`=UA6J`SPI$Fsz=3 z$x-(^v5^}<4bYwZwP91Z^*xO4;@{oluo+v_=N{J1=bx90KMx<^O1QCt|21!gdjTYa z+gXssijyEJr72W~WNc@H30%F0c`_ft4(zm05PK{X!d?s2VxNWTu-`%l@RWt#z%dK` KiN7p#mhca}j)imp delta 2278 zcmah~d0bRg6#mXI%zN{=#xQJ(5<3zWqG-7!BB*Sls4O9(V2)rVD3F$BV~g!dbxX|_ zv(olbM+ZYwGAq+I%d*t6)od}_%gXB9;U#1A`}N0r_j~7_^PO|z4 z24Db9GcX3LH9TOzg4K2u;z5NTG8nBX*dD=h$);U2P$m3)kuadPo z5zrxPbHdsod)A4-4%DuwpVP2IsXp&kUpqCtpy5R&cuB)94KEvr!D=154eY@yO666B zUQ_6G18-oj6E^G%!rOR9!+ss_>UdAb0RzoAsNsDBX*g`hhxkax$2vaI@u`l_bR5y~ zxzahR;|m>M>iDWy$JaWJDd9KD>bM=>;yVN1;|JyJM*~0MXD2k3&k6kImq8%X$f8kzMpjP=t+P^~C(xEdRvRHzZjVm&%+*@0q|_YcLcO3M5`>|?-6Ds}T}j;tj_ihp=BDPxn%PCJ=DLRIO~E!g z!$HBkI2>3mD1@8>D=3r&VGdj`D4elI5e{6VHX{Xf_igrYz%3}sx7pKyd4hWRaI^!n z1?EtwKq<-yB@K_vrg4`97XN#pc z!T?{$8O|B~;sqs8qQFFy@QacJDlkc-WI??tg(E!6L8*fJ(AgTDBPfmf%H7T(_H^o} zQGdcE%rjiBicXQup^-ruG(e+)g3hJ$0Lmmzc z_Z$gZZwVMj#d2k2R6rq(m#vXIA_{2&L927sOm{Ul@pRBcLS>4q4v3N`1A^t|?zypr zR6+=8ay2#0Y^X1)sjsPZ&2rT@E9Fu`c#TYt4hvLYWu8Gj>MgcHDrd3GiVE|z_govu z-+a2o97eI+8n=QyS9r?fdr`(DL6tN`U>R2%*Kvh$HJ27wayik&bwqU%LKZyfM`Ef>WM}iEJhk95 zK1XsGst=VXxicln-I?<&KdUgGF4H57&wQcJiksPtFT*@Nd+G)Z_ae(LC>yJQi_qC9 zb}YhG04K;JVG?ATCua0=NFA}DhGozT)NY#H5+-^?H@QW=J?i+9;2WO~>H2KnbRY}-Vy~y>W=t#}wXKv%OZt+?3Q2&Q@ z-v3zNfjiwkbG|lA^9<9uot@{mqo51JG(Z1#tiW9ysTC{vZNc5Xeh*`G4?p)#!hKk! zUib6vTz*n{YMXJ0`y+&Zk|%HrLgw?2@&s;YK^kv-z(35%G?l8*1CO!6WZ3aIkK+?~ o5>J_EJvNwVBQ}|6GoCTg7Hl=qHf%T1n|RAazu;FB{ftN~GITN%CX+&4LBSox z1r_(5;};L2r=@U?2fz9|Jp2ehpwFF2(u4+uFLSqdect8X`SbSm-vO+{j}h#{Km;o= zScc^o60`l{Gb}z&$~X|gK^%(UFpiYtDLgIX88K=RQjf@pl_3sY#?c6>Fc`+D7>`9z z0Yl8lcpPJb))ZWca#*m-k;Dn{ab%>*Q4cqav>3+)%gHcK$(V>>DF$UcE8{r{)vo4@ z>Tb8@Y6EuKiRmc`mA%KcaZOFThN<>x$xaDn1IDPOxoJn2&|Y}D$zPh9HLC6zIj+at z&e=PgDPuugcXcOWSbA65adgY=we7KVa<@Jqp|+`cHj{)SJ+*tn(h^2&#$lRP zy2-E%ce8|GQ}ccaO--ILr_|I5Q_UmvP0Ya}Naw}%qgvW@2k$^pLS1ng;-J9xiDcIP z{(Dk;k9Z5?YP5KKwqYxMHR^vyOz;QCL~NqPA`=ma`UxXp&VZ}M#+WHyAehE<($N$4 zI6W&&E(vpsXcxLll8#}y9LF^?%?LMnQPfOhL>tl6xRW;GYSOkD4>8RP3R##-4h=2Y z;g3p>W$8|rsijgPo97mWZMjD!^3l;#wmGiHyZsQ($Ru*Pvz(ihw56D&yTxNx_J|tT zSSaB>c-aqRJTKz~3E@pKGn20oKLk4sQ51EvQhT+iV;L_hcnPN!JcP9h8nIHr8N96E z6>L>-7HcI`dG+ok#DL2Y_ z9lR@{Q54_*hfT%>1@GZ~R?v(cFINKWt}1>d7pNdG}X z;7A8u@GSD!Vzw3Yo0Zy?o9@z5$C&IAR^MNvk%2eX=$@;ea(CH2_SFSS^V^ySJtJnQL-ZZz;fOU?Sz}3AS%$POkkKwz^kzSURk0332CX$)s+@ zC9KMKum~RhR;DTiBW)aV%xrlT3MSBABR2_jL95RSW)jrpJDJ~KtFy0wT+T4qUUT;52L8J4#Q)2#jej0yz#T}W+OKu zl)g65W8dUP8VahDsjQMp>xp~=@n6hw8J$`~gV*sZ(D7Yp&$-Z!4s?1hv||%z0X#~o zFoJxaZw?AqwqR?<>^`0bcv|h-Gz}$y;VgRj0a-^3+W7)s@2RZwnQ|(tGb$x)%Z6EM zq${NqeXeB^b8e!d_bMuHpz6RBs-w|K)U-~bmcu0GPNI%9^ZJO=d_Q@ggr@XP=FCXylKCBsr80fsG1 zla~{nW@6Msgoc=xXNb&MVk1yp$D|ozj%`O5XFUvcHy-msd@kd57%yNKPbJDYOp28R zMI?&=$ESas^#0jy?ujT=BXAq-GJ0k7$>{$Z{WN4x7Bhxc1Oq6)fu#g$*{=u+%h}@i a^{XpNlD%97@C0^pjPSIczfU_#%l-vi%8gV2 delta 412 zcmXv|O)mpc6g_V~+Zt6ZqobuAt*U8tp%zUDe?Uaitp$t0ER;;g#>Q`G?hnCgu#njL z3s#mAkyzS@`=;ENoO9o~=YBktzEkTjKaWoUHqg$%L`gzf!h(dw3@WIaa7`=;7+b+0 zh_>ljtkJGGrBBfv-89HmoY7k^o9+iEgQMs&^ab{sw4>SdDzbE_w8#-%I@9W93n|nr z)Uj-#ffWl))J&{e@X(@n{Yp`rbM<~tjZ{`C&w#fCS3|M4%qrH&9F4fWrfFTm_v~(@{$g-^l10cZw3*4M9POdQkAVP->|^JEWrDbf;wHvAhinjH zmoOJZxZ;?5PI!|1P4X(Ij5%Y%Ia4k*t0kd06D*L#ND3!uyxia;L!4W#xg$$XD)Q7R z(4nY(T4T!2gIw^)DkavWdy8iwFG600lm%8O%2thcRDmNJe9`2W7JszWO1v-1yUHM2(?6@lSU#Hlp>L+g+iG~lZbZFR4CdiNChvbr5ptF3N7Ly z!5Pf8vESg2@#7s|p7+vmbR0jw24zQ^8}v%h%?cjYIANVrw(zoz4?7p^afuT@`vh=v zMwD}61bHSzUi^~yRl{z`{^nn2(n%?lT_% diff --git a/sync-gather/pom.xml b/sync-gather/pom.xml new file mode 100644 index 0000000..dabe325 --- /dev/null +++ b/sync-gather/pom.xml @@ -0,0 +1,40 @@ + + + + com.lyr + sync + 1.0.0 + + 4.0.0 + + sync-gather + + + 数据采集模块 + + + + + + + com.lyr + sync-common + + + + com.lyr + sync-framework + + + + org.projectlombok + lombok + provided + + + + + + \ No newline at end of file diff --git a/sync-gather/src/main/java/com/lyr/gather/controller/DataSourceConfigController.java b/sync-gather/src/main/java/com/lyr/gather/controller/DataSourceConfigController.java new file mode 100644 index 0000000..0ba0eb6 --- /dev/null +++ b/sync-gather/src/main/java/com/lyr/gather/controller/DataSourceConfigController.java @@ -0,0 +1,34 @@ +package com.lyr.gather.controller; + +import com.lyr.gather.service.DataSourceConfigService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * @author liyc + * @date 2024/10/30 + * @description TODO + **/ +@RestController +@RequestMapping("/gather") +public class DataSourceConfigController { + + + @Resource + private DataSourceConfigService dataSourceConfigService; + + + @GetMapping("/print") + public void print() { + dataSourceConfigService.print(); + } + + + @GetMapping("/add") + public void add() { + dataSourceConfigService.add(); + } +} diff --git a/sync-gather/src/main/java/com/lyr/gather/domain/vo/DataSourceConfig.java b/sync-gather/src/main/java/com/lyr/gather/domain/vo/DataSourceConfig.java new file mode 100644 index 0000000..c07c4fd --- /dev/null +++ b/sync-gather/src/main/java/com/lyr/gather/domain/vo/DataSourceConfig.java @@ -0,0 +1,68 @@ +package com.lyr.gather.domain.vo; + +import com.lyr.common.annotation.Excel; +import lombok.Data; + + +/** + * @author liyc + * @date 2024/10/30 + * @description TODO + **/ +@Data +public class DataSourceConfig { + + private static final long serialVersionUID = 1L; + + /** + * 主键，自动递增 + */ + private Long id; + + /** + * 数据源的唯一名称，用于标识不同的数据源 + */ + @Excel(name = "数据源的唯一名称，用于标识不同的数据源") + private String name; + + /** + * 数据库类型，例如 MySQL, PostgreSQL 等 + */ + @Excel(name = "数据库类型，例如 MySQL, PostgreSQL 等") + private String dbType; + + /** + * 数据库连接URL + */ + @Excel(name = "数据库连接URL") + private String url; + + /** + * 数据库用户名 + */ + @Excel(name = "数据库用户名") + private String username; + + /** + * 数据库密码 + */ + @Excel(name = "数据库密码") + private String password; + + /** + * 数据库驱动类名 + */ + @Excel(name = "数据库驱动类名") + private String driverClassName; + + @Excel(name = "bean名称") + private String beanName; + + /** + * 是否启用该数据源，1 表示启用，0 表示禁用 + */ + @Excel(name = "是否启用该数据源，1 表示启用，0 表示禁用") + private Integer isEnabled; + + +} diff --git a/sync-gather/src/main/java/com/lyr/gather/mapper/DataSourceConfigMapper.java b/sync-gather/src/main/java/com/lyr/gather/mapper/DataSourceConfigMapper.java new file mode 100644 index 0000000..2a3f286 --- /dev/null +++ b/sync-gather/src/main/java/com/lyr/gather/mapper/DataSourceConfigMapper.java @@ -0,0 +1,7 @@ +package com.lyr.gather.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.lyr.gather.domain.vo.DataSourceConfig; + +public interface DataSourceConfigMapper extends BaseMapper { +} diff --git a/sync-gather/src/main/java/com/lyr/gather/service/DataSourceConfigService.java b/sync-gather/src/main/java/com/lyr/gather/service/DataSourceConfigService.java new file mode 100644 index 0000000..1e48d39 --- /dev/null +++ b/sync-gather/src/main/java/com/lyr/gather/service/DataSourceConfigService.java @@ -0,0 +1,11 @@ +package com.lyr.gather.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.lyr.gather.domain.vo.DataSourceConfig; + +public interface DataSourceConfigService extends IService { + + void print(); + + void add(); +} diff --git a/sync-gather/src/main/java/com/lyr/gather/service/impl/DataSourceConfigServiceImpl.java b/sync-gather/src/main/java/com/lyr/gather/service/impl/DataSourceConfigServiceImpl.java new file mode 100644 index 0000000..e9cc276 --- /dev/null +++ b/sync-gather/src/main/java/com/lyr/gather/service/impl/DataSourceConfigServiceImpl.java @@ -0,0 +1,48 @@ +package com.lyr.gather.service.impl; + +import com.alibaba.druid.pool.DruidDataSource; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.lyr.framework.manager.DataSourceManagerService; +import com.lyr.gather.domain.vo.DataSourceConfig; +import com.lyr.gather.mapper.DataSourceConfigMapper; +import com.lyr.gather.service.DataSourceConfigService; +import org.springframework.stereotype.Service; + +import javax.annotation.PostConstruct; +import javax.annotation.Resource; +import java.util.List; + +@Service +public class DataSourceConfigServiceImpl extends ServiceImpl implements DataSourceConfigService { + + @Resource + private DataSourceManagerService dataSourceManagerService; + + @PostConstruct + private void registered() { + List configList = this.lambdaQuery().eq(DataSourceConfig::getIsEnabled, 1).list(); + configList.stream().forEach(e -> { + DruidDataSource dataSource = new DruidDataSource(); + dataSource.setDriverClassName(e.getDriverClassName()); + dataSource.setUrl(e.getUrl()); + dataSource.setUsername(e.getUsername()); + dataSource.setPassword(e.getPassword()); + dataSourceManagerService.registerDataSources(e.getBeanName(), dataSource); + }); + } + + @Override + public void print() { + dataSourceManagerService.print(); + } + + @Override + public void add() { + DruidDataSource dataSource = new DruidDataSource(); + dataSource.setUrl("jdbc:sqlserver://192.168.3.28:1433;DatabaseName=BiDataDeYue;encrypt=true;trustServerCertificate=true;"); + dataSource.setUsername("sa"); + dataSource.setPassword("mssql_whdZeB"); + dataSource.setDriverClassName("com.microsoft.sqlserver.jdbc.SQLServerDriver"); + dataSourceManagerService.registerDataSources("biDataDeYue", dataSource); + } +} diff --git a/sync-generator/src/main/java/com/lyr/generator/controller/GenController.java b/sync-generator/src/main/java/com/lyr/generator/controller/GenController.java index b5a11e4..aa56180 100644 --- a/sync-generator/src/main/java/com/lyr/generator/controller/GenController.java +++ b/sync-generator/src/main/java/com/lyr/generator/controller/GenController.java @@ -49,7 +49,7 @@ public class GenController extends BaseController { @PreAuthorize("@ss.hasPermi('tool:gen:list')") @GetMapping("/list") public TableDataInfo genList(GenTable genTable) { - startPage(); + List list = genTableService.selectGenTableList(genTable); return getDataTable(list); } @@ -76,7 +76,7 @@ public class GenController extends BaseController { @PreAuthorize("@ss.hasPermi('tool:gen:list')") @GetMapping("/db/list") public TableDataInfo dataList(GenTable genTable) { - startPage(); + List list = genTableService.selectDbTableList(genTable); return getDataTable(list); } diff --git a/sync-generator/src/main/resources/vm/java/controller.java.vm b/sync-generator/src/main/resources/vm/java/controller.java.vm index f5d98a8..7d7a138 100644 --- a/sync-generator/src/main/resources/vm/java/controller.java.vm +++ b/sync-generator/src/main/resources/vm/java/controller.java.vm @@ -44,7 +44,7 @@ public class ${ClassName}Controller extends BaseController { @GetMapping("/list") #if($table.crud || $table.sub) public TableDataInfo list(${ClassName} ${className}) { - startPage(); + List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); return getDataTable(list); } diff --git a/sync-generator/target/classes/com/lyr/generator/controller/GenController.class b/sync-generator/target/classes/com/lyr/generator/controller/GenController.class index 3b8a7e53c98ebf63b4a5883159a5840934af86ab..1f7794339a6e6de36a49db1a3b48c12a6ce7570b 100644 GIT binary patch delta 3669 zcmbVO33yc175>kgnY@>oOO_!J1_(I2Dnd7{)D{g68KM;0TI8MDm+-Q-Uh(6PcvU;R=EtA#XKnq(k9ZAU z_v5d4BO8Ci-~IRp-Zb%+9|Le&Fa2i#|H8lZ@V1F}O#H`>61=O|p4HYlOJIrk5fy{( z;xWampFR`2{gQ>(O)&{vEI&p|c0l|Rutf0}>A@J16F~e$$<=0_9`f}NWG2#6TLpUP zrH9@DDU?2zge>W+&3=~jx1`9D0s3vAC4)>E>_??ex>AbuFhsw;Ye|Xr7^;V1ei<$! zOc`lPSdd%4x@lglu5G)RR*#4&QTqok0k_?gz0Z)+woz)55nY7E3bmML$|xmeGFr(+ zQm*7;8KY#Zj8j;Eg{F*Ga*0ex+?P{SSfS)nxlG_~Ucb3T$wZl?WU`D-ypR)#Pm!sn zM3h`ES16e#SDJE_lIc>ZWQNQ%WtNiJQl+F?uGS0Zm{Ox;uGE?`Psx0_#*_t07Rn+) z&$Y2lv9gV=4UJ_}o10@>W;e97Dp@Q`n1_<3vP{WxxmGZ2<@$AHvBrkFSY51aRbrWy zotT)Nm$*B3&V&_urXlq44W_J3 z6y^1)yIvZVtdlBJnv|@U8w9=1?Ad>&C0nsLu`jR0bF0J?C-RnfZsW6meyO!h zwkz2tI}$bd(Y&2{#V*-x%I!+_$lk=A`THfD*wAxG+rr?h7At!$50=3{>IcDmzGd-w zjXg`&NeO)6V~|JeB}+N#0Kjl8p3Y1? z*XxuD`Mi#^4J}xU>$R~2(t^e~&2?yERE_8jKC}3&bpiP_AYw})OHfVABudLbg|`FQ zi;lrx;S2eKfoKZKg9S8uguH1xr_?dSAzu=?=Tj<%#VsZi;1u*qJk`H2u4$U&Y@AN4 z7VB|?okk@#Fhv8s=+n#;Js6B~J6SKn7>O3N!UvtUCdcurPkU`dr`INWb)jOjO-0<{ z;zn#?3{wkw6Ai)5?^7yMsJ!lkn!~JWKCDn{Z0-JsQnwJ$R@_P+v``;seqKI@b|9ZR z1hq=8Hr3J6Bzi_ket}?D61}1>^@*7S`q@;6ouz52hq_c-C_)^!af_Y^+5~%ST6Hx! zGaI>W7YZ}0X&W84V~2}zkBhN5(vIGC8AVe?C^YOsGD_RgCxws);UxNYB9wtnF*pc| z(+GMO7UbK#B)ev&shvOJA4xV8OkZp{-)UNet2F;1o*k zMR~|~5+xN``qYH7k{Fu8FoV8*^~>S7OqW7;wH2y+1r;C_szz)KU$2hFnO zUc)A`f}a9+kwOzwF#-wP&5|p}czg=?kW|H)eRlIGAW6GyTKA&2O|X}I<>S*_>%&15 zFqO}cO;VH==P35u;&h%sC)#J}RS>ts-A7uTaPQ33f)U0rN?mT`K#B_^D&}LB0r8}He{!t1k)r2 zdB9FFG(*|P!l1i}Z{VBU;QdH5`pCDsQ2b;D@^9P7b9B+^+r!3w7bMP4mmS?Gf7ykV zKS||Jb)&pK!5>imzrl)s=L3uq6`t-E)Wi#edX}J``!Jx~qp>XAbPs2c^~?o9JxiIL zv_JvpzG59?EArc6=`Fv delta 3779 zcmbVO33yc175>kgnY@>o3&~7EU=R$1gurBCWXGT=B0_|)ML-3V0Yer-5|gmGJr@uV zY1MJ5T@6kTI1)TU(2^wJjCxzHfG;d$k4s``%*`M(Fk>-@WJFckVg=+2_UT zH>>Rz_3|D4;kzMx58pTOgCK%9YT<_= z{0Kj`@DmH|n*FDm^JgZ09z;aTi{KX_{1U&?)UShh6Ti_6zYXGd_qx$JTLU;>r>*b#&{$=7s5G6QCDMAD#B9<7I_<|@GKiMT< zN|xSD6FY-q;kYT;1TMiKCP*kGN(Nanm|rAE>z7Uh?#kPfRjIQw4e%s+VCQ ziOO(G&aq^KCP!Lwt|f(*jMAskmK2#XCWtC+bd?nAr9>Z3S~6C1l5_XlSaKmuRoAPP7XA4bAIYOu0zOOu3lH zww5jJN-mLEN-mX2g0aby##md)Y`M&oawT)*awT(Ro+(vIu8{dk7D%-z3zaOA#Y&dQ zQvJHdlq;1iljWwYP;!+J#5GD*$|^x#KZsdvZHa9Q8rnOQtd?tOu#)R!jgo|{rQ&rh z8!Hk`4Qmr?6UmmG4T*JH{`FF;WW6jF$Ql8Z)JeUP25A)JI)a-L&2<$u9c>NGbxJl! zlPMcd>2yBL*}AT_wWFb>SxK|BC~1|&rre;UP1=()a)(cE!*(SdvPsEiy=;-KO18<3 zN^X*y6<)$umE0oB6^?M>-L0n3Ik#bDa&K<2?{>K(*`2%6cPIBqxZK(Q#(A=us}=y1;##iCWx#bI^wN$1bZ{%+K zNDPVfz=(CjSC)d`Ky@tMgFq)g_@Jc?=FTPoKc*lDQyr zHmC-zxPhQTn1?o+X3)f$Xs2mDjK)OANIzm2j}B}?z%f@l#pS9`b8V*ET&^wT%5cF} z?E=`Y3%21#;-GZN>G2Oo8zYUa4ZT~q^UZ8Fvuv=l%A39L) zrJa86C4Go64tY9CUThY|%X^R?r}KvhcJ!bi-tYPXx&lmNi;0{EdliN;(Z&$3jzr9r zn2tn=7YPd^aT{)@<~&Xlon*drlDRjVd6VH`C&@hMcM$rW*zQ5!@ zc5j#|wgbA9c)ZHkjl20`Pdo0x-deneUcQ&I+$_0|)cvQ7kXQMLS&Z(oUW_Pv79)Fc zZgn3D8H-U1Y0hY2jp$k^5+->Jp*9PMk6jU;_&Viv~X0X)e1oQP?7 z2oKY%ir?Pnw3&SDp@(%Y>_&m(VLv?PVo z1LF7z8vjW=K}EWbmQlCH7`3(M*xaTW@Tlpeyc{$JwBrZpqX%i-Lr(q`xUbU|M!j~d ztD%rOyu^C)6d*6Lp2E{)&}}Cql<+CAus_X{pcBt{(B^v3ay&d2Wa0@ry7v*!{sCBW z(pYlvEV?LCV;PX--5FS(Ll2p}UU(q07xr>C_#Ic(Ql0LFVGmEG*9Ql5b{EkT?A=c~ zh}>ZnP9qAZdwUjA?B4yuDr7UwQh1(MebnJ6qR(Wuloy<)?N;MK2d8p-wlmdQ`Q)=K z2N&#GLe>2-qQNrtXXy4)R(=2%_77`!ygo;?JqX)4FrcAC(vTxKjL%UtMLA_*kln=R z@dYY49q9lUznJ0TFAhNdB?tLnopgHMIM|bV9>2uq;wEKg_E2x=g2K6#Qz4E_+@=C)_H{GWOIP2vzf_jBvc0IL)yPjy#I7f;8 zed1$RyjcG}iIqkDr$yVHAg_`A7`xQ#oP2LMFekeL>~zGV>4-<2VPcRW-x(%8KD3Ytly6I0g+YI|E list = ${className}Service.select${ClassName}List(${className}); return getDataTable(list); } diff --git a/sync-quartz/src/main/java/com/lyr/quartz/controller/SysJobController.java b/sync-quartz/src/main/java/com/lyr/quartz/controller/SysJobController.java index 3d6bfd5..8bb2683 100644 --- a/sync-quartz/src/main/java/com/lyr/quartz/controller/SysJobController.java +++ b/sync-quartz/src/main/java/com/lyr/quartz/controller/SysJobController.java @@ -38,7 +38,7 @@ public class SysJobController extends BaseController { @PreAuthorize("@ss.hasPermi('monitor:job:list')") @GetMapping("/list") public TableDataInfo list(SysJob sysJob) { - startPage(); + List list = jobService.selectJobList(sysJob); return getDataTable(list); } diff --git a/sync-quartz/src/main/java/com/lyr/quartz/controller/SysJobLogController.java b/sync-quartz/src/main/java/com/lyr/quartz/controller/SysJobLogController.java index a55153b..22be600 100644 --- a/sync-quartz/src/main/java/com/lyr/quartz/controller/SysJobLogController.java +++ b/sync-quartz/src/main/java/com/lyr/quartz/controller/SysJobLogController.java @@ -32,7 +32,7 @@ public class SysJobLogController extends BaseController { @PreAuthorize("@ss.hasPermi('monitor:job:list')") @GetMapping("/list") public TableDataInfo list(SysJobLog sysJobLog) { - startPage(); + List list = jobLogService.selectJobLogList(sysJobLog); return getDataTable(list); } diff --git a/sync-quartz/target/classes/com/lyr/quartz/controller/SysJobController.class b/sync-quartz/target/classes/com/lyr/quartz/controller/SysJobController.class index b20b09bc6a4d6dc9fa4d99a5eed90ae9e1ed2c98..eb4c637f0d21dde445426d14a9e6ea74fbb0a343 100644 GIT binary patch delta 2569 zcmb_d32+ou5Ph@P%+5{{GfDsd3@g z4U0tHE<1NurKyg@q&RD@sfdccv(Sz zJImMKULEY0Hw>>BconZ1cpYyTcoT0KcpL31-ZAhl-m|v`Bij4;z`%!Sw+HKm86TnD zz{mK+z^ByI=q16=41A6+6qMLQLk0FKeUSG{d}VLaE$@14u&0E=fsF>f=2;D)L1VrV z_iyo?f$#Byfgkacf{gWRmu_6py1uP#!<>d91Dj;~XW9M*zZ%#qE?Y!5O>{Hxo8bK2 z?qd{q|G=O2NTa=}U&biERZijo1s;i*vVyAs4C7>NV8Qc#5hX(i6JlwQj0@CtZ}TjBL!Y&a5wzt(11_&dBV&}Ac z*CT!!eK86L@zfCiS%rgXeF*L4pRQ&!H3GjUM@S9!*K*R1<)e+ zSkSPLFNh)zqH%5TN6kPp)Cym3UvY`4#SoN8U3?~8fHMBA963x|9#d9HO{pA&{0^M? zI1)$kXQC6t9(wd}5PRvTqZ&u^B*C5oE3rA6KXEsY;iiO9L`^)5V{sf$IldlIoKTDL zI1wlDd^fCt$>6b5l{ain5+vxgt zc3h5v?fhl;&c-b$>@Mg%QY^zU6fy2S6GROVqQddpU~la)!m4DVNs%No!4PK?ojWjz zdl~}a;vqvK18_E10a{MRISzMu$wP2Q8c3;10BISIBg{X7a_ph$VNi(;eLQ zTbL+46vj(0lMQyd)7GTyd@P^I>HX>gqGo4HHY|aiXjm7fSKo{d_;svdfu9?1UVD2m zyzfHjyes=GMlfuaO1;q_^}(3M_BuNSajuJ4I$LfWatJ17GBgk5-te9I8#&4-m4R+I zgzh4^Bt3#l`Hnd4&v})2W7&T#_n|BEK+q=}u=~o*BZ~PBXy=A^>cN-cawaSNPNzHv lSELoimAI-SyH_W$6-k4Zu0P8eXFD93TwlZWwH@|z{smSZ%BlbW delta 2627 zcmb_dd013c6#u=MVcwfJ571YDkO)ag%z#UQ6h&HYML`yAqitAZX+#NGk@Z?ki_Fqz zC8QN?n5D7x08wdQY%i2{Tfk_wy)3`J&UtTU7zWU<@9Up?-aYr6bARXj&OOh_?#$M< z{j+H+fGq5laRiph$iW>hT9&(UC+_0y3K1(s=rWvGC1DoJyZP`QKD<|kh}ANxQ6u6$ z8PQlKVGYZ*d~&~p2YB-!+t#w?ArTKtctpmdcuYc_CSsk0$0e+1%@Y!yl(0d3 zFaq@w8e}x0NkTJ+c$z~Pe0vLTTP3uyW)o}L`D-&TTX@;Zx(;5RVbfvN=U14SP06h%bqFSwNCrD<(AUaE=g!SDJQgr@~U1AW*qnN~Iil5i}oie-S~Fokvk zreYddv2!U&JINT20h^~8c5fRTHWX-{3%-BWQqMLvQ2`EE;-PZ~}mj^v4?J*gZ8DCCdX5Xx~fea*xvbV$H7)X-fKWSz{Y zGE7v3?Qr^3u?14DBi`Z7R9yyS&e+1Jk_V6tHzp#M`Z0-0$k}IEae_FLaVm=FGKy^? zwvk7SiP%nlGET$k&>SZCSVChR=F=tC;Td!dr;$b)e;Q}vEHdpg{}jbyaPUu?Gx1{5xIC~cE96FFZ`wn604n1c%_URV_`45?xXE+Q9& zTVgI_C?^*I7vmB_O#p=TR169#WO)rlwj!zqDV}yj`&uwe9d1A+^#LR_^*~w;#2ARJ zCtaKx--?9l!Hv~}`rAfq!APH7O)T;`)KNvPNE*s7c~HND$xl;9@5?czzhff~*~cxZ z{f%2OW{9NKw4mjvdM~|*Lk*+{i1IK|UjK{Gcg9T8xVKD(gscEV^fk|X1M}%jg45&8 z$;n8^rL=QW*-LSm$z4)k>y(AH&gIlPFgX;N!z*YbV8LMYX#@D9CmY~zzx0LL{ulcC z{4`Y^n!kbc^*O5Qe(4J}9*VwPt7$_``}hmcml>dMY(M(8$Nf+Am50$+fhz~nw=h5- z<`eNeZc{zY8qHb*6|C`Fi6~r4Ew?CS{H6w452^mv zi=qL06*ZyFY&!?FPigqPx|&dHp#zIy2L{$P;oVmmgkMHM8GfRFcpYv--pFdm^i;Cy z;PR;1JTAz<8ptwF8Z4m+x-!FIDW`(sFc_uGUs-vi^H;Neb`x!2^nC-^0=2a-`D!HriJO?Qj1VM+e;p diff --git a/sync-quartz/target/classes/com/lyr/quartz/controller/SysJobLogController.class b/sync-quartz/target/classes/com/lyr/quartz/controller/SysJobLogController.class index 7b3f1d78826f5841dd7bd36e4fe9ea88fab1510d..c576f2991dcaa6920c54c69ca89e975b0065e336 100644 GIT binary patch delta 1042 zcmZ{iNmCP16otR;1Un?n6eWm)qKpO*M4WIIQIW|B5pYCs7Sy2I{057izd}kY6k6rR zo&Um}D}RFJx!nz>QswHN_wI1cx$pgK_}(!2?MWGX3i%VXMO zCP^8y2}Uj6w&Wd4-Zga3(0xM>49$5w^q60rS@vo()cK^@>apPSh{rxpc)Ie-8*a<+ z%;z~Td|tBXv&1W(*Szt`vF!8K`j!}3nM%w#9q$)AKK)KqxcO?y0|(b;DsIzhi(+jQ zMW@qtoq7}<#j@-g&Z>Y*eN=?d4q-nmU?&YaIW)3MRo1+q7*njte#Y%wC+0Gi?JAIu zf7ER(n3Plvw2-1TnAQ|_MAOvEZkjYTC4r6XQT1Nc8)taatQ(VGr`V#~)*NlL8<@q( z(IK>ttdb_^197dLJWZykD^N84m9pvdmNmSAczwLHJDn&{ZcameX|>oIQuLDHfYkH_ zI{R&ql!dMhb`~HewCg6a(JMBWz8nYX zU*HgjIimTYt)oK67*Mg<8dS6`R%N3_CtV7pY{|vXH4q5T;O4D%Q+XA~IiYzaTRd5` z#Z#PCi)UZqjDW*g&i#+uH|~m3?x78Cqs|v`4{|=@F0wwfVf{jA{UVoC6j~oH)pD5; z*|a^F3wwb|Tf;h)4%q@#|D=R}ZG!o7t^|6*uUi?(DcS#~h|y5QSdoZvF;0ld)gWt2 M3td&bwkh-aU;CJ0F8}}l delta 1073 zcmZuv*-{fx5Ir+lCYg+hL_-84MgfsYq6ASf;w~ymATFqYThxdPxFm6Vu;wH3=08{^ zr4!tEi<%WZAY-=|DS%ZEtG$dGW58a6w#r0Duh#@NY-Mh_4M<@d zD-C_v&Mp~VVe~O3>?U;kGklqK_;nN=JKIFyBX4{PEvmZu;l}`C7*wcfchW;82GZC; z^caQqVJDIMIWOGq$pBAejU?kBPj}TYgx!)XLaSkznT-rDDa^rpas}9(7FAiLYUV3~ z^KoMhp@P51pUK6;O_;K=t1-?Au_J;J+LY&xqe|zPi__AXMix1e5nCzNIgwC`eVj9~ zhZv4uiSMQw_i}(F?&Sz+WQ`%7cx&Xzq+?%=zuW!_4&WfhiSMp;h*<%L*(`paV$>O9 zwr6%kM-!G9-TrI^M=2M2_O_JAFo7e)>u~XCn~TSAoFj((5+|5wIH@@Q%e_Ikqn+H7 zLhW$bPVUo~^tjtrKl69>v+nBWFvTW!_4A!tE?}CdqGf_j@&Zw@VI46(eG?o1Nm(`( r{Vc*LDJ$GxIOsync-common + + org.projectlombok + lombok + provided + + + + com.baomidou + mybatis-plus-boot-starter + \ No newline at end of file diff --git a/sync-system/src/main/java/com/lyr/system/domain/SysCache.java b/sync-system/src/main/java/com/lyr/system/domain/SysCache.java index 1d1d450..a2a9bc7 100644 --- a/sync-system/src/main/java/com/lyr/system/domain/SysCache.java +++ b/sync-system/src/main/java/com/lyr/system/domain/SysCache.java @@ -1,5 +1,6 @@ package com.lyr.system.domain; + import com.lyr.common.utils.StringUtils; /** diff --git a/sync-system/src/main/java/com/lyr/system/mapper/SysDeptMapper.java b/sync-system/src/main/java/com/lyr/system/mapper/SysDeptMapper.java index fff8626..1065bab 100644 --- a/sync-system/src/main/java/com/lyr/system/mapper/SysDeptMapper.java +++ b/sync-system/src/main/java/com/lyr/system/mapper/SysDeptMapper.java @@ -1,5 +1,6 @@ package com.lyr.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.lyr.common.core.domain.entity.SysDept; import org.apache.ibatis.annotations.Param; @@ -10,7 +11,7 @@ import java.util.List; * * @author ruoyi */ -public interface SysDeptMapper { +public interface SysDeptMapper extends BaseMapper { /** * 查询部门管理数据 * diff --git a/sync-system/src/main/java/com/lyr/system/service/impl/SysDictDataServiceImpl.java b/sync-system/src/main/java/com/lyr/system/service/impl/SysDictDataServiceImpl.java index 5016ba6..b16c7c9 100644 --- a/sync-system/src/main/java/com/lyr/system/service/impl/SysDictDataServiceImpl.java +++ b/sync-system/src/main/java/com/lyr/system/service/impl/SysDictDataServiceImpl.java @@ -2,6 +2,7 @@ package com.lyr.system.service.impl; import com.lyr.common.core.domain.entity.SysDictData; import com.lyr.common.utils.DictUtils; +import com.lyr.common.utils.spring.SpringUtils; import com.lyr.system.mapper.SysDictDataMapper; import com.lyr.system.service.ISysDictDataService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sync-system/src/main/resources/mapper/system/SysDeptMapper.xml b/sync-system/src/main/resources/mapper/system/SysDeptMapper.xml index 0afc409..e68b16f 100644 --- a/sync-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/sync-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -23,8 +23,18 @@ - select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, - d.del_flag, d.create_by, d.create_time + select d.dept_id, + d.parent_id, + d.ancestors, + d.dept_name, + d.order_num, + d.leader, + d.phone, + d.email, + d.status, + d.del_flag, + d.create_by, + d.create_time from sys_dept d @@ -61,27 +71,47 @@