Przeglądaj źródła

华高三期看板实时

wzy 5 dni temu
rodzic
commit
d3210efdfe

+ 4 - 4
mjava-huagao/pom.xml

@@ -25,11 +25,11 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <!--sql server依赖-->
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.32</version>
-            <scope>runtime</scope>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
+            <version>12.4.0.jre8</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>

+ 2 - 0
mjava-huagao/src/main/java/com/malk/huagao/HuaGaoApplication.java

@@ -4,6 +4,8 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
+import java.security.Security;
+
 @SpringBootApplication(scanBasePackages = {"com.malk"})
 public class HuaGaoApplication {
     public static void main(String[] args) {

+ 2 - 2
mjava-huagao/src/main/java/com/malk/huagao/service/impl/HuaGaoServiceImpl.java

@@ -345,7 +345,7 @@ private Map crcreateUser_dingTalk(String name, String randomAccount, String rand
         }
     }*/
 
-    private List<Map> getYdFormDataList(String formUuid, String searchCondition, YDConf.FORM_QUERY formQuery) {
+    /*private List<Map> getYdFormDataList(String formUuid, String searchCondition, YDConf.FORM_QUERY formQuery) {
         List<Map> list = new ArrayList<>();
         DDR_New ddrNew = new DDR_New();
         int pageNumber = 1;
@@ -360,7 +360,7 @@ private Map crcreateUser_dingTalk(String name, String randomAccount, String rand
             pageNumber++;
         }while (ddrNew.getTotalCount() > ddrNew.getPageNumber() * pageSize);
         return list;
-    }
+    }*/
 
     private Map<String,Map<String,String>> toDateMap(List<Map> valList){
         Map<String,Map<String,String>>  result = new HashMap<>();

+ 2 - 2
mjava-huagao/src/main/java/com/malk/huagao/utils/MPGenerator.java

@@ -10,8 +10,8 @@ public class MPGenerator {
     public static void main(String[] args) {
         //可以直接去官方文档上查看
         FastAutoGenerator
-                .create("jdbc:mysql://mes.huagaochina.com:7707/huagao",
-                        "root", "HG_root@2025..")
+                .create("jdbc:sqlserver://113.45.187.194:1433;databaseName=dingding",
+                        "hgdd", "hgdd@2025")
                 .globalConfig(builder -> {
                     builder.author("WZY")
                             .disableOpenDir()

+ 5 - 4
mjava-huagao/src/main/resources/application-dev.yml

@@ -13,10 +13,11 @@ logging:
 
 spring:
   datasource:
-    url: jdbc:mysql://mes.huagaochina.com:7707/huagao?serverTimezone=GMT%2B8
-    username: root
-    password: HG_root@2025..
-    driver-class-name: com.mysql.cj.jdbc.Driver
+    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+    #trustServerCertificate=true 临时绕过证书验证的风险
+    url: jdbc:sqlserver://113.45.187.194:1433;databaseName=dingding;encrypt=true;trustServerCertificate=true;
+    username: hgdd
+    password: hgdd@2025
 
 mybatis-plus:
   configuration:

+ 22 - 4
mjava-huagao/src/main/resources/application-prod.yml

@@ -4,12 +4,30 @@ server:
     context-path: /huagao
 
 enable:
-  scheduling: false
+  scheduling: true
 logging:
   config: classpath:logback-spring.xml
   path: /home/server/huagao/log/
   level:
-    com.malk.*: debug
+    com.malk.*: info
+
+spring:
+  datasource:
+    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+    #trustServerCertificate=true 临时绕过证书验证的风险
+    url: jdbc:sqlserver://113.45.187.194:1433;databaseName=dingding;encrypt=true;trustServerCertificate=true;
+    username: hgdd
+    password: hgdd@2025
+
+mybatis-plus:
+  configuration:
+    #开启驼峰命名自动映射
+    map-underscore-to-camel-case: true
+    #开启日志打印
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  type-aliases-package: com.malk.huagao.entity
+  #扫描mapper文件
+  mapper-locations: classpath:mapper/*.xml
 
 # dingtalk
 dingtalk:
@@ -23,7 +41,7 @@ dingtalk:
 
 # aliwork
 aliwork:
-  appType:
-  systemToken:
+  appType: APP_BWPT6ET90UEE8IBEY9GJ
+  systemToken: 37766HD145ST2RBB9S4D37J2WMNU293GASC8M6Q
 
 

+ 1 - 1
mjava-huagao/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: prod
   servlet:
     multipart:
       max-file-size: 100MB

+ 1 - 1
mjava-huagao/src/test/java/com/malk/huagao/YyYdTest.java

@@ -93,7 +93,7 @@ public class YyYdTest {
 
     @Test
     public void test3() {
-        LocalDateTime startTime= LocalDate.now().minusDays(1).atTime(LocalTime.MIN);
+        LocalDateTime startTime= LocalDate.now().minusDays(3).atTime(LocalTime.MIN);
         LocalDateTime endTime= LocalDate.now().atTime(LocalTime.MIN);
 
         huaGaoService.syncKqData(startTime,endTime);