Browse Source

统一修改版本到SNAPSHOT

yingp 7 years ago
parent
commit
cb546be5e1
43 changed files with 56 additions and 49 deletions
  1. 1 1
      README.md
  2. 1 1
      applications/common-dto/pom.xml
  3. 1 1
      applications/document/pom.xml
  4. 1 1
      applications/money/pom.xml
  5. 1 2
      applications/pom.xml
  6. 1 1
      applications/purchase/pom.xml
  7. 1 1
      applications/purchase/purchase-api/pom.xml
  8. 1 1
      applications/purchase/purchase-dto/pom.xml
  9. 1 1
      applications/purchase/purchase-server/pom.xml
  10. 1 1
      applications/sale/pom.xml
  11. 1 1
      applications/storage/pom.xml
  12. 1 1
      base-servers/account/account-api/pom.xml
  13. 1 1
      base-servers/account/account-dto/pom.xml
  14. 1 1
      base-servers/account/account-server/pom.xml
  15. 1 1
      base-servers/account/pom.xml
  16. 1 1
      base-servers/admin-server/pom.xml
  17. 1 1
      base-servers/auth/auth-api/pom.xml
  18. 1 1
      base-servers/auth/auth-client/pom.xml
  19. 1 1
      base-servers/auth/auth-common/pom.xml
  20. 1 1
      base-servers/auth/auth-dto/pom.xml
  21. 1 1
      base-servers/auth/auth-server/pom.xml
  22. 1 1
      base-servers/auth/pom.xml
  23. 1 1
      base-servers/eureka-server/pom.xml
  24. 1 1
      base-servers/file/file-api/pom.xml
  25. 1 1
      base-servers/file/file-dto/pom.xml
  26. 1 1
      base-servers/file/file-server/pom.xml
  27. 1 1
      base-servers/file/pom.xml
  28. 1 1
      base-servers/gateway-server/pom.xml
  29. 1 1
      base-servers/mail/mail-api/pom.xml
  30. 1 1
      base-servers/mail/mail-dto/pom.xml
  31. 1 1
      base-servers/mail/mail-server/pom.xml
  32. 1 1
      base-servers/mail/pom.xml
  33. 2 1
      base-servers/pom.xml
  34. 1 1
      base-servers/sms/pom.xml
  35. 1 1
      base-servers/sms/sms-api/pom.xml
  36. 1 1
      base-servers/sms/sms-server/pom.xml
  37. 3 3
      base-servers/ui-server/pom.xml
  38. 0 0
      base-servers/ui-server/src/main/java/com/usoftchina/saas/ui/UiApplication.java
  39. 1 1
      base-servers/zipkin-server/pom.xml
  40. 1 1
      framework/core/pom.xml
  41. 1 1
      framework/pom.xml
  42. 1 1
      pom.xml
  43. 12 5
      script/mysql/init/ui.sql

+ 1 - 1
README.md

@@ -13,7 +13,6 @@
 │  |  |  |─purchase-server--------------------采购服务
 │  |  ├─sale----------------------------------销售
 │  |  ├─storage-------------------------------库存
-│  |  ├─ui------------------------------------UI配置
 │  │ 
 │  ├─base-servers-----------------------------基础服务
 │  |  ├─admin-server--------------------------spring-boot-admin监控中心
@@ -41,6 +40,7 @@
 │  |  |  |─sms-api----------------------------短信服务api
 │  |  |  |─sms-dto----------------------------短信服务数据传输对象
 │  |  |  |─sms-server-------------------------短信服务
+│  |  ├─ui-server-----------------------------UI配置服务
 │  |  ├─zipkin-server-------------------------zipkin分布式服务链路跟踪
 │  │ 
 │  ├─doc--------------------------------------项目文档

+ 1 - 1
applications/common-dto/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>applications</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
applications/document/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>applications</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
applications/money/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>applications</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 2
applications/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>saas-platform</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,7 +18,6 @@
         <module>storage</module>
         <module>money</module>
         <module>document</module>
-        <module>ui</module>
         <module>common-dto</module>
     </modules>
 

+ 1 - 1
applications/purchase/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>applications</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
applications/purchase/purchase-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>purchase</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
applications/purchase/purchase-dto/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>purchase</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
applications/purchase/purchase-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>purchase</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
applications/sale/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>applications</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
applications/storage/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>applications</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
base-servers/account/account-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>account</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
base-servers/account/account-dto/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>account</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
base-servers/account/account-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>account</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
base-servers/account/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>base-servers</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
base-servers/admin-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>base-servers</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
base-servers/auth/auth-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>auth</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
base-servers/auth/auth-client/pom.xml

@@ -5,7 +5,7 @@
 <parent>
     <artifactId>auth</artifactId>
     <groupId>com.usoftchina.saas</groupId>
-    <version>1.0.0</version>
+    <version>1.0.0-SNAPSHOT</version>
 </parent>
 <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
base-servers/auth/auth-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>auth</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
base-servers/auth/auth-dto/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>auth</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
base-servers/auth/auth-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>auth</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
base-servers/auth/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>base-servers</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
base-servers/eureka-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>base-servers</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
base-servers/file/file-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>file</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
base-servers/file/file-dto/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>file</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
base-servers/file/file-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>file</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
base-servers/file/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>base-servers</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
base-servers/gateway-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>base-servers</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
base-servers/mail/mail-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mail</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
base-servers/mail/mail-dto/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mail</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
base-servers/mail/mail-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mail</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
base-servers/mail/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>base-servers</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 2 - 1
base-servers/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>saas-platform</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,6 +21,7 @@
         <module>mail</module>
         <module>sms</module>
         <module>account</module>
+        <module>ui-server</module>
     </modules>
 
 </project>

+ 1 - 1
base-servers/sms/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>base-servers</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
base-servers/sms/sms-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sms</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
base-servers/sms/sms-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sms</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 3 - 3
applications/ui/pom.xml → base-servers/ui-server/pom.xml

@@ -3,13 +3,13 @@
          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>applications</artifactId>
+        <artifactId>base-servers</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>ui</artifactId>
+    <artifactId>ui-server</artifactId>
     <description>ui config server</description>
 
     <dependencies>

+ 0 - 0
applications/ui/src/main/java/com/usoftchina/saas/ui/UiApplication.java → base-servers/ui-server/src/main/java/com/usoftchina/saas/ui/UiApplication.java


+ 1 - 1
base-servers/zipkin-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>base-servers</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
framework/core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>framework</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
framework/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>saas-platform</artifactId>
         <groupId>com.usoftchina.saas</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
pom.xml

@@ -16,7 +16,7 @@
     <groupId>com.usoftchina.saas</groupId>
     <artifactId>saas-platform</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.0</version>
+    <version>1.0.0-SNAPSHOT</version>
     <description>saas framework parent</description>
 
     <properties>

+ 12 - 5
script/mysql/init/ui.sql

@@ -1,10 +1,17 @@
 CREATE DATABASE `saas_ui` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
 use `saas_ui`;
 
+create table `ui_page`(
+  id int unsigned primary key not null auto_increment,
+  description varchar(500) not null,
+  xtype varchar(50),
+  layout json
+);
+
 create table `ui_form`(
-id int unsigned primary key not null auto_increment,
-name varchar(100) not null,
-field_name varchar(100) not null,
-field_desc varchar(100) not null,
-field_order int not null
+  id int unsigned primary key not null auto_increment,
+  page_id varchar(100) not null,
+  field_name varchar(100) not null,
+  field_desc varchar(100) not null,
+  field_order int not null
 );