'1'

twzd-admin/pom.xml → jpcj-admin/pom.xml

@@ -4,12 +4,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.miaxis</groupId>
-        <artifactId>twzd</artifactId>
+        <artifactId>jpcj</artifactId>
         <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
-    <artifactId>twzd-admin</artifactId>
+    <artifactId>jpcj-admin</artifactId>
 
     <description>
         web服务入口
@@ -41,7 +41,7 @@
         <!-- 核心模块-->
         <dependency>
             <groupId>com.miaxis</groupId>
-            <artifactId>twzd-framework</artifactId>
+            <artifactId>jpcj-framework</artifactId>
         </dependency>
 
         <dependency>
@@ -53,7 +53,7 @@
         <!-- app端-->
         <dependency>
             <groupId>com.miaxis</groupId>
-            <artifactId>twzd-service</artifactId>
+            <artifactId>jpcj-service</artifactId>
             <version>1.0.1</version>
         </dependency>
         <!-- 定时任务-->
@@ -65,7 +65,7 @@
         <!-- 代码生成-->
         <dependency>
             <groupId>com.miaxis</groupId>
-            <artifactId>twzd-generator</artifactId>
+            <artifactId>jpcj-generator</artifactId>
             <version>1.0.1</version>
         </dependency>
 

twzd-admin/src/main/java/com/miaxis/TwzdApplication.java → jpcj-admin/src/main/java/com/miaxis/JpcjApplication.java

@@ -15,13 +15,13 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableFeignClients
 @EnableScheduling//开启定时任务注解
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
-public class TwzdApplication
+public class JpcjApplication
 {
     public static void main(String[] args)
     {
         // System.setProperty("spring.devtools.restart.enabled", "false");
-        SpringApplication.run(TwzdApplication.class, args);
-        System.out.println(" 头文字D！  发车！  \n") ;
+        SpringApplication.run(JpcjApplication.class, args);
+        System.out.println(" 金牌车教！  发车！  \n") ;
 
     }
 }

twzd-admin/src/main/java/com/miaxis/TwzdServletInitializer.java → jpcj-admin/src/main/java/com/miaxis/JpcjServletInitializer.java

@@ -8,11 +8,11 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
  *
  * @author miaxis
  */
-public class TwzdServletInitializer extends SpringBootServletInitializer
+public class JpcjServletInitializer extends SpringBootServletInitializer
 {
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
     {
-        return application.sources(TwzdApplication.class);
+        return application.sources(JpcjApplication.class);
     }
 }

twzd-admin/src/main/resources/application-dev.yml → jpcj-admin/src/main/resources/application-dev.yml

@@ -6,8 +6,8 @@ spring:
         druid:
             # 主库数据源
             master:
-                #url: jdbc:mysql://192.168.8.213:3306/twzd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                url: jdbc:mysql://1.15.26.233:3307/twzd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                #url: jdbc:mysql://192.168.8.213:3306/jpcj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                url: jdbc:mysql://1.15.26.233:3307/jpcj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
                 username: root
                 password: miaxis110
             # 从库数据源
@@ -97,10 +97,10 @@ wxpay:
     merchantId: 1615410794
     serialNumber: 5F85D69504B3B33DAF5A7C5B86A3E93915D3D5B0
     v3key: 8604f2a6eb6338cfa64e7df4ec2c08b3
-    notifyUrl: http://1.15.26.233:8080/twzd-admin/open-api/wx/notify/wxpay
-    notifyUrlRefund: http://1.15.26.233:8080/twzd-admin/open-api/wx/notify/refund
-    xcxNotifyUrl: http://1.15.26.233:8080/twzd-admin/open-api/wx/notify/xcxWxpay
-    xcxNotifyUrlRefund: http://1.15.26.233:8080/twzd-admin/open-api/wx/notify/xcxRefund
+    notifyUrl: http://1.15.26.233:8080/jpcj-admin/open-api/wx/notify/wxpay
+    notifyUrlRefund: http://1.15.26.233:8080/jpcj-admin/open-api/wx/notify/refund
+    xcxNotifyUrl: http://1.15.26.233:8080/jpcj-admin/open-api/wx/notify/xcxWxpay
+    xcxNotifyUrlRefund: http://1.15.26.233:8080/jpcj-admin/open-api/wx/notify/xcxRefund
     appId: wx67ca1b8c9816ef28
 
 # 腾讯cos
@@ -108,9 +108,9 @@ cos:
     secretId: AKIDwISNOFsJXYGjy89FJI9UnzuZFgTtRgFe
     secretKey: IK5af8MJzPoKbdQxDCtKWR5T5PSEkyDB
     bucket: ap-shanghai
-    bucketName: twzd-1305573081
-    path: https://twzd-1305573081.cos.ap-shanghai.myqcloud.com
-    preffix: twzd-test
+    bucketName: jpcj-1305573081
+    path: https://jpcj-1305573081.cos.ap-shanghai.myqcloud.com
+    preffix: jpcj-test
 
 
 # 分销二维码生成路径

twzd-admin/src/main/resources/application-prod.yml → jpcj-admin/src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://172.17.0.6:3306/twzd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                url: jdbc:mysql://172.17.0.6:3306/jpcj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
                 username: root
                 password: Miaxis@2020
             # 从库数据源
@@ -106,9 +106,9 @@ cos:
     secretId: AKIDwISNOFsJXYGjy89FJI9UnzuZFgTtRgFe
     secretKey: IK5af8MJzPoKbdQxDCtKWR5T5PSEkyDB
     bucket: ap-shanghai
-    bucketName: twzd-1305573081
-    path: https://twzd-1305573081.cos.ap-shanghai.myqcloud.com
-    preffix: twzd-prod
+    bucketName: jpcj-1305573081
+    path: https://jpcj-1305573081.cos.ap-shanghai.myqcloud.com
+    preffix: jpcj-prod
 
 
 # 带参数的二维码生成路径

twzd-admin/src/main/resources/application-prodtest.yml → jpcj-admin/src/main/resources/application-prodtest.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://sh-cdb-2y9n2832.sql.tencentcdb.com:60123/twzd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                url: jdbc:mysql://sh-cdb-2y9n2832.sql.tencentcdb.com:60123/jpcj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
                 username: root
                 password: Miaxis@2020
             # 从库数据源
@@ -106,9 +106,9 @@ cos:
     secretId: AKIDwISNOFsJXYGjy89FJI9UnzuZFgTtRgFe
     secretKey: IK5af8MJzPoKbdQxDCtKWR5T5PSEkyDB
     bucket: ap-shanghai
-    bucketName: twzd-1305573081
-    path: https://twzd-1305573081.cos.ap-shanghai.myqcloud.com
-    preffix: twzd-prod
+    bucketName: jpcj-1305573081
+    path: https://jpcj-1305573081.cos.ap-shanghai.myqcloud.com
+    preffix: jpcj-prod
 
 
 # 带参数的二维码生成路径

twzd-admin/src/main/resources/application.yml → jpcj-admin/src/main/resources/application.yml

@@ -57,7 +57,7 @@ logging:
 # Spring配置
 spring:
   jmx:
-    default-domain: twzd
+    default-domain: jpcj
   # 资源信息
   messages:
     # 国际化资源文件路径

twzd-admin/src/main/resources/logback.xml → jpcj-admin/src/main/resources/logback.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <property name="log.path" value="/data/logs/twzd"/>
+    <property name="log.path" value="/data/logs/jpcj"/>
     <property name="console.log.pattern"
               value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
     <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/>

twzd-admin/src/test/java/com/miaxis/test/NormalTest.java → jpcj-admin/src/test/java/com/miaxis/test/NormalTest.java

@@ -2,7 +2,7 @@ package com.miaxis.test;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.miaxis.TwzdApplication;
+import com.miaxis.JpcjApplication;
 import com.miaxis.common.core.domain.entity.UserInfo;
 import com.miaxis.feign.dto.WxGzhBatchUser;
 import com.miaxis.feign.service.IWxSendService;
@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @ActiveProfiles("prodtest")
-@SpringBootTest(classes = TwzdApplication.class)
+@SpringBootTest(classes = JpcjApplication.class)
 @RunWith(SpringRunner.class)
 public class NormalTest {
 

twzd-common/pom.xml → jpcj-common/pom.xml

@@ -4,12 +4,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.miaxis</groupId>
-        <artifactId>twzd</artifactId>
+        <artifactId>jpcj</artifactId>
         <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>twzd-common</artifactId>
+    <artifactId>jpcj-common</artifactId>
 
     <description>
         common通用工具

twzd-common/src/main/java/com/miaxis/common/config/WxPayConfigImpl.java → jpcj-common/src/main/java/com/miaxis/common/config/WxPayConfigImpl.java

@@ -34,7 +34,7 @@ public class WxPayConfigImpl implements WXPayConfig {
     public WxPayConfigImpl() {
         try {
             //这个证书的位置不是瞎鸡儿填的，你要在这个路径真的有一个证书
-            // InputStream is = new FileInputStream("F:\\twzd\\twzd\\twzd-admin\\src\\main\\resources\\wechatpay\\apiclient_cert.p12");
+            // InputStream is = new FileInputStream("F:\\jpcj\\jpcj\\jpcj-admin\\src\\main\\resources\\wechatpay\\apiclient_cert.p12");
             InputStream is = new FileInputStream(new ClassPathResource("wechatpay/apiclient_cert.p12").getFile());
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             byte[] bs = new byte[1024];