提交code服务代码

 Source/BladeX/blade-auth/src/main/java/org/springblade/auth/constant/AuthConstant.java

@@ -31,7 +31,7 @@
    /**
     * pl_sys_client表字段
     */
    String CLIENT_FIELDS = "client_id, CONCAT('{noop}',client_secret) as client_secret, resource_ids, scope, authorized_grant_types, " +
    String CLIENT_FIELDS = "client_id, CONCAT('{noop}',client_secret) as client_secret, Autowired_ids, scope, authorized_grant_types, " +
        "web_server_redirect_uri, authorities, access_token_validity, " +
        "refresh_token_validity, additional_information, autoapprove";


 Source/BladeX/blade-auth/src/main/resources/application.yml

@@ -31,7 +31,7 @@
    template-loader-path: classpath:/templates/
  web:
    # èµ„源路径
    resources:
    Autowireds:
      static-locations: classpath:/static/

#swagger文档

 Source/BladeX/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java

@@ -36,7 +36,7 @@
    /**
     * CODE æ–°æ·»åŠ çš„CODE服务名
     */
    String CODE_NAME = "CODE";
    String CODE_NAME = "code";

    /**
     * é¡¶çº§çˆ¶èŠ‚点id

 Source/BladeX/blade-common/src/main/java/org/springblade/common/constant/TenantConstant.java

@@ -60,7 +60,7 @@
     * ç§Ÿæˆ·é»˜è®¤èœå•é›†åˆ
     */
    List<String> MENU_CODES = Arrays.asList(
        "desk", "flow", "work", "monitor", "resource", "role", "user", "dept", "dictbiz", "topmenu"
        "desk", "flow", "work", "monitor", "Autowired", "role", "user", "dept", "dictbiz", "topmenu"
    );

}

 Source/BladeX/blade-gateway/src/main/java/org/springblade/gateway/provider/AuthProvider.java

@@ -50,7 +50,7 @@
        DEFAULT_SKIP_URL.add("/menu/auth-routes");
        DEFAULT_SKIP_URL.add("/menu/top-menu");
        DEFAULT_SKIP_URL.add("/tenant/info");
        DEFAULT_SKIP_URL.add("/process/resource-view");
        DEFAULT_SKIP_URL.add("/process/Autowired-view");
        DEFAULT_SKIP_URL.add("/process/diagram-view");
        DEFAULT_SKIP_URL.add("/manager/check-upload");
        DEFAULT_SKIP_URL.add("/error/**");

 Source/BladeX/blade-ops-api/blade-resource-api/pom.xml

@@ -9,7 +9,7 @@
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>blade-resource-api</artifactId>
    <artifactId>blade-Autowired-api</artifactId>
    <name>${project.artifactId}</name>
    <version>${bladex.project.version}</version>
    <packaging>jar</packaging>

 Source/BladeX/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/entity/Attach.java

@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.entity;
package org.springblade.Autowired.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;

 Source/BladeX/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/entity/Oss.java

@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.entity;
package org.springblade.Autowired.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;

 Source/BladeX/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/entity/Sms.java

@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.entity;
package org.springblade.Autowired.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;

 Source/BladeX/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/enums/SmsCodeEnum.java

@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.enums;
package org.springblade.Autowired.enums;

import lombok.AllArgsConstructor;
import lombok.Getter;

 Source/BladeX/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/utils/SmsUtil.java

@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.utils;
package org.springblade.Autowired.utils;

import org.springblade.core.sms.model.SmsCode;
import org.springblade.core.sms.model.SmsResponse;

 Source/BladeX/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/vo/AttachVO.java

@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.vo;
package org.springblade.Autowired.vo;

import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.resource.entity.Attach;
import org.springblade.Autowired.entity.Attach;

/**
 * é™„件表视图实体类

 Source/BladeX/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/vo/OssVO.java

@@ -1,9 +1,9 @@
package org.springblade.resource.vo;
package org.springblade.Autowired.vo;

import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.resource.entity.Oss;
import org.springblade.Autowired.entity.Oss;

/**
 * OssVO

 Source/BladeX/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/vo/SmsVO.java

@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.vo;
package org.springblade.Autowired.vo;

import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.resource.entity.Sms;
import org.springblade.Autowired.entity.Sms;

/**
 * çŸ­ä¿¡é…ç½®è¡¨è§†å›¾å®žä½“ç±»

 Source/BladeX/blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/controller/FlowProcessController.java

@@ -84,12 +84,12 @@
     *
     * @param processDefinitionId æµç¨‹id
     * @param processInstanceId   å®žä¾‹id
     * @param resourceType        èµ„源类型
     * @param AutowiredType        èµ„源类型
     * @param response            å“åº”
     */
    @GetMapping("resource-view")
    public void resourceView(@RequestParam String processDefinitionId, String processInstanceId, @RequestParam(defaultValue = IMAGE_NAME) String resourceType, HttpServletResponse response) {
        flowEngineService.resourceView(processDefinitionId, processInstanceId, resourceType, response);
    @GetMapping("Autowired-view")
    public void AutowiredView(@RequestParam String processDefinitionId, String processInstanceId, @RequestParam(defaultValue = IMAGE_NAME) String AutowiredType, HttpServletResponse response) {
        flowEngineService.AutowiredView(processDefinitionId, processInstanceId, AutowiredType, response);
    }



 Source/BladeX/blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/entity/FlowProcess.java

@@ -41,7 +41,7 @@
    private String categoryName;
    private Integer version;
    private String deploymentId;
    private String resourceName;
    private String ResourceName;
    private String diagramResourceName;
    private Integer suspensionState;
    private Date deploymentTime;
@@ -56,7 +56,7 @@
            this.categoryName = FlowCache.getCategoryName(entity.getCategory());
            this.version = entity.getVersion();
            this.deploymentId = entity.getDeploymentId();
            this.resourceName = entity.getResourceName();
            this.ResourceName = entity.getResourceName();
            this.diagramResourceName = entity.getDiagramResourceName();
            this.suspensionState = entity.getSuspensionState();
        }

 Source/BladeX/blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/service/FlowEngineService.java

@@ -151,10 +151,10 @@
     *
     * @param processDefinitionId
     * @param processInstanceId
     * @param resourceType
     * @param AutowiredType
     * @param response
     */
    void resourceView(String processDefinitionId, String processInstanceId, String resourceType, HttpServletResponse response);
    void AutowiredView(String processDefinitionId, String processInstanceId, String AutowiredType, HttpServletResponse response);

    /**
     * èŽ·å–XML

 Source/BladeX/blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/service/impl/FlowEngineServiceImpl.java

@@ -434,7 +434,7 @@
    }

    @Override
    public void resourceView(String processDefinitionId, String processInstanceId, String resourceType, HttpServletResponse response) {
    public void AutowiredView(String processDefinitionId, String processInstanceId, String AutowiredType, HttpServletResponse response) {
        if (StringUtil.isAllBlank(processDefinitionId, processInstanceId)) {
            return;
        }
@@ -443,17 +443,17 @@
            processDefinitionId = processInstance.getProcessDefinitionId();
        }
        ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(processDefinitionId).singleResult();
        String resourceName = "";
        if (resourceType.equals(IMAGE_NAME)) {
            resourceName = processDefinition.getDiagramResourceName();
        } else if (resourceType.equals(XML_NAME)) {
            resourceName = processDefinition.getResourceName();
        String AutowiredName = "";
        if (AutowiredType.equals(IMAGE_NAME)) {
            AutowiredName = processDefinition.getDiagramResourceName();
        } else if (AutowiredType.equals(XML_NAME)) {
            AutowiredName = processDefinition.getResourceName();
        }
        try {
            InputStream resourceAsStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(), resourceName);
            InputStream AutowiredAsStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(), AutowiredName);
            byte[] b = new byte[1024];
            int len;
            while ((len = resourceAsStream.read(b, 0, INT_1024)) != -1) {
            while ((len = AutowiredAsStream.read(b, 0, INT_1024)) != -1) {
                response.getOutputStream().write(b, 0, len);
            }
        } catch (Exception exception) {

 Source/BladeX/blade-ops/blade-resource/Dockerfile

@@ -2,13 +2,13 @@

MAINTAINER bladejava@qq.com

RUN mkdir -p /blade/resource
RUN mkdir -p /blade/Autowired

WORKDIR /blade/resource
WORKDIR /blade/Autowired

EXPOSE 36007

ADD ./target/blade-resource.jar ./app.jar
ADD ./target/blade-Autowired.jar ./app.jar

ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]


 Source/BladeX/blade-ops/blade-resource/pom.xml

@@ -9,7 +9,7 @@
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>blade-resource</artifactId>
    <artifactId>blade-Autowired</artifactId>
    <name>${project.artifactId}</name>
    <version>${bladex.project.version}</version>
    <packaging>jar</packaging>
@@ -74,7 +74,7 @@
        </dependency>
        <dependency>
            <groupId>org.springblade</groupId>
            <artifactId>blade-resource-api</artifactId>
            <artifactId>blade-Autowired-api</artifactId>
            <version>${bladex.project.version}</version>
        </dependency>
        <dependency>

 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/ResourceApplication.java

@@ -14,10 +14,9 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource;
package org.springblade.Autowired;

import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.cloud.feign.EnableBladeFeign;
import org.springblade.core.launch.BladeApplication;
import org.springblade.core.launch.constant.AppConstant;

@@ -30,7 +29,7 @@
public class ResourceApplication {

    public static void main(String[] args) {
        BladeApplication.run(AppConstant.APPLICATION_RESOURCE_NAME, ResourceApplication.class, args);
        BladeApplication.run(AppConstant.APPLICATION_REPORT_NAME, ResourceApplication.class, args);
    }

}

 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/AliOssBuilder.java

@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.builder.oss;
package org.springblade.Autowired.builder.oss;

import com.aliyun.oss.ClientConfiguration;
import com.aliyun.oss.OSSClient;
@@ -25,7 +25,7 @@
import org.springblade.core.oss.AliossTemplate;
import org.springblade.core.oss.props.OssProperties;
import org.springblade.core.oss.rule.OssRule;
import org.springblade.resource.entity.Oss;
import org.springblade.Autowired.entity.Oss;

/**
 * é˜¿é‡Œäº‘存储构建类

 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/MinioOssBuilder.java

@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.builder.oss;
package org.springblade.Autowired.builder.oss;

import io.minio.MinioClient;
import lombok.SneakyThrows;
@@ -22,7 +22,7 @@
import org.springblade.core.oss.MinioTemplate;
import org.springblade.core.oss.props.OssProperties;
import org.springblade.core.oss.rule.OssRule;
import org.springblade.resource.entity.Oss;
import org.springblade.Autowired.entity.Oss;

/**
 * Minio云存储构建类

 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java

@@ -14,10 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.builder.oss;
package org.springblade.Autowired.builder.oss;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.springblade.Autowired.entity.Oss;
import org.springblade.Autowired.service.IOssService;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.oss.OssTemplate;
@@ -31,8 +33,6 @@
import org.springblade.core.tool.utils.StringPool;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.core.tool.utils.WebUtil;
import org.springblade.resource.entity.Oss;
import org.springblade.resource.service.IOssService;

import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -100,13 +100,13 @@
                        ossRule = new BladeOssRule(Boolean.FALSE);
                    }
                    if (oss.getCategory() == OssEnum.MINIO.getCategory()) {
                        template = MinioOssBuilder.template(oss, ossRule);
                        template = org.springblade.Autowired.builder.oss.MinioOssBuilder.template(oss, ossRule);
                    } else if (oss.getCategory() == OssEnum.QINIU.getCategory()) {
                        template = QiniuOssBuilder.template(oss, ossRule);
                        template = org.springblade.Autowired.builder.oss.QiniuOssBuilder.template(oss, ossRule);
                    } else if (oss.getCategory() == OssEnum.ALI.getCategory()) {
                        template = AliOssBuilder.template(oss, ossRule);
                        template = org.springblade.Autowired.builder.oss.AliOssBuilder.template(oss, ossRule);
                    } else if (oss.getCategory() == OssEnum.TENCENT.getCategory()) {
                        template = TencentOssBuilder.template(oss, ossRule);
                        template = org.springblade.Autowired.builder.oss.TencentOssBuilder.template(oss, ossRule);
                    }
                    templatePool.put(tenantId, template);
                    ossPool.put(tenantId, oss);

 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/QiniuOssBuilder.java

@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.builder.oss;
package org.springblade.Autowired.builder.oss;

import com.qiniu.storage.BucketManager;
import com.qiniu.storage.Configuration;
@@ -26,7 +26,7 @@
import org.springblade.core.oss.QiniuTemplate;
import org.springblade.core.oss.props.OssProperties;
import org.springblade.core.oss.rule.OssRule;
import org.springblade.resource.entity.Oss;
import org.springblade.Autowired.entity.Oss;

/**
 * ä¸ƒç‰›äº‘存储构建类

 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/TencentOssBuilder.java

@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.builder.oss;
package org.springblade.Autowired.builder.oss;

import com.qcloud.cos.COSClient;
import com.qcloud.cos.ClientConfig;
@@ -26,7 +26,7 @@
import org.springblade.core.oss.props.OssProperties;
import org.springblade.core.oss.rule.OssRule;
import org.springblade.core.oss.TencentCosTemplate;
import org.springblade.resource.entity.Oss;
import org.springblade.Autowired.entity.Oss;

/**
 * è…¾è®¯äº‘存储构建类

 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/AliSmsBuilder.java

@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.builder.sms;
package org.springblade.Autowired.builder.sms;

import com.aliyuncs.DefaultAcsClient;
import com.aliyuncs.IAcsClient;
@@ -25,7 +25,7 @@
import org.springblade.core.sms.SmsTemplate;
import org.springblade.core.sms.AliSmsTemplate;
import org.springblade.core.sms.props.SmsProperties;
import org.springblade.resource.entity.Sms;
import org.springblade.Autowired.entity.Sms;

/**
 * é˜¿é‡Œäº‘短信构建类

 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/QiniuSmsBuilder.java

@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.builder.sms;
package org.springblade.Autowired.builder.sms;

import com.qiniu.sms.SmsManager;
import com.qiniu.util.Auth;
@@ -23,7 +23,7 @@
import org.springblade.core.sms.SmsTemplate;
import org.springblade.core.sms.props.SmsProperties;
import org.springblade.core.sms.QiniuSmsTemplate;
import org.springblade.resource.entity.Sms;
import org.springblade.Autowired.entity.Sms;

/**
 * ä¸ƒç‰›äº‘短信构建类

 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/SmsBuilder.java

@@ -14,10 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.builder.sms;
package org.springblade.Autowired.builder.sms;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.springblade.Autowired.entity.Sms;
import org.springblade.Autowired.service.ISmsService;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.redis.cache.BladeRedis;
@@ -30,8 +32,6 @@
import org.springblade.core.tool.utils.StringPool;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.core.tool.utils.WebUtil;
import org.springblade.resource.entity.Sms;
import org.springblade.resource.service.ISmsService;

import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -96,13 +96,13 @@
                template = templatePool.get(tenantId);
                if (Func.hasEmpty(template, smsCached) || !sms.getTemplateId().equals(smsCached.getTemplateId()) || !sms.getAccessKey().equals(smsCached.getAccessKey())) {
                    if (sms.getCategory() == SmsEnum.YUNPIAN.getCategory()) {
                        template = YunpianSmsBuilder.template(sms, bladeRedis);
                        template = org.springblade.Autowired.builder.sms.YunpianSmsBuilder.template(sms, bladeRedis);
                    } else if (sms.getCategory() == SmsEnum.QINIU.getCategory()) {
                        template = QiniuSmsBuilder.template(sms, bladeRedis);
                        template = org.springblade.Autowired.builder.sms.QiniuSmsBuilder.template(sms, bladeRedis);
                    } else if (sms.getCategory() == SmsEnum.ALI.getCategory()) {
                        template = AliSmsBuilder.template(sms, bladeRedis);
                        template = org.springblade.Autowired.builder.sms.AliSmsBuilder.template(sms, bladeRedis);
                    } else if (sms.getCategory() == SmsEnum.TENCENT.getCategory()) {
                        template = TencentSmsBuilder.template(sms, bladeRedis);
                        template = org.springblade.Autowired.builder.sms.TencentSmsBuilder.template(sms, bladeRedis);
                    }
                    templatePool.put(tenantId, template);
                    smsPool.put(tenantId, sms);

 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/TencentSmsBuilder.java

@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.builder.sms;
package org.springblade.Autowired.builder.sms;

import com.github.qcloudsms.SmsMultiSender;
import lombok.SneakyThrows;
@@ -23,7 +23,7 @@
import org.springblade.core.sms.props.SmsProperties;
import org.springblade.core.sms.TencentSmsTemplate;
import org.springblade.core.tool.utils.Func;
import org.springblade.resource.entity.Sms;
import org.springblade.Autowired.entity.Sms;

/**
 * è…¾è®¯äº‘短信构建类

 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/YunpianSmsBuilder.java

@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.builder.sms;
package org.springblade.Autowired.builder.sms;

import com.yunpian.sdk.YunpianClient;
import lombok.SneakyThrows;
@@ -22,7 +22,7 @@
import org.springblade.core.sms.SmsTemplate;
import org.springblade.core.sms.props.SmsProperties;
import org.springblade.core.sms.YunpianSmsTemplate;
import org.springblade.resource.entity.Sms;
import org.springblade.Autowired.entity.Sms;

/**
 * äº‘片短信构建类

 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/config/BladeOssConfiguration.java

@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.config;
package org.springblade.Autowired.config;

import lombok.AllArgsConstructor;
import org.springblade.core.oss.props.OssProperties;
import org.springblade.resource.builder.oss.OssBuilder;
import org.springblade.resource.service.IOssService;
import org.springblade.Autowired.builder.oss.OssBuilder;
import org.springblade.Autowired.service.IOssService;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;


 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/config/BladeSmsConfiguration.java

@@ -14,13 +14,13 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.config;
package org.springblade.Autowired.config;

import lombok.AllArgsConstructor;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.sms.props.SmsProperties;
import org.springblade.resource.builder.sms.SmsBuilder;
import org.springblade.resource.service.ISmsService;
import org.springblade.Autowired.builder.sms.SmsBuilder;
import org.springblade.Autowired.service.ISmsService;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;


 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/AttachController.java

@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.controller;
package org.springblade.Autowired.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -28,9 +28,9 @@
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.resource.entity.Attach;
import org.springblade.resource.service.IAttachService;
import org.springblade.resource.vo.AttachVO;
import org.springblade.Autowired.entity.Attach;
import org.springblade.Autowired.service.IAttachService;
import org.springblade.Autowired.vo.AttachVO;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;

 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/OssController.java

@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.controller;
package org.springblade.Autowired.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -22,19 +22,17 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.Autowired.entity.Oss;
import org.springblade.Autowired.service.IOssService;
import org.springblade.Autowired.vo.OssVO;
import org.springblade.Autowired.wrapper.OssWrapper;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.annotation.PreAuth;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.Func;
import org.springblade.resource.entity.Oss;
import org.springblade.resource.service.IOssService;
import org.springblade.resource.vo.OssVO;
import org.springblade.resource.wrapper.OssWrapper;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;


 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/SmsController.java

@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.controller;
package org.springblade.Autowired.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -31,10 +31,10 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.Func;
import org.springblade.resource.entity.Sms;
import org.springblade.resource.service.ISmsService;
import org.springblade.resource.vo.SmsVO;
import org.springblade.resource.wrapper.SmsWrapper;
import org.springblade.Autowired.entity.Sms;
import org.springblade.Autowired.service.ISmsService;
import org.springblade.Autowired.vo.SmsVO;
import org.springblade.Autowired.wrapper.SmsWrapper;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;


 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/OssEndpoint.java

@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.endpoint;
package org.springblade.Autowired.endpoint;

import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
@@ -27,9 +27,9 @@
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.FileUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.resource.builder.oss.OssBuilder;
import org.springblade.resource.entity.Attach;
import org.springblade.resource.service.IAttachService;
import org.springblade.Autowired.builder.oss.OssBuilder;
import org.springblade.Autowired.entity.Attach;
import org.springblade.Autowired.service.IAttachService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;


 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/SmsEndpoint.java

@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.endpoint;
package org.springblade.Autowired.endpoint;

import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
@@ -26,7 +26,7 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.resource.builder.sms.SmsBuilder;
import org.springblade.Autowired.builder.sms.SmsBuilder;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -35,7 +35,7 @@
import java.util.HashMap;
import java.util.Map;

import static org.springblade.resource.utils.SmsUtil.*;
import static org.springblade.Autowired.utils.SmsUtil.*;

/**
 * çŸ­ä¿¡æœåŠ¡ç«¯ç‚¹

 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/SmsClient.java

@@ -14,9 +14,10 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.feign;
package org.springblade.Autowired.feign;

import lombok.AllArgsConstructor;
import org.springblade.Autowired.builder.sms.SmsBuilder;
import org.springblade.core.sms.model.SmsCode;
import org.springblade.core.sms.model.SmsData;
import org.springblade.core.sms.model.SmsResponse;
@@ -24,13 +25,13 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.resource.builder.sms.SmsBuilder;
import org.springblade.resource.feign.ISmsClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.Map;

import static org.springblade.resource.utils.SmsUtil.*;
import static org.springblade.Autowired.utils.SmsUtil.*;

/**
 * çŸ­ä¿¡è¿œç¨‹è°ƒç”¨æœåŠ¡

 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/mapper/AttachMapper.java

@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.mapper;
package org.springblade.Autowired.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.resource.entity.Attach;
import org.springblade.resource.vo.AttachVO;
import org.springblade.Autowired.entity.Attach;
import org.springblade.Autowired.vo.AttachVO;

import java.util.List;


 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/mapper/AttachMapper.xml

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.resource.mapper.AttachMapper">
<mapper namespace="org.springblade.Autowired.mapper.AttachMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="attachResultMap" type="org.springblade.resource.entity.Attach">
    <resultMap id="attachResultMap" type="org.springblade.Autowired.entity.Attach">
        <result column="id" property="id"/>
        <result column="create_user" property="createUser"/>
        <result column="create_dept" property="createDept"/>

 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/mapper/OssMapper.java

@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.mapper;
package org.springblade.Autowired.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.resource.entity.Oss;
import org.springblade.resource.vo.OssVO;
import org.springblade.Autowired.entity.Oss;
import org.springblade.Autowired.vo.OssVO;

import java.util.List;


 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/mapper/OssMapper.xml

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.resource.mapper.OssMapper">
<mapper namespace="org.springblade.Autowired.mapper.OssMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="ossResultMap" type="org.springblade.resource.entity.Oss">
    <resultMap id="ossResultMap" type="org.springblade.Autowired.entity.Oss">
        <result column="id" property="id"/>
        <result column="create_user" property="createUser"/>
        <result column="create_time" property="createTime"/>

 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/mapper/SmsMapper.java

@@ -14,10 +14,10 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.mapper;
package org.springblade.Autowired.mapper;

import org.springblade.resource.entity.Sms;
import org.springblade.resource.vo.SmsVO;
import org.springblade.Autowired.entity.Sms;
import org.springblade.Autowired.vo.SmsVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;

 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/mapper/SmsMapper.xml

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.resource.mapper.SmsMapper">
<mapper namespace="org.springblade.Autowired.mapper.SmsMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="smsResultMap" type="org.springblade.resource.entity.Sms">
    <resultMap id="smsResultMap" type="org.springblade.Autowired.entity.Sms">
        <result column="id" property="id"/>
        <result column="create_user" property="createUser"/>
        <result column="create_dept" property="createDept"/>

 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/service/IAttachService.java

@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.service;
package org.springblade.Autowired.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import org.springblade.resource.entity.Attach;
import org.springblade.resource.vo.AttachVO;
import org.springblade.Autowired.entity.Attach;
import org.springblade.Autowired.vo.AttachVO;

/**
 * é™„件表 æœåŠ¡ç±»

 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/service/IOssService.java

@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.service;
package org.springblade.Autowired.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import org.springblade.resource.entity.Oss;
import org.springblade.resource.vo.OssVO;
import org.springblade.Autowired.entity.Oss;
import org.springblade.Autowired.vo.OssVO;

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

 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/service/ISmsService.java

@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.service;
package org.springblade.Autowired.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import org.springblade.resource.entity.Sms;
import org.springblade.resource.vo.SmsVO;
import org.springblade.Autowired.entity.Sms;
import org.springblade.Autowired.vo.SmsVO;

/**
 * çŸ­ä¿¡é…ç½®è¡¨ æœåŠ¡ç±»

 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/service/impl/AttachServiceImpl.java

@@ -14,14 +14,14 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.service.impl;
package org.springblade.Autowired.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.resource.entity.Attach;
import org.springblade.resource.mapper.AttachMapper;
import org.springblade.resource.service.IAttachService;
import org.springblade.resource.vo.AttachVO;
import org.springblade.Autowired.entity.Attach;
import org.springblade.Autowired.mapper.AttachMapper;
import org.springblade.Autowired.service.IAttachService;
import org.springblade.Autowired.vo.AttachVO;
import org.springframework.stereotype.Service;

/**

 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/service/impl/OssServiceImpl.java

@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.service.impl;
package org.springblade.Autowired.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -23,10 +23,10 @@
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.resource.entity.Oss;
import org.springblade.resource.vo.OssVO;
import org.springblade.resource.mapper.OssMapper;
import org.springblade.resource.service.IOssService;
import org.springblade.Autowired.entity.Oss;
import org.springblade.Autowired.vo.OssVO;
import org.springblade.Autowired.mapper.OssMapper;
import org.springblade.Autowired.service.IOssService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;


 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/service/impl/SmsServiceImpl.java

@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.service.impl;
package org.springblade.Autowired.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -23,10 +23,10 @@
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.resource.entity.Sms;
import org.springblade.resource.mapper.SmsMapper;
import org.springblade.resource.service.ISmsService;
import org.springblade.resource.vo.SmsVO;
import org.springblade.Autowired.entity.Sms;
import org.springblade.Autowired.mapper.SmsMapper;
import org.springblade.Autowired.service.ISmsService;
import org.springblade.Autowired.vo.SmsVO;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;


 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/wrapper/OssWrapper.java

@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.wrapper;
package org.springblade.Autowired.wrapper;

import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.resource.entity.Oss;
import org.springblade.resource.vo.OssVO;
import org.springblade.Autowired.entity.Oss;
import org.springblade.Autowired.vo.OssVO;
import org.springblade.system.cache.DictCache;
import org.springblade.system.enums.DictEnum;


 Source/BladeX/blade-ops/blade-resource/src/main/java/org/springblade/resource/wrapper/SmsWrapper.java

@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill åº„骞 (smallchill@163.com)
 */
package org.springblade.resource.wrapper;
package org.springblade.Autowired.wrapper;

import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.resource.entity.Sms;
import org.springblade.resource.vo.SmsVO;
import org.springblade.Autowired.entity.Sms;
import org.springblade.Autowired.vo.SmsVO;
import org.springblade.system.cache.DictCache;
import org.springblade.system.enums.DictEnum;


 Source/BladeX/blade-ops/blade-xxljob-admin/doc/XXL-JOB¹Ù·½Îĵµ.md

@@ -454,7 +454,7 @@
#### æ­¥éª¤ä¸€ï¼šè°ƒåº¦ä¸­å¿ƒé…ç½®ï¼š
调度中心配置文件地址：

    /xxl-job/xxl-job-admin/src/main/resources/application.properties
    /xxl-job/xxl-job-admin/src/main/Autowireds/application.properties


调度中心配置内容说明：
@@ -526,7 +526,7 @@

/**
* å¦‚需自定义 mysql ç­‰é…ç½®ï¼Œå¯é€šè¿‡ "PARAMS" æŒ‡å®šï¼Œå‚数格式 RAMS="--key=value  --key2=value2" ï¼›
* é…ç½®é¡¹å‚考文件：/xxl-job/xxl-job-admin/src/main/resources/application.properties
* é…ç½®é¡¹å‚考文件：/xxl-job/xxl-job-admin/src/main/Autowireds/application.properties
*/
docker run -e PARAMS="--spring.datasource.url=jdbc:mysql://127.0.0.1:3306/xxl_job?Unicode=true&characterEncoding=UTF-8" -p 8080:8080 -v /tmp:/data/applogs --name xxl-job-admin  -d xuxueli/xxl-job-admin
```
@@ -543,7 +543,7 @@
#### æ­¥éª¤äºŒï¼šæ‰§è¡Œå™¨é…ç½®
执行器配置，配置文件地址：

    /xxl-job/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/application.properties
    /xxl-job/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/Autowireds/application.properties

执行器配置，配置内容说明：

@@ -630,7 +630,7 @@

#### æ­¥éª¤äºŒï¼šâ€œGLUE模式(Java)” ä»»åŠ¡å¼€å‘：
请点击任务右侧 â€œGLUE” æŒ‰é’®ï¼Œè¿›å…¥ â€œGLUE编辑器开发界面” ï¼Œè§ä¸‹å›¾ã€‚“GLUE模式(Java)” è¿è¡Œæ¨¡å¼çš„任务默认已经初始化了示例任务代码，即打印Hello World。
（ â€œGLUE模式(Java)” è¿è¡Œæ¨¡å¼çš„任务实际上是一段继承自IJobHandler的Java类代码，它在执行器项目中运行，可使用@Resource/@Autowire注入执行器里中的其他服务，详细介绍请查看第三章节）
（ â€œGLUE模式(Java)” è¿è¡Œæ¨¡å¼çš„任务实际上是一段继承自IJobHandler的Java类代码，它在执行器项目中运行，可使用@Autowired/@Autowire注入执行器里中的其他服务，详细介绍请查看第三章节）

![输入图片说明](https://www.xuxueli.com/doc/static/xxl-job/images/img_Fgql.png "在这里输入图片标题")

@@ -670,7 +670,7 @@
    - Cron：触发任务执行的Cron表达式；
    - è¿è¡Œæ¨¡å¼ï¼š
        BEAN模式：任务以JobHandler方式维护在执行器端；需要结合 "JobHandler" å±žæ€§åŒ¹é…æ‰§è¡Œå™¨ä¸­ä»»åŠ¡ï¼›
        GLUE模式(Java)：任务以源码方式维护在调度中心；该模式的任务实际上是一段继承自IJobHandler的Java类代码并 "groovy" æºç æ–¹å¼ç»´æŠ¤ï¼Œå®ƒåœ¨æ‰§è¡Œå™¨é¡¹ç›®ä¸­è¿è¡Œï¼Œå¯ä½¿ç”¨@Resource/@Autowire注入执行器里中的其他服务；
        GLUE模式(Java)：任务以源码方式维护在调度中心；该模式的任务实际上是一段继承自IJobHandler的Java类代码并 "groovy" æºç æ–¹å¼ç»´æŠ¤ï¼Œå®ƒåœ¨æ‰§è¡Œå™¨é¡¹ç›®ä¸­è¿è¡Œï¼Œå¯ä½¿ç”¨@Autowired/@Autowire注入执行器里中的其他服务；
        GLUE模式(Shell)：任务以源码方式维护在调度中心；该模式的任务实际上是一段 "shell" è„šæœ¬ï¼›
        GLUE模式(Python)：任务以源码方式维护在调度中心；该模式的任务实际上是一段 "python" è„šæœ¬ï¼›
        GLUE模式(PHP)：任务以源码方式维护在调度中心；该模式的任务实际上是一段 "php" è„šæœ¬ï¼›

 Source/BladeX/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java

@@ -48,7 +48,7 @@
        ReturnT<Map<String, Object>> chartInfo = xxlJobService.chartInfo(startDate, endDate);
        return chartInfo;
    }
	

    @RequestMapping("/toLogin")
    @PermissionLimit(limit=false)
    public String toLogin(HttpServletRequest request, HttpServletResponse response) {
@@ -57,7 +57,7 @@
        }
        return "login";
    }
	

    @RequestMapping(value="login", method=RequestMethod.POST)
    @ResponseBody
    @PermissionLimit(limit=false)
@@ -65,14 +65,14 @@
        boolean ifRem = (ifRemember!=null && ifRemember.trim().length()>0 && "on".equals(ifRemember))?true:false;
        return loginService.login(request, response, userName, password, ifRem);
    }
	

    @RequestMapping(value="logout", method=RequestMethod.POST)
    @ResponseBody
    @PermissionLimit(limit=false)
    public ReturnT<String> logout(HttpServletRequest request, HttpServletResponse response){
        return loginService.logout(request, response);
    }
	

    @RequestMapping("/help")
    public String help() {

@@ -89,5 +89,5 @@
        dateFormat.setLenient(false);
        binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, true));
    }
	

}

 Source/BladeX/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/controller/JobCodeController.java

@@ -24,7 +24,7 @@
@Controller
@RequestMapping("/jobcode")
public class JobCodeController {
	

    @Resource
    private XxlJobInfoDao xxlJobInfoDao;
    @Resource
@@ -52,7 +52,7 @@
        model.addAttribute("jobLogGlues", jobLogGlues);
        return "jobcode/jobcode.index";
    }
	

    @RequestMapping("/save")
    @ResponseBody
    public ReturnT<String> save(Model model, int id, String glueSource, String glueRemark) {
@@ -67,7 +67,7 @@
        if (exists_jobInfo == null) {
            return new ReturnT<String>(500, I18nUtil.getString("jobinfo_glue_jobid_unvalid"));
        }
		

        // update new code
        exists_jobInfo.setGlueSource(glueSource);
        exists_jobInfo.setGlueRemark(glueRemark);
@@ -92,5 +92,5 @@

        return ReturnT.SUCCESS;
    }
	

}

 Source/BladeX/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java

@@ -39,7 +39,7 @@
    private XxlJobGroupDao xxlJobGroupDao;
    @Resource
    private XxlJobService xxlJobService;
	

    @RequestMapping
    public String index(HttpServletRequest request, Model model, @RequestParam(required = false, defaultValue = "-1") int jobGroup) {

@@ -89,46 +89,46 @@
            throw new RuntimeException(I18nUtil.getString("system_permission_limit") + "[username="+ loginUser.getUsername() +"]");
        }
    }
	

    @RequestMapping("/pageList")
    @ResponseBody
    public Map<String, Object> pageList(@RequestParam(required = false, defaultValue = "0") int start,  
    public Map<String, Object> pageList(@RequestParam(required = false, defaultValue = "0") int start,
            @RequestParam(required = false, defaultValue = "10") int length,
            int jobGroup, int triggerStatus, String jobDesc, String executorHandler, String author) {
		

        return xxlJobService.pageList(start, length, jobGroup, triggerStatus, jobDesc, executorHandler, author);
    }
	

    @RequestMapping("/add")
    @ResponseBody
    public ReturnT<String> add(XxlJobInfo jobInfo) {
        return xxlJobService.add(jobInfo);
    }
	

    @RequestMapping("/update")
    @ResponseBody
    public ReturnT<String> update(XxlJobInfo jobInfo) {
        return xxlJobService.update(jobInfo);
    }
	

    @RequestMapping("/remove")
    @ResponseBody
    public ReturnT<String> remove(int id) {
        return xxlJobService.remove(id);
    }
	

    @RequestMapping("/stop")
    @ResponseBody
    public ReturnT<String> pause(int id) {
        return xxlJobService.stop(id);
    }
	

    @RequestMapping("/start")
    @ResponseBody
    public ReturnT<String> start(int id) {
        return xxlJobService.start(id);
    }
	

    @RequestMapping("/trigger")
    @ResponseBody
    //@PermissionLimit(limit = false)
@@ -162,5 +162,5 @@
        }
        return new ReturnT<List<String>>(result);
    }
	

}

 Source/BladeX/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java

@@ -1,10 +1,10 @@
package com.xxl.job.admin.controller;

import com.xxl.job.admin.core.scheduler.XxlJobScheduler;
import com.xxl.job.admin.core.exception.XxlJobException;
import com.xxl.job.admin.core.model.XxlJobGroup;
import com.xxl.job.admin.core.model.XxlJobInfo;
import com.xxl.job.admin.core.model.XxlJobLog;
import com.xxl.job.admin.core.scheduler.XxlJobScheduler;
import com.xxl.job.admin.core.util.I18nUtil;
import com.xxl.job.admin.dao.XxlJobGroupDao;
import com.xxl.job.admin.dao.XxlJobInfoDao;
@@ -80,7 +80,7 @@
        List<XxlJobInfo> list = xxlJobInfoDao.getJobsByGroup(jobGroup);
        return new ReturnT<List<XxlJobInfo>>(list);
    }
	

    @RequestMapping("/pageList")
    @ResponseBody
    public Map<String, Object> pageList(HttpServletRequest request,
@@ -90,7 +90,7 @@

        // valid permission
        JobInfoController.validPermission(request, jobGroup);    // ä»…管理员支持查询全部；普通用户仅支持查询有权限的 jobGroup
		

        // parse param
        Date triggerTimeStart = null;
        Date triggerTimeEnd = null;
@@ -101,11 +101,11 @@
                triggerTimeEnd = DateUtil.parseDateTime(temp[1]);
            }
        }
		

        // page query
        List<XxlJobLog> list = xxlJobLogDao.pageList(start, length, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus);
        int list_count = xxlJobLogDao.pageListCount(start, length, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus);
		

        // package result
        Map<String, Object> maps = new HashMap<String, Object>();
        maps.put("recordsTotal", list_count);        // æ€»è®°å½•æ•°

 Source/BladeX/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java

@@ -25,7 +25,7 @@

    @Override
    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
		

        if (!(handler instanceof HandlerMethod)) {
            return super.preHandle(request, response, handler);
        }
@@ -55,5 +55,5 @@

        return super.preHandle(request, response, handler);
    }
	

}

 Source/BladeX/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/controller/interceptor/WebMvcConfig.java

@@ -1,10 +1,9 @@
package com.xxl.job.admin.controller.interceptor;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;

import javax.annotation.Resource;

/**
 * web mvc config
@@ -14,9 +13,9 @@
@Configuration(proxyBeanMethods = false)
public class WebMvcConfig extends WebMvcConfigurerAdapter {

    @Resource
    @Autowired
    private PermissionInterceptor permissionInterceptor;
    @Resource
    @Autowired
    private CookieInterceptor cookieInterceptor;

    @Override

 Source/BladeX/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java

@@ -34,8 +34,8 @@
            String i18nFile = MessageFormat.format("i18n/message{0}.properties", i18n);

            // load prop
            Resource resource = new ClassPathResource(i18nFile);
            EncodedResource encodedResource = new EncodedResource(resource,"UTF-8");
            Resource Resource = new ClassPathResource(i18nFile);
            EncodedResource encodedResource = new EncodedResource(Resource,"UTF-8");
            prop = PropertiesLoaderUtils.loadProperties(encodedResource);
        } catch (IOException e) {
            logger.error(e.getMessage(), e);

 Source/BladeX/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/service/LoginService.java

@@ -8,7 +8,6 @@
import com.xxl.job.core.biz.model.ReturnT;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.DigestUtils;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

 Source/BladeX/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java

@@ -1,8 +1,8 @@
package com.xxl.job.admin.service.impl;

import com.xxl.job.admin.core.cron.CronExpression;
import com.xxl.job.admin.core.model.XxlJobGroup;
import com.xxl.job.admin.core.model.XxlJobInfo;
import com.xxl.job.admin.core.cron.CronExpression;
import com.xxl.job.admin.core.model.XxlJobLogReport;
import com.xxl.job.admin.core.route.ExecutorRouteStrategyEnum;
import com.xxl.job.admin.core.thread.JobScheduleHelper;
@@ -40,14 +40,14 @@
    private XxlJobLogGlueDao xxlJobLogGlueDao;
    @Resource
    private XxlJobLogReportDao xxlJobLogReportDao;
	

    @Override
    public Map<String, Object> pageList(int start, int length, int jobGroup, int triggerStatus, String jobDesc, String executorHandler, String author) {

        // page list
        List<XxlJobInfo> list = xxlJobInfoDao.pageList(start, length, jobGroup, triggerStatus, jobDesc, executorHandler, author);
        int list_count = xxlJobInfoDao.pageListCount(start, length, jobGroup, triggerStatus, jobDesc, executorHandler, author);
		

        // package result
        Map<String, Object> maps = new HashMap<String, Object>();
        maps.put("recordsTotal", list_count);        // æ€»è®°å½•æ•°

 Source/BladeX/blade-ops/blade-xxljob-admin/src/main/resources/application.yml

@@ -35,7 +35,7 @@
    servlet:
      load-on-startup: 0
    static-path-pattern: /static/**
  resources:
  Autowireds:
    static-locations: classpath:/static/

management:

 Source/BladeX/blade-ops/blade-xxljob-admin/src/main/resources/i18n/message_en.properties

@@ -5,15 +5,15 @@

## system
system_tips=System message
system_ok=Confirm 
system_ok=Confirm
system_close=Close
system_save=Save 
system_save=Save
system_cancel=Cancel
system_search=Search
system_status=Status
system_opt=Operate
system_please_input=please input 
system_please_choose=please choose 
system_please_input=please input
system_please_choose=please choose
system_success=success
system_fail=fail
system_add_suc=add success
@@ -26,8 +26,8 @@
system_empty=Empty
system_opt_suc=operate success
system_opt_fail=operate fail
system_opt_edit=Edit 
system_opt_del=Delete 
system_opt_edit=Edit
system_opt_del=Delete
system_unvalid=illegal
system_not_found=not exist
system_nav=Navigation
@@ -136,8 +136,8 @@
jobinfo_opt_run=Run Once
jobinfo_opt_registryinfo=Registry Info
jobinfo_opt_next_time=Next trigger time
jobinfo_glue_remark=Resource Remark
jobinfo_glue_remark_limit=Resource Remark length is limited to 4~100
jobinfo_glue_remark=Autowired Remark
jobinfo_glue_remark_limit=Autowired Remark length is limited to 4~100
jobinfo_glue_rollback=Version Backtrack
jobinfo_glue_jobid_unvalid=Job ID is illegal
jobinfo_glue_gluetype_unvalid=The job is not GLUE Type
@@ -177,7 +177,7 @@
joblog_kill_log_limit=Trigger Fail, can not kill job
joblog_kill_log_byman=Manual operation to active kill job
joblog_rolling_log=Rolling log
joblog_rolling_log_refresh=Refresh 
joblog_rolling_log_refresh=Refresh
joblog_rolling_log_triggerfail=The job trigger fail, can not view the rolling log
joblog_rolling_log_failoften=The request for the Rolling log is terminated, the number of failed requests exceeds the limit, Reload the log on the refresh page
joblog_logid_unvalid=Log ID is illegal

 Source/BladeX/blade-ops/blade-xxljob-admin/src/main/resources/static/plugins/codemirror/mode/php/php.js

@@ -86,7 +86,7 @@
    "die echo empty exit eval include include_once isset list require require_once return " +
    "print unset __halt_compiler self static parent yield insteadof finally";
  var phpAtoms = "true false null TRUE FALSE NULL __CLASS__ __DIR__ __FILE__ __LINE__ __METHOD__ __FUNCTION__ __NAMESPACE__ __TRAIT__";
  var phpBuiltin = "func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents file_put_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists array_intersect_key array_combine array_column pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once json_decode json_encode json_last_error json_last_error_msg curl_close curl_copy_handle curl_errno curl_error curl_escape curl_exec curl_file_create curl_getinfo curl_init curl_multi_add_handle curl_multi_close curl_multi_exec curl_multi_getcontent curl_multi_info_read curl_multi_init curl_multi_remove_handle curl_multi_select curl_multi_setopt curl_multi_strerror curl_pause curl_reset curl_setopt_array curl_setopt curl_share_close curl_share_init curl_share_setopt curl_strerror curl_unescape curl_version mysqli_affected_rows mysqli_autocommit mysqli_change_user mysqli_character_set_name mysqli_close mysqli_commit mysqli_connect_errno mysqli_connect_error mysqli_connect mysqli_data_seek mysqli_debug mysqli_dump_debug_info mysqli_errno mysqli_error_list mysqli_error mysqli_fetch_all mysqli_fetch_array mysqli_fetch_assoc mysqli_fetch_field_direct mysqli_fetch_field mysqli_fetch_fields mysqli_fetch_lengths mysqli_fetch_object mysqli_fetch_row mysqli_field_count mysqli_field_seek mysqli_field_tell mysqli_free_result mysqli_get_charset mysqli_get_client_info mysqli_get_client_stats mysqli_get_client_version mysqli_get_connection_stats mysqli_get_host_info mysqli_get_proto_info mysqli_get_server_info mysqli_get_server_version mysqli_info mysqli_init mysqli_insert_id mysqli_kill mysqli_more_results mysqli_multi_query mysqli_next_result mysqli_num_fields mysqli_num_rows mysqli_options mysqli_ping mysqli_prepare mysqli_query mysqli_real_connect mysqli_real_escape_string mysqli_real_query mysqli_reap_async_query mysqli_refresh mysqli_rollback mysqli_select_db mysqli_set_charset mysqli_set_local_infile_default mysqli_set_local_infile_handler mysqli_sqlstate mysqli_ssl_set mysqli_stat mysqli_stmt_init mysqli_store_result mysqli_thread_id mysqli_thread_safe mysqli_use_result mysqli_warning_count";
  var phpBuiltin = "func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_Autowired is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents file_put_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists array_intersect_key array_combine array_column pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once json_decode json_encode json_last_error json_last_error_msg curl_close curl_copy_handle curl_errno curl_error curl_escape curl_exec curl_file_create curl_getinfo curl_init curl_multi_add_handle curl_multi_close curl_multi_exec curl_multi_getcontent curl_multi_info_read curl_multi_init curl_multi_remove_handle curl_multi_select curl_multi_setopt curl_multi_strerror curl_pause curl_reset curl_setopt_array curl_setopt curl_share_close curl_share_init curl_share_setopt curl_strerror curl_unescape curl_version mysqli_affected_rows mysqli_autocommit mysqli_change_user mysqli_character_set_name mysqli_close mysqli_commit mysqli_connect_errno mysqli_connect_error mysqli_connect mysqli_data_seek mysqli_debug mysqli_dump_debug_info mysqli_errno mysqli_error_list mysqli_error mysqli_fetch_all mysqli_fetch_array mysqli_fetch_assoc mysqli_fetch_field_direct mysqli_fetch_field mysqli_fetch_fields mysqli_fetch_lengths mysqli_fetch_object mysqli_fetch_row mysqli_field_count mysqli_field_seek mysqli_field_tell mysqli_free_result mysqli_get_charset mysqli_get_client_info mysqli_get_client_stats mysqli_get_client_version mysqli_get_connection_stats mysqli_get_host_info mysqli_get_proto_info mysqli_get_server_info mysqli_get_server_version mysqli_info mysqli_init mysqli_insert_id mysqli_kill mysqli_more_results mysqli_multi_query mysqli_next_result mysqli_num_fields mysqli_num_rows mysqli_options mysqli_ping mysqli_prepare mysqli_query mysqli_real_connect mysqli_real_escape_string mysqli_real_query mysqli_reap_async_query mysqli_refresh mysqli_rollback mysqli_select_db mysqli_set_charset mysqli_set_local_infile_default mysqli_set_local_infile_handler mysqli_sqlstate mysqli_ssl_set mysqli_stat mysqli_stmt_init mysqli_store_result mysqli_thread_id mysqli_thread_safe mysqli_use_result mysqli_warning_count";
  CodeMirror.registerHelper("hintWords", "php", [phpKeywords, phpAtoms, phpBuiltin].join(" ").split(" "));
  CodeMirror.registerHelper("wordChars", "php", /[\w$]/);


 Source/BladeX/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/ApiScope.java

@@ -45,7 +45,7 @@
     * èµ„源编号
     */
    @ApiModelProperty(value = "资源编号")
    private String resourceCode;
    private String AutowiredCode;
    /**
     * æŽ¥å£æƒé™åç§°
     */

 Source/BladeX/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/AuthClient.java

@@ -51,7 +51,7 @@
     * èµ„源集合
     */
    @ApiModelProperty(value = "资源集合")
    private String resourceIds;
    private String AutowiredIds;
    /**
     * æŽˆæƒèŒƒå›´
     */

 Source/BladeX/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/DataScope.java

@@ -45,7 +45,7 @@
     * èµ„源编号
     */
    @ApiModelProperty(value = "资源编号")
    private String resourceCode;
    private String AutowiredCode;
    /**
     * æ•°æ®æƒé™åç§°
     */

 Source/BladeX/blade-service/blade-code/pom.xml

@@ -86,6 +86,7 @@
            <artifactId>vci-platform-webservice</artifactId>
            <version>2022.1-SNAPSHOT</version>
        </dependency>

        <dependency>
            <groupId>org.springblade</groupId>
            <artifactId>blade-core-cloud</artifactId>
@@ -96,6 +97,10 @@
            <version>3.0.1.RELEASE</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.oracle.database.jdbc</groupId>
            <artifactId>ojdbc8</artifactId>
        </dependency>
    </dependencies>

    <build>

 Source/BladeX/blade-service/blade-code/src/main/java/org/springblade/code/CodeApplication.java

@@ -20,6 +20,9 @@
import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication;
import org.springblade.core.launch.constant.AppConstant;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.scheduling.annotation.EnableScheduling;

/**
 * Code启动器
@@ -27,6 +30,9 @@
 * @author ludc
 */
@BladeCloudApplication
@ComponentScan({"com.vci.*"})
@EnableScheduling
@EnableCaching
public class CodeApplication {

    public static void main(String[] args) {

 Source/BladeX/blade-service/blade-code/src/main/resources/application-dev.yml

@@ -1,11 +1,7 @@
#服务器端口
server:
  port: 36013
###tomcat相关的配置
  servlet:
    context-path: /web
  tomcat:
    uri-encoding: UTF-8

#数据源配置
spring:
  datasource:
@@ -43,16 +39,7 @@

  cache:
    type: ehcache
  servlet:
    multipart:
      enabled: true
      ###单个文件大小：50M
      max-file-size: 52428800
      ###总上传的文件大小：50M
      max-request-size: 52428800
  mvc:
    view:
      suffix: .html

##web配置
vciweb:
  debug: true

 Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantPackageController.java

@@ -26,9 +26,7 @@
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.annotation.PreAuth;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.Func;
import org.springblade.system.entity.TenantPackage;
import org.springblade.system.service.ITenantPackageService;

 Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/controller/TopMenuController.java

@@ -26,10 +26,8 @@
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.annotation.PreAuth;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.Func;
import org.springblade.system.entity.TopMenu;
import org.springblade.system.service.ITopMenuService;

 Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/mapper/AuthClientMapper.xml

@@ -13,7 +13,7 @@
        <result column="is_deleted" property="isDeleted"/>
        <result column="client_id" property="clientId"/>
        <result column="client_secret" property="clientSecret"/>
        <result column="resources_ids" property="resourceIds"/>
        <result column="Autowireds_ids" property="AutowiredIds"/>
        <result column="scope" property="scope"/>
        <result column="authorized_grant_types" property="authorizedGrantTypes"/>
        <result column="web_server_redirect_uri" property="webServerRedirectUri"/>

 Source/BladeX/pom.xml

@@ -89,17 +89,17 @@

    <build>
        <finalName>${project.name}</finalName>
        <resources>
            <resource>
                <directory>src/main/resources</directory>
            </resource>
            <resource>
        <Autowireds>
            <Autowired>
                <directory>src/main/Autowireds</directory>
            </Autowired>
            <Autowired>
                <directory>src/main/java</directory>
                <includes>
                    <include>**/*.xml</include>
                </includes>
            </resource>
        </resources>
            </Autowired>
        </Autowireds>
        <pluginManagement>
            <plugins>
                <plugin>

 Source/BladeX/service-start.sh

@@ -40,9 +40,9 @@
 docker build -f ./blade-ops/blade-report/Dockerfile -t bladex/blade-report .
 docker run -d -p 36006:36006 --name blade-report bladex/blade-report:latest

 #启动resource服务
 docker build -f ./blade-ops/blade-resource/Dockerfile -t bladex/blade-resource .
 docker run -d -p 36007:36007 --name blade-resource bladex/blade-resource:latest
 #启动Autowired服务
 docker build -f ./blade-ops/blade-Autowired/Dockerfile -t bladex/blade-Autowired .
 docker run -d -p 36007:36007 --name blade-Autowired bladex/blade-Autowired:latest

 #启动swagger服务
 docker build -f ./blade-ops/blade-swagger/Dockerfile -t bladex/blade-swagger .

 Source/BladeX/service-stop.sh

@@ -112,8 +112,8 @@
             echo $containerName" is not up!!!"
    fi

    imagesName=bladex/blade-resource
    containerName=blade-resource
    imagesName=bladex/blade-Autowired
    containerName=blade-Autowired
    if [[ -n $(docker ps -q -f "name=$containerName") ]];then
             echo $containerName"is up,we will stop and remove it !!!"
             docker stop $containerName