Revert "1. 统一包名修改"

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021 cloud-cloud
+Copyright (c) 2021 yudao-cloud
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

base-server/pom.xml

@@ -3,7 +3,7 @@
          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>
-        <groupId>com.zt.plat</groupId>
+        <groupId>cn.iocoder.cloud</groupId>
         <artifactId>dsc-base</artifactId>
         <version>${revision}</version>
     </parent>
@@ -16,35 +16,35 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.zt.plat</groupId>
+            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>cloud-module-system-api</artifactId>
+            <artifactId>yudao-module-system-api</artifactId>
             <version>${revision}</version>
         </dependency>
         <dependency>
-            <groupId>com.zt.plat</groupId>
+            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>cloud-module-infra-api</artifactId>
+            <artifactId>yudao-module-infra-api</artifactId>
             <version>${revision}</version>
         </dependency>
         <dependency>
-            <groupId>com.zt.plat</groupId>
+            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>cloud-module-base-server</artifactId>
+            <artifactId>yudao-module-base-server</artifactId>
             <version>${revision}</version>
         </dependency>
         <dependency>
-            <groupId>com.zt.plat</groupId>
+            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>cloud-module-contract-order-server</artifactId>
+            <artifactId>yudao-module-contract-order-server</artifactId>
             <version>${revision}</version>
         </dependency>
         <dependency>
-            <groupId>com.zt.plat</groupId>
+            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>cloud-module-erp-server</artifactId>
+            <artifactId>yudao-module-erp-server</artifactId>
             <version>${revision}</version>
         </dependency>
 
         <!-- Web 相关 -->
         <dependency>
-            <groupId>com.zt.plat</groupId>
+            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>cloud-spring-boot-starter-web</artifactId>
+            <artifactId>yudao-spring-boot-starter-web</artifactId>
         </dependency>
 
         <dependency>
@@ -55,8 +55,8 @@
 
         <!-- 服务保障相关 -->
         <dependency>
-            <groupId>com.zt.plat</groupId>
+            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>cloud-spring-boot-starter-protection</artifactId>
+            <artifactId>yudao-spring-boot-starter-protection</artifactId>
         </dependency>
 
         <!-- Registry 注册中心相关 -->
@@ -73,9 +73,9 @@
 
         <!-- RPC 远程调用相关 -->
         <dependency>
-            <groupId>com.zt.plat</groupId>
+            <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>cloud-spring-boot-starter-rpc</artifactId>
+            <artifactId>yudao-spring-boot-starter-rpc</artifactId>
-            <!-- 目的：cloud-server 单体启动，禁用 openfeign -->
+            <!-- 目的：yudao-server 单体启动，禁用 openfeign -->
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework.cloud</groupId>

base-server/src/main/java/cn/iocoder/yudao/base/BaseServerApplication.java

@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.base;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * Base 服务器的启动类
+ *
+ * @author ZT
+ */
+@SuppressWarnings("SpringComponentScan") // 忽略 IDEA 无法识别 ${yudao.info.base-package}
+@SpringBootApplication(scanBasePackages = {"${yudao.info.base-package}.base", "${yudao.info.base-package}.module"},
+        excludeName = {})
+public class BaseServerApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(BaseServerApplication.class, args);
+    }
+
+}

base-server/src/main/java/cn/iocoder/yudao/base/controller/base/BaseDemoController.java

@@ -1,4 +1,4 @@
-package com.zt.plat.base.controller.base;
+package cn.iocoder.yudao.base.controller.base;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -6,9 +6,9 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.zt.plat.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 
-import static com.zt.plat.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 /**
  * base 控制器

base-server/src/main/java/com/zt/plat/base/BaseServerApplication.java

@@ -1,20 +0,0 @@
-package com.zt.plat.base;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-/**
- * Base 服务器的启动类
- *
- * @author ZT
- */
-@SuppressWarnings("SpringComponentScan") // 忽略 IDEA 无法识别 ${cloud.info.base-package}
-@SpringBootApplication(scanBasePackages = {"${cloud.info.base-package}.base", "${cloud.info.base-package}.module"},
-        excludeName = {})
-public class BaseServerApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(BaseServerApplication.class, args);
-    }
-
-}

base-server/src/main/resources/application-local.yml

@@ -78,7 +78,7 @@ management:
 logging:
   level:
     # 配置自己写的 MyBatis Mapper 打印日志
-    com.zt.plat.module.base.dal.mysql: debug
+    cn.iocoder.yudao.module.base.dal.mysql: debug
     org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR
 
 mybatis-plus:
@@ -87,7 +87,7 @@ mybatis-plus:
 
 
 # 芋道配置项，设置当前项目所有自定义的配置
-cloud:
+yudao:
   env: # 多环境的配置项
     tag: ${HOSTNAME}
   security:

base-server/src/main/resources/application.yml

@@ -83,7 +83,7 @@ mybatis-plus:
       logic-delete-value: 1 # 逻辑已删除值(默认为 1)
       logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
     banner: false # 关闭控制台的 Banner 打印
-  type-aliases-package: com.zt.plat.module.*.dal.dataobject
+  type-aliases-package: cn.iocoder.yudao.module.*.dal.dataobject
   encryptor:
     password: XDV71a+xqStEA3WH # 加解密的秘钥，可使用 https://www.imaegoo.com/2020/aes-key-generator/ 网站生成
 
@@ -101,13 +101,13 @@ xxl:
       logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径
     accessToken: default_token # 执行器通讯TOKEN
 
-cloud:
+yudao:
   info:
     version: 1.0.0
-    base-package: com.zt.plat
+    base-package: cn.iocoder.yudao
   web:
     admin-ui:
-      url: http://dashboard.cloud.iocoder.cn # Admin 管理后台 UI 的地址
+      url: http://dashboard.yudao.iocoder.cn # Admin 管理后台 UI 的地址
   xss:
     enable: false
     exclude-urls: # 如下两个 url，仅仅是为了演示，去掉配置也没关系
@@ -116,7 +116,7 @@ cloud:
   swagger:
     title: 管理后台
     description: 提供管理员管理的所有功能
-    version: ${cloud.info.version}
+    version: ${yudao.info.version}
   tenant: # 多租户相关配置项
     enable: true