wuwen před 5 roky
rodič
revize
7fa604a3bd

+ 10 - 7
ssj_aijia/pom.xml

@@ -34,6 +34,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
         <spring-cloud-alibaba.version>2.1.0.RELEASE</spring-cloud-alibaba.version>
+        <nacos.version>0.2.2.RELEASE</nacos.version>
         <swagger.version>2.9.2</swagger.version>
     </properties>
 
@@ -53,6 +54,12 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+				<version>${nacos.version}</version>
+			</dependency>
+			
         </dependencies>
     </dependencyManagement>
 
@@ -67,12 +74,7 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-zipkin</artifactId>
         </dependency>
-        
-        <dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-		</dependency>
-		<!-- swagger集成 -->
+        <!-- swagger集成 -->
 		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger2</artifactId>
@@ -95,7 +97,8 @@
 			<artifactId>json-lib-ext-spring</artifactId>
 			<version>1.0.2</version>
 		</dependency>
-
+            
+       
     </dependencies>
 
     <repositories><!-- 代码库 -->

+ 3 - 3
ssj_aijia/ssj-aijia-api/src/main/java/com/cloud/ssj/Application.java

@@ -7,7 +7,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrapUI;
 
 /**
- * 程�主入�
+ * 程�主入�?
  * 
  * @author Minbo
  *
@@ -15,10 +15,10 @@ import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrap
 @SpringBootApplication
 @EnableSwaggerBootstrapUI
 @EnableDiscoveryClient
-public class Application {
+public class ApiApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(Application.class, args);
+		SpringApplication.run(ApiApplication.class, args);
 	}
 
 }

+ 0 - 4
ssj_aijia/ssj-aijia-common-config/pom.xml

@@ -57,10 +57,6 @@
         </dependency>
 
         <dependency>
-       		<groupId>com.alibaba.cloud</groupId>
-        	<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
-        </dependency>
-        <dependency>
 	        <groupId>com.alibaba.cloud</groupId>
 	        <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>

+ 0 - 25
ssj_aijia/ssj-aijia-common-config/src/main/java/com/cloud/ssj/config/DataSourceProxyConfig.java

@@ -1,25 +0,0 @@
-package com.cloud.ssj.config;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-
-import com.alibaba.druid.pool.DruidDataSource;
-
-import io.seata.rm.datasource.DataSourceProxy;
-
-@Configuration
-public class DataSourceProxyConfig {
-    @Bean
-    @ConfigurationProperties(prefix = "spring.datasource")
-    public DruidDataSource druidDataSource() {
-        return new DruidDataSource();
-    }
-
-    @Primary
-    @Bean
-    public DataSourceProxy dataSource(DruidDataSource druidDataSource) {
-        return new DataSourceProxy(druidDataSource);
-    }
-}