Browse Source

成都凯越v1.0

wzy 11 months ago
parent
commit
38701ad22a

+ 26 - 0
mjava-kaiyue_cd/pom.xml

@@ -39,4 +39,30 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.1.1.RELEASE</version>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                    <!-- 如果没有该配置,devtools不会生效: 打包时关闭 -->
+                    <fork>false</fork>
+                    <!-- 避免中文乱码 -->
+                    <jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
+                </configuration>
+                <!-- 允许生成可运行jar -->
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+
 </project>

+ 2 - 1
mjava-kaiyue_cd/src/main/java/com/malk/kaiyue_cd/service/impl/KYCDServiceImpl.java

@@ -471,7 +471,8 @@ public class KYCDServiceImpl extends ServiceImpl<AdvancedLeaveMapper, AdvancedLe
         Map leaveMap = new HashMap();
         //查询员工年假余额
         Map body1 = new HashMap();
-        body1.put("leave_code","609a84ed-54d4-4ecd-a44f-4c55b04c37ea");//年假(测试)
+//        body1.put("leave_code","609a84ed-54d4-4ecd-a44f-4c55b04c37ea");//年假(测试)
+        body1.put("leave_code","f7e0de92-806f-457e-9aa1-c20b245d741e");//年假
         body1.put("op_userid",ddConf.getOperator());
         body1.put("userids",userId);
         body1.put("offset",0);

+ 1 - 1
mjava-kaiyue_cd/src/main/resources/application-dev.yml

@@ -1,6 +1,6 @@
 # 环境配置
 server:
-  port: 9001
+  port: 9002
   servlet:
     context-path: /api/kaiyue_cd
 

+ 3 - 0
mjava-kaiyue_cd/src/main/resources/application.yml

@@ -0,0 +1,3 @@
+spring:
+  profiles:
+    active: dev