Merge pull request 'feat : 模块抽离 + 自定义查分表模块基本完成' (#50) from clay into master

Reviewed-on: http://git.feashow.cn/clay/fateverse/pulls/50

admin/admin-biz/src/main/resources/bootstrap.yml

@@ -36,7 +36,7 @@ dubbo:
   protocol:
     name: dubbo
     port: -1
-    serialization: fastjson2
+#    serialization: fastjson2
   registry:
     address: nacos://${spring.cloud.nacos.discovery.server-addr}
     username: ${spring.cloud.nacos.discovery.username}

auth/src/main/java/cn/fateverse/auth/config/CaptchaConfig.java

@@ -34,7 +34,7 @@ public class CaptchaConfig {
         //鱼眼 com.google.code.kaptcha.impl.FishEyeGimpy
         //阴影 com.google.code.kaptcha.impl.ShadowGimpy
 //        properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_STRING,"123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ#$!@&%");
-        properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_STRING,"1234567890");
+        properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_STRING,"0123456789");
         properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy");
         DefaultKaptcha defaultKaptcha = new DefaultKaptcha();
         Config config = new Config(properties);

auth/src/main/resources/bootstrap.yml

@@ -39,7 +39,7 @@ dubbo:
   protocol:
     name: dubbo
     port: -1
-    serialization: fastjson2
+#    serialization: fastjson2
   registry:
     address: nacos://${spring.cloud.nacos.discovery.server-addr}
     username: ${spring.cloud.nacos.discovery.username}

code-gen/src/main/java/cn/fateverse/code/entity/TableColumn.java

@@ -1,6 +1,5 @@
 package cn.fateverse.code.entity;
 
-import cn.hutool.core.util.StrUtil;
 import cn.fateverse.code.util.constant.CodeGenConstants;
 import cn.fateverse.common.core.annotaion.EnableAutoField;
 import cn.fateverse.common.core.entity.BaseEntity;

code-gen/src/main/resources/bootstrap.yml

@@ -34,7 +34,7 @@ dubbo:
   protocol:
     name: dubbo
     port: -1
-    serialization: fastjson2
+#    serialization: fastjson2
   registry:
     address: nacos://${spring.cloud.nacos.discovery.server-addr}
     username: ${spring.cloud.nacos.discovery.username}

code-gen/src/main/resources/vm/react/view.tsx.vm

@@ -3,14 +3,14 @@ import { PlusCircleTwoTone, EditTwoTone, DeleteTwoTone, ExclamationCircleOutline
 import Table, { ColumnsType } from "antd/lib/table";
 import { TableRowSelection } from "antd/lib/table/interface";
 import React, { Fragment, useEffect, useReducer, useState } from "react";
-import { get${ClassName}List, get${ClassName}Details, add${ClassName}, edit${ClassName}, del${ClassName} } from "../../api/${businessName}";
+import { get${ClassName}List, get${ClassName}Details, add${ClassName}, edit${ClassName}, del${ClassName} } from "./view.tsx${businessName}";
 #if($table.hasDictSelect())
 import { DTag } from "../../components/DTag";
 import { getCacheType } from "../../utils/cache";
 #end
 import SearchForm from "../../components/SearchForm";
 import { IModalConfig, IResponse } from "../../type";
-import { DataType } from "../../type/${businessName}";
+import { DataType } from "./view.tsx${businessName}";
 import confirm from "antd/lib/modal/confirm";
 import { parseDateTime, queryReducer, reducerPagination } from "../../utils/tool";
 

custom-query/custom-query-biz/pom.xml

@@ -3,19 +3,28 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>visual</artifactId>
+        <artifactId>custom-query</artifactId>
         <groupId>cn.fateverse</groupId>
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>custom-query</artifactId>
-    <description>自定义查询模块</description>
+    <artifactId>custom-query-biz</artifactId>
+
     <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
         <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
 
+
+
     <dependencies>
+        <dependency>
+            <groupId>cn.fateverse</groupId>
+            <artifactId>custom-query-submter</artifactId>
+            <version>1.0.0</version>
+        </dependency>
         <dependency>
             <groupId>cn.fateverse</groupId>
             <artifactId>common-security</artifactId>
@@ -89,4 +98,5 @@
         </plugins>
     </build>
 
+
 </project>