فهرست منبع

lrl -2021-10-13

lirl 3 سال پیش
والد
کامیت
dd230d5657

+ 3 - 1
src/main/java/com/steerinfo/DataSouceApplication.java

@@ -6,15 +6,17 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.hystrix.EnableHystrix;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
 @SpringBootApplication(scanBasePackages = "com.steerinfo.**")
 @MapperScan("com.steerinfo.**")//该注解会扫描 mapper 包下的接口,把接口生成代理对象并加入到 spring 容器中
 @EnableConfigurationProperties(DruidConfig.class)//手动开启druid数据源
-@EnableFeignClients
 @EnableHystrix
 @EnableCaching
+@EnableFeignClients
+@EnableDiscoveryClient
 public class DataSouceApplication {
     public static void main(String[] args) {
         SpringApplication.run(DataSouceApplication.class, args);

+ 1 - 1
src/main/java/com/steerinfo/product/emssteel/mapper/EmsSteelMapper.xml

@@ -10,7 +10,7 @@
     </resultMap>
 
    <select id="getGrades" parameterType="String" resultMap="BaseResultMap">
-           select distinct steel_name
+           select  distinct steel_name
            from ems_steel t
           where steel_name not like '%判废%'
             and steel_name not like '%ф%'

+ 1 - 1
src/main/java/com/steerinfo/quality/bfhyd/mapper/BfhydMapper.xml

@@ -518,7 +518,7 @@
   <!-- 友情提示!!!-->
   <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
    <select id="getAll" resultMap="BaseResultMap">
-   SELECT TOP 150* from ( SELECT   BFHYD_ZJDH, BFHYD_SYRQ , BFHYD_HYRQ , BFHYD_26,
+   SELECT TOP 200* from ( SELECT   BFHYD_ZJDH, BFHYD_SYRQ , BFHYD_HYRQ , BFHYD_26,
                     BFHYD_27 , BFHYD_01 , BFHYD_02 , BFHYD_03 ,
                     BFHYD_04 , BFHYD_05 , BFHYD_06, BFHYD_07,
                     BFHYD_08 , BFHYD_09, BFHYD_10 , BFHYD_11 , BFHYD_12 ,

+ 0 - 1
src/main/java/com/steerinfo/quality/bfhyd/service/impl/BfhydServiceImpl.java

@@ -24,7 +24,6 @@ import java.util.List;
  */
 @Service(value = "bfhydService")
 public class BfhydServiceImpl  implements IBfhydService {
-
     @Autowired
     private BfhydMapper bfhydMapper;
 

+ 4 - 5
src/main/resources/application.properties

@@ -6,13 +6,12 @@ api.version=v1
 spring.zipkin.base-url=http://${ZIPKIN_HOST:localhost}:9411
 spring.sleuth.sampler.percentage=1.0
 #督昢靡備
-spring.application.name=xt-ems-datasource
+spring.application.name= xt-ems-datasource
 #傷諳瘍
-server.port=${SERVER_PORT:8087}
+server.port=${SERVER_PORT:8888}
 #蛁聊華硊
-eureka.client.serviceUrl.defaultZone=http://root:root@${EUREKA_HOST:localhost}:${EUREKA_PORT:8019}/eureka/
-#羲ぎ蛹婥歙
+eureka.client.serviceUrl.defaultZone= http://root:root@${EUREKA_HOST:172.16.90.238}:${EUREKA_PORT:8086}/eureka/
+#羲ぎ蛹婥歙
 ribbon.eureka.enabled=true
 eureka.client.metadata-map.cluster=ribbon
-eureka.instance.hostname=xt-ems-datasource
 management.endpoints.web.exposure.include=*

+ 0 - 1
src/main/resources/bootstrap.properties

@@ -15,7 +15,6 @@ spring.druid.password3=atjt@123
 spring.druid.driver-class-name-oracle=oracle.jdbc.driver.OracleDriver
 ##sqlserver
 spring.druid.driver-class-name-sqlserver= com.microsoft.sqlserver.jdbc.SQLServerDriver
-
 spring.druid.initialSize=3
 spring.druid.minIdle=3
 spring.druid.maxActive=10