Przeglądaj źródła

前段架构调整

吴学文 6 lat temu
rodzic
commit
4408f2a532
100 zmienionych plików z 685 dodań i 28 usunięć
  1. BIN
      .DS_Store
  2. 10 0
      AppFrontService/docker/Dockerfile
  3. 16 0
      AppFrontService/docker/bin/start_appFront.sh
  4. 25 0
      AppFrontService/docker/docker-compose.yml
  5. 11 0
      AppFrontService/docker/onStart.sh
  6. 92 0
      AppFrontService/pom.xml
  7. 72 0
      AppFrontService/src/main/java/com/java110/app/AppServiceApplicationStart.java
  8. 92 0
      AppFrontService/src/main/resources/application-dev.yml
  9. 92 0
      AppFrontService/src/main/resources/application-prod.yml
  10. 92 0
      AppFrontService/src/main/resources/application-test.yml
  11. 3 0
      AppFrontService/src/main/resources/application.yml
  12. 15 0
      AppFrontService/src/main/resources/banner.txt
  13. 75 0
      AppFrontService/src/main/resources/dataSource.yml
  14. 3 0
      AppFrontService/src/main/resources/java110.properties
  15. 20 0
      AppFrontService/src/test/java/com/java110/AppTest.java
  16. 5 19
      WebService/pom.xml
  17. 3 2
      WebService/src/main/java/com/java110/web/WebServiceApplicationStart.java
  18. 1 1
      WebService/src/main/java/com/java110/web/components/assetImport/AssetImportComponent.java
  19. BIN
      java110-front/.DS_Store
  20. 52 0
      java110-front/pom.xml
  21. BIN
      java110-front/src/.DS_Store
  22. BIN
      java110-front/src/main/.DS_Store
  23. 1 1
      WebService/src/main/java/com/java110/web/controller/CallComponentController.java
  24. 1 1
      WebService/src/main/java/com/java110/web/controller/FlowController.java
  25. 1 1
      WebService/src/main/java/com/java110/web/core/PackageScanner.java
  26. 1 1
      WebService/src/main/java/com/java110/web/core/VcCreateDialect.java
  27. 1 1
      WebService/src/main/java/com/java110/web/core/VcCreateProcessor.java
  28. 1 1
      WebService/src/main/java/com/java110/web/core/VueComponentTemplate.java
  29. BIN
      java110-front/src/main/resources/.DS_Store
  30. BIN
      java110-front/src/main/resources/static/.DS_Store
  31. 0 0
      java110-front/src/main/resources/static/css/animate.css
  32. 0 0
      java110-front/src/main/resources/static/css/bootstrap/bootstrap-datetimepicker.min.css
  33. 0 0
      java110-front/src/main/resources/static/css/bootstrap/bootstrap-grid.css
  34. 0 0
      java110-front/src/main/resources/static/css/bootstrap/bootstrap-grid.css.map
  35. 0 0
      java110-front/src/main/resources/static/css/bootstrap/bootstrap-grid.min.css
  36. 0 0
      java110-front/src/main/resources/static/css/bootstrap/bootstrap-grid.min.css.map
  37. 0 0
      java110-front/src/main/resources/static/css/bootstrap/bootstrap-reboot.css
  38. 0 0
      java110-front/src/main/resources/static/css/bootstrap/bootstrap-reboot.css.map
  39. 0 0
      java110-front/src/main/resources/static/css/bootstrap/bootstrap-reboot.min.css
  40. 0 0
      java110-front/src/main/resources/static/css/bootstrap/bootstrap-reboot.min.css.map
  41. 0 0
      java110-front/src/main/resources/static/css/bootstrap/bootstrap.css
  42. 0 0
      java110-front/src/main/resources/static/css/bootstrap/bootstrap.css.map
  43. 0 0
      java110-front/src/main/resources/static/css/bootstrap/bootstrap.min.css
  44. 0 0
      java110-front/src/main/resources/static/css/bootstrap/bootstrap.min.css.map
  45. 0 0
      java110-front/src/main/resources/static/css/common.css
  46. 0 0
      java110-front/src/main/resources/static/css/jquery.step.css
  47. 0 0
      java110-front/src/main/resources/static/css/patterns/1.png
  48. 0 0
      java110-front/src/main/resources/static/css/patterns/2.png
  49. 0 0
      java110-front/src/main/resources/static/css/patterns/3.png
  50. 0 0
      java110-front/src/main/resources/static/css/patterns/4.png
  51. 0 0
      java110-front/src/main/resources/static/css/patterns/5.png
  52. 0 0
      java110-front/src/main/resources/static/css/patterns/6.png
  53. 0 0
      java110-front/src/main/resources/static/css/patterns/7.png
  54. 0 0
      java110-front/src/main/resources/static/css/patterns/congruent_pentagon.png
  55. 0 0
      java110-front/src/main/resources/static/css/patterns/header-profile-skin-1.png
  56. 0 0
      java110-front/src/main/resources/static/css/patterns/header-profile-skin-2.png
  57. 0 0
      java110-front/src/main/resources/static/css/patterns/header-profile-skin-3.png
  58. 0 0
      java110-front/src/main/resources/static/css/patterns/header-profile.png
  59. 0 0
      java110-front/src/main/resources/static/css/patterns/otis_redding.png
  60. 0 0
      java110-front/src/main/resources/static/css/patterns/shattered.png
  61. 0 0
      java110-front/src/main/resources/static/css/patterns/triangular.png
  62. 0 0
      java110-front/src/main/resources/static/css/plugins/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css
  63. 0 0
      java110-front/src/main/resources/static/css/plugins/blueimp/css/blueimp-gallery-indicator.css
  64. 0 0
      java110-front/src/main/resources/static/css/plugins/blueimp/css/blueimp-gallery-video.css
  65. 0 0
      java110-front/src/main/resources/static/css/plugins/blueimp/css/blueimp-gallery.css
  66. 0 0
      java110-front/src/main/resources/static/css/plugins/blueimp/css/blueimp-gallery.min.css
  67. 0 0
      java110-front/src/main/resources/static/css/plugins/blueimp/css/demo.css
  68. 0 0
      java110-front/src/main/resources/static/css/plugins/blueimp/img/error.png
  69. 0 0
      java110-front/src/main/resources/static/css/plugins/blueimp/img/error.svg
  70. 0 0
      java110-front/src/main/resources/static/css/plugins/blueimp/img/loading.gif
  71. 0 0
      java110-front/src/main/resources/static/css/plugins/blueimp/img/play-pause.png
  72. 0 0
      java110-front/src/main/resources/static/css/plugins/blueimp/img/play-pause.svg
  73. 0 0
      java110-front/src/main/resources/static/css/plugins/blueimp/img/video-play.png
  74. 0 0
      java110-front/src/main/resources/static/css/plugins/blueimp/img/video-play.svg
  75. 0 0
      java110-front/src/main/resources/static/css/plugins/bootstrap-markdown/bootstrap-markdown.min.css
  76. 0 0
      java110-front/src/main/resources/static/css/plugins/bootstrap-rtl/bootstrap-rtl.css
  77. 0 0
      java110-front/src/main/resources/static/css/plugins/bootstrap-rtl/bootstrap-rtl.css.map
  78. 0 0
      java110-front/src/main/resources/static/css/plugins/bootstrap-rtl/bootstrap-rtl.min.css
  79. 0 0
      java110-front/src/main/resources/static/css/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css
  80. 0 0
      java110-front/src/main/resources/static/css/plugins/bootstrapSocial/bootstrap-social.css
  81. 0 0
      java110-front/src/main/resources/static/css/plugins/bootstrapTour/bootstrap-tour.min.css
  82. 0 0
      java110-front/src/main/resources/static/css/plugins/c3/c3.min.css
  83. 0 0
      java110-front/src/main/resources/static/css/plugins/chartist/chartist.min.css
  84. 0 0
      java110-front/src/main/resources/static/css/plugins/chosen/bootstrap-chosen.css
  85. 0 0
      java110-front/src/main/resources/static/css/plugins/chosen/chosen-sprite.png
  86. 0 0
      java110-front/src/main/resources/static/css/plugins/chosen/chosen-sprite@2x.png
  87. 0 0
      java110-front/src/main/resources/static/css/plugins/chosen/chosen.css
  88. 0 0
      java110-front/src/main/resources/static/css/plugins/clockpicker/clockpicker.css
  89. 0 0
      java110-front/src/main/resources/static/css/plugins/codemirror/ambiance.css
  90. 0 0
      java110-front/src/main/resources/static/css/plugins/codemirror/codemirror.css
  91. 0 0
      java110-front/src/main/resources/static/css/plugins/colorpicker/bootstrap-colorpicker.min.css
  92. 0 0
      java110-front/src/main/resources/static/css/plugins/cropper/cropper.min.css
  93. 0 0
      java110-front/src/main/resources/static/css/plugins/dataTables/datatables.min.css
  94. 0 0
      java110-front/src/main/resources/static/css/plugins/datapicker/datepicker3.css
  95. 0 0
      java110-front/src/main/resources/static/css/plugins/daterangepicker/daterangepicker-bs3.css
  96. 0 0
      java110-front/src/main/resources/static/css/plugins/dropzone/basic.css
  97. 0 0
      java110-front/src/main/resources/static/css/plugins/dropzone/dropzone.css
  98. 0 0
      java110-front/src/main/resources/static/css/plugins/dualListbox/bootstrap-duallistbox.min.css
  99. 0 0
      java110-front/src/main/resources/static/css/plugins/footable/fonts/footable.eot
  100. 0 0
      WebService/src/main/resources/static/css/plugins/footable/fonts/footable.svg

BIN
.DS_Store


+ 10 - 0
AppFrontService/docker/Dockerfile

@@ -0,0 +1,10 @@
+FROM registry.cn-beijing.aliyuncs.com/sxd/ubuntu-java8:1.0
+MAINTAINER wuxw <928255095@qq.com>
+
+
+ADD bin/start_appFront.sh /root/
+
+
+RUN chmod u+x /root/start_appFront.sh
+
+CMD ["/root/start_appFront.sh","dev"]

+ 16 - 0
AppFrontService/docker/bin/start_appFront.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+#### debug model prod
+#nohup java -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8000,suspend=n -jar -Dspring.profiles.active=dev target/AppFrontService.jar > appFront.log 2>&1 &
+
+#### normal prod model
+#nohup java -jar -Dspring.profiles.active=prod target/AppFrontService.jar > appFront.log 2>&1 &
+
+#### normal test model
+#nohup java -jar -Dspring.profiles.active=test target/AppFrontService.jar > appFront.log 2>&1 &
+
+#### normal dev model
+#nohup java -jar -Dspring.profiles.active=dev target/AppFrontService.jar > appFront.log 2>&1 &
+
+nohup java -jar -Dspring.profiles.active=$1 target/AppFrontService.jar > appFront.log 2>&1 &
+
+tail -100f appFront.log

+ 25 - 0
AppFrontService/docker/docker-compose.yml

@@ -0,0 +1,25 @@
+version: '2'
+services:
+   appfrontserivce:
+       container_name: appfrontserivce-1
+       build:
+          context: .
+          dockerfile: Dockerfile
+       restart: always
+       ports:
+       - "443:8443"
+       volumes:
+       - ../target/AppFrontService.jar:/root/target/AppFrontService.jar
+       networks:
+       - java110-net
+#       mem_limit: 1024m
+#       extra_hosts:
+#       - "dev.java110.com:192.168.1.18"
+#       - "dev.db.java110.com:192.168.1.18"
+#       - "dev.zk.java110.com:192.168.1.18"
+#       - "dev.kafka.java110.com:192.168.1.18"
+#       - "dev.redis.java110.com:192.168.1.18"
+#       - "api.java110.com:92.168.1.18"
+networks:
+  java110-net:
+    external: true

+ 11 - 0
AppFrontService/docker/onStart.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+cp -r ../bin .
+
+cp  -r ../target .
+
+docker build -t java110/appFront .
+
+docker run -ti --name appFront_test -p8443:8443 -idt java110/appFront:latest
+
+docker logs -f appFront_test

+ 92 - 0
AppFrontService/pom.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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>MicroCommunity</artifactId>
+        <groupId>com.java110</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>AppFrontService</artifactId>
+
+    <name>AppFrontService</name>
+    <!-- FIXME change it to the project's website -->
+    <url>http://www.example.com</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.java110</groupId>
+            <artifactId>java110-front</artifactId>
+        </dependency>
+
+
+
+        <dependency>
+            <groupId>net.sourceforge.nekohtml</groupId>
+            <artifactId>nekohtml</artifactId>
+        </dependency>
+
+
+        <dependency>
+            <groupId>com.java110</groupId>
+            <artifactId>java110-config</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>AppService</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>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.java110.app.AppApplicationStart</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

+ 72 - 0
AppFrontService/src/main/java/com/java110/app/AppServiceApplicationStart.java

@@ -0,0 +1,72 @@
+package com.java110.app;
+
+import com.java110.service.init.ServiceStartInit;
+import com.java110.front.core.VueComponentTemplate;
+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.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.http.converter.StringHttpMessageConverter;
+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.service.aop",
+        "com.java110.service.configuration",
+        "com.java110.service.controller",
+        "com.java110.service.filter",
+        "com.java110.service.init",
+        "com.java110.web",
+        "com.java110.core",
+        "com.java110.config.properties.code",
+        "com.java110.cache",
+        "com.java110.report"
+})
+@EnableDiscoveryClient
+//@EnableConfigurationProperties(EventProperties.class)
+@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class})
+public class AppServiceApplicationStart {
+
+    private static Logger logger = LoggerFactory.getLogger(AppServiceApplicationStart.class);
+
+
+    /**
+     * 实例化RestTemplate,通过@LoadBalanced注解开启均衡负载能力.
+     *
+     * @return restTemplate
+     */
+    @Bean
+    //@LoadBalanced
+    public RestTemplate restTemplate() {
+        StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
+        RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build();
+        return restTemplate;
+    }
+
+
+    public static void main(String[] args) throws Exception {
+        try {
+            ApplicationContext context = SpringApplication.run(AppServiceApplicationStart.class, args);
+            ServiceStartInit.initSystemConfig(context);
+            VueComponentTemplate.initComponent(VueComponentTemplate.DEFAULT_COMPONENT_PACKAGE_PATH);
+        }catch (Throwable e){
+            logger.error("系统启动失败",e);
+        }
+    }
+}

+ 92 - 0
AppFrontService/src/main/resources/application-dev.yml

@@ -0,0 +1,92 @@
+project:
+  name: dev
+
+jedis:
+  pool:
+    config:
+      maxTotal: 100
+      maxIdle: 20
+      maxWaitMillis: 20000
+    host: dev.redis.java110.com
+    port: 6379
+    timeout: 3000
+    password:
+
+eureka:
+  instance:
+    leaseRenewalIntervalInSeconds: 10
+    leaseExpirationDurationInSeconds: 30
+    preferIpAddress: true
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
+  client:
+    serviceUrl:
+      defaultZone: http://dev.java110.com:8761/eureka/
+      #defaultZone: http://localhost:8761/eureka/
+server:
+  port: 8012
+  session:
+    cookie:
+      http-only: true
+  tomcat:
+    uri-encoding: UTF-8
+
+spring:
+  http:
+    encoding:
+      charset: UTF-8
+      enabled: true
+      force: true
+  application:
+    name: app-front-service
+  redis:
+    database: 0
+    host: dev.redis.java110.com
+    port: 6379
+    pool:
+      max-active: 300
+      max-wait: 10000
+      max-idle: 100
+      min-idle: 0
+      timeout: 0
+
+  thymeleaf:
+    mode: LEGACYHTML5
+    cache: false
+    prefix: classpath:/views/
+    encoding: UTF-8
+    suffix: .html
+    content-type: text/html
+
+#============== 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: consoleService
+    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
+
+

+ 92 - 0
AppFrontService/src/main/resources/application-prod.yml

@@ -0,0 +1,92 @@
+project:
+  name: prod
+
+jedis:
+  pool:
+    config:
+      maxTotal: 100
+      maxIdle: 20
+      maxWaitMillis: 20000
+    host: prod.redis.java110.com
+    port: 6379
+    timeout: 3000
+    password:
+
+eureka:
+  instance:
+    leaseRenewalIntervalInSeconds: 10
+    leaseExpirationDurationInSeconds: 30
+    preferIpAddress: true
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
+  client:
+    serviceUrl:
+      defaultZone: http://prod.java110.com:8761/eureka/
+      #defaultZone: http://localhost:8761/eureka/
+server:
+  port: 8012
+  session:
+    cookie:
+      http-only: true
+  tomcat:
+    uri-encoding: UTF-8
+
+spring:
+  http:
+    encoding:
+      charset: UTF-8
+      enabled: true
+      force: true
+  application:
+    name: web-service
+  redis:
+    database: 0
+    host: prod.redis.java110.com
+    port: 6379
+    pool:
+      max-active: 300
+      max-wait: 10000
+      max-idle: 100
+      min-idle: 0
+      timeout: 0
+
+  thymeleaf:
+    mode: LEGACYHTML5
+    cache: false
+    prefix: classpath:/views/
+    encoding: UTF-8
+    suffix: .html
+    content-type: text/html
+
+#============== kafka ===================
+kafka:
+  consumer:
+    zookeeper:
+      connect: prod.zk.java110.com:2181
+    servers: prod.kafka.java110.com:9092
+    enable:
+      auto:
+        commit: true
+    session:
+      timeout: 6000
+    auto:
+      commit:
+        interval: 100
+      offset:
+        reset: latest
+    topic: test
+    group:
+      id: appFrontService
+    concurrency: 10
+
+  producer:
+    zookeeper:
+      connect: prod.zk.java110.com:2181
+    servers: prod.kafka.java110.com:9092
+    retries: 0
+    batch:
+      size: 4096
+    linger: 1
+    buffer:
+      memory: 40960
+
+

+ 92 - 0
AppFrontService/src/main/resources/application-test.yml

@@ -0,0 +1,92 @@
+project:
+  name: test
+
+jedis:
+  pool:
+    config:
+      maxTotal: 100
+      maxIdle: 20
+      maxWaitMillis: 20000
+    host: test.redis.java110.com
+    port: 6379
+    timeout: 3000
+    password:
+
+eureka:
+  instance:
+    leaseRenewalIntervalInSeconds: 10
+    leaseExpirationDurationInSeconds: 30
+    preferIpAddress: true
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
+  client:
+    serviceUrl:
+      defaultZone: http://test.java110.com:8761/eureka/
+      #defaultZone: http://localhost:8761/eureka/
+server:
+  port: 8012
+  session:
+    cookie:
+      http-only: true
+  tomcat:
+    uri-encoding: UTF-8
+
+spring:
+  http:
+    encoding:
+      charset: UTF-8
+      enabled: true
+      force: true
+  application:
+    name: app-front-service
+  redis:
+    database: 0
+    host: test.redis.java110.com
+    port: 6379
+    pool:
+      max-active: 300
+      max-wait: 10000
+      max-idle: 100
+      min-idle: 0
+      timeout: 0
+
+  thymeleaf:
+    mode: LEGACYHTML5
+    cache: false
+    prefix: classpath:/views/
+    encoding: UTF-8
+    suffix: .html
+    content-type: text/html
+
+#============== kafka ===================
+kafka:
+  consumer:
+    zookeeper:
+      connect: test.zk.java110.com:2181
+    servers: test.kafka.java110.com:9092
+    enable:
+      auto:
+        commit: true
+    session:
+      timeout: 6000
+    auto:
+      commit:
+        interval: 100
+      offset:
+        reset: latest
+    topic: test
+    group:
+      id: appFrontService
+    concurrency: 10
+
+  producer:
+    zookeeper:
+      connect: test.zk.java110.com:2181
+    servers: test.kafka.java110.com:9092
+    retries: 0
+    batch:
+      size: 4096
+    linger: 1
+    buffer:
+      memory: 40960
+
+

+ 3 - 0
AppFrontService/src/main/resources/application.yml

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

+ 15 - 0
AppFrontService/src/main/resources/banner.txt

@@ -0,0 +1,15 @@
+${AnsiColor.BRIGHT_RED}
+     __                       ____  ____ _______
+    |__|_____  ___  _______  /_   |/_   |\   _  \
+    |  |\__  \ \  \/ /\__  \  |   | |   |/  /_\  \
+    |  | / __ \_\   /  / __ \_|   | |   |\  \_/   \
+/\__|  |(____  / \_/  (____  /|___| |___| \_____  /
+\______|     \/            \/                   \/
+_________                                 .__             _________                      .__
+\_   ___ \   ____    ____    ______ ____  |  |    ____   /   _____/  ____ _______ ___  __|__|  ____   ____
+/    \  \/  /  _ \  /    \  /  ___//  _ \ |  |  _/ __ \  \_____  \ _/ __ \\_  __ \\  \/ /|  |_/ ___\_/ __ \
+\     \____(  <_> )|   |  \ \___ \(  <_> )|  |__\  ___/  /        \\  ___/ |  | \/ \   / |  |\  \___\  ___/
+ \______  / \____/ |___|  //____  >\____/ |____/ \___  >/_______  / \___  >|__|     \_/  |__| \___  >\___  >
+        \/              \/      \/                   \/         \/      \/                        \/     \/
+
+ java110 ConsoleService starting, more information scan https://github.com/java110/MicroCommunity

+ 75 - 0
AppFrontService/src/main/resources/dataSource.yml

@@ -0,0 +1,75 @@
+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_xxx:
+      actualDataNodes: ds${0..1}.business_community
+      databaseStrategy:
+        inline:
+          shardingColumn: community_id
+          algorithmExpression: ds${Long.parseLong(community_id) % 2}
+
+  bindingTables:
+    - business_xxx
+
+  defaultDataSourceName: ds1
+  defaultDatabaseStrategy:
+    none:
+  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
AppFrontService/src/main/resources/java110.properties

@@ -0,0 +1,3 @@
+java110.mappingPath=
+
+

+ 20 - 0
AppFrontService/src/test/java/com/java110/AppTest.java

@@ -0,0 +1,20 @@
+package com.java110;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+{
+    /**
+     * Rigorous Test :-)
+     */
+    @Test
+    public void shouldAnswerWithTrue()
+    {
+        assertTrue( true );
+    }
+}

+ 5 - 19
WebService/pom.xml

@@ -22,31 +22,20 @@
     </properties>
 
     <dependencies>
+
         <dependency>
             <groupId>com.java110</groupId>
-            <artifactId>java110-service</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>java110-db</artifactId>
-                    <groupId>com.java110</groupId>
-                </exclusion>
-            </exclusions>
+            <artifactId>java110-front</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
-        </dependency>
+
 
         <dependency>
             <groupId>net.sourceforge.nekohtml</groupId>
             <artifactId>nekohtml</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.thymeleaf</groupId>
-            <artifactId>thymeleaf</artifactId>
-        </dependency>
+
 
         <dependency>
             <groupId>com.java110</groupId>
@@ -54,10 +43,7 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.jsoup</groupId>
-            <artifactId>jsoup</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>com.java110</groupId>
             <artifactId>ReportComponent</artifactId>

+ 3 - 2
WebService/src/main/java/com/java110/web/WebServiceApplicationStart.java

@@ -1,7 +1,7 @@
 package com.java110.web;
 
 import com.java110.service.init.ServiceStartInit;
-import com.java110.web.core.VueComponentTemplate;
+import com.java110.front.core.VueComponentTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
@@ -36,7 +36,8 @@ import java.nio.charset.Charset;
         "com.java110.core",
         "com.java110.config.properties.code",
         "com.java110.cache",
-        "com.java110.report"
+        "com.java110.report",
+        "com.java110.front"
 })
 @EnableDiscoveryClient
 //@EnableConfigurationProperties(EventProperties.class)

+ 1 - 1
WebService/src/main/java/com/java110/web/components/assetImport/AssetImportComponent.java

@@ -1,7 +1,7 @@
 package com.java110.web.components.assetImport;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.controller.CallComponentController;
+import com.java110.front.controller.CallComponentController;
 import com.java110.web.smo.assetImport.IAssetImportSMO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

BIN
java110-front/.DS_Store


+ 52 - 0
java110-front/pom.xml

@@ -0,0 +1,52 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <artifactId>MicroCommunity</artifactId>
+        <groupId>com.java110</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>java110-front</artifactId>
+    <packaging>jar</packaging>
+    <!-- TODO project name  -->
+    <name>java110-front</name>
+    <description></description>
+
+    <!-- TODO
+		<organization>
+		<name>company name</name>
+		<url>company url</url>
+		</organization>
+	-->
+
+    <dependencies>
+        <dependency>
+            <groupId>com.java110</groupId>
+            <artifactId>java110-service</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>java110-db</artifactId>
+                    <groupId>com.java110</groupId>
+                </exclusion>
+            </exclusions>
+        </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>
+    </dependencies>
+
+
+</project>

BIN
java110-front/src/.DS_Store


BIN
java110-front/src/main/.DS_Store


+ 1 - 1
WebService/src/main/java/com/java110/web/controller/CallComponentController.java

@@ -1,4 +1,4 @@
-package com.java110.web.controller;
+package com.java110.front.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.utils.constant.CommonConstant;

+ 1 - 1
WebService/src/main/java/com/java110/web/controller/FlowController.java

@@ -1,4 +1,4 @@
-package com.java110.web.controller;
+package com.java110.front.controller;
 
 import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.util.Assert;

+ 1 - 1
WebService/src/main/java/com/java110/web/core/PackageScanner.java

@@ -1,5 +1,5 @@
 
-package com.java110.web.core;
+package com.java110.front.core;
 
 import org.springframework.util.StringUtils;
 

+ 1 - 1
WebService/src/main/java/com/java110/web/core/VcCreateDialect.java

@@ -1,4 +1,4 @@
-package com.java110.web.core;
+package com.java110.front.core;
 
 import org.springframework.stereotype.Component;
 import org.thymeleaf.dialect.AbstractProcessorDialect;

+ 1 - 1
WebService/src/main/java/com/java110/web/core/VcCreateProcessor.java

@@ -1,4 +1,4 @@
-package com.java110.web.core;
+package com.java110.front.core;
 
 import org.apache.commons.lang3.StringUtils;
 import org.jsoup.Jsoup;

+ 1 - 1
WebService/src/main/java/com/java110/web/core/VueComponentTemplate.java

@@ -1,4 +1,4 @@
-package com.java110.web.core;
+package com.java110.front.core;
 
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.util.StringUtils;

BIN
java110-front/src/main/resources/.DS_Store


BIN
java110-front/src/main/resources/static/.DS_Store


WebService/src/main/resources/static/css/animate.css → java110-front/src/main/resources/static/css/animate.css


WebService/src/main/resources/static/css/bootstrap/bootstrap-datetimepicker.min.css → java110-front/src/main/resources/static/css/bootstrap/bootstrap-datetimepicker.min.css


WebService/src/main/resources/static/css/bootstrap/bootstrap-grid.css → java110-front/src/main/resources/static/css/bootstrap/bootstrap-grid.css


WebService/src/main/resources/static/css/bootstrap/bootstrap-grid.css.map → java110-front/src/main/resources/static/css/bootstrap/bootstrap-grid.css.map


WebService/src/main/resources/static/css/bootstrap/bootstrap-grid.min.css → java110-front/src/main/resources/static/css/bootstrap/bootstrap-grid.min.css


WebService/src/main/resources/static/css/bootstrap/bootstrap-grid.min.css.map → java110-front/src/main/resources/static/css/bootstrap/bootstrap-grid.min.css.map


WebService/src/main/resources/static/css/bootstrap/bootstrap-reboot.css → java110-front/src/main/resources/static/css/bootstrap/bootstrap-reboot.css


WebService/src/main/resources/static/css/bootstrap/bootstrap-reboot.css.map → java110-front/src/main/resources/static/css/bootstrap/bootstrap-reboot.css.map


WebService/src/main/resources/static/css/bootstrap/bootstrap-reboot.min.css → java110-front/src/main/resources/static/css/bootstrap/bootstrap-reboot.min.css


WebService/src/main/resources/static/css/bootstrap/bootstrap-reboot.min.css.map → java110-front/src/main/resources/static/css/bootstrap/bootstrap-reboot.min.css.map


WebService/src/main/resources/static/css/bootstrap/bootstrap.css → java110-front/src/main/resources/static/css/bootstrap/bootstrap.css


WebService/src/main/resources/static/css/bootstrap/bootstrap.css.map → java110-front/src/main/resources/static/css/bootstrap/bootstrap.css.map


WebService/src/main/resources/static/css/bootstrap/bootstrap.min.css → java110-front/src/main/resources/static/css/bootstrap/bootstrap.min.css


WebService/src/main/resources/static/css/bootstrap/bootstrap.min.css.map → java110-front/src/main/resources/static/css/bootstrap/bootstrap.min.css.map


WebService/src/main/resources/static/css/common.css → java110-front/src/main/resources/static/css/common.css


WebService/src/main/resources/static/css/jquery.step.css → java110-front/src/main/resources/static/css/jquery.step.css


WebService/src/main/resources/static/css/patterns/1.png → java110-front/src/main/resources/static/css/patterns/1.png


WebService/src/main/resources/static/css/patterns/2.png → java110-front/src/main/resources/static/css/patterns/2.png


WebService/src/main/resources/static/css/patterns/3.png → java110-front/src/main/resources/static/css/patterns/3.png


WebService/src/main/resources/static/css/patterns/4.png → java110-front/src/main/resources/static/css/patterns/4.png


WebService/src/main/resources/static/css/patterns/5.png → java110-front/src/main/resources/static/css/patterns/5.png


WebService/src/main/resources/static/css/patterns/6.png → java110-front/src/main/resources/static/css/patterns/6.png


WebService/src/main/resources/static/css/patterns/7.png → java110-front/src/main/resources/static/css/patterns/7.png


WebService/src/main/resources/static/css/patterns/congruent_pentagon.png → java110-front/src/main/resources/static/css/patterns/congruent_pentagon.png


WebService/src/main/resources/static/css/patterns/header-profile-skin-1.png → java110-front/src/main/resources/static/css/patterns/header-profile-skin-1.png


WebService/src/main/resources/static/css/patterns/header-profile-skin-2.png → java110-front/src/main/resources/static/css/patterns/header-profile-skin-2.png


WebService/src/main/resources/static/css/patterns/header-profile-skin-3.png → java110-front/src/main/resources/static/css/patterns/header-profile-skin-3.png


WebService/src/main/resources/static/css/patterns/header-profile.png → java110-front/src/main/resources/static/css/patterns/header-profile.png


WebService/src/main/resources/static/css/patterns/otis_redding.png → java110-front/src/main/resources/static/css/patterns/otis_redding.png


WebService/src/main/resources/static/css/patterns/shattered.png → java110-front/src/main/resources/static/css/patterns/shattered.png


WebService/src/main/resources/static/css/patterns/triangular.png → java110-front/src/main/resources/static/css/patterns/triangular.png


WebService/src/main/resources/static/css/plugins/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css → java110-front/src/main/resources/static/css/plugins/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css




WebService/src/main/resources/static/css/plugins/blueimp/css/blueimp-gallery.css → java110-front/src/main/resources/static/css/plugins/blueimp/css/blueimp-gallery.css


WebService/src/main/resources/static/css/plugins/blueimp/css/blueimp-gallery.min.css → java110-front/src/main/resources/static/css/plugins/blueimp/css/blueimp-gallery.min.css


WebService/src/main/resources/static/css/plugins/blueimp/css/demo.css → java110-front/src/main/resources/static/css/plugins/blueimp/css/demo.css


WebService/src/main/resources/static/css/plugins/blueimp/img/error.png → java110-front/src/main/resources/static/css/plugins/blueimp/img/error.png


WebService/src/main/resources/static/css/plugins/blueimp/img/error.svg → java110-front/src/main/resources/static/css/plugins/blueimp/img/error.svg


WebService/src/main/resources/static/css/plugins/blueimp/img/loading.gif → java110-front/src/main/resources/static/css/plugins/blueimp/img/loading.gif


WebService/src/main/resources/static/css/plugins/blueimp/img/play-pause.png → java110-front/src/main/resources/static/css/plugins/blueimp/img/play-pause.png


WebService/src/main/resources/static/css/plugins/blueimp/img/play-pause.svg → java110-front/src/main/resources/static/css/plugins/blueimp/img/play-pause.svg


WebService/src/main/resources/static/css/plugins/blueimp/img/video-play.png → java110-front/src/main/resources/static/css/plugins/blueimp/img/video-play.png


WebService/src/main/resources/static/css/plugins/blueimp/img/video-play.svg → java110-front/src/main/resources/static/css/plugins/blueimp/img/video-play.svg


WebService/src/main/resources/static/css/plugins/bootstrap-markdown/bootstrap-markdown.min.css → java110-front/src/main/resources/static/css/plugins/bootstrap-markdown/bootstrap-markdown.min.css


WebService/src/main/resources/static/css/plugins/bootstrap-rtl/bootstrap-rtl.css → java110-front/src/main/resources/static/css/plugins/bootstrap-rtl/bootstrap-rtl.css


WebService/src/main/resources/static/css/plugins/bootstrap-rtl/bootstrap-rtl.css.map → java110-front/src/main/resources/static/css/plugins/bootstrap-rtl/bootstrap-rtl.css.map


WebService/src/main/resources/static/css/plugins/bootstrap-rtl/bootstrap-rtl.min.css → java110-front/src/main/resources/static/css/plugins/bootstrap-rtl/bootstrap-rtl.min.css


WebService/src/main/resources/static/css/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css → java110-front/src/main/resources/static/css/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css


WebService/src/main/resources/static/css/plugins/bootstrapSocial/bootstrap-social.css → java110-front/src/main/resources/static/css/plugins/bootstrapSocial/bootstrap-social.css


WebService/src/main/resources/static/css/plugins/bootstrapTour/bootstrap-tour.min.css → java110-front/src/main/resources/static/css/plugins/bootstrapTour/bootstrap-tour.min.css


WebService/src/main/resources/static/css/plugins/c3/c3.min.css → java110-front/src/main/resources/static/css/plugins/c3/c3.min.css


WebService/src/main/resources/static/css/plugins/chartist/chartist.min.css → java110-front/src/main/resources/static/css/plugins/chartist/chartist.min.css


WebService/src/main/resources/static/css/plugins/chosen/bootstrap-chosen.css → java110-front/src/main/resources/static/css/plugins/chosen/bootstrap-chosen.css


WebService/src/main/resources/static/css/plugins/chosen/chosen-sprite.png → java110-front/src/main/resources/static/css/plugins/chosen/chosen-sprite.png


WebService/src/main/resources/static/css/plugins/chosen/chosen-sprite@2x.png → java110-front/src/main/resources/static/css/plugins/chosen/chosen-sprite@2x.png


WebService/src/main/resources/static/css/plugins/chosen/chosen.css → java110-front/src/main/resources/static/css/plugins/chosen/chosen.css


WebService/src/main/resources/static/css/plugins/clockpicker/clockpicker.css → java110-front/src/main/resources/static/css/plugins/clockpicker/clockpicker.css


WebService/src/main/resources/static/css/plugins/codemirror/ambiance.css → java110-front/src/main/resources/static/css/plugins/codemirror/ambiance.css


WebService/src/main/resources/static/css/plugins/codemirror/codemirror.css → java110-front/src/main/resources/static/css/plugins/codemirror/codemirror.css


WebService/src/main/resources/static/css/plugins/colorpicker/bootstrap-colorpicker.min.css → java110-front/src/main/resources/static/css/plugins/colorpicker/bootstrap-colorpicker.min.css


WebService/src/main/resources/static/css/plugins/cropper/cropper.min.css → java110-front/src/main/resources/static/css/plugins/cropper/cropper.min.css


WebService/src/main/resources/static/css/plugins/dataTables/datatables.min.css → java110-front/src/main/resources/static/css/plugins/dataTables/datatables.min.css


WebService/src/main/resources/static/css/plugins/datapicker/datepicker3.css → java110-front/src/main/resources/static/css/plugins/datapicker/datepicker3.css


WebService/src/main/resources/static/css/plugins/daterangepicker/daterangepicker-bs3.css → java110-front/src/main/resources/static/css/plugins/daterangepicker/daterangepicker-bs3.css


WebService/src/main/resources/static/css/plugins/dropzone/basic.css → java110-front/src/main/resources/static/css/plugins/dropzone/basic.css


WebService/src/main/resources/static/css/plugins/dropzone/dropzone.css → java110-front/src/main/resources/static/css/plugins/dropzone/dropzone.css


WebService/src/main/resources/static/css/plugins/dualListbox/bootstrap-duallistbox.min.css → java110-front/src/main/resources/static/css/plugins/dualListbox/bootstrap-duallistbox.min.css


WebService/src/main/resources/static/css/plugins/footable/fonts/footable.eot → java110-front/src/main/resources/static/css/plugins/footable/fonts/footable.eot


+ 0 - 0
WebService/src/main/resources/static/css/plugins/footable/fonts/footable.svg


Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików