修改部署相关代码

 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



 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;

 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;

 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;

 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;


/**
 * æœåŠ¡ç±»
 *

 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"]


 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>


 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));

 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;


 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;


 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;


 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;

 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;


 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;

 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;


 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;


 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;


 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;


 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;


 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;

 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;

 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;


 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;

/**
 * æŽ§åˆ¶å™¨

 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;

 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;

 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.

 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'}]