Browse Source

seate配置文件修改

dev
yujintao 6 years ago
parent
commit
0618779f44
  1. 24
      esua-epdc/epdc-admin/epdc-admin-server/pom.xml
  2. 4
      esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/registry.conf
  3. 5
      esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
  4. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf
  5. 24
      esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
  6. 4
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/registry.conf
  7. 24
      esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
  8. 4
      esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/registry.conf
  9. 24
      esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
  10. 32
      esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/BannerDao.xml
  11. 4
      esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/registry.conf
  12. 24
      esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
  13. 4
      esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/registry.conf
  14. 24
      esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
  15. 4
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/registry.conf

24
esua-epdc/epdc-admin/epdc-admin-server/pom.xml

@ -71,6 +71,30 @@
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<resources>
<resource>
<filtering>true</filtering>
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>**/application*.yml</include>
<include>**/*.properties</include>
<include>logback-spring.xml</include>
<include>registry.conf</include>
</includes>
</resource>
<resource>
<directory>${basedir}/src/main/resources</directory>
<excludes>
<exclude>**/application*.yml</exclude>
<exclude>**/*.properties</exclude>
<exclude>logback-spring.xml</exclude>
<exclude>registry.conf</exclude>
</excludes>
</resource>
</resources>
</build>
<profiles>

4
esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/registry.conf

@ -3,7 +3,7 @@ registry {
type = "nacos"
nacos {
serverAddr = "47.104.224.45"
serverAddr = "@nacos.server-addr@"
namespace = "public"
cluster = "default"
}
@ -14,7 +14,7 @@ config {
type = "nacos"
nacos {
serverAddr = "47.104.224.45"
serverAddr = "@nacos.server-addr@"
namespace = "public"
cluster = "default"
}

5
esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml

@ -118,8 +118,8 @@
<excludes>
<exclude>**/application*.yml</exclude>
<exclude>**/*.properties</exclude>
<exclude>registry.conf</exclude>
<exclude>logback-spring.xml</exclude>
<exclude>registry.conf</exclude>
</excludes>
</resource>
</resources>
@ -149,7 +149,6 @@
<nacos.register-enabled>false</nacos.register-enabled>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<nacos.host>47.104.224.45</nacos.host>
<!--公众号配置-->
<wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
<wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>
@ -181,7 +180,6 @@
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<nacos.host>47.104.224.45</nacos.host>
<!--公众号配置-->
<wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
<wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>
@ -213,7 +211,6 @@
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>172.31.171.61:9300</nacos.server-addr>
<nacos.host>172.31.171.61</nacos.host>
<!--公众号配置-->
<wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
<wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>

4
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf

@ -3,7 +3,7 @@ registry {
type = "nacos"
nacos {
serverAddr = @nacos.host@
serverAddr = "@nacos.server-addr@"
namespace = "public"
cluster = "default"
}
@ -14,7 +14,7 @@ config {
type = "nacos"
nacos {
serverAddr = @nacos.host@
serverAddr = "nacos.server-addr"
namespace = "public"
cluster = "default"
}

24
esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml

@ -72,6 +72,30 @@
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<resources>
<resource>
<filtering>true</filtering>
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>**/application*.yml</include>
<include>**/*.properties</include>
<include>logback-spring.xml</include>
<include>registry.conf</include>
</includes>
</resource>
<resource>
<directory>${basedir}/src/main/resources</directory>
<excludes>
<exclude>**/application*.yml</exclude>
<exclude>**/*.properties</exclude>
<exclude>logback-spring.xml</exclude>
<exclude>registry.conf</exclude>
</excludes>
</resource>
</resources>
</build>

4
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/registry.conf

@ -3,7 +3,7 @@ registry {
type = "nacos"
nacos {
serverAddr = "47.104.224.45"
serverAddr = "@nacos.server-addr@"
namespace = "public"
cluster = "default"
}
@ -14,7 +14,7 @@ config {
type = "nacos"
nacos {
serverAddr = "47.104.224.45"
serverAddr = "@nacos.server-addr@"
namespace = "public"
cluster = "default"
}

24
esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml

@ -102,6 +102,30 @@
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<resources>
<resource>
<filtering>true</filtering>
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>**/application*.yml</include>
<include>**/*.properties</include>
<include>logback-spring.xml</include>
<include>registry.conf</include>
</includes>
</resource>
<resource>
<directory>${basedir}/src/main/resources</directory>
<excludes>
<exclude>**/application*.yml</exclude>
<exclude>**/*.properties</exclude>
<exclude>logback-spring.xml</exclude>
<exclude>registry.conf</exclude>
</excludes>
</resource>
</resources>
</build>
<profiles>

4
esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/registry.conf

@ -3,7 +3,7 @@ registry {
type = "nacos"
nacos {
serverAddr = "47.104.224.45"
serverAddr = "@nacos.server-addr@"
namespace = "public"
cluster = "default"
}
@ -14,7 +14,7 @@ config {
type = "nacos"
nacos {
serverAddr = "47.104.224.45"
serverAddr = "@nacos.server-addr@"
namespace = "public"
cluster = "default"
}

24
esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml

@ -67,6 +67,30 @@
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<resources>
<resource>
<filtering>true</filtering>
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>**/application*.yml</include>
<include>**/*.properties</include>
<include>logback-spring.xml</include>
<include>registry.conf</include>
</includes>
</resource>
<resource>
<directory>${basedir}/src/main/resources</directory>
<excludes>
<exclude>**/application*.yml</exclude>
<exclude>**/*.properties</exclude>
<exclude>logback-spring.xml</exclude>
<exclude>registry.conf</exclude>
</excludes>
</resource>
</resources>
</build>

32
esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/BannerDao.xml

@ -3,44 +3,24 @@
<mapper namespace="com.elink.esua.epdc.dao.BannerDao">
<resultMap type="com.elink.esua.epdc.entity.BannerEntity" id="bannerMap">
<result property="id" column="ID"/>
<result property="url" column="URL"/>
<result property="title" column="TITLE"/>
<result property="imgUrl" column="IMG_URL"/>
<result property="bannerType" column="BANNER_TYPE"/>
<result property="state" column="STATE"/>
<result property="stateTime" column="STATE_TIME"/>
<result property="revision" column="REVISION"/>
<result property="gridId" column="GRID_ID"/>
<result property="createdBy" column="CREATED_BY"/>
<result property="createdTime" column="CREATED_TIME"/>
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
<result property="delFlag" column="DEL_FLAG"/>
<result property="deptName" column="DEPT_NAME"/>
<result property="deptId" column="DEPT_ID"/>
<result property="street" column="STREET"/>
<result property="streetId" column="STREET_ID"/>
<result property="community" column="COMMUNITY"/>
<result property="communityId" column="COMMUNITY_ID"/>
<result property="grid" column="GRID"/>
<result property="creatorName" column="CREATOR_NAME"/>
<result property="position" column="POSITION"/>
</resultMap>
<select id="selectListBanner" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO">
SELECT
eb.ID AS id,
eb.NEWS_FLAG AS newsFlag,
eb.NEWS_ID AS newsId,
eb.IMG_URL AS imgUrl,
eb.TITLE AS title
FROM
epdc_banner eb
LEFT JOIN epdc_banner_department ed ON ed.GRID_ID = #{deptId}
LEFT JOIN epdc_banner_department ed ON ed.BANNER_ID = eb.ID
WHERE
eb.STATE = '1'
AND eb.POSITION = #{position}
AND ed.GRID_ID = #{deptId}
AND eb.DEL_FLAG = '0'
AND ed.DEL_FLAG = '0'
order by eb.CREATED_TIME desc
limit 5
</select>
</mapper>

4
esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/registry.conf

@ -3,7 +3,7 @@ registry {
type = "nacos"
nacos {
serverAddr = "47.104.224.45"
serverAddr = "@nacos.server-addr@"
namespace = "public"
cluster = "default"
}
@ -14,7 +14,7 @@ config {
type = "nacos"
nacos {
serverAddr = "47.104.224.45"
serverAddr = "@nacos.server-addr@"
namespace = "public"
cluster = "default"
}

24
esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml

@ -110,6 +110,30 @@
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<resources>
<resource>
<filtering>true</filtering>
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>**/application*.yml</include>
<include>**/*.properties</include>
<include>logback-spring.xml</include>
<include>registry.conf</include>
</includes>
</resource>
<resource>
<directory>${basedir}/src/main/resources</directory>
<excludes>
<exclude>**/application*.yml</exclude>
<exclude>**/*.properties</exclude>
<exclude>logback-spring.xml</exclude>
<exclude>registry.conf</exclude>
</excludes>
</resource>
</resources>
</build>
<profiles>

4
esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/registry.conf

@ -3,7 +3,7 @@ registry {
type = "nacos"
nacos {
serverAddr = "47.104.224.45"
serverAddr = "@nacos.server-addr@"
namespace = "public"
cluster = "default"
}
@ -14,7 +14,7 @@ config {
type = "nacos"
nacos {
serverAddr = "47.104.224.45"
serverAddr = "@nacos.server-addr@"
namespace = "public"
cluster = "default"
}

24
esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml

@ -66,6 +66,30 @@
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<resources>
<resource>
<filtering>true</filtering>
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>**/application*.yml</include>
<include>**/*.properties</include>
<include>logback-spring.xml</include>
<include>registry.conf</include>
</includes>
</resource>
<resource>
<directory>${basedir}/src/main/resources</directory>
<excludes>
<exclude>**/application*.yml</exclude>
<exclude>**/*.properties</exclude>
<exclude>logback-spring.xml</exclude>
<exclude>registry.conf</exclude>
</excludes>
</resource>
</resources>
</build>

4
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/registry.conf

@ -3,7 +3,7 @@ registry {
type = "nacos"
nacos {
serverAddr = "47.104.224.45"
serverAddr = "@nacos.server-addr@"
namespace = "public"
cluster = "default"
}
@ -14,7 +14,7 @@ config {
type = "nacos"
nacos {
serverAddr = "47.104.224.45"
serverAddr = "@nacos.server-addr@"
namespace = "public"
cluster = "default"
}

Loading…
Cancel
Save