From b0dc3b48be862f09da13a212d8a731d546b7dfc2 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 31 三月 2023 16:31:16 +0800 Subject: [PATCH] 修改部署相关代码 --- Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/ParamController.java | 4 Source/data/applogs/xxl-job/xxl-job-admin.log | 3 + Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DeptController.java | 10 +- Source/UBCS/ubcs-service/ubcs-desk/src/main/java/com/vci/ubcs/desk/controller/LeaveController.java | 4 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantPackageController.java | 4 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/ILogApiService.java | 1 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DictController.java | 8 +- Source/UBCS/ubcs-ops/ubcs-resource/Dockerfile | 6 +- Source/UBCS/ubcs-service/pom.xml | 2 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/ApiScopeController.java | 4 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java | 2 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/DictBizOmdController.java | 6 +- Source/UBCS/ubcs-ops/ubcs-develop/src/main/java/com/vci/ubcs/develop/controller/DatasourceController.java | 2 Source/UBCS/ubcs-ops/ubcs-develop/src/main/java/com/vci/ubcs/develop/controller/CodeController.java | 8 +- Source/UBCS/ubcs-service/ubcs-desk/src/main/java/com/vci/ubcs/desk/controller/NoticeController.java | 10 +- Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/RoleController.java | 8 +- Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/RegionController.java | 4 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DataScopeController.java | 6 +- Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java | 12 ++-- Source/UBCS/service-start.sh | 6 +- Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantController.java | 12 ++-- Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TopMenuController.java | 6 +- Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DictBizController.java | 6 +- Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/PostController.java | 6 +- Source/data/applogs/xxl-job/xxl-job-executor-sample-springboot.log | 7 ++ Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/feign/LogClient.java | 1 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/AuthClientController.java | 2 27 files changed, 81 insertions(+), 69 deletions(-) diff --git a/Source/UBCS/service-start.sh b/Source/UBCS/service-start.sh index fff5123..c1ac1c3 100644 --- a/Source/UBCS/service-start.sh +++ b/Source/UBCS/service-start.sh @@ -43,7 +43,7 @@ #鍚姩Resource鏈嶅姟 docker build -f ./ubcs-ops/ubcs-resource/Dockerfile -t vci-ubcs/ubcs-resource . - docker run -d -p 36007:36007 --name ubcs-rresource vci-ubcs/ubcs-resource:latest + docker run -d -p 36007:36007 --name ubcs-resource vci-ubcs/ubcs-resource:latest #鍚姩swagger鏈嶅姟 docker build -f ./ubcs-ops/ubcs-swagger/Dockerfile -t vci-ubcs/ubcs-swagger . @@ -62,11 +62,11 @@ docker run -d -p 37000:37000 --name ubcs-gateway vci-ubcs/ubcs-gateway:latest #鍚姩omdy鏈嶅姟 - docker build -f ./ubcs-omd/Dockerfile -t vci-ubcs/ubcs-omd . + docker build -f ./ubcs-service/ubcs-omd/Dockerfile -t vci-ubcs/ubcs-omd . docker run -d -p 36015:36015 --name ubcs-omd vci-ubcs/ubcs-omd:latest #鍚姩code鏈嶅姟 - docker build -f ./ubcs-code/Dockerfile -t vci-ubcs/ubcs-code . + docker build -f ./ubcs-service/ubcs-code/Dockerfile -t vci-ubcs/ubcs-code . docker run -d -p 36013:36013 --name ubcs-code vci-ubcs/ubcs-code:latest diff --git a/Source/UBCS/ubcs-ops/ubcs-develop/src/main/java/com/vci/ubcs/develop/controller/CodeController.java b/Source/UBCS/ubcs-ops/ubcs-develop/src/main/java/com/vci/ubcs/develop/controller/CodeController.java index 996aed9..47a35d8 100644 --- a/Source/UBCS/ubcs-ops/ubcs-develop/src/main/java/com/vci/ubcs/develop/controller/CodeController.java +++ b/Source/UBCS/ubcs-ops/ubcs-develop/src/main/java/com/vci/ubcs/develop/controller/CodeController.java @@ -22,6 +22,10 @@ import com.vci.ubcs.develop.entity.Datasource; import com.vci.ubcs.develop.entity.Model; import com.vci.ubcs.develop.entity.ModelPrototype; +import com.vci.ubcs.develop.service.ICodeService; +import com.vci.ubcs.develop.service.IDatasourceService; +import com.vci.ubcs.develop.service.IModelPrototypeService; +import com.vci.ubcs.develop.service.IModelService; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; @@ -32,10 +36,6 @@ import org.springblade.core.tool.jackson.JsonUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.StringUtil; -import com.vci.ubcs.develop.service.ICodeService; -import com.vci.ubcs.develop.service.IDatasourceService; -import com.vci.ubcs.develop.service.IModelPrototypeService; -import com.vci.ubcs.develop.service.IModelService; import org.springblade.develop.support.BladeCodeGenerator; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; diff --git a/Source/UBCS/ubcs-ops/ubcs-develop/src/main/java/com/vci/ubcs/develop/controller/DatasourceController.java b/Source/UBCS/ubcs-ops/ubcs-develop/src/main/java/com/vci/ubcs/develop/controller/DatasourceController.java index 55986ea..8d13c53 100644 --- a/Source/UBCS/ubcs-ops/ubcs-develop/src/main/java/com/vci/ubcs/develop/controller/DatasourceController.java +++ b/Source/UBCS/ubcs-ops/ubcs-develop/src/main/java/com/vci/ubcs/develop/controller/DatasourceController.java @@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.vci.ubcs.develop.entity.Datasource; +import com.vci.ubcs.develop.service.IDatasourceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -29,7 +30,6 @@ import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import com.vci.ubcs.develop.service.IDatasourceService; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/feign/LogClient.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/feign/LogClient.java index 399c48a..b4e0257 100644 --- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/feign/LogClient.java +++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/feign/LogClient.java @@ -16,6 +16,7 @@ */ package com.vci.ubcs.core.log.feign; + import com.vci.ubcs.core.log.model.LogApi; import com.vci.ubcs.core.log.model.LogError; import com.vci.ubcs.core.log.model.LogUsual; diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/ILogApiService.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/ILogApiService.java index fa70369..bc4f664 100644 --- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/ILogApiService.java +++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/ILogApiService.java @@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.vci.ubcs.core.log.model.LogApi; + /** * 鏈嶅姟绫� * diff --git a/Source/UBCS/ubcs-ops/ubcs-resource/Dockerfile b/Source/UBCS/ubcs-ops/ubcs-resource/Dockerfile index 208a1a4..df0ad9d 100644 --- a/Source/UBCS/ubcs-ops/ubcs-resource/Dockerfile +++ b/Source/UBCS/ubcs-ops/ubcs-resource/Dockerfile @@ -2,13 +2,13 @@ MAINTAINER bladejava@qq.com -RUN mkdir -p /ubcs/Resource +RUN mkdir -p /ubcs/resource -WORKDIR /ubcs/Resource +WORKDIR /ubcs/resource EXPOSE 36007 -ADD ./target/ubcs-Resource.jar ./app.jar +ADD ./target/ubcs-resource.jar ./app.jar ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"] diff --git a/Source/UBCS/ubcs-service/pom.xml b/Source/UBCS/ubcs-service/pom.xml index ab4402f..15ae54a 100644 --- a/Source/UBCS/ubcs-service/pom.xml +++ b/Source/UBCS/ubcs-service/pom.xml @@ -21,7 +21,7 @@ <module>ubcs-desk</module> <module>ubcs-system</module> <module>ubcs-user</module> -<!-- <module>ubcs-code</module>--> + <module>ubcs-code</module> <module>ubcs-omd</module> </modules> diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java index e12b48c..ce05b52 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java @@ -151,7 +151,7 @@ if(!conditionMap.containsKey("pkCodeRule") || StringUtils.isBlank(conditionMap.get("pkCodeRule"))){ return new DataGrid<>(); } - List<CodeBasicSecDO> doList = codeBasicSecMapper.selectByCondition(conditionMap, pageHelper); + List<CodeBasicSecDO> doList = codeBasicSecMapper.(conditionMap, pageHelper); DataGrid<CodeBasicSecVO> dataGrid = new DataGrid<CodeBasicSecVO>(); if (!CollectionUtils.isEmpty(doList)) { dataGrid.setData(codeBasicSecDO2VOs(doList)); diff --git a/Source/UBCS/ubcs-service/ubcs-desk/src/main/java/com/vci/ubcs/desk/controller/LeaveController.java b/Source/UBCS/ubcs-service/ubcs-desk/src/main/java/com/vci/ubcs/desk/controller/LeaveController.java index 6554dd5..512c675 100644 --- a/Source/UBCS/ubcs-service/ubcs-desk/src/main/java/com/vci/ubcs/desk/controller/LeaveController.java +++ b/Source/UBCS/ubcs-service/ubcs-desk/src/main/java/com/vci/ubcs/desk/controller/LeaveController.java @@ -16,14 +16,14 @@ */ package com.vci.ubcs.desk.controller; +import com.vci.ubcs.common.cache.CacheNames; import com.vci.ubcs.desk.entity.ProcessLeave; +import com.vci.ubcs.desk.service.ILeaveService; import com.vci.ubcs.system.user.cache.UserCache; import lombok.AllArgsConstructor; -import com.vci.ubcs.common.cache.CacheNames; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; -import com.vci.ubcs.desk.service.ILeaveService; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; diff --git a/Source/UBCS/ubcs-service/ubcs-desk/src/main/java/com/vci/ubcs/desk/controller/NoticeController.java b/Source/UBCS/ubcs-service/ubcs-desk/src/main/java/com/vci/ubcs/desk/controller/NoticeController.java index afb0f1c..eb41c3f 100644 --- a/Source/UBCS/ubcs-service/ubcs-desk/src/main/java/com/vci/ubcs/desk/controller/NoticeController.java +++ b/Source/UBCS/ubcs-service/ubcs-desk/src/main/java/com/vci/ubcs/desk/controller/NoticeController.java @@ -18,6 +18,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.vci.ubcs.desk.entity.Notice; +import com.vci.ubcs.desk.feign.INoticeClient; +import com.vci.ubcs.desk.service.INoticeService; +import com.vci.ubcs.desk.vo.NoticeVO; +import com.vci.ubcs.desk.wrapper.NoticeWrapper; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; @@ -27,11 +32,6 @@ import org.springblade.core.tenant.annotation.TenantDS; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import com.vci.ubcs.desk.entity.Notice; -import com.vci.ubcs.desk.feign.INoticeClient; -import com.vci.ubcs.desk.service.INoticeService; -import com.vci.ubcs.desk.vo.NoticeVO; -import com.vci.ubcs.desk.wrapper.NoticeWrapper; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/DictBizOmdController.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/DictBizOmdController.java index 8bc9646..228126b 100644 --- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/DictBizOmdController.java +++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/DictBizOmdController.java @@ -18,6 +18,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.vci.ubcs.omd.entity.DictBizM; +import com.vci.ubcs.omd.service.IDictBizService; +import com.vci.ubcs.omd.vo.DictBizMVO; import com.vci.ubcs.omd.wrapper.DictBizWrapper; import io.swagger.annotations.*; import lombok.AllArgsConstructor; @@ -27,9 +30,6 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; -import com.vci.ubcs.omd.entity.DictBizM; -import com.vci.ubcs.omd.service.IDictBizService; -import com.vci.ubcs.omd.vo.DictBizMVO; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/ApiScopeController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/ApiScopeController.java index 46105aa..2add6a0 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/ApiScopeController.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/ApiScopeController.java @@ -18,7 +18,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.vci.ubcs.system.entity.ApiScope; import com.vci.ubcs.system.service.IApiScopeService; +import com.vci.ubcs.system.vo.ApiScopeVO; import com.vci.ubcs.system.wrapper.ApiScopeWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -31,8 +33,6 @@ import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import com.vci.ubcs.system.entity.ApiScope; -import com.vci.ubcs.system.vo.ApiScopeVO; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/AuthClientController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/AuthClientController.java index dae2717..a452de4 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/AuthClientController.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/AuthClientController.java @@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.vci.ubcs.system.entity.AuthClient; import com.vci.ubcs.system.service.IAuthClientService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -29,7 +30,6 @@ import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import com.vci.ubcs.system.entity.AuthClient; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DataScopeController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DataScopeController.java index ec53524..ac9a9ff 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DataScopeController.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DataScopeController.java @@ -18,21 +18,21 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.vci.ubcs.system.entity.DataScope; import com.vci.ubcs.system.service.IDataScopeService; +import com.vci.ubcs.system.vo.DataScopeVO; import com.vci.ubcs.system.wrapper.DataScopeWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; -import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.cache.utils.CacheUtil; +import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import com.vci.ubcs.system.entity.DataScope; -import com.vci.ubcs.system.vo.DataScopeVO; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DeptController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DeptController.java index baeec08..3c098e0 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DeptController.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DeptController.java @@ -19,14 +19,18 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.vci.ubcs.system.cache.DictCache; +import com.vci.ubcs.system.entity.Dept; +import com.vci.ubcs.system.enums.DictEnum; import com.vci.ubcs.system.service.IDeptService; import com.vci.ubcs.system.user.cache.UserCache; import com.vci.ubcs.system.user.entity.User; +import com.vci.ubcs.system.vo.DeptVO; import com.vci.ubcs.system.wrapper.DeptWrapper; import io.swagger.annotations.*; import lombok.AllArgsConstructor; -import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.cache.utils.CacheUtil; +import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; import org.springblade.core.secure.BladeUser; import org.springblade.core.tenant.annotation.NonDS; @@ -34,10 +38,6 @@ import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.support.Kv; import org.springblade.core.tool.utils.Func; -import com.vci.ubcs.system.cache.DictCache; -import com.vci.ubcs.system.entity.Dept; -import com.vci.ubcs.system.enums.DictEnum; -import com.vci.ubcs.system.vo.DeptVO; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DictBizController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DictBizController.java index 66615d9..86efba4 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DictBizController.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DictBizController.java @@ -18,18 +18,18 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.vci.ubcs.system.entity.DictBiz; import com.vci.ubcs.system.service.IDictBizService; +import com.vci.ubcs.system.vo.DictBizVO; import com.vci.ubcs.system.wrapper.DictBizWrapper; import io.swagger.annotations.*; import lombok.AllArgsConstructor; -import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.cache.utils.CacheUtil; +import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; -import com.vci.ubcs.system.entity.DictBiz; -import com.vci.ubcs.system.vo.DictBizVO; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DictController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DictController.java index 60e6a01..891277d 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DictController.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/DictController.java @@ -19,20 +19,20 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.vci.ubcs.common.constant.CommonConstant; +import com.vci.ubcs.system.entity.Dict; import com.vci.ubcs.system.service.IDictService; +import com.vci.ubcs.system.vo.DictVO; import com.vci.ubcs.system.wrapper.DictWrapper; import io.swagger.annotations.*; import lombok.AllArgsConstructor; -import com.vci.ubcs.common.constant.CommonConstant; -import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.cache.utils.CacheUtil; +import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.StringPool; -import com.vci.ubcs.system.entity.Dict; -import com.vci.ubcs.system.vo.DictVO; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java index 8d49df5..f597a76 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java @@ -18,13 +18,18 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.vci.ubcs.system.entity.Menu; +import com.vci.ubcs.system.entity.TopMenu; import com.vci.ubcs.system.service.IMenuService; import com.vci.ubcs.system.service.ITopMenuService; +import com.vci.ubcs.system.vo.CheckedTreeVO; +import com.vci.ubcs.system.vo.GrantTreeVO; +import com.vci.ubcs.system.vo.MenuVO; import com.vci.ubcs.system.wrapper.MenuWrapper; import io.swagger.annotations.*; import lombok.AllArgsConstructor; -import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.cache.utils.CacheUtil; +import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; import org.springblade.core.secure.BladeUser; import org.springblade.core.tenant.annotation.NonDS; @@ -32,11 +37,6 @@ import org.springblade.core.tool.node.TreeNode; import org.springblade.core.tool.support.Kv; import org.springblade.core.tool.utils.Func; -import com.vci.ubcs.system.entity.Menu; -import com.vci.ubcs.system.entity.TopMenu; -import com.vci.ubcs.system.vo.CheckedTreeVO; -import com.vci.ubcs.system.vo.GrantTreeVO; -import com.vci.ubcs.system.vo.MenuVO; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/ParamController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/ParamController.java index 7127d81..db36371 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/ParamController.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/ParamController.java @@ -18,17 +18,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.vci.ubcs.system.entity.Param; import com.vci.ubcs.system.service.IParamService; import io.swagger.annotations.*; import lombok.AllArgsConstructor; -import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.cache.utils.CacheUtil; +import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import com.vci.ubcs.system.entity.Param; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/PostController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/PostController.java index 7e79da8..5366108 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/PostController.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/PostController.java @@ -19,22 +19,22 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.vci.ubcs.system.entity.Post; import com.vci.ubcs.system.service.IPostService; +import com.vci.ubcs.system.vo.PostVO; import com.vci.ubcs.system.wrapper.PostWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; -import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.cache.utils.CacheUtil; +import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import com.vci.ubcs.system.entity.Post; -import com.vci.ubcs.system.vo.PostVO; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/RegionController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/RegionController.java index 787a19c..80044f3 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/RegionController.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/RegionController.java @@ -20,9 +20,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.vci.ubcs.system.entity.Region; import com.vci.ubcs.system.excel.RegionExcel; import com.vci.ubcs.system.excel.RegionImporter; import com.vci.ubcs.system.service.IRegionService; +import com.vci.ubcs.system.vo.RegionVO; import com.vci.ubcs.system.wrapper.RegionWrapper; import io.swagger.annotations.*; import lombok.AllArgsConstructor; @@ -33,8 +35,6 @@ import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; -import com.vci.ubcs.system.entity.Region; -import com.vci.ubcs.system.vo.RegionVO; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import springfox.documentation.annotations.ApiIgnore; diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/RoleController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/RoleController.java index d4bb4a0..cbfa0d6 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/RoleController.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/RoleController.java @@ -19,9 +19,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.vci.ubcs.system.cache.SysCache; +import com.vci.ubcs.system.entity.Role; import com.vci.ubcs.system.service.IRoleService; import com.vci.ubcs.system.user.cache.UserCache; import com.vci.ubcs.system.user.entity.User; +import com.vci.ubcs.system.vo.GrantVO; +import com.vci.ubcs.system.vo.RoleVO; import com.vci.ubcs.system.wrapper.RoleWrapper; import io.swagger.annotations.*; import lombok.AllArgsConstructor; @@ -33,10 +37,6 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.Func; -import com.vci.ubcs.system.cache.SysCache; -import com.vci.ubcs.system.entity.Role; -import com.vci.ubcs.system.vo.GrantVO; -import com.vci.ubcs.system.vo.RoleVO; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantController.java index a2e5bcd..831bbd2 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantController.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantController.java @@ -20,12 +20,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.vci.ubcs.system.entity.Tenant; +import com.vci.ubcs.system.entity.TenantPackage; import com.vci.ubcs.system.service.ITenantPackageService; import com.vci.ubcs.system.service.ITenantService; +import com.vci.ubcs.system.vo.TenantVO; import io.swagger.annotations.*; import lombok.AllArgsConstructor; -import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.cache.utils.CacheUtil; +import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; @@ -34,9 +37,6 @@ import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.support.Kv; import org.springblade.core.tool.utils.Func; -import com.vci.ubcs.system.entity.Tenant; -import com.vci.ubcs.system.entity.TenantPackage; -import com.vci.ubcs.system.vo.TenantVO; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; @@ -44,11 +44,11 @@ import java.util.List; import java.util.Map; +import static com.vci.ubcs.system.cache.SysCache.TENANT_PACKAGE_ID; +import static com.vci.ubcs.system.cache.SysCache.TENANT_TENANT_ID; import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE; import static org.springblade.core.tenant.constant.TenantBaseConstant.TENANT_DATASOURCE_CACHE; import static org.springblade.core.tenant.constant.TenantBaseConstant.TENANT_DATASOURCE_EXIST_KEY; -import static com.vci.ubcs.system.cache.SysCache.TENANT_PACKAGE_ID; -import static com.vci.ubcs.system.cache.SysCache.TENANT_TENANT_ID; /** * 鎺у埗鍣� diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantPackageController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantPackageController.java index a323994..4a86f44 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantPackageController.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantPackageController.java @@ -18,18 +18,18 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.vci.ubcs.system.entity.TenantPackage; import com.vci.ubcs.system.service.ITenantPackageService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; -import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.cache.utils.CacheUtil; +import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import com.vci.ubcs.system.entity.TenantPackage; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TopMenuController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TopMenuController.java index 4321169..281c182 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TopMenuController.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TopMenuController.java @@ -18,20 +18,20 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.vci.ubcs.system.entity.TopMenu; import com.vci.ubcs.system.service.ITopMenuService; +import com.vci.ubcs.system.vo.GrantVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; -import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.cache.utils.CacheUtil; +import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import com.vci.ubcs.system.entity.TopMenu; -import com.vci.ubcs.system.vo.GrantVO; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; diff --git a/Source/data/applogs/xxl-job/xxl-job-admin.log b/Source/data/applogs/xxl-job/xxl-job-admin.log new file mode 100644 index 0000000..f10288e --- /dev/null +++ b/Source/data/applogs/xxl-job/xxl-job-admin.log @@ -0,0 +1,3 @@ +2023-03-31 16:24:00,837 INFO [background-preinit] o.h.validator.internal.util.Version [Version.java : 21] HV000001: Hibernate Validator 6.2.3.Final +2023-03-31 16:24:01,577 INFO [main] c.a.n.p.a.s.c.ClientAuthPluginManager [ClientAuthPluginManager.java : 56] [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.impl.NacosClientAuthServiceImpl success. +2023-03-31 16:24:01,578 INFO [main] c.a.n.p.a.s.c.ClientAuthPluginManager [ClientAuthPluginManager.java : 56] [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.ram.RamClientAuthServiceImpl success. diff --git a/Source/data/applogs/xxl-job/xxl-job-executor-sample-springboot.log b/Source/data/applogs/xxl-job/xxl-job-executor-sample-springboot.log new file mode 100644 index 0000000..64f961e --- /dev/null +++ b/Source/data/applogs/xxl-job/xxl-job-executor-sample-springboot.log @@ -0,0 +1,7 @@ +2023-03-31 16:24:08,389 INFO [background-preinit] o.h.validator.internal.util.Version [Version.java : 21] HV000001: Hibernate Validator 6.2.3.Final +2023-03-31 16:24:09,203 INFO [main] c.a.n.p.a.s.c.ClientAuthPluginManager [ClientAuthPluginManager.java : 56] [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.impl.NacosClientAuthServiceImpl success. +2023-03-31 16:24:09,204 INFO [main] c.a.n.p.a.s.c.ClientAuthPluginManager [ClientAuthPluginManager.java : 56] [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.ram.RamClientAuthServiceImpl success. +2023-03-31 16:24:14,279 WARN [main] c.a.c.n.c.NacosPropertySourceBuilder [NacosPropertySourceBuilder.java : 87] Ignore the empty nacos configuration and get it based on dataId[ubcs-xxljob] & group[DEFAULT_GROUP] +2023-03-31 16:24:14,288 WARN [main] c.a.c.n.c.NacosPropertySourceBuilder [NacosPropertySourceBuilder.java : 87] Ignore the empty nacos configuration and get it based on dataId[ubcs-xxljob.yaml] & group[DEFAULT_GROUP] +2023-03-31 16:24:14,304 WARN [main] c.a.c.n.c.NacosPropertySourceBuilder [NacosPropertySourceBuilder.java : 87] Ignore the empty nacos configuration and get it based on dataId[ubcs-xxljob-dev.yaml] & group[DEFAULT_GROUP] +2023-03-31 16:24:14,305 INFO [main] o.s.c.b.c.PropertySourceBootstrapConfiguration [PropertySourceBootstrapConfiguration.java : 109] Located property source: [BootstrapPropertySource {name='bootstrapProperties-ubcs-xxljob-dev.yaml,DEFAULT_GROUP'}, BootstrapPropertySource {name='bootstrapProperties-ubcs-xxljob.yaml,DEFAULT_GROUP'}, BootstrapPropertySource {name='bootstrapProperties-ubcs-xxljob,DEFAULT_GROUP'}, BootstrapPropertySource {name='bootstrapProperties-ubcs-dev.yaml,DEFAULT_GROUP'}, BootstrapPropertySource {name='bootstrapProperties-ubcs.yaml,DEFAULT_GROUP'}] -- Gitblit v1.9.3