diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java
index 20915ae66..6be6d81e1 100644
--- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java
@@ -1,8 +1,8 @@
/**
* Copyright (c) 2018 人人开源 All rights reserved.
- *
+ *
* https://www.renren.io
- *
+ *
* 版权所有，侵权必究！
*/
@@ -23,4 +23,9 @@ public interface ServiceConstant {
* 授权服务
*/
String EPDC_AUTH_SERVER = "epdc-auth-server";
+
+ /**
+ * DEMO服务
+ */
+ String EPDC_DEMO_SERVER = "epdc-demo-server";
}
diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/config/WebMvcConfig.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/config/WebMvcConfig.java
index 22c32c415..c0b80387f 100644
--- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/config/WebMvcConfig.java
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/config/WebMvcConfig.java
@@ -51,30 +51,9 @@ public class WebMvcConfig implements WebMvcConfigurer {
converters.add(new ResourceHttpMessageConverter());
converters.add(new AllEncompassingFormHttpMessageConverter());
converters.add(new StringHttpMessageConverter());
-// converters.add(jackson2HttpMessageConverter());
converters.add(fastJsonHttpMessageConverters());
}
-// @Bean
-// public MappingJackson2HttpMessageConverter jackson2HttpMessageConverter() {
-// MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
-// ObjectMapper mapper = new ObjectMapper();
-//
-// //日期格式转换
-// mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-// mapper.setDateFormat(new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN));
-// mapper.setTimeZone(TimeZone.getTimeZone("GMT+8"));
-//
-// //Long类型转String类型
-// SimpleModule simpleModule = new SimpleModule();
-// simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
-// simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance);
-// mapper.registerModule(simpleModule);
-//
-// converter.setObjectMapper(mapper);
-// return converter;
-// }
-
@Bean
public FastJsonHttpMessageConverter fastJsonHttpMessageConverters() {
//创建fastJson消息转换器
diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml
index 32394d2f5..8b7d1817a 100644
--- a/esua-epdc/epdc-gateway/pom.xml
+++ b/esua-epdc/epdc-gateway/pom.xml
@@ -75,8 +75,6 @@
lb://epdc-auth-server
lb://epdc-admin-server
- lb://epdc-monitor-server
-
lb://epdc-oss-server
lb://epdc-message-server
@@ -84,14 +82,7 @@
lb://epdc-job-server
lb://epdc-api-server
- http://127.0.0.1:8019
- http://127.0.0.1:8090
- lb://epdc-notice-server
- http://127.0.0.1:9001
- lb://epdc-safety-server
- lb://epdc-config-server
- http://127.0.0.1:8088
- http://127.0.0.1:8069
+ lb://epdc-demo-server
true
@@ -111,8 +102,6 @@
lb://epdc-auth-server
lb://epdc-admin-server
- lb://epdc-monitor-server
-
lb://epdc-oss-server
lb://epdc-message-server
@@ -120,16 +109,7 @@
lb://epdc-job-server
lb://epdc-api-server
- lb://epdc-building-server
-
- lb://epdc-notice-server
- lb://epdc-property-server
-
- lb://epdc-safety-server
- lb://epdc-config-server
- lb://epdc-app-user-server
-
- lb://epdc-iot-server
+ lb://epdc-demo-server
true
@@ -149,8 +129,6 @@
lb://epdc-auth-server
lb://epdc-admin-server
- lb://epdc-monitor-server
-
lb://epdc-oss-server
lb://epdc-message-server
@@ -158,16 +136,7 @@
lb://epdc-job-server
lb://epdc-api-server
- lb://epdc-building-server
-
- lb://epdc-notice-server
- lb://epdc-property-server
-
- lb://epdc-safety-server
- lb://epdc-config-server
- lb://epdc-app-user-server
-
- lb://epdc-iot-server
+ lb://epdc-demo-server
true
diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml
index 8864c62f1..96157c976 100644
--- a/esua-epdc/epdc-gateway/src/main/resources/application.yml
+++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml
@@ -71,6 +71,14 @@ spring:
- Path=/api/**
filters:
- StripPrefix=0
+ #DEMO服务
+ - id: epdc-demo-server
+ uri: @gateway.routes.epdc-demo-server.uri@
+ order: 7
+ predicates:
+ - Path=/demo/**
+ filters:
+ - StripPrefix=0
nacos:
discovery:
server-addr: @nacos.server-addr@
@@ -84,21 +92,6 @@ management:
health:
show-details: ALWAYS
-#eureka:
-# instance:
-# prefer-ip-address: true
-# instance-id: ${spring.cloud.client.ip-address}:${server.port}
-# metadata-map:
-# management:
-# context-path: /actuator
-# health-check-url-path: /actuator/health
-# status-page-url-path: /actuator/info
-# client:
-# service-url:
-# defaultZone: http://eureka:8761/eureka/
-
-
-
feign:
hystrix:
enabled: true
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
index acd3224b2..db13d4461 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
@@ -36,15 +36,29 @@
org.springframework
spring-context-support
-
- org.springframework.cloud
- spring-cloud-starter-netflix-eureka-client
-
de.codecentric
spring-boot-admin-starter-client
${spring.boot.admin.version}
+
+
+
+ com.alibaba.cloud
+ spring-cloud-alibaba-seata
+
+
+ io.seata
+ seata-all
+
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiRegisterController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiRegisterController.java
index 9b29c0d18..ad4cb626a 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiRegisterController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiRegisterController.java
@@ -53,4 +53,15 @@ public class ApiRegisterController {
return new Result();
}
+
+ /**
+ * 注册
+ *
+ * @param dto
+ * @return
+ */
+ @PostMapping("register2")
+ public Result register2(@RequestBody RegisterDTO dto) {
+ return userService.register2(dto);
+ }
}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/DemoFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/DemoFeignClient.java
new file mode 100644
index 000000000..3451ec5ab
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/DemoFeignClient.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.feign;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.feign.fallback.DemoFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 用户接口
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@FeignClient(name = ServiceConstant.EPDC_DEMO_SERVER, fallback = DemoFeignClientFallback.class, contextId = "DemoFeignClient")
+public interface DemoFeignClient {
+
+ @GetMapping("demo/demo/seata")
+ Result seata(@RequestParam("name") String username, @RequestParam("age") int age);
+}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/DemoFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/DemoFeignClientFallback.java
new file mode 100644
index 000000000..5d0021227
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/DemoFeignClientFallback.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.feign.fallback;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.feign.DemoFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * 用户接口 Fallback
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Component
+public class DemoFeignClientFallback implements DemoFeignClient {
+
+ @Override
+ public Result seata(String username, int age) {
+ return new Result().error("调用失败");
+ }
+}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/UserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/UserService.java
index 9ffd2976a..7556ddb09 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/UserService.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/UserService.java
@@ -9,6 +9,8 @@
package com.elink.esua.epdc.service;
import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.RegisterDTO;
import com.elink.esua.epdc.entity.UserEntity;
import com.elink.esua.epdc.dto.LoginDTO;
@@ -31,4 +33,6 @@ public interface UserService extends BaseService {
* @return 返回登录信息
*/
Map login(LoginDTO dto);
+
+ Result register2(RegisterDTO dto);
}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
index 24b650812..c8bb7fb2b 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
@@ -1,8 +1,8 @@
/**
* Copyright (c) 2018 人人开源 All rights reserved.
- *
+ *
* https://www.renren.io
- *
+ *
* 版权所有，侵权必究！
*/
@@ -11,53 +11,81 @@ package com.elink.esua.epdc.service.impl;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
import com.elink.esua.epdc.commons.tools.exception.RenException;
+import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
import com.elink.esua.epdc.dao.UserDao;
+import com.elink.esua.epdc.dto.RegisterDTO;
import com.elink.esua.epdc.entity.TokenEntity;
import com.elink.esua.epdc.entity.UserEntity;
import com.elink.esua.epdc.dto.LoginDTO;
+import com.elink.esua.epdc.feign.DemoFeignClient;
import com.elink.esua.epdc.service.TokenService;
import com.elink.esua.epdc.service.UserService;
+import io.seata.spring.annotation.GlobalTransactional;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@Service
public class UserServiceImpl extends BaseServiceImpl implements UserService {
- @Autowired
- private TokenService tokenService;
-
- @Override
- public UserEntity getByMobile(String mobile) {
- return baseDao.getUserByMobile(mobile);
- }
-
- @Override
- public UserEntity getUserByUserId(Long userId) {
- return baseDao.getUserByUserId(userId);
- }
-
- @Override
- public Map login(LoginDTO dto) {
- UserEntity user = getByMobile(dto.getMobile());
- AssertUtils.isNull(user, ErrorCode.ACCOUNT_PASSWORD_ERROR);
-
- //密码错误
- if(!user.getPassword().equals(DigestUtils.sha256Hex(dto.getPassword()))){
- throw new RenException(ErrorCode.ACCOUNT_PASSWORD_ERROR);
- }
-
- //获取登录token
- TokenEntity tokenEntity = tokenService.createToken(user.getId());
-
- Map map = new HashMap<>(2);
- map.put("token", tokenEntity.getToken());
- map.put("expire", tokenEntity.getExpireDate().getTime() - System.currentTimeMillis());
-
- return map;
- }
+
+ @Autowired
+ private DemoFeignClient demoFeignClient;
+
+ @Autowired
+ private TokenService tokenService;
+
+ @Override
+ public UserEntity getByMobile(String mobile) {
+ return baseDao.getUserByMobile(mobile);
+ }
+
+ @Override
+ public UserEntity getUserByUserId(Long userId) {
+ return baseDao.getUserByUserId(userId);
+ }
+
+ @Override
+ public Map login(LoginDTO dto) {
+ UserEntity user = getByMobile(dto.getMobile());
+ AssertUtils.isNull(user, ErrorCode.ACCOUNT_PASSWORD_ERROR);
+
+ //密码错误
+ if (!user.getPassword().equals(DigestUtils.sha256Hex(dto.getPassword()))) {
+ throw new RenException(ErrorCode.ACCOUNT_PASSWORD_ERROR);
+ }
+
+ //获取登录token
+ TokenEntity tokenEntity = tokenService.createToken(user.getId());
+
+ Map map = new HashMap<>(2);
+ map.put("token", tokenEntity.getToken());
+ map.put("expire", tokenEntity.getExpireDate().getTime() - System.currentTimeMillis());
+
+ return map;
+ }
+
+ @Override
+ @GlobalTransactional
+ public Result register2(RegisterDTO dto) {
+ UserEntity user = new UserEntity();
+ user.setMobile(dto.getMobile());
+ user.setUsername(dto.getMobile());
+ user.setPassword(DigestUtils.sha256Hex(dto.getPassword()));
+ user.setCreateDate(new Date());
+ boolean success = this.insert(user);
+ if (success) {
+ Result result = demoFeignClient.seata(dto.getMobile(), 1405);
+ if (!result.success()) {
+ throw new RuntimeException("失败lelelelellele");
+ }
+ return new Result();
+ }
+ return new Result().error();
+ }
}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml
index 67163ea89..a3a7d17a5 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml
@@ -17,31 +17,24 @@ spring:
date-format: yyyy-MM-dd HH:mm:ss
redis:
database: 0
- host: redis
+ host: 47.104.224.45
timeout: 30s
port: 6379
- password: 123456
+ password: elink@888
datasource:
druid:
- driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://localhost:3306/renren_cloud?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
- username: renren
- password: 123456
- #Oracle
- # driver-class-name: oracle.jdbc.OracleDriver
- # url: jdbc:oracle:thin:@localhost:1521:xe
- # username: renren_cloud
- # password: 123456
- #SQLServer
- # driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- # url: jdbc:sqlserver://localhost:1433;DatabaseName=renren_cloud
- # username: sa
- # password: 123456
- #postgresql
-# driver-class-name: org.postgresql.Driver
-# url: jdbc:postgresql://localhost:5432/renren_cloud
-# username: postgres
-# password: 123456
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://47.104.224.45:3308/epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
+ username: root
+ password: shibei@888
+ cloud:
+ nacos:
+ discovery:
+ server-addr: 47.104.224.45:8848
+ register-enabled: true
+ alibaba:
+ seata:
+ tx-service-group: epdc-api-server-fescar-service-group
management:
endpoints:
@@ -52,23 +45,10 @@ management:
health:
show-details: ALWAYS
-eureka:
- instance:
- prefer-ip-address: true
- instance-id: ${spring.cloud.client.ip-address}:${server.port}
- metadata-map:
- management:
- context-path: ${server.servlet.context-path}/actuator
- health-check-url-path: ${server.servlet.context-path}/actuator/health
- status-page-url-path: ${server.servlet.context-path}/actuator/info
- client:
- service-url:
- defaultZone: http://eureka:8761/eureka/
-
mybatis-plus:
mapper-locations: classpath:/mapper/**/*.xml
#实体扫描，多个package用逗号或者分号分隔
- typeAliasesPackage: io.renren.entity
+ typeAliasesPackage: com.elink.esua.epdc.entity
global-config:
#数据库相关配置
db-config:
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/logback-spring.xml
index 5deef2105..3c9a1a6a3 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/logback-spring.xml
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/logback-spring.xml
@@ -8,14 +8,14 @@
-
+
-
+
-
\ No newline at end of file
+
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf
new file mode 100644
index 000000000..9cfedf9cc
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf
@@ -0,0 +1,21 @@
+registry {
+ # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa
+ type = "nacos"
+
+ nacos {
+ serverAddr = "47.104.224.45"
+ namespace = "public"
+ cluster = "default"
+ }
+}
+
+config {
+ # file、nacos 、apollo、zk、consul、etcd3
+ type = "nacos"
+
+ nacos {
+ serverAddr = "47.104.224.45"
+ namespace = "public"
+ cluster = "default"
+ }
+}
diff --git a/esua-epdc/epdc-module/epdc-demo/db/mysql.sql b/esua-epdc/epdc-module/epdc-demo/db/mysql.sql
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-demo/db/oracle.sql b/esua-epdc/epdc-module/epdc-demo/db/oracle.sql
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-demo/db/postgresql.sql b/esua-epdc/epdc-module/epdc-demo/db/postgresql.sql
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-demo/db/sqlserver.sql b/esua-epdc/epdc-module/epdc-demo/db/sqlserver.sql
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-client/pom.xml b/esua-epdc/epdc-module/epdc-demo/epdc-demo-client/pom.xml
new file mode 100644
index 000000000..b1fee55ad
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-client/pom.xml
@@ -0,0 +1,27 @@
+
+
+ 4.0.0
+
+
+ com.esua.epdc
+ epdc-demo
+ 1.0.0
+
+
+ epdc-demo-client
+ jar
+
+
+
+ com.esua.epdc
+ epdc-commons-tools
+ 1.0.0
+
+
+
+
+ ${project.artifactId}
+
+
+
diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml
new file mode 100644
index 000000000..abca22391
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml
@@ -0,0 +1,85 @@
+
+
+ 4.0.0
+
+
+ com.esua.epdc
+ epdc-demo
+ 1.0.0
+
+
+ epdc-demo-server
+ jar
+
+
+
+ com.esua.epdc
+ epdc-demo-client
+ 1.0.0
+
+
+ com.esua.epdc
+ epdc-commons-tools
+ 1.0.0
+
+
+ com.esua.epdc
+ epdc-commons-mybatis
+ 1.0.0
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+ org.springframework
+ spring-context-support
+
+
+ de.codecentric
+ spring-boot-admin-starter-client
+ ${spring.boot.admin.version}
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-alibaba-seata
+
+
+ io.seata
+ seata-all
+
+
+
+
+
+ ${project.artifactId}
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+ true
+
+
+
+ com.spotify
+ docker-maven-plugin
+
+
+
+
+
diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/ModuleApplication.java b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/ModuleApplication.java
new file mode 100644
index 000000000..1064023b4
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/ModuleApplication.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+/**
+ * 模块
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableFeignClients
+public class ModuleApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(ModuleApplication.class, args);
+ }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
new file mode 100644
index 000000000..b3ef92547
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.config;
+
+import com.elink.esua.epdc.commons.tools.config.ModuleConfig;
+import org.springframework.stereotype.Service;
+
+/**
+ * 模块配置信息
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Service
+public class ModuleConfigImpl implements ModuleConfig {
+ @Override
+ public String getName() {
+ return "module";
+ }
+}
diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/controller/DemoController.java b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/controller/DemoController.java
new file mode 100644
index 000000000..c3f8473b6
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/controller/DemoController.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.service.DemoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 测试接口
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+@RestController
+@RequestMapping("demo")
+public class DemoController {
+
+ @Autowired
+ private DemoService demoService;
+
+ /**
+ * 忽略Token验证测试
+ *
+ * @return
+ */
+ @GetMapping("seata")
+ public Result seata(String name, int age) {
+ return demoService.createDemo(name, age);
+ }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/dao/DemoDao.java b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/dao/DemoDao.java
new file mode 100644
index 000000000..ea50563e7
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/dao/DemoDao.java
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.entity.DemoEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 用户
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+@Mapper
+public interface DemoDao extends BaseDao {
+}
diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/entity/DemoEntity.java b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/entity/DemoEntity.java
new file mode 100644
index 000000000..7f0d7504d
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/entity/DemoEntity.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 用户
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+@Data
+@TableName("demo")
+public class DemoEntity implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 用户ID
+ */
+ @TableId
+ private Long id;
+ /**
+ * 用户名
+ */
+ private String name;
+ /**
+ * 手机号
+ */
+ private int age;
+}
diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/exception/ModuleErrorCode.java b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/exception/ModuleErrorCode.java
new file mode 100644
index 000000000..4f56d60cd
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/exception/ModuleErrorCode.java
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.exception;
+
+import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
+
+/**
+ * 模块错误编码，由9位数字组成，前6位为模块编码，后3位为业务编码
+ *
+ * 如：100001001（100001代表模块，001代表业务代码）
+ *
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+public interface ModuleErrorCode extends ErrorCode {
+
+}
diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/service/DemoService.java b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/service/DemoService.java
new file mode 100644
index 000000000..9f6f83ebb
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/service/DemoService.java
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.entity.DemoEntity;
+
+/**
+ * 用户
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+public interface DemoService extends BaseService {
+
+ Result createDemo(String name, int age);
+}
diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/service/impl/DemoServiceImpl.java b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/service/impl/DemoServiceImpl.java
new file mode 100644
index 000000000..e6df0af2d
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/service/impl/DemoServiceImpl.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.service.impl;
+
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dao.DemoDao;
+import com.elink.esua.epdc.entity.DemoEntity;
+import com.elink.esua.epdc.service.DemoService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DemoServiceImpl extends BaseServiceImpl implements DemoService {
+
+ @Override
+ public Result createDemo(String name, int age) {
+ DemoEntity entity = new DemoEntity();
+ entity.setName(name);
+ entity.setAge(age);
+ baseDao.insert(entity);
+ return new Result().ok("demo执行完毕");
+ }
+}
diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/utils/ModuleConstant.java b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/utils/ModuleConstant.java
new file mode 100644
index 000000000..03d407f87
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/utils/ModuleConstant.java
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.utils;
+
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+
+/**
+ * 模块常量
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.1.0
+ */
+public interface ModuleConstant extends Constant {
+
+}
diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/application.yml
new file mode 100644
index 000000000..a56468c5f
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/application.yml
@@ -0,0 +1,67 @@
+server:
+ port: 9654
+ servlet:
+ context-path: /demo
+
+spring:
+ application:
+ name: epdc-demo-server
+ # 环境 dev|test|prod
+ profiles:
+ active: dev
+ messages:
+ encoding: UTF-8
+ basename: i18n/messages,i18n/messages_common
+ jackson:
+ time-zone: GMT+8
+ date-format: yyyy-MM-dd HH:mm:ss
+ redis:
+ database: 0
+ host: 47.104.224.45
+ timeout: 30s
+ port: 6379
+ password: elink@888
+ datasource:
+ type: com.alibaba.druid.pool.DruidDataSource
+ druid:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://47.104.224.45:3308/epdc_demo?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
+ username: root
+ password: shibei@888
+ cloud:
+ nacos:
+ discovery:
+ server-addr: 47.104.224.45:8848
+ register-enabled: true
+ alibaba:
+ seata:
+ tx-service-group: epdc-demo-server-fescar-service-group
+
+management:
+ endpoints:
+ web:
+ exposure:
+ include: "*"
+ endpoint:
+ health:
+ show-details: ALWAYS
+
+mybatis-plus:
+ mapper-locations: classpath:/mapper/**/*.xml
+ #实体扫描，多个package用逗号或者分号分隔
+ typeAliasesPackage: com.elink.esua.epdc.entity
+ global-config:
+ #数据库相关配置
+ db-config:
+ #主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
+ id-type: UUID
+ #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
+ field-strategy: NOT_NULL
+ #驼峰下划线转换
+ column-underline: true
+ banner: false
+ #原生配置
+ configuration:
+ map-underscore-to-camel-case: true
+ cache-enabled: false
+ call-setters-on-nulls: true
diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/i18n/messages.properties b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/i18n/messages.properties
new file mode 100644
index 000000000..a7091dbb4
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/i18n/messages.properties
@@ -0,0 +1 @@
+#Default
diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/i18n/messages_en_US.properties b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/i18n/messages_en_US.properties
new file mode 100644
index 000000000..9e895e428
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/i18n/messages_en_US.properties
@@ -0,0 +1 @@
+#English
diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/i18n/messages_zh_CN.properties b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/i18n/messages_zh_CN.properties
new file mode 100644
index 000000000..b21fd22ec
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/i18n/messages_zh_CN.properties
@@ -0,0 +1 @@
+#\u7B80\u4F53\u4E2D\u6587
diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/i18n/messages_zh_TW.properties b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/i18n/messages_zh_TW.properties
new file mode 100644
index 000000000..4433dba45
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/i18n/messages_zh_TW.properties
@@ -0,0 +1 @@
+#\u7E41\u4F53\u4E2D\u6587
diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/i18n/validation.properties b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/i18n/validation.properties
new file mode 100644
index 000000000..56ca909c4
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/i18n/validation.properties
@@ -0,0 +1 @@
+#Default
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/i18n/validation_en_US.properties b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/i18n/validation_en_US.properties
new file mode 100644
index 000000000..9e895e428
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/i18n/validation_en_US.properties
@@ -0,0 +1 @@
+#English
diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/i18n/validation_zh_CN.properties b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/i18n/validation_zh_CN.properties
new file mode 100644
index 000000000..b21fd22ec
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/i18n/validation_zh_CN.properties
@@ -0,0 +1 @@
+#\u7B80\u4F53\u4E2D\u6587
diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/i18n/validation_zh_TW.properties b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/i18n/validation_zh_TW.properties
new file mode 100644
index 000000000..4433dba45
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/i18n/validation_zh_TW.properties
@@ -0,0 +1 @@
+#\u7E41\u4F53\u4E2D\u6587
diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/logback-spring.xml
new file mode 100644
index 000000000..5deef2105
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/logback-spring.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/registry.conf
new file mode 100644
index 000000000..9cfedf9cc
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/registry.conf
@@ -0,0 +1,21 @@
+registry {
+ # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa
+ type = "nacos"
+
+ nacos {
+ serverAddr = "47.104.224.45"
+ namespace = "public"
+ cluster = "default"
+ }
+}
+
+config {
+ # file、nacos 、apollo、zk、consul、etcd3
+ type = "nacos"
+
+ nacos {
+ serverAddr = "47.104.224.45"
+ namespace = "public"
+ cluster = "default"
+ }
+}
diff --git a/esua-epdc/epdc-module/epdc-demo/pom.xml b/esua-epdc/epdc-module/epdc-demo/pom.xml
new file mode 100644
index 000000000..b6e114c65
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-demo/pom.xml
@@ -0,0 +1,21 @@
+
+
+ 4.0.0
+
+
+ com.esua.epdc
+ epdc-module
+ 1.0.0
+
+
+ com.esua.epdc
+ epdc-demo
+ pom
+
+
+ epdc-demo-client
+ epdc-demo-server
+
+
+
diff --git a/esua-epdc/epdc-module/pom.xml b/esua-epdc/epdc-module/pom.xml
index 1ab7df974..c4c8cb879 100644
--- a/esua-epdc/epdc-module/pom.xml
+++ b/esua-epdc/epdc-module/pom.xml
@@ -19,6 +19,7 @@
epdc-message
epdc-activiti
epdc-api
+ epdc-demo
diff --git a/esua-epdc/pom.xml b/esua-epdc/pom.xml
index 2eea6e01e..9caf6bf03 100644
--- a/esua-epdc/pom.xml
+++ b/esua-epdc/pom.xml
@@ -32,6 +32,7 @@
2.7.0
1.1.1
2.0.3
+ 0.8.0
@@ -59,6 +60,12 @@
pom
import
+
+
+ io.seata
+ seata-all
+ ${seata.version}
+