Merge branch 'master' of http://103.135.160.14:9034/r/se-cloud

liufan9527

2024-11-27 816022de986f97869923dc8024e4985242a9068e

Merge branch 'master' of http://103.135.160.14:9034/r/se-cloud

 .gitignore

@@ -50,3 +50,4 @@
/docker-compose/mysql/data
/docker-compose/nacos/logs/nacos_gc.log.0.current
/docker-compose/redis/data/dump.rdb
/bak

 504/¹¦ÄÜÁбí.xlsx

Binary files differ

 docker/copy.sh

ÎļþÒÑɾ³ý

 docker/deploy.sh

ÎļþÒÑɾ³ý

 docker/docker-compose.yml

ÎļþÒÑɾ³ý

 docker/mysql/db/readme.txt

ÎļþÒÑɾ³ý

 docker/mysql/dockerfile

ÎļþÒÑɾ³ý

 docker/nacos/conf/application.properties

ÎļþÒÑɾ³ý

 docker/nacos/dockerfile

ÎļþÒÑɾ³ý

 docker/nginx/conf/nginx.conf

ÎļþÒÑɾ³ý

 docker/nginx/dockerfile

ÎļþÒÑɾ³ý

 docker/nginx/html/dist/readme.txt

ÎļþÒÑɾ³ý

 docker/redis/conf/redis.conf

ÎļþÒÑɾ³ý

 docker/redis/dockerfile

ÎļþÒÑɾ³ý

 docker/se/auth/dockerfile

ÎļþÒÑɾ³ý

 docker/se/auth/jar/readme.txt

ÎļþÒÑɾ³ý

 docker/se/gateway/dockerfile

ÎļþÒÑɾ³ý

 docker/se/gateway/jar/readme.txt

ÎļþÒÑɾ³ý

 docker/se/modules/file/dockerfile

ÎļþÒÑɾ³ý

 docker/se/modules/file/jar/readme.txt

ÎļþÒÑɾ³ý

 docker/se/modules/gen/dockerfile

ÎļþÒÑɾ³ý

 docker/se/modules/gen/jar/readme.txt

ÎļþÒÑɾ³ý

 docker/se/modules/job/dockerfile

ÎļþÒÑɾ³ý

 docker/se/modules/job/jar/readme.txt

ÎļþÒÑɾ³ý

 docker/se/modules/system/dockerfile

ÎļþÒÑɾ³ý

 docker/se/modules/system/jar/readme.txt

ÎļþÒÑɾ³ý

 docker/se/visual/monitor/dockerfile

ÎļþÒÑɾ³ý

 docker/se/visual/monitor/jar/readme.txt

ÎļþÒÑɾ³ý

 pom.xml

@@ -226,7 +226,7 @@
    </dependencyManagement>

    <modules>
        <module>se-auth</module>
        <!--<module>se-auth</module>-->
        <module>se-gateway</module>
        <module>se-visual</module>
        <module>se-modules</module>

 se-auth/pom.xml

ÎļþÒÑɾ³ý

 se-auth/se-auth.iml

ÎļþÒÑɾ³ý

 se-auth/src/main/java/com/se/auth/SeAuthApplication.java

ÎļþÒÑɾ³ý

 se-auth/src/main/java/com/se/auth/controller/HealthController.java

ÎļþÒÑɾ³ý

 se-auth/src/main/java/com/se/auth/controller/TokenController.java

ÎļþÒÑɾ³ý

 se-auth/src/main/java/com/se/auth/form/LoginBody.java

ÎļþÒÑɾ³ý

 se-auth/src/main/java/com/se/auth/form/RegisterBody.java

ÎļþÒÑɾ³ý

 se-auth/src/main/java/com/se/auth/service/SysLoginService.java

ÎļþÒÑɾ³ý

 se-auth/src/main/java/com/se/auth/service/SysPasswordService.java

ÎļþÒÑɾ³ý

 se-auth/src/main/java/com/se/auth/service/SysRecordLogService.java

ÎļþÒÑɾ³ý

 se-auth/src/main/resources/banner.txt

ÎļþÒÑɾ³ý

 se-auth/src/main/resources/bootstrap.yml

ÎļþÒÑɾ³ý

 se-auth/src/main/resources/logback.xml

ÎļþÒÑɾ³ý

 se-modules/pom.xml

@@ -10,9 +10,9 @@

    <modules>
        <module>se-system</module>
        <module>se-gen</module>
        <!--<module>se-gen</module>
        <module>se-job</module>
        <module>se-file</module>
        <module>se-file</module>-->
    </modules>

    <artifactId>se-modules</artifactId>

 se-modules/se-file/pom.xml

ÎļþÒÑɾ³ý

 se-modules/se-file/src/main/java/com/se/file/SeFileApplication.java

ÎļþÒÑɾ³ý

 se-modules/se-file/src/main/java/com/se/file/config/MinioConfig.java

ÎļþÒÑɾ³ý

 se-modules/se-file/src/main/java/com/se/file/config/ResourcesConfig.java

ÎļþÒÑɾ³ý

 se-modules/se-file/src/main/java/com/se/file/controller/SysFileController.java

ÎļþÒÑɾ³ý

 se-modules/se-file/src/main/java/com/se/file/service/FastDfsSysFileServiceImpl.java

ÎļþÒÑɾ³ý

 se-modules/se-file/src/main/java/com/se/file/service/ISysFileService.java

ÎļþÒÑɾ³ý

 se-modules/se-file/src/main/java/com/se/file/service/LocalSysFileServiceImpl.java

ÎļþÒÑɾ³ý

 se-modules/se-file/src/main/java/com/se/file/service/MinioSysFileServiceImpl.java

ÎļþÒÑɾ³ý

 se-modules/se-file/src/main/java/com/se/file/utils/FileUploadUtils.java

ÎļþÒÑɾ³ý

 se-modules/se-file/src/main/resources/banner.txt

ÎļþÒÑɾ³ý

 se-modules/se-file/src/main/resources/bootstrap.yml

ÎļþÒÑɾ³ý

 se-modules/se-file/src/main/resources/logback.xml

ÎļþÒÑɾ³ý

 se-modules/se-gen/pom.xml

ÎļþÒÑɾ³ý

 se-modules/se-gen/src/main/java/com/se/gen/SeGenApplication.java

ÎļþÒÑɾ³ý

 se-modules/se-gen/src/main/resources/banner.txt

ÎļþÒÑɾ³ý

 se-modules/se-gen/src/main/resources/bootstrap.yml

ÎļþÒÑɾ³ý

 se-modules/se-gen/src/main/resources/logback.xml

ÎļþÒÑɾ³ý

 se-modules/se-gen/src/main/resources/vm/java/controller.java.vm

ÎļþÒÑɾ³ý

 se-modules/se-gen/src/main/resources/vm/java/domain.java.vm

ÎļþÒÑɾ³ý

 se-modules/se-gen/src/main/resources/vm/java/mapper.java.vm

ÎļþÒÑɾ³ý

 se-modules/se-gen/src/main/resources/vm/java/service.java.vm

ÎļþÒÑɾ³ý

 se-modules/se-gen/src/main/resources/vm/java/serviceImpl.java.vm

ÎļþÒÑɾ³ý

 se-modules/se-gen/src/main/resources/vm/java/sub-domain.java.vm

ÎļþÒÑɾ³ý

 se-modules/se-gen/src/main/resources/vm/js/api.js.vm

ÎļþÒÑɾ³ý

 se-modules/se-gen/src/main/resources/vm/sql/sql.vm

ÎļþÒÑɾ³ý

 se-modules/se-gen/src/main/resources/vm/vue/index-tree.vue.vm

ÎļþÒÑɾ³ý

 se-modules/se-gen/src/main/resources/vm/vue/index.vue.vm

ÎļþÒÑɾ³ý

 se-modules/se-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm

ÎļþÒÑɾ³ý

 se-modules/se-gen/src/main/resources/vm/vue/v3/index.vue.vm

ÎļþÒÑɾ³ý

 se-modules/se-gen/src/main/resources/vm/xml/mapper.xml.vm

ÎļþÒÑɾ³ý

 se-modules/se-job/pom.xml

ÎļþÒÑɾ³ý

 se-modules/se-job/src/main/java/com/se/job/SeJobApplication.java

ÎļþÒÑɾ³ý

 se-modules/se-job/src/main/resources/banner.txt

ÎļþÒÑɾ³ý

 se-modules/se-job/src/main/resources/bootstrap.yml

ÎļþÒÑɾ³ý

 se-modules/se-job/src/main/resources/logback.xml

ÎļþÒÑɾ³ý

 se-modules/se-system/pom.xml

@@ -41,13 +41,6 @@
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
        
        <!-- Swagger UI -->
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger-ui</artifactId>
            <version>${swagger.fox.version}</version>
        </dependency>
		
        <!-- Mysql Connector -->
        <dependency>
            <groupId>com.mysql</groupId>
@@ -70,6 +63,13 @@
        <dependency>
            <groupId>com.se</groupId>
            <artifactId>se-common-log</artifactId>
        </dependency>

        <!-- Swagger UI -->
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger-ui</artifactId>
            <version>${swagger.fox.version}</version>
        </dependency>
        
        <!-- SE Common Swagger -->
@@ -105,6 +105,24 @@
            <groupId>com.se</groupId>
            <artifactId>se-api-system</artifactId>
        </dependency>

        <!-- Apache Velocity -->
        <dependency>
            <groupId>org.apache.velocity</groupId>
            <artifactId>velocity-engine-core</artifactId>
        </dependency>

        <!-- Quartz -->
        <dependency>
            <groupId>org.quartz-scheduler</groupId>
            <artifactId>quartz</artifactId>
            <exclusions>
                <exclusion>
                    <groupId>com.mchange</groupId>
                    <artifactId>c3p0</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
    </dependencies>

    <build>

 se-modules/se-system/src/main/java/com/se/system/config/GenConfig.java

ÎļþÃû´Ó se-modules/se-gen/src/main/java/com/se/gen/config/GenConfig.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.se.gen.config;
package com.se.system.config;

import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;

 se-modules/se-system/src/main/java/com/se/system/config/ScheduleConfig.java

ÎļþÃû´Ó se-modules/se-job/src/main/java/com/se/job/config/ScheduleConfig.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
//package com.se.job.config;
package com.se.system.config;//package com.se.job.config;
//
//import java.util.Properties;
//import javax.sql.DataSource;

 se-modules/se-system/src/main/java/com/se/system/controller/GenController.java

ÎļþÃû´Ó se-modules/se-gen/src/main/java/com/se/gen/controller/GenController.java ÐÞ¸Ä
@@ -1,23 +1,5 @@
package com.se.gen.controller;
package com.se.system.controller;

import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;

import com.se.gen.domain.GenTableColumn;
import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.se.common.core.text.Convert;
import com.se.common.core.web.controller.BaseController;
import com.se.common.core.web.domain.AjaxResult;
@@ -25,9 +7,20 @@
import com.se.common.log.annotation.Log;
import com.se.common.log.enums.BusinessType;
import com.se.common.security.annotation.RequiresPermissions;
import com.se.gen.domain.GenTable;
import com.se.gen.service.IGenTableColumnService;
import com.se.gen.service.IGenTableService;
import com.se.system.domain.GenTable;
import com.se.system.domain.GenTableColumn;
import com.se.system.service.inte.IGenTableColumnService;
import com.se.system.service.inte.IGenTableService;
import org.apache.commons.io.IOUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * ä»£ç ç”Ÿæˆ æ“ä½œå¤„理
@@ -38,10 +31,10 @@
@RestController
public class GenController extends BaseController
{
    @Autowired
    @Resource
    private IGenTableService genTableService;

    @Autowired
    @Resource
    private IGenTableColumnService genTableColumnService;

    /**

 se-modules/se-system/src/main/java/com/se/system/controller/IndexController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,95 @@
package com.se.system.controller;

import com.alibaba.fastjson2.JSON;
import com.se.common.core.utils.ServletUtils;
import com.se.common.core.utils.StringUtils;
import com.se.common.core.utils.ip.IpUtils;
import com.se.common.core.web.controller.BaseController;
import com.se.common.core.web.domain.AjaxResult;
import com.se.common.log.annotation.Log;
import com.se.common.log.enums.BusinessType;
import com.se.common.security.utils.SecurityUtils;
import com.se.system.api.domain.SysOperLog;
import com.se.system.api.model.LoginUser;
import com.se.system.service.inte.ISysOperLogService;
import org.springframework.http.HttpMethod;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;

@RestController
@RequestMapping("/index")
@SuppressWarnings("ALL")
public class IndexController extends BaseController {
    @Resource
    ISysOperLogService operLogService;

    @GetMapping("/monitor")
    public Map<String, Object> monitor() {
        Map<String, Object> map = new HashMap<>();

        return map;
    }

    @GetMapping("/userList")
    public Map<String, Object> userList() {
        Map<String, Object> map = new HashMap<>();

        return map;
    }

    @GetMapping("/uvCount")
    public Map<String, Object> uvCount() {
        Map<String, Object> map = new HashMap<>();

        return map;
    }

    @GetMapping("/pvCount")
    public Map<String, Object> pvCount() {
        Map<String, Object> map = new HashMap<>();

        return map;
    }

    //@Log(title = "角色管理", businessType = BusinessType.INSERT)
    @GetMapping("/addAccessLog")
    public AjaxResult addAccessLog(String title, int status) {
        long start = System.currentTimeMillis();

        SysOperLog log = new SysOperLog();
        log.setTitle(title);
        // 0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据
        log.setBusinessType(0);
        // ServletUtils.getRequest().getMethod()
        log.setMethod("com.se.system.controller.IndexController.addAccessLog()");
        log.setRequestMethod("GET");
        log.setOperatorType(1);

        LoginUser loginUser = SecurityUtils.getLoginUser();
        if (null != loginUser) {
            log.setOperName(loginUser.getUsername());
            log.setDeptName(loginUser.getSysUser().getDept().getDeptName());
        }
        // StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255)
        log.setOperUrl("/index/addAccessLog");
        log.setOperIp(IpUtils.getIpAddr());
        log.setOperParam("{\"title\":\"" + title + "\"}");

        log.setJsonResult(String.format("{\"msg\":\"%s\",\"code\":%d}", 0 == status ? "成功" : "失败", 0 == status ? 200 : 400));
        log.setStatus(status);
        log.setOperTime(new Date());
        log.setCostTime(System.currentTimeMillis() - start + 10);

        int rows = operLogService.insertOperlog(log);

        return toAjax(rows);
    }
}



 se-modules/se-system/src/main/java/com/se/system/controller/SysJobController.java

ÎļþÃû´Ó se-modules/se-job/src/main/java/com/se/job/controller/SysJobController.java ÐÞ¸Ä
@@ -1,21 +1,5 @@
package com.se.job.controller;
package com.se.system.controller;

import java.util.List;
import javax.servlet.http.HttpServletResponse;

import com.se.job.domain.SysJob;
import com.se.job.service.ISysJobService;
import com.se.job.util.ScheduleUtils;
import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.se.common.core.constant.Constants;
import com.se.common.core.exception.job.TaskException;
import com.se.common.core.utils.StringUtils;
@@ -27,7 +11,16 @@
import com.se.common.log.enums.BusinessType;
import com.se.common.security.annotation.RequiresPermissions;
import com.se.common.security.utils.SecurityUtils;
import com.se.job.util.CronUtils;
import com.se.system.domain.SysJob;
import com.se.system.service.inte.ISysJobService;
import com.se.system.utils.CronUtils;
import com.se.system.utils.ScheduleUtils;
import org.quartz.SchedulerException;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;

/**
 * è°ƒåº¦ä»»åŠ¡ä¿¡æ¯æ“ä½œå¤„理
@@ -38,7 +31,7 @@
@RequestMapping("/job")
public class SysJobController extends BaseController
{
    @Autowired
    @Resource
    private ISysJobService jobService;

    /**

 se-modules/se-system/src/main/java/com/se/system/controller/SysJobLogController.java

ÎļþÃû´Ó se-modules/se-job/src/main/java/com/se/job/controller/SysJobLogController.java ÐÞ¸Ä
@@ -1,17 +1,5 @@
package com.se.job.controller;
package com.se.system.controller;

import java.util.List;
import javax.servlet.http.HttpServletResponse;

import com.se.job.domain.SysJobLog;
import com.se.job.service.ISysJobLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.se.common.core.utils.poi.ExcelUtil;
import com.se.common.core.web.controller.BaseController;
import com.se.common.core.web.domain.AjaxResult;
@@ -19,6 +7,13 @@
import com.se.common.log.annotation.Log;
import com.se.common.log.enums.BusinessType;
import com.se.common.security.annotation.RequiresPermissions;
import com.se.system.domain.SysJobLog;
import com.se.system.service.inte.ISysJobLogService;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;

/**
 * è°ƒåº¦æ—¥å¿—操作处理
@@ -29,7 +24,7 @@
@RequestMapping("/job/log")
public class SysJobLogController extends BaseController
{
    @Autowired
    @Resource
    private ISysJobLogService jobLogService;

    /**

 se-modules/se-system/src/main/java/com/se/system/domain/GenTable.java

ÎļþÃû´Ó se-modules/se-gen/src/main/java/com/se/gen/domain/GenTable.java ÐÞ¸Ä
@@ -1,12 +1,13 @@
package com.se.gen.domain;
package com.se.system.domain;

import java.util.List;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import org.apache.commons.lang3.ArrayUtils;
import com.se.common.core.constant.GenConstants;
import com.se.common.core.utils.StringUtils;
import com.se.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.ArrayUtils;

import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import java.util.List;

/**
 * ä¸šåŠ¡è¡¨ gen_table

 se-modules/se-system/src/main/java/com/se/system/domain/GenTableColumn.java

ÎļþÃû´Ó se-modules/se-gen/src/main/java/com/se/gen/domain/GenTableColumn.java ÐÞ¸Ä
@@ -1,10 +1,10 @@
package com.se.gen.domain;

import javax.validation.constraints.NotBlank;
package com.se.system.domain;

import com.se.common.core.utils.StringUtils;
import com.se.common.core.web.domain.BaseEntity;

import javax.validation.constraints.NotBlank;

/**
 * ä»£ç ç”Ÿæˆä¸šåŠ¡å­—段表 gen_table_column
 * 

 se-modules/se-system/src/main/java/com/se/system/domain/SysJob.java

ÎļþÃû´Ó se-modules/se-job/src/main/java/com/se/job/domain/SysJob.java ÐÞ¸Ä
@@ -1,17 +1,18 @@
package com.se.job.domain;
package com.se.system.domain;

import java.util.Date;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.se.common.core.annotation.Excel;
import com.se.common.core.annotation.Excel.ColumnType;
import com.se.common.core.constant.ScheduleConstants;
import com.se.common.core.utils.StringUtils;
import com.se.common.core.web.domain.BaseEntity;
import com.se.job.util.CronUtils;
import com.se.system.utils.CronUtils;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import java.util.Date;

/**
 * å®šæ—¶ä»»åŠ¡è°ƒåº¦è¡¨ sys_job

 se-modules/se-system/src/main/java/com/se/system/domain/SysJobLog.java

ÎļþÃû´Ó se-modules/se-job/src/main/java/com/se/job/domain/SysJobLog.java ÐÞ¸Ä
@@ -1,10 +1,11 @@
package com.se.job.domain;
package com.se.system.domain;

import java.util.Date;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.se.common.core.annotation.Excel;
import com.se.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

import java.util.Date;

/**
 * å®šæ—¶ä»»åŠ¡è°ƒåº¦æ—¥å¿—表 sys_job_log

 se-modules/se-system/src/main/java/com/se/system/mapper/GenTableColumnMapper.java

ÎļþÃû´Ó se-modules/se-gen/src/main/java/com/se/gen/mapper/GenTableColumnMapper.java ÐÞ¸Ä
@@ -1,7 +1,8 @@
package com.se.gen.mapper;
package com.se.system.mapper;

import com.se.system.domain.GenTableColumn;

import java.util.List;
import com.se.gen.domain.GenTableColumn;

/**
 * ä¸šåŠ¡å­—段 æ•°æ®å±‚

 se-modules/se-system/src/main/java/com/se/system/mapper/GenTableMapper.java

ÎļþÃû´Ó se-modules/se-gen/src/main/java/com/se/gen/mapper/GenTableMapper.java ÐÞ¸Ä
@@ -1,7 +1,8 @@
package com.se.gen.mapper;
package com.se.system.mapper;

import com.se.system.domain.GenTable;

import java.util.List;
import com.se.gen.domain.GenTable;

/**
 * ä¸šåŠ¡ æ•°æ®å±‚

 se-modules/se-system/src/main/java/com/se/system/mapper/SysJobLogMapper.java

ÎļþÃû´Ó se-modules/se-job/src/main/java/com/se/job/mapper/SysJobLogMapper.java ÐÞ¸Ä
@@ -1,7 +1,8 @@
package com.se.job.mapper;
package com.se.system.mapper;

import com.se.system.domain.SysJobLog;

import java.util.List;
import com.se.job.domain.SysJobLog;

/**
 * è°ƒåº¦ä»»åŠ¡æ—¥å¿—信息 æ•°æ®å±‚

 se-modules/se-system/src/main/java/com/se/system/mapper/SysJobMapper.java

ÎļþÃû´Ó se-modules/se-job/src/main/java/com/se/job/mapper/SysJobMapper.java ÐÞ¸Ä
@@ -1,7 +1,8 @@
package com.se.job.mapper;
package com.se.system.mapper;

import com.se.system.domain.SysJob;

import java.util.List;
import com.se.job.domain.SysJob;

/**
 * è°ƒåº¦ä»»åŠ¡ä¿¡æ¯ æ•°æ®å±‚

 se-modules/se-system/src/main/java/com/se/system/service/impl/GenTableColumnServiceImpl.java

ÎļþÃû´Ó se-modules/se-gen/src/main/java/com/se/gen/service/GenTableColumnServiceImpl.java ÐÞ¸Ä
@@ -1,12 +1,13 @@
package com.se.gen.service;
package com.se.system.service.impl;

import java.util.List;

import com.se.gen.domain.GenTableColumn;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.se.common.core.text.Convert;
import com.se.gen.mapper.GenTableColumnMapper;
import com.se.system.domain.GenTableColumn;
import com.se.system.mapper.GenTableColumnMapper;
import com.se.system.service.inte.IGenTableColumnService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

/**
 * ä¸šåŠ¡å­—段 æœåŠ¡å±‚实现
@@ -16,7 +17,7 @@
@Service
public class GenTableColumnServiceImpl implements IGenTableColumnService 
{
    @Autowired
    @Resource
    private GenTableColumnMapper genTableColumnMapper;

    /**

 se-modules/se-system/src/main/java/com/se/system/service/impl/GenTableServiceImpl.java

ÎļþÃû´Ó se-modules/se-gen/src/main/java/com/se/gen/service/GenTableServiceImpl.java ÐÞ¸Ä
@@ -1,5 +1,32 @@
package com.se.gen.service;
package com.se.system.service.impl;

import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.se.common.core.constant.Constants;
import com.se.common.core.constant.GenConstants;
import com.se.common.core.exception.ServiceException;
import com.se.common.core.text.CharsetKit;
import com.se.common.core.utils.StringUtils;
import com.se.common.security.utils.SecurityUtils;
import com.se.system.domain.GenTable;
import com.se.system.domain.GenTableColumn;
import com.se.system.mapper.GenTableColumnMapper;
import com.se.system.mapper.GenTableMapper;
import com.se.system.service.inte.IGenTableService;
import com.se.system.utils.GenUtils;
import com.se.system.utils.VelocityInitializer;
import com.se.system.utils.VelocityUtils;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
@@ -12,32 +39,6 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;

import com.se.gen.domain.GenTableColumn;
import com.se.gen.util.GenUtils;
import com.se.gen.util.VelocityInitializer;
import com.se.gen.util.VelocityUtils;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.se.common.core.constant.Constants;
import com.se.common.core.constant.GenConstants;
import com.se.common.core.exception.ServiceException;
import com.se.common.core.text.CharsetKit;
import com.se.common.core.utils.StringUtils;
import com.se.common.security.utils.SecurityUtils;
import com.se.gen.domain.GenTable;
import com.se.gen.mapper.GenTableColumnMapper;
import com.se.gen.mapper.GenTableMapper;

/**
 * ä¸šåŠ¡ æœåŠ¡å±‚实现
 * 
@@ -48,10 +49,10 @@
{
    private static final Logger log = LoggerFactory.getLogger(GenTableServiceImpl.class);

    @Autowired
    @Resource
    private GenTableMapper genTableMapper;

    @Autowired
    @Resource
    private GenTableColumnMapper genTableColumnMapper;

    /**

 se-modules/se-system/src/main/java/com/se/system/service/impl/SysJobLogServiceImpl.java

ÎļþÃû´Ó se-modules/se-job/src/main/java/com/se/job/service/SysJobLogServiceImpl.java ÐÞ¸Ä
@@ -1,10 +1,12 @@
package com.se.job.service;
package com.se.system.service.impl;

import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import com.se.system.domain.SysJobLog;
import com.se.system.mapper.SysJobLogMapper;
import com.se.system.service.inte.ISysJobLogService;
import org.springframework.stereotype.Service;
import com.se.job.domain.SysJobLog;
import com.se.job.mapper.SysJobLogMapper;

import javax.annotation.Resource;
import java.util.List;

/**
 * å®šæ—¶ä»»åŠ¡è°ƒåº¦æ—¥å¿—信息 æœåŠ¡å±‚
@@ -14,7 +16,7 @@
@Service
public class SysJobLogServiceImpl implements ISysJobLogService
{
    @Autowired
    @Resource
    private SysJobLogMapper jobLogMapper;

    /**

 se-modules/se-system/src/main/java/com/se/system/service/impl/SysJobServiceImpl.java

ÎļþÃû´Ó se-modules/se-job/src/main/java/com/se/job/service/SysJobServiceImpl.java ÐÞ¸Ä
@@ -1,7 +1,12 @@
package com.se.job.service;
package com.se.system.service.impl;

import java.util.List;
import javax.annotation.PostConstruct;
import com.se.common.core.constant.ScheduleConstants;
import com.se.common.core.exception.job.TaskException;
import com.se.system.domain.SysJob;
import com.se.system.mapper.SysJobMapper;
import com.se.system.service.inte.ISysJobService;
import com.se.system.utils.CronUtils;
import com.se.system.utils.ScheduleUtils;
import org.quartz.JobDataMap;
import org.quartz.JobKey;
import org.quartz.Scheduler;
@@ -9,12 +14,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.se.common.core.constant.ScheduleConstants;
import com.se.common.core.exception.job.TaskException;
import com.se.job.domain.SysJob;
import com.se.job.mapper.SysJobMapper;
import com.se.job.util.CronUtils;
import com.se.job.util.ScheduleUtils;

import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.util.List;

/**
 * å®šæ—¶ä»»åŠ¡è°ƒåº¦ä¿¡æ¯ æœåŠ¡å±‚
@@ -24,10 +27,10 @@
@Service
public class SysJobServiceImpl implements ISysJobService
{
    @Autowired
    @Resource
    private Scheduler scheduler;

    @Autowired
    @Resource
    private SysJobMapper jobMapper;

    /**

 se-modules/se-system/src/main/java/com/se/system/service/inte/IGenTableColumnService.java

ÎļþÃû´Ó se-modules/se-gen/src/main/java/com/se/gen/service/IGenTableColumnService.java ÐÞ¸Ä
@@ -1,7 +1,8 @@
package com.se.gen.service;
package com.se.system.service.inte;

import com.se.system.domain.GenTableColumn;

import java.util.List;
import com.se.gen.domain.GenTableColumn;

/**
 * ä¸šåŠ¡å­—段 æœåŠ¡å±‚

 se-modules/se-system/src/main/java/com/se/system/service/inte/IGenTableService.java

ÎļþÃû´Ó se-modules/se-gen/src/main/java/com/se/gen/service/IGenTableService.java ÐÞ¸Ä
@@ -1,8 +1,9 @@
package com.se.gen.service;
package com.se.system.service.inte;

import com.se.system.domain.GenTable;

import java.util.List;
import java.util.Map;
import com.se.gen.domain.GenTable;

/**
 * ä¸šåŠ¡ æœåŠ¡å±‚

 se-modules/se-system/src/main/java/com/se/system/service/inte/ISysJobLogService.java

ÎļþÃû´Ó se-modules/se-job/src/main/java/com/se/job/service/ISysJobLogService.java ÐÞ¸Ä
@@ -1,7 +1,8 @@
package com.se.job.service;
package com.se.system.service.inte;

import com.se.system.domain.SysJobLog;

import java.util.List;
import com.se.job.domain.SysJobLog;

/**
 * å®šæ—¶ä»»åŠ¡è°ƒåº¦æ—¥å¿—信息信息 æœåŠ¡å±‚

 se-modules/se-system/src/main/java/com/se/system/service/inte/ISysJobService.java

ÎļþÃû´Ó se-modules/se-job/src/main/java/com/se/job/service/ISysJobService.java ÐÞ¸Ä
@@ -1,9 +1,10 @@
package com.se.job.service;
package com.se.system.service.inte;

import com.se.common.core.exception.job.TaskException;
import com.se.system.domain.SysJob;
import org.quartz.SchedulerException;

import java.util.List;
import org.quartz.SchedulerException;
import com.se.common.core.exception.job.TaskException;
import com.se.job.domain.SysJob;

/**
 * å®šæ—¶ä»»åŠ¡è°ƒåº¦ä¿¡æ¯ä¿¡æ¯ æœåŠ¡å±‚

 se-modules/se-system/src/main/java/com/se/system/utils/AbstractQuartzJob.java

ÎļþÃû´Ó se-modules/se-job/src/main/java/com/se/job/util/AbstractQuartzJob.java ÐÞ¸Ä
@@ -1,20 +1,20 @@
package com.se.job.util;
package com.se.system.utils;

import java.util.Date;

import com.se.job.domain.SysJob;
import com.se.job.domain.SysJobLog;
import com.se.job.service.ISysJobLogService;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.se.common.core.constant.ScheduleConstants;
import com.se.common.core.utils.ExceptionUtil;
import com.se.common.core.utils.SpringUtils;
import com.se.common.core.utils.StringUtils;
import com.se.common.core.utils.bean.BeanUtils;
import com.se.system.domain.SysJob;
import com.se.system.domain.SysJobLog;
import com.se.system.service.inte.ISysJobLogService;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.Date;

/**
 * æŠ½è±¡quartz调用

 se-modules/se-system/src/main/java/com/se/system/utils/CronUtils.java

ÎļþÃû´Ó se-modules/se-job/src/main/java/com/se/job/util/CronUtils.java ÐÞ¸Ä
@@ -1,8 +1,9 @@
package com.se.job.util;
package com.se.system.utils;

import org.quartz.CronExpression;

import java.text.ParseException;
import java.util.Date;
import org.quartz.CronExpression;

/**
 * cron表达式工具类

 se-modules/se-system/src/main/java/com/se/system/utils/GenUtils.java

ÎļþÃû´Ó se-modules/se-gen/src/main/java/com/se/gen/util/GenUtils.java ÐÞ¸Ä
@@ -1,13 +1,13 @@
package com.se.gen.util;
package com.se.system.utils;

import java.util.Arrays;

import com.se.gen.config.GenConfig;
import com.se.gen.domain.GenTableColumn;
import org.apache.commons.lang3.RegExUtils;
import com.se.common.core.constant.GenConstants;
import com.se.common.core.utils.StringUtils;
import com.se.gen.domain.GenTable;
import com.se.system.config.GenConfig;
import com.se.system.domain.GenTable;
import com.se.system.domain.GenTableColumn;
import org.apache.commons.lang3.RegExUtils;

import java.util.Arrays;

/**
 * ä»£ç ç”Ÿæˆå™¨ å·¥å…·ç±»

 se-modules/se-system/src/main/java/com/se/system/utils/JobInvokeUtil.java

ÎļþÃû´Ó se-modules/se-job/src/main/java/com/se/job/util/JobInvokeUtil.java ÐÞ¸Ä
@@ -1,12 +1,13 @@
package com.se.job.util;
package com.se.system.utils;

import com.se.common.core.utils.SpringUtils;
import com.se.common.core.utils.StringUtils;
import com.se.system.domain.SysJob;

import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.LinkedList;
import java.util.List;
import com.se.common.core.utils.SpringUtils;
import com.se.common.core.utils.StringUtils;
import com.se.job.domain.SysJob;

/**
 * ä»»åŠ¡æ‰§è¡Œå·¥å…·

 se-modules/se-system/src/main/java/com/se/system/utils/QuartzDisallowConcurrentExecution.java

ÎļþÃû´Ó se-modules/se-job/src/main/java/com/se/job/util/QuartzDisallowConcurrentExecution.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package com.se.job.util;
package com.se.system.utils;

import com.se.job.domain.SysJob;
import com.se.system.domain.SysJob;
import org.quartz.DisallowConcurrentExecution;
import org.quartz.JobExecutionContext;


 se-modules/se-system/src/main/java/com/se/system/utils/QuartzJobExecution.java

ÎļþÃû´Ó se-modules/se-job/src/main/java/com/se/job/util/QuartzJobExecution.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package com.se.job.util;
package com.se.system.utils;

import com.se.job.domain.SysJob;
import com.se.system.domain.SysJob;
import org.quartz.JobExecutionContext;

/**

 se-modules/se-system/src/main/java/com/se/system/utils/RyTask.java

ÎļþÃû´Ó se-modules/se-job/src/main/java/com/se/job/task/RyTask.java ÐÞ¸Ä
@@ -1,7 +1,7 @@
package com.se.job.task;
package com.se.system.utils;

import org.springframework.stereotype.Component;
import com.se.common.core.utils.StringUtils;
import org.springframework.stereotype.Component;

/**
 * å®šæ—¶ä»»åŠ¡è°ƒåº¦æµ‹è¯•

 se-modules/se-system/src/main/java/com/se/system/utils/ScheduleUtils.java

ÎļþÃû´Ó se-modules/se-job/src/main/java/com/se/job/util/ScheduleUtils.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package com.se.job.util;
package com.se.system.utils;

import com.se.job.domain.SysJob;
import com.se.system.domain.SysJob;
import org.quartz.CronScheduleBuilder;
import org.quartz.CronTrigger;
import org.quartz.Job;

 se-modules/se-system/src/main/java/com/se/system/utils/VelocityInitializer.java

ÎļþÃû´Ó se-modules/se-gen/src/main/java/com/se/gen/util/VelocityInitializer.java ÐÞ¸Ä
@@ -1,8 +1,9 @@
package com.se.gen.util;
package com.se.system.utils;

import com.se.common.core.constant.Constants;
import org.apache.velocity.app.Velocity;

import java.util.Properties;
import org.apache.velocity.app.Velocity;
import com.se.common.core.constant.Constants;

/**
 * VelocityEngine工厂

 se-modules/se-system/src/main/java/com/se/system/utils/VelocityUtils.java

ÎļþÃû´Ó se-modules/se-gen/src/main/java/com/se/gen/util/VelocityUtils.java ÐÞ¸Ä
@@ -1,18 +1,18 @@
package com.se.gen.util;
package com.se.system.utils;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

import com.se.gen.domain.GenTableColumn;
import org.apache.velocity.VelocityContext;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.se.common.core.constant.GenConstants;
import com.se.common.core.utils.DateUtils;
import com.se.common.core.utils.StringUtils;
import com.se.gen.domain.GenTable;
import com.se.system.domain.GenTable;
import com.se.system.domain.GenTableColumn;
import org.apache.velocity.VelocityContext;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

/**
 * æ¨¡æ¿å·¥å…·ç±»

 se-modules/se-system/src/main/resources/mapper/system/GenTableColumnMapper.xml

ÎļþÃû´Ó se-modules/se-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml ÐÞ¸Ä
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.se.gen.mapper.GenTableColumnMapper">
<mapper namespace="com.se.system.mapper.GenTableColumnMapper">

    <resultMap type="GenTableColumn" id="GenTableColumnResult">
        <id     property="columnId"       column="column_id"      />

 se-modules/se-system/src/main/resources/mapper/system/GenTableMapper.xml

ÎļþÃû´Ó se-modules/se-gen/src/main/resources/mapper/generator/GenTableMapper.xml ÐÞ¸Ä
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.se.gen.mapper.GenTableMapper">
<mapper namespace="com.se.system.mapper.GenTableMapper">

    <resultMap type="GenTable" id="GenTableResult">
        <id     property="tableId"        column="table_id"          />

 se-modules/se-system/src/main/resources/mapper/system/SysJobLogMapper.xml

ÎļþÃû´Ó se-modules/se-job/src/main/resources/mapper/job/SysJobLogMapper.xml ÐÞ¸Ä
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.se.job.mapper.SysJobLogMapper">
<mapper namespace="com.se.system.mapper.SysJobLogMapper">

    <resultMap type="SysJobLog" id="SysJobLogResult">
        <id     property="jobLogId"       column="job_log_id"      />

 se-modules/se-system/src/main/resources/mapper/system/SysJobMapper.xml

ÎļþÃû´Ó se-modules/se-job/src/main/resources/mapper/job/SysJobMapper.xml ÐÞ¸Ä
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.se.job.mapper.SysJobMapper">
<mapper namespace="com.se.system.mapper.SysJobMapper">

    <resultMap type="SysJob" id="SysJobResult">
        <id     property="jobId"          column="job_id"          />

 ˵Ã÷.txt

@@ -1,8 +1,12 @@
http://192.168.11.203:8090/sso/login

--------------------------------------------------------
http://192.168.11.203:8090/sso/login，admin，admin123
http://192.168.11.203:8848/nacos，nAcos_!9#_admIn

http://103.135.160.14:9029/prod-api/
103.135.160.14:9029，映射到 192.168.11.206:8090


--------------------------------------------------------
docker-compose logs -f -n 50 se-system

se-gateway-dev.yml，修改
@@ -10,6 +14,15 @@
uri: lb://se-auth â†’ uri: lb://se-system

uri: lb://se-file   â†’ uri: lb://se-system

uri: lb://se-gen  â†’ uri: lb://se-system

uri: lb://se-job  â†’ uri: lb://se-system

  # ä¸æ ¡éªŒç™½åå•
  ignore:
    whites:
      - /system/index/*

--------------------------------------------------------

@@ -34,4 +47,16 @@
  accessKey: minioadmin
  secretKey: minioadmin
  bucketName: test

# ä»£ç ç”Ÿæˆ
gen:
  # ä½œè€…
  author: se
  # é»˜è®¤ç”ŸæˆåŒ…路径 system éœ€æ”¹æˆè‡ªå·±çš„模块名称 å¦‚ system monitor tool
  packageName: com.se.system
  # è‡ªåŠ¨åŽ»é™¤è¡¨å‰ç¼€ï¼Œé»˜è®¤æ˜¯false
  autoRemovePre: false
  # è¡¨å‰ç¼€ï¼ˆç”Ÿæˆç±»åä¸ä¼šåŒ…含表前缀，多个用逗号分隔）
  tablePrefix: sys_

--------------------------------------------------------