diff --git a/README.md b/README.md index 45ecb6be..77caf667 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,6 @@ |skyeye-notice |8096 |公告模块 |notice-web.jar | |skyeye-forum |8097 |论坛模块 |forum-web.jar | |skyeye-jobdiary |8098 |工作日报模块 |jobdiary-web.jar | -|skyeye-light-app |8099 |轻应用模块 |light-app-web.jar | |skyeye-ehr |8100 |EHR模块 |ehr-web.jar | |skyeye-wages |8101 |薪资模块 |wages-web.jar | |skyeye-deploy |8010 |部署模块 |deploy-web.war | diff --git a/skyeye-adm/adm-common/pom.xml b/skyeye-adm/adm-common/pom.xml index 84827c22..7082d898 100644 --- a/skyeye-adm/adm-common/pom.xml +++ b/skyeye-adm/adm-common/pom.xml @@ -29,6 +29,15 @@ ${basedir}/lib/aspose-words-15.8.0-jdk16.jar + + + epublib-core + latest + 1.3.1 + system + ${basedir}/lib/epublib-core-latest.jar + + \ No newline at end of file diff --git a/skyeye-light-app/light-app-entity/src/main/java/com/skyeye/eve/rest/pro/win/SysEveWinDragDropService.java b/skyeye-adm/adm-common/src/main/java/com/skyeye/rest/pro/win/SysEveWinDragDropService.java similarity index 96% rename from skyeye-light-app/light-app-entity/src/main/java/com/skyeye/eve/rest/pro/win/SysEveWinDragDropService.java rename to skyeye-adm/adm-common/src/main/java/com/skyeye/rest/pro/win/SysEveWinDragDropService.java index 9e0a5482..1042bb42 100644 --- a/skyeye-light-app/light-app-entity/src/main/java/com/skyeye/eve/rest/pro/win/SysEveWinDragDropService.java +++ b/skyeye-adm/adm-common/src/main/java/com/skyeye/rest/pro/win/SysEveWinDragDropService.java @@ -2,7 +2,7 @@ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.rest.pro.win; +package com.skyeye.rest.pro.win; import com.skyeye.common.client.ClientConfiguration; import org.springframework.cloud.openfeign.FeignClient; diff --git a/skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/controller/LightAppController.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/controller/LightAppController.java similarity index 96% rename from skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/controller/LightAppController.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/controller/LightAppController.java index ac3b5d41..7ff11dbb 100644 --- a/skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/controller/LightAppController.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/controller/LightAppController.java @@ -2,7 +2,7 @@ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.controller; +package com.skyeye.eve.lightapp.controller; import com.skyeye.annotation.api.Api; import com.skyeye.annotation.api.ApiImplicitParam; @@ -11,8 +11,8 @@ import com.skyeye.annotation.api.ApiOperation; import com.skyeye.common.entity.search.CommonPageInfo; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; -import com.skyeye.eve.entity.LightApp; -import com.skyeye.eve.service.LightAppService; +import com.skyeye.eve.lightapp.entity.LightApp; +import com.skyeye.eve.lightapp.service.LightAppService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/controller/LightAppTypeController.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/controller/LightAppTypeController.java similarity index 96% rename from skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/controller/LightAppTypeController.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/controller/LightAppTypeController.java index 530fb9d9..1e5e1458 100644 --- a/skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/controller/LightAppTypeController.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/controller/LightAppTypeController.java @@ -2,7 +2,7 @@ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.controller; +package com.skyeye.eve.lightapp.controller; import com.skyeye.annotation.api.Api; import com.skyeye.annotation.api.ApiImplicitParam; @@ -11,8 +11,8 @@ import com.skyeye.annotation.api.ApiOperation; import com.skyeye.common.entity.search.CommonPageInfo; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; -import com.skyeye.eve.entity.LightAppType; -import com.skyeye.eve.service.LightAppTypeService; +import com.skyeye.eve.lightapp.entity.LightAppType; +import com.skyeye.eve.lightapp.service.LightAppTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/dao/LightAppDao.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/dao/LightAppDao.java similarity index 86% rename from skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/dao/LightAppDao.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/dao/LightAppDao.java index abdcf583..c750207a 100644 --- a/skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/dao/LightAppDao.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/dao/LightAppDao.java @@ -2,10 +2,11 @@ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.dao; +package com.skyeye.eve.lightapp.dao; import com.skyeye.common.entity.search.CommonPageInfo; -import com.skyeye.eve.entity.LightApp; +import com.skyeye.eve.dao.SkyeyeBaseMapper; +import com.skyeye.eve.lightapp.entity.LightApp; import java.util.List; import java.util.Map; diff --git a/skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/dao/LightAppTypeDao.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/dao/LightAppTypeDao.java similarity index 86% rename from skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/dao/LightAppTypeDao.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/dao/LightAppTypeDao.java index fcecd597..ba33e19f 100644 --- a/skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/dao/LightAppTypeDao.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/dao/LightAppTypeDao.java @@ -2,10 +2,11 @@ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.dao; +package com.skyeye.eve.lightapp.dao; import com.skyeye.common.entity.search.CommonPageInfo; -import com.skyeye.eve.entity.LightAppType; +import com.skyeye.eve.dao.SkyeyeBaseMapper; +import com.skyeye.eve.lightapp.entity.LightAppType; import java.util.List; import java.util.Map; diff --git a/skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/entity/LightApp.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/entity/LightApp.java similarity index 97% rename from skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/entity/LightApp.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/entity/LightApp.java index ba04c923..c77ce946 100644 --- a/skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/entity/LightApp.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/entity/LightApp.java @@ -2,7 +2,7 @@ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.entity; +package com.skyeye.eve.lightapp.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/entity/LightAppType.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/entity/LightAppType.java similarity index 97% rename from skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/entity/LightAppType.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/entity/LightAppType.java index 3c0cf55c..34aebf6f 100644 --- a/skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/entity/LightAppType.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/entity/LightAppType.java @@ -2,7 +2,7 @@ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.entity; +package com.skyeye.eve.lightapp.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/service/LightAppService.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/service/LightAppService.java similarity index 91% rename from skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/service/LightAppService.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/service/LightAppService.java index 4f73c370..8006cdc6 100644 --- a/skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/service/LightAppService.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/service/LightAppService.java @@ -2,12 +2,12 @@ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.service; +package com.skyeye.eve.lightapp.service; import com.skyeye.base.business.service.SkyeyeBusinessService; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; -import com.skyeye.eve.entity.LightApp; +import com.skyeye.eve.lightapp.entity.LightApp; /** * @ClassName: LightAppService diff --git a/skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/service/LightAppTypeService.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/service/LightAppTypeService.java similarity index 91% rename from skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/service/LightAppTypeService.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/service/LightAppTypeService.java index 819c9e8e..d46589d6 100644 --- a/skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/service/LightAppTypeService.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/service/LightAppTypeService.java @@ -2,12 +2,12 @@ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.service; +package com.skyeye.eve.lightapp.service; import com.skyeye.base.business.service.SkyeyeBusinessService; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; -import com.skyeye.eve.entity.LightAppType; +import com.skyeye.eve.lightapp.entity.LightAppType; /** * @ClassName: LightAppTypeService diff --git a/skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/service/impl/LightAppServiceImpl.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/service/impl/LightAppServiceImpl.java similarity index 93% rename from skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/service/impl/LightAppServiceImpl.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/service/impl/LightAppServiceImpl.java index 7587269c..a4b23390 100644 --- a/skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/service/impl/LightAppServiceImpl.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/service/impl/LightAppServiceImpl.java @@ -2,7 +2,7 @@ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.service.impl; +package com.skyeye.eve.lightapp.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -16,12 +16,12 @@ import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; import com.skyeye.common.util.DataCommonUtil; import com.skyeye.common.util.mybatisplus.MybatisPlusUtil; -import com.skyeye.eve.dao.LightAppDao; -import com.skyeye.eve.entity.LightApp; -import com.skyeye.eve.rest.pro.win.SysEveWinDragDropService; -import com.skyeye.eve.service.LightAppService; -import com.skyeye.eve.service.LightAppTypeService; +import com.skyeye.eve.lightapp.dao.LightAppDao; +import com.skyeye.eve.lightapp.entity.LightApp; +import com.skyeye.eve.lightapp.service.LightAppService; +import com.skyeye.eve.lightapp.service.LightAppTypeService; import com.skyeye.exception.CustomException; +import com.skyeye.rest.pro.win.SysEveWinDragDropService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/service/impl/LightAppTypeServiceImpl.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/service/impl/LightAppTypeServiceImpl.java similarity index 92% rename from skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/service/impl/LightAppTypeServiceImpl.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/service/impl/LightAppTypeServiceImpl.java index 17812d8e..f4f91c0b 100644 --- a/skyeye-light-app/light-app-pro/src/main/java/com/skyeye/eve/service/impl/LightAppTypeServiceImpl.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/lightapp/service/impl/LightAppTypeServiceImpl.java @@ -2,7 +2,7 @@ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.service.impl; +package com.skyeye.eve.lightapp.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.skyeye.annotation.service.SkyeyeService; @@ -12,9 +12,9 @@ import com.skyeye.common.enumeration.EnableEnum; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; import com.skyeye.common.util.mybatisplus.MybatisPlusUtil; -import com.skyeye.eve.dao.LightAppTypeDao; -import com.skyeye.eve.entity.LightAppType; -import com.skyeye.eve.service.LightAppTypeService; +import com.skyeye.eve.lightapp.dao.LightAppTypeDao; +import com.skyeye.eve.lightapp.entity.LightAppType; +import com.skyeye.eve.lightapp.service.LightAppTypeService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/skyeye-light-app/light-app-pro/src/main/resources/mapper/lightapp/LightAppMapper.xml b/skyeye-adm/adm-pro/src/main/resources/mapper/lightapp/LightAppMapper.xml similarity index 92% rename from skyeye-light-app/light-app-pro/src/main/resources/mapper/lightapp/LightAppMapper.xml rename to skyeye-adm/adm-pro/src/main/resources/mapper/lightapp/LightAppMapper.xml index b808dafc..1938216f 100644 --- a/skyeye-light-app/light-app-pro/src/main/resources/mapper/lightapp/LightAppMapper.xml +++ b/skyeye-adm/adm-pro/src/main/resources/mapper/lightapp/LightAppMapper.xml @@ -1,6 +1,6 @@ - + SELECT diff --git a/skyeye-light-app/.gitignore b/skyeye-light-app/.gitignore deleted file mode 100644 index b501cc26..00000000 --- a/skyeye-light-app/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -*.class - -# Package Files # -*.war -*.ear - -class -.idea -*.iml -.settings -*.classpath -/bin -/images/ -classes -/target/ -/.project/ -/.metadata/ -/logs/ \ No newline at end of file diff --git a/skyeye-light-app/light-app-common/.gitignore b/skyeye-light-app/light-app-common/.gitignore deleted file mode 100644 index b501cc26..00000000 --- a/skyeye-light-app/light-app-common/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -*.class - -# Package Files # -*.war -*.ear - -class -.idea -*.iml -.settings -*.classpath -/bin -/images/ -classes -/target/ -/.project/ -/.metadata/ -/logs/ \ No newline at end of file diff --git a/skyeye-light-app/light-app-common/pom.xml b/skyeye-light-app/light-app-common/pom.xml deleted file mode 100644 index 94cc4eab..00000000 --- a/skyeye-light-app/light-app-common/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - skyeye-light-app - com.skyeye - 1-SNAPSHOT - - 4.0.0 - - light-app-common - - - - - - com.skyeye - skyeye-common-rest - 1.0-SNAPSHOT - - - - - \ No newline at end of file diff --git a/skyeye-light-app/light-app-common/src/main/java/com/skyeye/common/constans/LightAppConstants.java b/skyeye-light-app/light-app-common/src/main/java/com/skyeye/common/constans/LightAppConstants.java deleted file mode 100644 index 6e759bfa..00000000 --- a/skyeye-light-app/light-app-common/src/main/java/com/skyeye/common/constans/LightAppConstants.java +++ /dev/null @@ -1,18 +0,0 @@ -/******************************************************************************* - * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye - ******************************************************************************/ - -package com.skyeye.common.constans; - -/** - * @ClassName: LightAppConstants - * @Description: 轻应用常量类 - * @author: skyeye云系列--卫志强 - * @date: 2022/8/6 0:07 - * @Copyright: 2022 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. - * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 - */ -public class LightAppConstants { - - -} diff --git a/skyeye-light-app/light-app-entity/.gitignore b/skyeye-light-app/light-app-entity/.gitignore deleted file mode 100644 index b501cc26..00000000 --- a/skyeye-light-app/light-app-entity/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -*.class - -# Package Files # -*.war -*.ear - -class -.idea -*.iml -.settings -*.classpath -/bin -/images/ -classes -/target/ -/.project/ -/.metadata/ -/logs/ \ No newline at end of file diff --git a/skyeye-light-app/light-app-entity/pom.xml b/skyeye-light-app/light-app-entity/pom.xml deleted file mode 100644 index cd9ebc0f..00000000 --- a/skyeye-light-app/light-app-entity/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - skyeye-light-app - com.skyeye - 1-SNAPSHOT - - 4.0.0 - - light-app-entity - - - - - com.skyeye - light-app-common - 1-SNAPSHOT - - - - - \ No newline at end of file diff --git a/skyeye-light-app/light-app-pro/.gitignore b/skyeye-light-app/light-app-pro/.gitignore deleted file mode 100644 index b501cc26..00000000 --- a/skyeye-light-app/light-app-pro/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -*.class - -# Package Files # -*.war -*.ear - -class -.idea -*.iml -.settings -*.classpath -/bin -/images/ -classes -/target/ -/.project/ -/.metadata/ -/logs/ \ No newline at end of file diff --git a/skyeye-light-app/light-app-pro/pom.xml b/skyeye-light-app/light-app-pro/pom.xml deleted file mode 100644 index 2ffb8f40..00000000 --- a/skyeye-light-app/light-app-pro/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - skyeye-light-app - com.skyeye - 1-SNAPSHOT - - 4.0.0 - - light-app-pro - - - - - com.skyeye - light-app-entity - 1-SNAPSHOT - - - - - \ No newline at end of file diff --git a/skyeye-light-app/light-app-web/.gitignore b/skyeye-light-app/light-app-web/.gitignore deleted file mode 100644 index b501cc26..00000000 --- a/skyeye-light-app/light-app-web/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -*.class - -# Package Files # -*.war -*.ear - -class -.idea -*.iml -.settings -*.classpath -/bin -/images/ -classes -/target/ -/.project/ -/.metadata/ -/logs/ \ No newline at end of file diff --git a/skyeye-light-app/light-app-web/pom.xml b/skyeye-light-app/light-app-web/pom.xml deleted file mode 100644 index 51c1925a..00000000 --- a/skyeye-light-app/light-app-web/pom.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - skyeye-light-app - com.skyeye - 1-SNAPSHOT - - 4.0.0 - - light-app-web - - - 8 - 8 - - - - - - com.skyeye - light-app-pro - 1-SNAPSHOT - - - - org.springframework.boot - spring-boot-starter-web-services - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - de.codecentric - spring-boot-admin-starter-client - 2.0.3 - - - - org.jolokia - jolokia-core - - - - com.googlecode.json-simple - json-simple - - - - - - ${project.artifactId} - - - - org.apache.maven.plugins - maven-resources-plugin - - UTF-8 - - - - - - org.springframework.boot - spring-boot-maven-plugin - - true - - - - org.springframework - springloaded - 1.2.5.RELEASE - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - UTF-8 - - - - - - \ No newline at end of file diff --git a/skyeye-light-app/light-app-web/src/main/java/com/SkyLightAppApplication.java b/skyeye-light-app/light-app-web/src/main/java/com/SkyLightAppApplication.java deleted file mode 100644 index 1e20b45e..00000000 --- a/skyeye-light-app/light-app-web/src/main/java/com/SkyLightAppApplication.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye - ******************************************************************************/ - -package com; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.transaction.annotation.EnableTransactionManagement; - -@SpringBootApplication -@EnableAutoConfiguration(exclude = { - org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class -}) -@ComponentScan(basePackages = {"com.skyeye"}) -@EnableTransactionManagement//启注解事务管理，等同于xml配置方式的 -@EnableDiscoveryClient -@EnableFeignClients -public class SkyLightAppApplication { - - public static void main(String[] args) { - System.setProperty("spring.devtools.restart.enabled", "false"); - SpringApplication.run(SkyLightAppApplication.class, args); - } - -} diff --git a/skyeye-light-app/light-app-web/src/main/java/com/skyeye/db/config/BaseDataSourceConfig.java b/skyeye-light-app/light-app-web/src/main/java/com/skyeye/db/config/BaseDataSourceConfig.java deleted file mode 100644 index f123625e..00000000 --- a/skyeye-light-app/light-app-web/src/main/java/com/skyeye/db/config/BaseDataSourceConfig.java +++ /dev/null @@ -1,162 +0,0 @@ -/******************************************************************************* - * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye - ******************************************************************************/ - -package com.skyeye.db.config; - -import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; -import com.skyeye.common.constans.CommonConstants; -import com.skyeye.exception.CustomException; -import org.apache.commons.collections.CollectionUtils; -import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionTemplate; -import org.mybatis.spring.annotation.MapperScan; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.jdbc.DataSourceBuilder; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; -import org.springframework.core.io.Resource; -import org.springframework.core.io.ResourceLoader; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import org.springframework.core.io.support.ResourcePatternResolver; -import org.springframework.jdbc.datasource.DataSourceTransactionManager; -import org.springframework.transaction.PlatformTransactionManager; - -import javax.sql.DataSource; -import java.io.IOException; -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Properties; - -@Configuration -@MapperScan(basePackages = { - "com.skyeye.eve.dao", - "com.skyeye.eve.*.dao"}, sqlSessionFactoryRef = "baseSqlSessionFactory") -public class BaseDataSourceConfig { - - private static final Logger LOGGER = LoggerFactory.getLogger(BaseDataSourceConfig.class); - - protected static Properties databaseTypeMappings = CommonConstants.getDefaultDatabaseTypeMappings(); - - @Autowired - protected ResourceLoader resourceLoader; - - /** - * Primary 必须加此注解，不然报错，下一个类则不需要添加，表示这个数据源是默认数据源 - * ConfigurationProperties(prefix)值必须是application.properteis中对应属性的前缀 - * - * @return - */ - @Bean(name = "baseDataSource") - @Primary - @ConfigurationProperties(prefix = "spring.datasource") - public DataSource baseDataSource() { - return DataSourceBuilder.create().build(); - } - - /** - * a、SqlSessionFactory 一旦被创建就应该在应用的运行期间一直存在，没有任何理由对它进行清除或重建。 - * b、使用 SqlSessionFactory 的最佳实践是在应用运行期间不要重复创建多次，多次重建 SqlSessionFactory 被视为一种代码“坏味道（bad smell）”。 - * c、因此 SqlSessionFactory 的最佳作用域是应用作用域。有很多方法可以做到，最简单的就是使用单例模式或者静态单例模式。 - * - * @param dataSource - * @return - */ - @Primary - @Bean(name = "baseSqlSessionFactory") - public SqlSessionFactory baseSqlSessionFactory(@Qualifier("baseDataSource") DataSource dataSource) { - MybatisSqlSessionFactoryBean sqlSessionFactoryBean = new MybatisSqlSessionFactoryBean(); - - sqlSessionFactoryBean.setDataSource(dataSource); - String databaseType = this.initDatabaseType(dataSource); - if (databaseType == null) { - throw new CustomException("couldn't deduct database type"); - } else { - try { - // 添加XML目录 - sqlSessionFactoryBean.setMapperLocations(resolveMapperLocations()); - sqlSessionFactoryBean.afterPropertiesSet(); - return sqlSessionFactoryBean.getObject(); - } catch (Exception var5) { - throw new CustomException("Could not create sqlSessionFactory", var5); - } - } - } - - public Resource[] resolveMapperLocations() { - ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver(); - List mapperLocations = new ArrayList<>(); - mapperLocations.add("classpath*:mapper/**/*.xml"); - List resources = new ArrayList(); - if (!CollectionUtils.isEmpty(mapperLocations)) { - for (String mapperLocation : mapperLocations) { - try { - Resource[] mappers = resourceResolver.getResources(mapperLocation); - resources.addAll(Arrays.asList(mappers)); - } catch (IOException e) { - LOGGER.error("Get myBatis resources happened exception", e); - } - } - } - return resources.toArray(new Resource[resources.size()]); - } - - @Primary - @Bean(name = "transactionManager") - public PlatformTransactionManager transactionManager(@Qualifier("baseDataSource") DataSource dataSourceOne) { - return new DataSourceTransactionManager(dataSourceOne); - } - - @Primary - @Bean(name = "sqlSessionTemplate") - public SqlSessionTemplate sqlSessionTemplate(@Qualifier("baseSqlSessionFactory") SqlSessionFactory sqlSessionFactory) { - // 使用上面配置的Factory - return new SqlSessionTemplate(sqlSessionFactory); - } - - /** - * 初始化 - * - * @param dataSource - * @return - */ - protected String initDatabaseType(@Qualifier("baseDataSource") DataSource dataSource) { - String databaseType = null; - Connection connection = null; - - try { - connection = dataSource.getConnection(); - DatabaseMetaData databaseMetaData = connection.getMetaData(); - String databaseProductName = databaseMetaData.getDatabaseProductName(); - LOGGER.info("database product name: '{}'", databaseProductName); - databaseType = databaseTypeMappings.getProperty(databaseProductName); - if (databaseType == null) { - throw new CustomException("couldn't deduct database type from database product name '" + databaseProductName + "'"); - } - - LOGGER.info("using database type: {}", databaseType); - } catch (SQLException var14) { - LOGGER.error("Exception while initializing Database connection", var14); - } finally { - try { - if (connection != null) { - connection.close(); - } - } catch (SQLException var13) { - LOGGER.error("Exception while closing the Database connection", var13); - } - } - databaseType = ("dm".equals(databaseType)) ? "oracle" : databaseType; - return databaseType; - } - -} diff --git a/skyeye-light-app/light-app-web/src/main/resources/banner.txt b/skyeye-light-app/light-app-web/src/main/resources/banner.txt deleted file mode 100644 index a7fe545a..00000000 --- a/skyeye-light-app/light-app-web/src/main/resources/banner.txt +++ /dev/null @@ -1,36 +0,0 @@ -/** - * _ooOoo_ - * o8888888o - * 88" . "88 - * (| -_- |) - * O\ = /O - * ____/`---'\____ - * .' \\| |// `. - * / \\||| : |||// \ - * / _||||| -:- |||||- \ - * | | \\\ - /// | | - * | \_| ''\---/'' | | - * \ .-\__ `-` ___/-. / - * ___`. .' /--.--\ `. . __ - * ."" '< `.___\_<|>_/___.' >'"". - * | | : `- \`.;`\ _ /`;.`/ - ` : | | - * \ \ `-. \_ __\ /__ _/ .-` / / - * ======`-.____`-.___\_____/___.-`____.-'====== - * `=---=' - * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - * 佛祖保佑 永无BUG - * 佛曰: - * 写字楼里写字间，写字间里程序员； - * 程序人员写程序，又拿程序换酒钱。 - * 酒醒只在网上坐，酒醉还来网下眠； - * 酒醉酒醒日复日，网上网下年复年。 - * 但愿老死电脑间，不愿鞠躬老板前； - * 奔驰宝马贵者趣，公交自行程序员。 - * 别人笑我忒疯癫，我笑自己命太贱； - * 不见满街漂亮妹，哪个归得程序员？ - * :: springboot 2.x - * :: Skyeye系列框架，作者：卫志强 - * :: 作者独家专属，未购买禁止私自使用 - * 启动：nohup java -jar -Dspring.cloud.nacos.discovery.server-addr=localhost:9000 -Dspring.cloud.nacos.config.server-addr=localhost:9000 -Dspring.profiles.active=dev light-app-web.jar >> /opt/service/project/nohup-light-app.out 2>&1 & - * 清空日志：cat /dev/null > xxx-web.out -*/ \ No newline at end of file diff --git a/skyeye-light-app/light-app-web/src/main/resources/bootstrap.yml b/skyeye-light-app/light-app-web/src/main/resources/bootstrap.yml deleted file mode 100644 index 720b3752..00000000 --- a/skyeye-light-app/light-app-web/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,38 +0,0 @@ - -server: - port: 8099 - -spring: - application: - name: skyeye-light-app-${spring.profiles.active} # 服务名 - profiles: - active: public - cloud: - nacos: - discovery: - server-addr: localhost:9000 # 配置服务注册nacos地址 - namespace: ${spring.profiles.active} # 配置命名空间 - service: ${spring.application.name} # 配置服务名 - config: - # 指定nacos server的地址 - server-addr: localhost:9000 - # 配置文件后缀 - file-extension: yml - # 命名空间 常用场景之一是不同环境的配置的区分隔离，例如开发测试环境和生产环境的资源（如配置、服务）隔离等 - namespace: ${spring.profiles.active} # 配置命名空间 - # 支持多个共享 Data Id 的配置，优先级小于ext-config,自定义 Data Id 配置 属性是个集合，内部由 Config POJO 组成。Config 有 3 个属性，分别是 dataId, group 以及 refresh - ext-config: - - data-id: skyeye-common.yml # 配置文件名-Data Id - group: DEFAULT_GROUP # 默认为DEFAULT_GROUP - refresh: false # 是否动态刷新，默认为false -logging: - level: - com.skyeye: debug - -feign: - client: - config: - # 全局配置 - default: - loggerLevel: FULL - diff --git a/skyeye-light-app/light-app-web/src/main/resources/log4j.properties b/skyeye-light-app/light-app-web/src/main/resources/log4j.properties deleted file mode 100644 index c6470a3a..00000000 --- a/skyeye-light-app/light-app-web/src/main/resources/log4j.properties +++ /dev/null @@ -1,55 +0,0 @@ -### set log levels这里的INFO,Stdout,D,E可以理解为变量，也可以说是输出平台，在下面我们可以看到 ### -log4j.rootLogger = INFO, C, D, E - -### console控制台输出 ### -log4j.appender.C = org.apache.log4j.ConsoleAppender -### System.out也就是输出 out输出是黑色字体，err输出的字体是红色 ### -log4j.appender.C.Target = System.out -### layout是指布局，也就是说输出日志信息的格式样式，在这里我们使用的是log4j提供的 ### -log4j.appender.C.layout = org.apache.log4j.PatternLayout -### 这里就是指定我们日志文件以哪一种格式去输出 ### -log4j.appender.C.layout.ConversionPattern = [skyeye-promote][%p] [%-d{yyyy-MM-dd HH:mm:ss}] %C.%M(%L) | %m%n - - -### log file INFO级别输出日志文件 ### -log4j.appender.D = org.apache.log4j.DailyRollingFileAppender -### 指定日志输出位置 ### -log4j.appender.D.File = ../logs/skyeye.log -### 这个的意思是指是追加还是覆盖 默认是 true true是追加 false是覆盖 ### -log4j.appender.D.Append = true -### 这个是指日志输出的级别在这里指定的是 INFO级别 ### -log4j.appender.D.Threshold = INFO -### layout是指布局，也就是说输出日志信息的格式样式，在这里我们使用的是log4j提供的 ### -log4j.appender.D.layout = org.apache.log4j.PatternLayout -### 这里就是指定我们日志文件以哪一种格式去输出 ### -log4j.appender.D.layout.ConversionPattern = [skyeye-promote][%p] [%-d{yyyy-MM-dd HH:mm:ss}] %C.%M(%L) | %m%n - - -### exception ERROR级别输出日志文件 ### -#这个跟上面一样 只不过是日志级别是 ERROR级的，方便我们直接查看系统异常信息 -log4j.appender.E = org.apache.log4j.DailyRollingFileAppender -log4j.appender.E.File = ../logs/skyeye_error.log -log4j.appender.E.Append = true -log4j.appender.E.Threshold = ERROR -log4j.appender.E.layout = org.apache.log4j.PatternLayout -log4j.appender.E.layout.ConversionPattern = [skyeye-promote][%p] [%-d{yyyy-MM-dd HH:mm:ss}] %C.%M(%L) | %m%n - -#localhost日志文件输出级别为INFO -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO -#localhost日志文件输出处理类2localhost.org.apache.juli.FileHandler -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler - -#manager日志文件输出级别为INFO -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO -#manager日志文件输出处理类3manager.org.apache.juli.FileHandler -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.FileHandler - -#host-manager日志文件输出级别为INFO -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO -#host-manager日志文件输出处理类4host-manager.org.apache.juli.FileHandler -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.FileHandler - -#设置包名的输出级别 -log4j.logger.com.skyeye.common.filter=info - - diff --git a/skyeye-light-app/pom.xml b/skyeye-light-app/pom.xml deleted file mode 100644 index 2267388a..00000000 --- a/skyeye-light-app/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - - - com.skyeye - skyeye-parent - 1.0-SNAPSHOT - - - com.skyeye - skyeye-light-app - 1-SNAPSHOT - pom - - - light-app-common - light-app-entity - light-app-pro - light-app-web - - - \ No newline at end of file