java110 před 5 roky
rodič
revize
2f3866e73c
49 změnil soubory, kde provedl 519 přidání a 131 odebrání
  1. 150 43
      java110-generator/pom.xml
  2. 87 0
      java110-generator/src/main/java/com/java110/generator/GeneratorServiceApplicationStart.java
  3. 2 2
      java110-generator/src/main/java/com/java110/code/back/BackCoderGeneratorStart.java
  4. 1 2
      java110-generator/src/main/java/com/java110/code/back/BaseGenerator.java
  5. 1 1
      java110-generator/src/main/java/com/java110/code/back/Data.java
  6. 2 2
      java110-generator/src/main/java/com/java110/code/back/GeneratorAbstractBussiness.java
  7. 3 3
      java110-generator/src/main/java/com/java110/code/back/GeneratorApiListener.java
  8. 2 2
      java110-generator/src/main/java/com/java110/code/back/GeneratorDeleteInfoListener.java
  9. 2 2
      java110-generator/src/main/java/com/java110/code/back/GeneratorDtoBean.java
  10. 2 2
      java110-generator/src/main/java/com/java110/code/back/GeneratorIInnerServiceSMO.java
  11. 2 2
      java110-generator/src/main/java/com/java110/code/back/GeneratorIServiceDaoListener.java
  12. 2 2
      java110-generator/src/main/java/com/java110/code/back/GeneratorInnerServiceSMOImpl.java
  13. 2 2
      java110-generator/src/main/java/com/java110/code/back/GeneratorSaveInfoListener.java
  14. 2 2
      java110-generator/src/main/java/com/java110/code/back/GeneratorServiceDaoImplListener.java
  15. 2 2
      java110-generator/src/main/java/com/java110/code/back/GeneratorServiceDaoImplMapperListener.java
  16. 2 2
      java110-generator/src/main/java/com/java110/code/back/GeneratorUpdateInfoListener.java
  17. 3 3
      java110-generator/src/main/java/com/java110/code/relationship/GeneratorBindingComponent.java
  18. 3 3
      java110-generator/src/main/java/com/java110/code/relationship/GeneratorFlow.java
  19. 3 3
      java110-generator/src/main/java/com/java110/code/relationship/GeneratorRelationShipStart.java
  20. 1 1
      java110-generator/src/main/java/com/java110/code/util/FileUtilBase.java
  21. 1 1
      java110-generator/src/main/java/com/java110/code/util/UnicodeReader.java
  22. 3 3
      java110-generator/src/main/java/com/java110/code/web/GeneratorAddComponent.java
  23. 3 3
      java110-generator/src/main/java/com/java110/code/web/GeneratorChooseComponent.java
  24. 3 3
      java110-generator/src/main/java/com/java110/code/web/GeneratorDeleteComponent.java
  25. 3 3
      java110-generator/src/main/java/com/java110/code/web/GeneratorEditComponent.java
  26. 3 3
      java110-generator/src/main/java/com/java110/code/web/GeneratorManagerComponent.java
  27. 2 2
      java110-generator/src/main/java/com/java110/code/web/GeneratorStart.java
  28. 2 2
      java110-generator/src/main/java/com/java110/code/web/GeneratorViewComponent.java
  29. 64 0
      java110-generator/src/main/resources/application-dev.yml
  30. 3 0
      java110-generator/src/main/resources/application.yml
  31. 125 0
      java110-generator/src/main/resources/dataSource.yml
  32. 3 0
      java110-generator/src/main/resources/java110.properties
  33. 1 1
      pom.xml
  34. 1 1
      service-common/src/main/java/com/java110/common/dao/impl/FileServiceDaoImpl.java
  35. 3 3
      service-front/src/main/java/com/java110/front/smo/impl/CommunityServiceSMOImpl.java
  36. 3 3
      service-front/src/main/java/com/java110/front/smo/impl/FeeServiceSMOImpl.java
  37. 1 1
      service-sequence/pom.xml
  38. 1 1
      service-sequence/src/main/java/com/java110/code/CodeServiceApplicationStart.java
  39. 2 2
      service-sequence/src/main/java/com/java110/code/api/CodeApi.java
  40. 1 1
      service-sequence/src/main/java/com/java110/code/dao/ICommonServiceDao.java
  41. 1 1
      service-sequence/src/main/java/com/java110/code/dao/IPrimaryKeyServiceDao.java
  42. 1 1
      service-sequence/src/main/java/com/java110/code/dao/ISnowflakeldWorker.java
  43. 2 2
      service-sequence/src/main/java/com/java110/code/dao/impl/CommonServiceDaoImpl.java
  44. 2 2
      service-sequence/src/main/java/com/java110/code/dao/impl/PrimaryKeyServiceDaoImpl.java
  45. 2 2
      service-sequence/src/main/java/com/java110/code/dao/impl/SnowflakeIdWorkerImpl.java
  46. 1 1
      service-sequence/src/main/java/com/java110/code/smo/ICommonServiceSmo.java
  47. 1 1
      service-sequence/src/main/java/com/java110/code/smo/IPrimaryKeyServiceSMO.java
  48. 3 3
      service-sequence/src/main/java/com/java110/code/smo/impl/CommonServiceSmoImpl.java
  49. 4 4
      service-sequence/src/main/java/com/java110/code/smo/impl/PrimaryKeyServiceSMOImpl.java

+ 150 - 43
java110-generator/pom.xml

@@ -15,6 +15,8 @@
     <!-- FIXME change it to the project's website -->
     <url>http://www.example.com</url>
 
+    <packaging>jar</packaging>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.7</maven.compiler.source>
@@ -32,51 +34,156 @@
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.java110</groupId>
+            <artifactId>java110-config</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.java110</groupId>
+            <artifactId>java110-service</artifactId>
+
+        </dependency>
+        <!--  WICKET DEPENDENCIES -->
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.thymeleaf</groupId>
+            <artifactId>thymeleaf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-spring</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.quartz-scheduler</groupId>
+            <artifactId>quartz</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+
     </dependencies>
 
     <build>
-        <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
-            <plugins>
-                <!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
-                <plugin>
-                    <artifactId>maven-clean-plugin</artifactId>
-                    <version>3.1.0</version>
-                </plugin>
-                <!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
-                <plugin>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.0.2</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.0</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.1</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.0.2</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-install-plugin</artifactId>
-                    <version>2.5.2</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.8.2</version>
-                </plugin>
-                <!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
-                <plugin>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <version>3.7.1</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-project-info-reports-plugin</artifactId>
-                    <version>3.0.0</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
+        <finalName>service-simple</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.10</version>
+                <executions>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>com.java110</groupId>
+                                    <artifactId>java110-config</artifactId>
+                                    <version>${microcommunity.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.java110</groupId>
+                                    <artifactId>service-front</artifactId>
+                                    <version>${microcommunity.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.java110</groupId>
+                                    <artifactId>service-job</artifactId>
+                                    <version>${microcommunity.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                                </artifactItem>
+
+                                <artifactItem>
+                                    <groupId>com.java110</groupId>
+                                    <artifactId>service-order</artifactId>
+                                    <version>${microcommunity.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.java110</groupId>
+                                    <artifactId>service-store</artifactId>
+                                    <version>${microcommunity.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.java110</groupId>
+                                    <artifactId>service-user</artifactId>
+                                    <version>${microcommunity.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.java110</groupId>
+                                    <artifactId>service-common</artifactId>
+                                    <version>${microcommunity.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.java110</groupId>
+                                    <artifactId>service-community</artifactId>
+                                    <version>${microcommunity.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.java110</groupId>
+                                    <artifactId>service-api</artifactId>
+                                    <version>${microcommunity.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.java110</groupId>
+                                    <artifactId>service-fee</artifactId>
+                                    <version>${microcommunity.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.java110.generator.GeneratorServiceApplicationStart</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 </project>

+ 87 - 0
java110-generator/src/main/java/com/java110/generator/GeneratorServiceApplicationStart.java

@@ -0,0 +1,87 @@
+package com.java110.generator;
+
+import com.java110.core.annotation.Java110ListenerDiscovery;
+import com.java110.core.event.service.BusinessServiceDataFlowEventPublishing;
+import com.java110.service.init.ServiceStartInit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.client.loadbalancer.LoadBalanced;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.http.converter.StringHttpMessageConverter;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.web.client.RestTemplate;
+
+import java.nio.charset.Charset;
+
+
+/**
+ * spring boot 初始化启动类
+ *
+ * @version v0.1
+ * @auther com.java110.wuxw
+ * @mail 928255095@qq.com
+ * @date 2016年8月6日
+ * @tag
+ */
+@SpringBootApplication(scanBasePackages = {"com.java110.core.annotation",
+        "com.java110.core.aop","com.java110.core.base","com.java110.core.cache",
+        "com.java110.core.client","com.java110.core.component","com.java110.core.context",
+        "com.java110.core.event","com.java110.core.factory",
+        "com.java110.core.kafka","com.java110.core.log","com.java110.core.proxy",
+        "com.java110.service", "com.java110.user",
+        "com.java110.job","com.java110.store","com.java110.fee","com.java110.community",
+        "com.java110.common","com.java110.order","com.java110.api","com.java110.front",
+         "com.java110.config.properties.code", "com.java110.db"})
+@Java110ListenerDiscovery(listenerPublishClass = BusinessServiceDataFlowEventPublishing.class,
+        basePackages = {"com.java110.user.listener","com.java110.job.listener",
+                "com.java110.store.listener","com.java110.fee.listener",
+                "com.java110.community.listener","com.java110.common.listener",
+                "com.java110.order.listener","com.java110.api.listener",
+        })
+@EnableScheduling
+@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class})
+public class GeneratorServiceApplicationStart {
+
+    private static Logger logger = LoggerFactory.getLogger(GeneratorServiceApplicationStart.class);
+
+
+    /**
+     * 实例化RestTemplate,通过@LoadBalanced注解开启均衡负载能力.
+     *
+     * @return restTemplate
+     */
+    @Bean
+    public RestTemplate restTemplate() {
+        StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
+        RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build();
+        return restTemplate;
+    }
+
+    /**
+     * 实例化RestTemplate
+     *
+     * @return restTemplate
+     */
+    @Bean
+    public com.java110.core.client.RestTemplate restTemplateNoLoadBalanced() {
+        StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
+        com.java110.core.client.RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(com.java110.core.client.RestTemplate.class);
+        return restTemplate;
+    }
+
+    public static void main(String[] args) throws Exception {
+        try {
+            ApplicationContext context = SpringApplication.run(GeneratorServiceApplicationStart.class, args);
+            ServiceStartInit.initSystemConfig(context);
+        } catch (Throwable e) {
+            logger.error("系统启动失败", e);
+        }
+    }
+}

+ 2 - 2
java110-generator/src/main/java/com/java110/code/back/BackCoderGeneratorStart.java

@@ -1,9 +1,9 @@
-package com.java110.code.back;
+package com.java110.generator.back;
 
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.java110.code.web.GeneratorStart;
+import com.java110.generator.web.GeneratorStart;
 
 import java.util.*;
 

+ 1 - 2
java110-generator/src/main/java/com/java110/code/back/BaseGenerator.java

@@ -1,7 +1,6 @@
-package com.java110.code.back;
+package com.java110.generator.back;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.code.util.FileUtilBase;
 
 import java.io.*;
 

+ 1 - 1
java110-generator/src/main/java/com/java110/code/back/Data.java

@@ -1,4 +1,4 @@
-package com.java110.code.back;
+package com.java110.generator.back;
 
 import java.util.Map;
 

+ 2 - 2
java110-generator/src/main/java/com/java110/code/back/GeneratorAbstractBussiness.java

@@ -1,6 +1,6 @@
-package com.java110.code.back;
+package com.java110.generator.back;
 
-import com.java110.code.util.FileUtilBase;
+import com.java110.generator.util.FileUtilBase;
 
 import java.util.Map;
 

+ 3 - 3
java110-generator/src/main/java/com/java110/code/back/GeneratorApiListener.java

@@ -1,7 +1,7 @@
-package com.java110.code.back;
+package com.java110.generator.back;
 
-import com.java110.code.util.FileUtilBase;
-import com.java110.code.web.GeneratorStart;
+import com.java110.generator.util.FileUtilBase;
+import com.java110.generator.web.GeneratorStart;
 
 import java.util.Map;
 

+ 2 - 2
java110-generator/src/main/java/com/java110/code/back/GeneratorDeleteInfoListener.java

@@ -1,6 +1,6 @@
-package com.java110.code.back;
+package com.java110.generator.back;
 
-import com.java110.code.util.FileUtilBase;
+import com.java110.generator.util.FileUtilBase;
 
 import java.util.Map;
 

+ 2 - 2
java110-generator/src/main/java/com/java110/code/back/GeneratorDtoBean.java

@@ -1,6 +1,6 @@
-package com.java110.code.back;
+package com.java110.generator.back;
 
-import com.java110.code.util.FileUtilBase;
+import com.java110.generator.util.FileUtilBase;
 
 import java.util.Map;
 

+ 2 - 2
java110-generator/src/main/java/com/java110/code/back/GeneratorIInnerServiceSMO.java

@@ -1,6 +1,6 @@
-package com.java110.code.back;
+package com.java110.generator.back;
 
-import com.java110.code.util.FileUtilBase;
+import com.java110.generator.util.FileUtilBase;
 
 /**
  * 内部服务类实现类

+ 2 - 2
java110-generator/src/main/java/com/java110/code/back/GeneratorIServiceDaoListener.java

@@ -1,6 +1,6 @@
-package com.java110.code.back;
+package com.java110.generator.back;
 
-import com.java110.code.util.FileUtilBase;
+import com.java110.generator.util.FileUtilBase;
 
 public class GeneratorIServiceDaoListener extends BaseGenerator {
 

+ 2 - 2
java110-generator/src/main/java/com/java110/code/back/GeneratorInnerServiceSMOImpl.java

@@ -1,6 +1,6 @@
-package com.java110.code.back;
+package com.java110.generator.back;
 
-import com.java110.code.util.FileUtilBase;
+import com.java110.generator.util.FileUtilBase;
 
 /**
  * 内部服务类实现类

+ 2 - 2
java110-generator/src/main/java/com/java110/code/back/GeneratorSaveInfoListener.java

@@ -1,6 +1,6 @@
-package com.java110.code.back;
+package com.java110.generator.back;
 
-import com.java110.code.util.FileUtilBase;
+import com.java110.generator.util.FileUtilBase;
 import org.springframework.util.StringUtils;
 
 import java.util.Map;

+ 2 - 2
java110-generator/src/main/java/com/java110/code/back/GeneratorServiceDaoImplListener.java

@@ -1,6 +1,6 @@
-package com.java110.code.back;
+package com.java110.generator.back;
 
-import com.java110.code.util.FileUtilBase;
+import com.java110.generator.util.FileUtilBase;
 
 public class GeneratorServiceDaoImplListener extends BaseGenerator {
 

+ 2 - 2
java110-generator/src/main/java/com/java110/code/back/GeneratorServiceDaoImplMapperListener.java

@@ -1,6 +1,6 @@
-package com.java110.code.back;
+package com.java110.generator.back;
 
-import com.java110.code.util.FileUtilBase;
+import com.java110.generator.util.FileUtilBase;
 
 import java.util.Map;
 

+ 2 - 2
java110-generator/src/main/java/com/java110/code/back/GeneratorUpdateInfoListener.java

@@ -1,6 +1,6 @@
-package com.java110.code.back;
+package com.java110.generator.back;
 
-import com.java110.code.util.FileUtilBase;
+import com.java110.generator.util.FileUtilBase;
 
 import java.util.Map;
 

+ 3 - 3
java110-generator/src/main/java/com/java110/code/relationship/GeneratorBindingComponent.java

@@ -1,10 +1,10 @@
-package com.java110.code.relationship;
+package com.java110.generator.relationship;
 
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.java110.code.back.BaseGenerator;
-import com.java110.code.web.GeneratorStart;
+import com.java110.generator.back.BaseGenerator;
+import com.java110.generator.web.GeneratorStart;
 import org.springframework.util.StringUtils;
 
 public class GeneratorBindingComponent extends BaseGenerator {

+ 3 - 3
java110-generator/src/main/java/com/java110/code/relationship/GeneratorFlow.java

@@ -1,9 +1,9 @@
-package com.java110.code.relationship;
+package com.java110.generator.relationship;
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.code.back.BaseGenerator;
-import com.java110.code.web.GeneratorStart;
+import com.java110.generator.back.BaseGenerator;
+import com.java110.generator.web.GeneratorStart;
 
 public class GeneratorFlow extends BaseGenerator {
 

+ 3 - 3
java110-generator/src/main/java/com/java110/code/relationship/GeneratorRelationShipStart.java

@@ -1,8 +1,8 @@
-package com.java110.code.relationship;
+package com.java110.generator.relationship;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.code.back.BaseGenerator;
-import com.java110.code.web.GeneratorStart;
+import com.java110.generator.back.BaseGenerator;
+import com.java110.generator.web.GeneratorStart;
 
 /**
  * @ClassName GeneratorRelationShipStart

+ 1 - 1
java110-generator/src/main/java/com/java110/code/util/FileUtilBase.java

@@ -1,4 +1,4 @@
-package com.java110.code.util;
+package com.java110.generator.util;
 
 
 import java.io.BufferedReader;

+ 1 - 1
java110-generator/src/main/java/com/java110/code/util/UnicodeReader.java

@@ -1,4 +1,4 @@
-package com.java110.code.util;
+package com.java110.generator.util;
 
 /**
 version: 1.1 / 2007-01-25

+ 3 - 3
java110-generator/src/main/java/com/java110/code/web/GeneratorAddComponent.java

@@ -1,10 +1,10 @@
-package com.java110.code.web;
+package com.java110.generator.web;
 
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.java110.code.back.BaseGenerator;
-import com.java110.code.util.FileUtilBase;
+import com.java110.generator.back.BaseGenerator;
+import com.java110.generator.util.FileUtilBase;
 import org.springframework.util.StringUtils;
 
 public class GeneratorAddComponent extends BaseGenerator {

+ 3 - 3
java110-generator/src/main/java/com/java110/code/web/GeneratorChooseComponent.java

@@ -1,9 +1,9 @@
-package com.java110.code.web;
+package com.java110.generator.web;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.java110.code.back.BaseGenerator;
-import com.java110.code.util.FileUtilBase;
+import com.java110.generator.back.BaseGenerator;
+import com.java110.generator.util.FileUtilBase;
 
 /**
  * @ClassName GeneratorChooseComponent

+ 3 - 3
java110-generator/src/main/java/com/java110/code/web/GeneratorDeleteComponent.java

@@ -1,10 +1,10 @@
-package com.java110.code.web;
+package com.java110.generator.web;
 
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.java110.code.back.BaseGenerator;
-import com.java110.code.util.FileUtilBase;
+import com.java110.generator.back.BaseGenerator;
+import com.java110.generator.util.FileUtilBase;
 
 public class GeneratorDeleteComponent extends BaseGenerator {
 

+ 3 - 3
java110-generator/src/main/java/com/java110/code/web/GeneratorEditComponent.java

@@ -1,10 +1,10 @@
-package com.java110.code.web;
+package com.java110.generator.web;
 
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.java110.code.back.BaseGenerator;
-import com.java110.code.util.FileUtilBase;
+import com.java110.generator.back.BaseGenerator;
+import com.java110.generator.util.FileUtilBase;
 import org.springframework.util.StringUtils;
 
 public class GeneratorEditComponent extends BaseGenerator {

+ 3 - 3
java110-generator/src/main/java/com/java110/code/web/GeneratorManagerComponent.java

@@ -1,10 +1,10 @@
-package com.java110.code.web;
+package com.java110.generator.web;
 
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.java110.code.back.BaseGenerator;
-import com.java110.code.util.FileUtilBase;
+import com.java110.generator.back.BaseGenerator;
+import com.java110.generator.util.FileUtilBase;
 
 public class GeneratorManagerComponent extends BaseGenerator {
 

+ 2 - 2
java110-generator/src/main/java/com/java110/code/web/GeneratorStart.java

@@ -1,7 +1,7 @@
-package com.java110.code.web;
+package com.java110.generator.web;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.code.back.BaseGenerator;
+import com.java110.generator.back.BaseGenerator;
 
 public class GeneratorStart extends BaseGenerator {
 

+ 2 - 2
java110-generator/src/main/java/com/java110/code/web/GeneratorViewComponent.java

@@ -1,9 +1,9 @@
-package com.java110.code.web;
+package com.java110.generator.web;
 
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.java110.code.back.BaseGenerator;
+import com.java110.generator.back.BaseGenerator;
 
 public class GeneratorViewComponent extends BaseGenerator {
 

+ 64 - 0
java110-generator/src/main/resources/application-dev.yml

@@ -0,0 +1,64 @@
+jedis:
+  pool:
+    config:
+      maxTotal: 100
+      maxIdle: 20
+      maxWaitMillis: 20000
+    host: dev.redis.java110.com
+    port: 6379
+    timeout: 3000
+    password: hc
+
+server:
+  port: 8888
+  tomcat:
+    uri-encoding: UTF-8
+
+spring:
+  http:
+    encoding:
+      charset: UTF-8
+      enabled: true
+      force: true
+  redis:
+    database: 0
+    host: dev.redis.java110.com
+    port: 6379
+    password: hc
+    pool:
+      max-active: 300
+      max-wait: 10000
+      max-idle: 100
+      min-idle: 0
+      timeout: 0
+#============== kafka ===================
+kafka:
+  consumer:
+    zookeeper:
+      connect: dev.zk.java110.com:2181
+    servers: dev.kafka.java110.com:9092
+    enable:
+      auto:
+        commit: true
+    session:
+      timeout: 6000
+    auto:
+      commit:
+        interval: 100
+      offset:
+        reset: latest
+    topic: test
+    group:
+      id: simpleBusinessStatus
+    concurrency: 10
+
+  producer:
+    zookeeper:
+      connect: dev.zk.java110.com:2181
+    servers: dev.kafka.java110.com:9092
+    retries: 0
+    batch:
+      size: 4096
+    linger: 1
+    buffer:
+      memory: 40960

+ 3 - 0
java110-generator/src/main/resources/application.yml

@@ -0,0 +1,3 @@
+spring:
+  profiles:
+    active: dev

+ 125 - 0
java110-generator/src/main/resources/dataSource.yml

@@ -0,0 +1,125 @@
+dataSources:
+  ds0: !!com.alibaba.druid.pool.DruidDataSource
+    driverClassName: com.mysql.jdbc.Driver
+    url: jdbc:mysql://dev.db.java110.com:3306/hc_community?useUnicode=true&characterEncoding=utf-8
+    username: hc_community
+    password: hc_community@12345678
+    minIdle: 5
+    validationQuery: SELECT 1 FROM DUAL
+    initialSize: 5
+    maxWait: 60000
+    filters: stat,wall,log4j
+    poolPreparedStatements: true
+#  ds0_slave0: !!com.alibaba.druid.pool.DruidDataSource
+#    driverClassName: com.mysql.jdbc.Driver
+#    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
+#    username: TT
+#    password: TT@12345678
+#    connectionTimeoutMilliseconds: 30000
+#    idleTimeoutMilliseconds: 60000
+#    maxPoolSize: 50
+#    minPoolSize: 1
+#    maintenanceIntervalMilliseconds: 30000
+  ds1: !!com.alibaba.druid.pool.DruidDataSource
+    driverClassName: com.mysql.jdbc.Driver
+    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
+    username: TT
+    password: TT@12345678
+    minIdle: 5
+    validationQuery: SELECT 1 FROM DUAL
+    initialSize: 5
+    maxWait: 60000
+    filters: stat,wall,log4j
+    poolPreparedStatements: true
+#  ds1_slave0: !!com.alibaba.druid.pool.DruidDataSource
+#    driverClassName: com.mysql.jdbc.Driver
+#    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
+#    username: TT
+#    password: TT@12345678
+#    connectionTimeoutMilliseconds: 30000
+#    idleTimeoutMilliseconds: 60000
+#    maxPoolSize: 50
+#    minPoolSize: 1
+#    maintenanceIntervalMilliseconds: 30000
+
+shardingRule:
+  tables:
+    business_community:
+      actualDataNodes: ds${0..1}.business_community
+      databaseStrategy:
+        inline:
+          shardingColumn: community_id
+          algorithmExpression: ds${Long.parseLong(community_id) % 2}
+    s_community:
+      actualDataNodes: ds${0..1}.s_community
+      databaseStrategy:
+        inline:
+          shardingColumn: community_id
+          algorithmExpression: ds${Long.parseLong(community_id) % 2}
+    business_community_attr:
+      actualDataNodes: ds${0..1}.business_community_attr
+      databaseStrategy:
+        inline:
+          shardingColumn: community_id
+          algorithmExpression: ds${Long.parseLong(community_id) % 2}
+    s_community_attr:
+      actualDataNodes: ds${0..1}.s_community_attr
+      databaseStrategy:
+        inline:
+          shardingColumn: community_id
+          algorithmExpression: ds${Long.parseLong(community_id) % 2}
+    business_community_member:
+      actualDataNodes: ds${0..1}.business_community_member
+      databaseStrategy:
+        inline:
+          shardingColumn: community_id
+          algorithmExpression: ds${Long.parseLong(community_id) % 2}
+    business_community_photo:
+      actualDataNodes: ds${0..1}.business_community_photo
+      databaseStrategy:
+        inline:
+          shardingColumn: community_id
+          algorithmExpression: ds${Long.parseLong(community_id) % 2}
+    s_community_member:
+      actualDataNodes: ds${0..1}.s_community_member
+      databaseStrategy:
+        inline:
+          shardingColumn: community_id
+          algorithmExpression: ds${Long.parseLong(community_id) % 2}
+    s_community_photo:
+      actualDataNodes: ds${0..1}.s_community_photo
+      databaseStrategy:
+        inline:
+          shardingColumn: community_id
+          algorithmExpression: ds${Long.parseLong(community_id) % 2}
+  bindingTables:
+    - business_community
+    - s_community
+    - business_community_member
+    - business_community_photo
+    - s_community_member
+    - s_community_photo
+    - business_community_attr
+    - s_community_attr
+
+  defaultDataSourceName: ds1
+  defaultDatabaseStrategy:
+    inline:
+      shardingColumn: community_id
+      algorithmExpression: ds${Long.parseLong(community_id) % 2}
+  defaultTableStrategy:
+    none:
+
+#  masterSlaveRules:
+#    ms_ds0:
+#     masterDataSourceName: ds0
+#     slaveDataSourceNames:
+#       - ds0_slave0
+#     loadBalanceAlgorithmType: ROUND_ROBIN
+#   ms_ds1:
+#     masterDataSourceName: ds1
+#     slaveDataSourceNames:
+#       - ds1_slave0
+#     loadBalanceAlgorithmType: ROUND_ROBIN
+props:
+  sql.show: true

+ 3 - 0
java110-generator/src/main/resources/java110.properties

@@ -0,0 +1,3 @@
+java110.mappingPath=classpath:mapper/*/*.xml
+
+

+ 1 - 1
pom.xml

@@ -15,7 +15,6 @@
         <module>java110-core</module>
         <module>java110-service</module>
         <module>java110-db</module>
-        <module>java110-generator</module>
         <module>service-user</module>
         <module>service-log</module>
         <module>service-fee</module>
@@ -31,6 +30,7 @@
         <module>service-common</module>
         <module>service-report</module>
         <module>service-front</module>
+        <module>java110-generator</module>
     </modules>
 
     <parent>

+ 1 - 1
service-common/src/main/java/com/java110/common/dao/impl/FileServiceDaoImpl.java

@@ -17,7 +17,7 @@ import java.util.Map;
  * 应用服务 与数据库交互
  * Created by wuxw on 2017/4/5.
  */
-@Service("appServiceDaoImpl")
+@Service("fileServiceDaoImpl")
 //@Transactional
 public class FileServiceDaoImpl extends BaseServiceDao implements IFileServiceDao {
 

+ 3 - 3
service-front/src/main/java/com/java110/front/smo/impl/CommunityServiceSMOImpl.java

@@ -28,10 +28,10 @@ import java.util.Map;
  * 小区服务类
  */
 
-@Service("communityServiceSMOImpl")
-public class CommunityServiceSMOImpl extends BaseComponentSMO implements ICommunityServiceSMO {
+@Service("frontCommunityServiceSMOImpl")
+public class FrontCommunityServiceSMOImpl extends BaseComponentSMO implements ICommunityServiceSMO {
 
-    private static Logger logger = LoggerFactory.getLogger(CommunityServiceSMOImpl.class);
+    private static Logger logger = LoggerFactory.getLogger(FrontCommunityServiceSMOImpl.class);
 
     @Autowired
     private RestTemplate restTemplate;

+ 3 - 3
service-front/src/main/java/com/java110/front/smo/impl/FeeServiceSMOImpl.java

@@ -22,10 +22,10 @@ import org.springframework.web.client.RestTemplate;
 /**
  * 房屋服务实现类
  */
-@Service("feeServiceSMOImpl")
-public class FeeServiceSMOImpl extends BaseComponentSMO implements IFeeServiceSMO {
+@Service("frontFeeServiceSMOImpl")
+public class FrontFeeServiceSMOImpl extends BaseComponentSMO implements IFeeServiceSMO {
 
-    private static Logger logger = LoggerFactory.getLogger(FeeServiceSMOImpl.class);
+    private static Logger logger = LoggerFactory.getLogger(FrontFeeServiceSMOImpl.class);
 
 
     @Autowired

+ 1 - 1
service-sequence/pom.xml

@@ -62,7 +62,7 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-                    <mainClass>com.java110.code.CodeServiceApplicationStart</mainClass>
+                    <mainClass>com.java110.generator.CodeServiceApplicationStart</mainClass>
                 </configuration>
             </plugin>
         </plugins>

+ 1 - 1
service-sequence/src/main/java/com/java110/code/CodeServiceApplicationStart.java

@@ -1,4 +1,4 @@
-package com.java110.code;
+package com.java110.generator;
 
 /**
  * Hello world!

+ 2 - 2
service-sequence/src/main/java/com/java110/code/api/CodeApi.java

@@ -1,7 +1,7 @@
-package com.java110.code.api;
+package com.java110.generator.api;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.code.smo.IPrimaryKeyServiceSMO;
+import com.java110.generator.smo.IPrimaryKeyServiceSMO;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.exception.ResponseErrorException;
 import com.java110.utils.util.Assert;

+ 1 - 1
service-sequence/src/main/java/com/java110/code/dao/ICommonServiceDao.java

@@ -1,4 +1,4 @@
-package com.java110.code.dao;
+package com.java110.generator.dao;
 
 
 import com.java110.entity.mapping.CodeMapping;

+ 1 - 1
service-sequence/src/main/java/com/java110/code/dao/IPrimaryKeyServiceDao.java

@@ -1,4 +1,4 @@
-package com.java110.code.dao;
+package com.java110.generator.dao;
 
 import java.util.Map;
 

+ 1 - 1
service-sequence/src/main/java/com/java110/code/dao/ISnowflakeldWorker.java

@@ -1,4 +1,4 @@
-package com.java110.code.dao;
+package com.java110.generator.dao;
 
 /**
  * Created by wuxw on 2018/6/3.

+ 2 - 2
service-sequence/src/main/java/com/java110/code/dao/impl/CommonServiceDaoImpl.java

@@ -1,6 +1,6 @@
-package com.java110.code.dao.impl;
+package com.java110.generator.dao.impl;
 
-import com.java110.code.dao.ICommonServiceDao;
+import com.java110.generator.dao.ICommonServiceDao;
 import com.java110.utils.util.SerializeUtil;
 import com.java110.core.base.dao.BaseServiceDao;
 import com.java110.entity.mapping.CodeMapping;

+ 2 - 2
service-sequence/src/main/java/com/java110/code/dao/impl/PrimaryKeyServiceDaoImpl.java

@@ -1,6 +1,6 @@
-package com.java110.code.dao.impl;
+package com.java110.generator.dao.impl;
 
-import com.java110.code.dao.IPrimaryKeyServiceDao;
+import com.java110.generator.dao.IPrimaryKeyServiceDao;
 import com.java110.utils.log.LoggerEngine;
 import com.java110.core.base.dao.BaseServiceDao;
 import org.slf4j.Logger;

+ 2 - 2
service-sequence/src/main/java/com/java110/code/dao/impl/SnowflakeIdWorkerImpl.java

@@ -1,4 +1,4 @@
-package com.java110.code.dao.impl;
+package com.java110.generator.dao.impl;
 
 
 /**
@@ -17,7 +17,7 @@ package com.java110.code.dao.impl;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.exception.DAOException;
 import com.java110.utils.log.LoggerEngine;
-import com.java110.code.dao.ISnowflakeldWorker;
+import com.java110.generator.dao.ISnowflakeldWorker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

+ 1 - 1
service-sequence/src/main/java/com/java110/code/smo/ICommonServiceSmo.java

@@ -1,4 +1,4 @@
-package com.java110.code.smo;
+package com.java110.generator.smo;
 
 import com.java110.entity.mapping.CodeMapping;
 

+ 1 - 1
service-sequence/src/main/java/com/java110/code/smo/IPrimaryKeyServiceSMO.java

@@ -1,4 +1,4 @@
-package com.java110.code.smo;
+package com.java110.generator.smo;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.utils.exception.SMOException;

+ 3 - 3
service-sequence/src/main/java/com/java110/code/smo/impl/CommonServiceSmoImpl.java

@@ -1,7 +1,7 @@
-package com.java110.code.smo.impl;
+package com.java110.generator.smo.impl;
 
-import com.java110.code.dao.ICommonServiceDao;
-import com.java110.code.smo.ICommonServiceSmo;
+import com.java110.generator.dao.ICommonServiceDao;
+import com.java110.generator.smo.ICommonServiceSmo;
 import com.java110.entity.mapping.CodeMapping;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+ 4 - 4
service-sequence/src/main/java/com/java110/code/smo/impl/PrimaryKeyServiceSMOImpl.java

@@ -1,9 +1,9 @@
-package com.java110.code.smo.impl;
+package com.java110.generator.smo.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.code.dao.IPrimaryKeyServiceDao;
-import com.java110.code.dao.ISnowflakeldWorker;
-import com.java110.code.smo.IPrimaryKeyServiceSMO;
+import com.java110.generator.dao.IPrimaryKeyServiceDao;
+import com.java110.generator.dao.ISnowflakeldWorker;
+import com.java110.generator.smo.IPrimaryKeyServiceSMO;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.core.context.CodeDataFlow;