소스 검색

5.7代码提交

“lqy 1 개월 전
부모
커밋
0eedcf31ea

+ 8 - 2
mjava-qiwang/pom.xml

@@ -12,7 +12,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-    </properties>>
+    </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
@@ -129,7 +129,13 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
+    <repositories>
+        <repository>
+            <id>com.e-iceblue</id>
+            <name>e-iceblue</name>
+            <url>https://repo.e-iceblue.com/nexus/content/groups/public/</url>
+        </repository>
+    </repositories>
     <build>
         <finalName>qiwang</finalName>
         <plugins>

+ 1 - 1
mjava-qiwang/src/main/java/com/malk/qiwang/Controller/InvoiceLibraryController.java

@@ -51,7 +51,7 @@ public class InvoiceLibraryController {
     private DDClient_Contacts ddClient_contacts;
     @Autowired
     private InvoiceLibraryMapper baseMapper;
-    private static final String url = "http://6de142c3.r39.cpolar.top/qiwang/";
+    private static final String url = "http://47.103.203.2:9092/qiwang/";
             //员工报销
     @PostMapping("/invoiceLibrary")
     public McR test(@RequestBody Map map) {

+ 10 - 10
mjava-qiwang/src/main/java/com/malk/qiwang/Controller/QiWangController.java

@@ -68,19 +68,19 @@ public class QiWangController {
     private DDClient_Workflow ddClientWorkflow ;
     @Autowired
     private DDClient_Contacts ddClient_contacts;
-    private static final String url = "http://3f8ee099.r39.cpolar.top/qiwang/";
+    private static final String url = "http://47.103.203.2:9092/qiwang/";
     @PostMapping("/test")
     public McR test(@RequestBody Map map) {
         log.info("map:{}", map);
         String processInstanceId = UtilMap.getString(map, "processInstanceId");
 
         // 获取审批实例信息
-        Map processInstance = ddClientWorkflow.getProcessInstanceId(ddClient.getAccessToken(), processInstanceId);
-        System.out.println("processInstance====" + processInstance);
-
-        if (Objects.nonNull(processInstance)) {
-            List<Map> formComponentValues = (List<Map>) processInstance.get("formComponentValues");
-            System.out.println("formComponentValues====" + formComponentValues);
+//        Map processInstance = ddClientWorkflow.getProcessInstanceId(ddClient.getAccessToken(), processInstanceId);
+//        System.out.println("processInstance====" + processInstance);
+//
+//        if (Objects.nonNull(processInstance)) {
+//            List<Map> formComponentValues = (List<Map>) processInstance.get("formComponentValues");
+//            System.out.println("formComponentValues====" + formComponentValues);
 
             // 存储所有处理结果
 //            List<Object> allResults = new ArrayList<>();
@@ -127,9 +127,9 @@ public class QiWangController {
 
             // 处理完所有附件后,汇总结果
 
-                return McR.success() ;
-
-        }
+//                return McR.success() ;
+//
+//        }
 
         return McR.success();
     }

+ 1 - 1
mjava-qiwang/src/main/java/com/malk/qiwang/Service/impl/InvoiceLibraryServiceImpl.java

@@ -95,7 +95,7 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
     private CompanyTitleMapper companyTitleMapper;
     @Autowired
     private DDClient_Contacts ddClient_contacts;
-    private static final String url = "http://3f8ee099.r39.cpolar.top/qiwang/";
+    private static final String url = "http://47.103.203.2:9092/qiwang/";
 
     @Override
     public McR invoiceLibrary(Map map) {

+ 61 - 61
mjava-qiwang/src/main/java/com/malk/qiwang/utils/MPGenerator.java

@@ -10,40 +10,40 @@ import java.sql.SQLException;
 import java.sql.Types;
 
 public class MPGenerator {
-    public static void main(String[] args) {
-        //可以直接去官方文档上查看
-        FastAutoGenerator
-                .create("jdbc:mysql://localhost:3306/invoice_db?useSSL=false&serverTimezone=Asia/Shanghai",
-                "root", "123456")
-                .globalConfig(builder -> {
-                    builder.author("LQY")
-                            .disableOpenDir()
-                            .outputDir(System.getProperty("user.dir")+
-                                    "/mjava-qiwang/src/main/java");
-                })
-                .dataSourceConfig(builder ->
-                        builder.typeConvertHandler((globalConfig, typeRegistry, metaInfo) -> {
-                            int typeCode = metaInfo.getJdbcType().TYPE_CODE;
-                            if (typeCode == Types.SMALLINT) {
-                                return DbColumnType.INTEGER;
-                            }
-                            return typeRegistry.getColumnType(metaInfo);
-                        }))
-                .packageConfig(builder -> {
-                    builder.parent("com.malk.qiwang")
-                            .controller("Controller")
-                            .service("Service")
-                            .serviceImpl("Service.impl")
-                            .mapper("mapper")
-                            .entity("entity");
-                })
-                .strategyConfig(builder -> {
-                    builder.addInclude("invoice_library")
-                            .entityBuilder().enableLombok();
-                })
-                .templateEngine(new VelocityTemplateEngine())
-                .execute();
-    }
+//    public static void main(String[] args) {
+//        //可以直接去官方文档上查看
+//        FastAutoGenerator
+//                .create("jdbc:mysql://localhost:3306/invoice_db?useSSL=false&serverTimezone=Asia/Shanghai",
+//                "root", "123456")
+//                .globalConfig(builder -> {
+//                    builder.author("LQY")
+//                            .disableOpenDir()
+//                            .outputDir(System.getProperty("user.dir")+
+//                                    "/mjava-qiwang/src/main/java");
+//                })
+//                .dataSourceConfig(builder ->
+//                        builder.typeConvertHandler((globalConfig, typeRegistry, metaInfo) -> {
+//                            int typeCode = metaInfo.getJdbcType().TYPE_CODE;
+//                            if (typeCode == Types.SMALLINT) {
+//                                return DbColumnType.INTEGER;
+//                            }
+//                            return typeRegistry.getColumnType(metaInfo);
+//                        }))
+//                .packageConfig(builder -> {
+//                    builder.parent("com.malk.qiwang")
+//                            .controller("Controller")
+//                            .service("Service")
+//                            .serviceImpl("Service.impl")
+//                            .mapper("mapper")
+//                            .entity("entity");
+//                })
+//                .strategyConfig(builder -> {
+//                    builder.addInclude("invoice_library")
+//                            .entityBuilder().enableLombok();
+//                })
+//                .templateEngine(new VelocityTemplateEngine())
+//                .execute();
+//    }
 //    public static void main(String[] args) {
 //        String url = "jdbc:sqlserver://113.45.187.194:1433;"+"databaseName=dingding;"+"encrypt=false;"+"trustServerCertificate=true;";
 //
@@ -54,31 +54,31 @@ public class MPGenerator {
 //        }
 //    }
 
-//    public static void main(String[] args) {
-//        // MySQL 本地连接配置
-//        String url = "jdbc:mysql://localhost:3306/invoice_db?useSSL=false&characterEncoding=utf8&serverTimezone=Asia/Shanghai";
-//        String username = "root";
-//        String password = "123456";
-//
-//        // 加载 MySQL 驱动(JDBC 4.0 后可以省略,但保留更稳妥)
-//        try {
-//            Class.forName("com.mysql.cj.jdbc.Driver");
-//        } catch (ClassNotFoundException e) {
-//            System.out.println("❌ MySQL JDBC 驱动未找到,请检查依赖");
-//            e.printStackTrace();
-//            return;
-//        }
-//
-//        // 使用 try-with-resources 自动关闭连接
-//        try (Connection conn = DriverManager.getConnection(url, username, password)) {
-//            System.out.println("✅ 连接本地 MySQL 数据库成功!");
-//            System.out.println("数据库: invoice_db");
-//            System.out.println("MySQL 版本: " + conn.getMetaData().getDatabaseProductVersion());
-//        } catch (SQLException e) {
-//            System.out.println("❌ 连接 MySQL 数据库失败!");
-//            System.err.println("错误代码: " + e.getErrorCode());
-//            System.err.println("错误信息: " + e.getMessage());
-//            e.printStackTrace();
-//        }
-//    }
+    public static void main(String[] args) {
+        // MySQL 本地连接配置
+        String url = "jdbc:mysql://47.103.203.2:3306/invoice_db?useSSL=false&characterEncoding=utf8&serverTimezone=Asia/Shanghai";
+        String username = "root";
+        String password = "QWhs@12345";
+
+        // 加载 MySQL 驱动(JDBC 4.0 后可以省略,但保留更稳妥)
+        try {
+            Class.forName("com.mysql.cj.jdbc.Driver");
+        } catch (ClassNotFoundException e) {
+            System.out.println("❌ MySQL JDBC 驱动未找到,请检查依赖");
+            e.printStackTrace();
+            return;
+        }
+
+        // 使用 try-with-resources 自动关闭连接
+        try (Connection conn = DriverManager.getConnection(url, username, password)) {
+            System.out.println("✅ 连接本地 MySQL 数据库成功!");
+            System.out.println("数据库: invoice_db");
+            System.out.println("MySQL 版本: " + conn.getMetaData().getDatabaseProductVersion());
+        } catch (SQLException e) {
+            System.out.println("❌ 连接 MySQL 数据库失败!");
+            System.err.println("错误代码: " + e.getErrorCode());
+            System.err.println("错误信息: " + e.getMessage());
+            e.printStackTrace();
+        }
+    }
 }

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

@@ -16,13 +16,14 @@ logging:
 dingtalk:
   agentId: 4362063085
   appKey: dinglh2civttmfufkrha
+  appSecret: 5Zwobht8IX48Q-y9a3E21cY1oswzCycmgxVFTzNZ8IP62SdItL6EzhmFbCik7wH_
 #  appKey: dingknkn9abneqetgc8a
 #  appSecret: 0JnyzqsxqnVrSwP3SiQvZrMGbk0PyUDcl58o1BS2Bro0lVxUYbi_XZ805IJIHUE8
-  appSecret: 5Zwobht8IX48Q-y9a3E21cY1oswzCycmgxVFTzNZ8IP62SdItL6EzhmFbCik7wH_
+
   operator: 16441447913471369 #刘志
   operatorUnionId: 99iiLnPefWJRBnaze9vB2fQiEiE #刘志
   spaceId: 660951480
-  downloadPath: C:\\Users\\EDY\\Desktop\\项目\\琦王\\files\\
+  downloadPath: D:\\qiwang\\files\\
 #  agentId: 2691784047
 #  appKey: dinghbynhnd2dbgypmsa
 #  appSecret: Kl5Xw8x0TlEIlvcJuUkYZD18UTTShJmfdKrAIpY8oX-Q_tazyUKA28nQh7dG5-mq
@@ -31,9 +32,9 @@ dingtalk:
   token: xpJRw0yOIo
 spring:
   datasource:
-    url: jdbc:mysql://localhost:3306/invoice_db?useSSL=false&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://47.103.203.2:3306/invoice_db?useSSL=false&characterEncoding=utf8&serverTimezone=Asia/Shanghai
     username: root
-    password: 123456
+    password: QWhs@12345
     driver-class-name: com.mysql.cj.jdbc.Driver
 
 mybatis-plus:

+ 24 - 7
mjava-qiwang/src/main/resources/application-prod.yml

@@ -15,19 +15,36 @@ logging:
 # dingtalk
 dingtalk:
   agentId: 4362063085
-  appKey: dingknkn9abneqetgc8a
-  appSecret: 0JnyzqsxqnVrSwP3SiQvZrMGbk0PyUDcl58o1BS2Bro0lVxUYbi_XZ805IJIHUE8
-  operator: "16441447913471369" #刘志
+  appKey: dinglh2civttmfufkrha
+  appSecret: 5Zwobht8IX48Q-y9a3E21cY1oswzCycmgxVFTzNZ8IP62SdItL6EzhmFbCik7wH_
+#  appKey: dingknkn9abneqetgc8a
+#  appSecret: 0JnyzqsxqnVrSwP3SiQvZrMGbk0PyUDcl58o1BS2Bro0lVxUYbi_XZ805IJIHUE8
+  operator: 16441447913471369 #刘志
   operatorUnionId: 99iiLnPefWJRBnaze9vB2fQiEiE #刘志
   spaceId: 660951480
-  downloadPath: C:\\Users\\EDY\\Desktop\\项目\\琦王\\files\\
+  downloadPath: D:\\qiwang\\files\\
 #  agentId: 2691784047
 #  appKey: dinghbynhnd2dbgypmsa
 #  appSecret: Kl5Xw8x0TlEIlvcJuUkYZD18UTTShJmfdKrAIpY8oX-Q_tazyUKA28nQh7dG5-mq
   corpId: dingdf7ab7df12214b0335c2f4657eb6378f
-  aesKey: oEBv2fnBAcBSlCZpsYKi5THmQBFaALQIzsFRbenX66n
-  token: h8cSLzNtQ1qTeQuBjY5OpDW
-
+  aesKey: yNR53hywSt4zJjjHUAcabqupuPJKWzVDbkTx12Q6Ctw
+  token: xpJRw0yOIo
+spring:
+  datasource:
+    url: jdbc:mysql://47.103.203.2:3306/invoice_db?useSSL=false&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+    username: root
+    password: QWhs@12345
+    driver-class-name: com.mysql.cj.jdbc.Driver
+
+mybatis-plus:
+  configuration:
+    #开启驼峰命名自动映射
+    map-underscore-to-camel-case: true
+    #开启日志打印
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  type-aliases-package: com.malk.qiwang.entity
+  #扫描mapper文件
+  mapper-locations: classpath:mapper/*.xml
 
 #aliwork:
 #  appType: APP_V25MK3XKODKB02UVTGSH