Merge branch 'test'

# Conflicts:
#	pom.xml
#	sql/dm/ruoyi-vue-pro-dm8.sql
#	sql/tools/convertor.py
#	yudao-framework/yudao-spring-boot-starter-biz-business/src/main/java/cn/iocoder/yudao/framework/business/core/db/BusinessBaseDO.java
#	yudao-module-crm/yudao-module-crm-server/src/main/resources/mapper/statistics/CrmStatisticsCustomerMapper.xml
#	yudao-module-iot/yudao-module-iot-biz/src/main/resources/application-dev.yaml
#	yudao-module-member/yudao-module-member-server/src/main/resources/application-dev.yaml

pom.xml

@@ -24,7 +24,7 @@
 <!--        <module>yudao-module-mall</module>-->
         <module>yudao-module-crm</module>
         <module>yudao-module-erp</module>
-        <module>yudao-module-ai</module>
+<!--        <module>yudao-module-ai</module>-->
         <module>yudao-module-template</module>
 <!--        <module>yudao-module-iot</module>-->
     </modules>

sql/tools/convertor.py

@@ -631,10 +631,10 @@ GO
 -- @formatter:off
 BEGIN TRANSACTION
 GO
-SET IDENTITY_INSERT {table_name.lower()} ON
+-- SET IDENTITY_INSERT {table_name.lower()} ON
 GO
 {inserts_lines}
-SET IDENTITY_INSERT {table_name.lower()} OFF
+-- SET IDENTITY_INSERT {table_name.lower()} OFF
 GO
 COMMIT
 GO
@@ -692,6 +692,12 @@ class DM8Convertor(Convertor):
             return "blob"
         if type == "mediumblob":
             return "varchar(10240)"
+        if type == "double":
+            return "double"
+        if type == "json":
+            return "clob"
+        if type == "longtext":
+            return "clob"
         if type == "decimal":
             return (
                 f"decimal({','.join(str(s) for s in size)})" if len(size) else "decimal"
@@ -705,6 +711,9 @@ class DM8Convertor(Convertor):
             if name == "id":
                 # 默认不生成自增，使用分布式 Id
                 return "id bigint NOT NULL PRIMARY KEY "
+            if name == "percent":
+                # percent 是 dm 保留关键字，需要用双引号包裹
+                return '"percent" decimal(24, 6) NOT NULL DEFAULT 0'
 
             type = col["type"].lower()
             full_type = self.translate_type(type, col["size"])
@@ -733,6 +742,10 @@ CREATE TABLE {table_name} (
     def gen_comment(self, table_sql: str, table_name: str) -> str:
         script = ""
         for field, comment_string in self.filed_comments(table_sql):
+            # 存在 percent 关键字需要双引号包裹
+            if field.lower() == "percent":
+                script = script.replace(f'{table_name}.percent', f'{table_name}."percent"')
+                continue
             script += (
                 f"COMMENT ON COLUMN {table_name}.{field} IS '{comment_string}';" + "\n"
             )
@@ -762,12 +775,13 @@ CREATE TABLE {table_name} (
 -- Records of {table_name.lower()}
 -- ----------------------------
 -- @formatter:off
-SET IDENTITY_INSERT {table_name.lower()} ON;
+-- SET IDENTITY_INSERT {table_name.lower()} ON;
 {inserts_lines}
 COMMIT;
-SET IDENTITY_INSERT {table_name.lower()} OFF;
+-- SET IDENTITY_INSERT {table_name.lower()} OFF;
 -- @formatter:on"""
-
+        script = script.replace(" percent,",' "percent",')
+        script = script.replace("\\'","''")
         return script
 
 
@@ -823,7 +837,7 @@ def main():
     )
     args = parser.parse_args()
 
-    sql_file = pathlib.Path("../mysql/ruoyi-vue-pro.sql").resolve().as_posix()
+    sql_file = pathlib.Path("../mysql/ai.sql").resolve().as_posix()
     convertor = None
     if args.type == "postgres":
         convertor = PostgreSQLConvertor(sql_file)

yudao-framework/yudao-spring-boot-starter-biz-business/src/main/java/cn/iocoder/yudao/framework/business/core/db/BusinessBaseDO.java

@@ -26,9 +26,6 @@ public class BusinessBaseDO extends TenantBaseDO {
     /** 部门名称 */
     @TableField(fill = FieldFill.INSERT, jdbcType = JdbcType.VARCHAR)
     private String deptName;
-    /** 任务编号 */
-    @TableField(fill = FieldFill.INSERT_UPDATE, jdbcType = JdbcType.VARCHAR)
-    private Long taskId;
     /** 岗位编号 */
     @TableField(fill = FieldFill.INSERT, jdbcType = JdbcType.VARCHAR)
     private Long postId;
@@ -43,7 +40,6 @@ public class BusinessBaseDO extends TenantBaseDO {
         this.companyName = null;
         this.deptId = null;
         this.deptName = null;
-        this.taskId = null;
         this.postId = null;
     }
 

yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/grey/GrayReactiveLoadBalancerClientFilter.java

@@ -78,7 +78,7 @@ public class GrayReactiveLoadBalancerClientFilter implements GlobalFilter, Order
                     if (!response.hasServer()) {
                         supportedLifecycleProcessors.forEach(lifecycle -> lifecycle
                                 .onComplete(new CompletionContext<>(CompletionContext.Status.DISCARD, lbRequest, response)));
-                        throw NotFoundException.create(properties.isUse404(), "Unable to find instance for " + url.getHost());
+                        throw NotFoundException.create(properties.isUse404(), "功能模块未装载 " + url.getHost());
                     }
 
                     ServiceInstance retrievedInstance = response.getServer();

yudao-module-ai/yudao-module-ai-server/src/main/resources/application-dev.yaml

@@ -3,7 +3,7 @@
 spring:
   cloud:
     nacos:
-      server-addr: 127.0.0.1:8848 # Nacos 服务器地址
+      server-addr: yudao-nacos:8848 # Nacos 服务器地址
       username: # Nacos 账号
       password: # Nacos 密码
       discovery: # 【配置中心】配置项
@@ -95,7 +95,7 @@ spring:
 xxl:
   job:
     admin:
-      addresses: http://127.0.0.1:9090/xxl-job-admin # 调度中心部署跟地址
+      addresses: http://xxl-job-admin:8080/xxl-job-admin # 调度中心部署跟地址
 
 --- #################### 服务保障相关配置 ####################