elink-star
/
esua-epdc-cloud
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev_1118' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_1118

dev
王金鹏 6 years ago
parent
081028d5e3 307f5c33a2
commit
aab39ac9c7
3 changed files with 34 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 64
      esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml
  2. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
  3. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

64
esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml
View File

@ -84,38 +84,38 @@
<skipTests>true</skipTests>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<version>${dockerfile-maven-plugin.version}</version>
<executions>
<execution>
<id>default</id>
<goals>
<!--如果package时不想用docker打包,就注释掉这个goal-->
<goal>build</goal>
<goal>push</goal>
</goals>
</execution>
</executions>
<configuration>
<username>admin</username>
<password>elink888</password>
<repository>47.104.85.99:9002/repository/docker-private/</repository>
<tag>latest</tag>
<buildArgs>
<!--提供参数向Dockerfile传递-->
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
</buildArgs>
</configuration>
</plugin>
<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-deploy-plugin</artifactId>-->
<!-- <configuration>-->
<!-- <skip>true</skip>-->
<!-- </configuration>-->
<!-- </plugin>-->
<!-- <plugin>-->
<!-- <groupId>com.spotify</groupId>-->
<!-- <artifactId>dockerfile-maven-plugin</artifactId>-->
<!-- <version>${dockerfile-maven-plugin.version}</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>default</id>-->
<!-- <goals>-->
<!-- &lt;!&ndash;如果package时不想用docker打包,就注释掉这个goal&ndash;&gt;-->
<!-- <goal>build</goal>-->
<!-- <goal>push</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- <configuration>-->
<!-- <username>admin</username>-->
<!-- <password>elink888</password>-->
<!-- <repository>47.104.85.99:9002/repository/docker-private/</repository>-->
<!-- <tag>latest</tag>-->
<!-- <buildArgs>-->
<!-- &lt;!&ndash;提供参数向Dockerfile传递&ndash;&gt;-->
<!-- <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>-->
<!-- </buildArgs>-->
<!-- </configuration>-->
<!-- </plugin>-->
</plugins>
</build>

2
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
View File

@ -293,7 +293,7 @@
SELECT
CREATED_TIME AS createdTime,
advice,
case STATE WHEN 0 THEN '【审核】' WHEN 1 THEN '【反馈】' WHEN '2' THEN '【关闭】' ELSE '' END AS stateName
case STATE WHEN 0 THEN '【审核】' WHEN 1 THEN '【反馈】' WHEN '2' THEN '【关闭】' WHEN 3 THEN '【转议题】' ELSE '' END AS stateName
FROM
epdc_issue_handle
WHERE

2
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
View File

@ -507,7 +507,7 @@
CREATED_TIME AS createdTime,
advice,
HANDLER_DEPT AS handlerDept,
CASE STATE WHEN 0 THEN '【审核通过】' WHEN 1 THEN '【反馈】' WHEN 2 THEN '【已关闭】' ELSE '' END AS progressName,
CASE STATE WHEN 0 THEN '【审核通过】' WHEN 1 THEN '【反馈】' WHEN 2 THEN '【已关闭】' WHEN 3 THEN '【转议题】' ELSE '' END AS progressName,
null AS DEPT_NAME
FROM
epdc_issue_handle

Write Preview
Loading…
Cancel
Save