whycq
2025-02-17 0cb816f646b57c2eb7679bde53ce8eae4da16f85
Merge remote-tracking branch 'origin/main' into dev
4个文件已修改
30 ■■■■ 已修改文件
rsf-framework/src/main/java/com/vincent/rsf/framework/generators/ReactGenerator.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-framework/src/main/resources/templates/react-admin/Controller.txt 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-framework/src/main/resources/templates/react-admin/Entity.txt 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-framework/src/main/java/com/vincent/rsf/framework/generators/ReactGenerator.java
@@ -259,7 +259,7 @@
        switch (this.sqlOsType) {
            case MYSQL:
                Class.forName("com.mysql.jdbc.Driver").newInstance();
                conn = DriverManager.getConnection("jdbc:mysql://"+url, username, password);
                conn = DriverManager.getConnection("jdbc:mysql://"+url+"?useUnicode=true&characterEncoding=UTF-8&useSSL=false", username, password);
                this.columns = getMysqlColumns(conn, table, true, sqlOsType);
                break;
            case SQL_SERVER:
@@ -520,7 +520,7 @@
            }
            // 外键修饰
            if (!Cools.isEmpty(column.getForeignKeyMajor())){
            if (!Cools.isEmpty(column.getForeignKey()) && !column.getForeignKey().equals("Tenant")){
                sb.append("    public String get").append(column.getHumpName().substring(0, 1).toUpperCase()).append(column.getHumpName().substring(1)).append("\\$").append("(){\n")
                        .append("        ").append(column.getForeignKey()).append("Service service = SpringUtils.getBean(").append(column.getForeignKey()).append("Service.class);\n")
                        .append("        ").append(column.getForeignKey()).append(" ").append(GeneratorUtils.firstCharConvert(column.getForeignKey()))
rsf-framework/src/main/resources/templates/react-admin/Controller.txt
@@ -4,14 +4,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.manager.common.utils.ExcelUtil;
import com.vincent.rsf.manager.common.annotation.OperationLog;
import com.vincent.rsf.manager.common.domain.BaseParam;
import com.vincent.rsf.manager.common.domain.KeyValVo;
import com.vincent.rsf.manager.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import @{COMPANYNAME}.entity.@{ENTITYNAME};
import @{COMPANYNAME}.service.@{ENTITYNAME}Service;
import com.vincent.rsf.manager.system.controller.BaseController;
import com.vincent.rsf.server.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -20,7 +20,6 @@
import java.util.*;
@RestController
@RequestMapping("/api")
public class @{ENTITYNAME}Controller extends BaseController {
    @Autowired
rsf-framework/src/main/resources/templates/react-admin/Entity.txt
@@ -10,9 +10,8 @@
import lombok.Data;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.SpringUtils;
import com.vincent.rsf.manager.system.service.UserService;
import com.vincent.rsf.manager.system.service.HostService;
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
@@ -15,15 +15,15 @@
        generator.frontendPrefixPath = "rsf-admin/";
        generator.sqlOsType = SqlOsType.MYSQL;
        generator.url="localhost:3306/rsf";
        generator.url="127.0.0.1:3306/rsf";
        generator.username="root";
        generator.password="xltys1995";
//        generator.url="47.97.1.152:51433;databasename=jkasrs";
//        generator.username="sa";
//        generator.password="Zoneyung@zy56$";
        generator.table="man_map";
        generator.tableDesc="Map";
        generator.table="man_customer";
        generator.tableDesc="Customer";
        generator.packagePath="com.vincent.rsf.server.manager";
        generator.build();
@@ -31,7 +31,7 @@
/*
 CREATE TABLE `man_tablename` (
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'ID',
 `uuid` VARCHAR(255) DEFAULT NULL COMMENT '标识',
 `uuid` VARCHAR(255) DEFAULT NULL COMMENT '编号',
 `name` VARCHAR(255) DEFAULT NULL COMMENT '名称(*)',
 `status` INT(1) NOT NULL DEFAULT '1' COMMENT '状态{1:正常,0:冻结}',
 `deleted` INT(1) NOT NULL DEFAULT '0' COMMENT '是否删除{1:是,0:否}',