Althars123 2 anni fa
parent
commit
37d7851412
100 ha cambiato i file con 36 aggiunte e 36 eliminazioni
  1. 14 14
      pom.xml
  2. 5 5
      sdjk-admin/pom.xml
  3. 2 2
      sdjk-admin/src/main/java/com/miaxis/SdjkApplication.java
  4. 2 2
      sdjk-admin/src/main/java/com/miaxis/SdjkServletInitializer.java
  5. 0 0
      sdjk-admin/src/main/java/com/miaxis/app/controller/ad/AdInfoController.java
  6. 0 0
      sdjk-admin/src/main/java/com/miaxis/app/controller/question/QuestionCollectionController.java
  7. 0 0
      sdjk-admin/src/main/java/com/miaxis/app/controller/question/QuestionInfoController.java
  8. 0 0
      sdjk-admin/src/main/java/com/miaxis/app/controller/question/QuestionVersionController.java
  9. 0 0
      sdjk-admin/src/main/java/com/miaxis/app/controller/question/QuestionWrongController.java
  10. 0 0
      sdjk-admin/src/main/java/com/miaxis/app/controller/score/ScoreInfoController.java
  11. 0 0
      sdjk-admin/src/main/java/com/miaxis/app/controller/user/UserInfoController.java
  12. 0 0
      sdjk-admin/src/main/java/com/miaxis/app/controller/vip/AppVipCodeController.java
  13. 0 0
      sdjk-admin/src/main/java/com/miaxis/app/controller/wx/WxController.java
  14. 0 0
      sdjk-admin/src/main/java/com/miaxis/app/controller/wx/WxNotifyController.java
  15. 0 0
      sdjk-admin/src/main/java/com/miaxis/pc/controller/vip/VipCodeController.java
  16. 0 0
      sdjk-admin/src/main/java/com/miaxis/pc/controller/wx/PcWxController.java
  17. 0 0
      sdjk-admin/src/main/java/com/miaxis/system/controller/common/CaptchaController.java
  18. 0 0
      sdjk-admin/src/main/java/com/miaxis/system/controller/common/CommonController.java
  19. 0 0
      sdjk-admin/src/main/java/com/miaxis/system/controller/monitor/ServerController.java
  20. 0 0
      sdjk-admin/src/main/java/com/miaxis/system/controller/monitor/SysLogininforController.java
  21. 0 0
      sdjk-admin/src/main/java/com/miaxis/system/controller/monitor/SysOperlogController.java
  22. 0 0
      sdjk-admin/src/main/java/com/miaxis/system/controller/monitor/SysUserOnlineController.java
  23. 0 0
      sdjk-admin/src/main/java/com/miaxis/system/controller/system/SysConfigController.java
  24. 0 0
      sdjk-admin/src/main/java/com/miaxis/system/controller/system/SysDeptController.java
  25. 0 0
      sdjk-admin/src/main/java/com/miaxis/system/controller/system/SysDictDataController.java
  26. 0 0
      sdjk-admin/src/main/java/com/miaxis/system/controller/system/SysDictTypeController.java
  27. 0 0
      sdjk-admin/src/main/java/com/miaxis/system/controller/system/SysLoginController.java
  28. 0 0
      sdjk-admin/src/main/java/com/miaxis/system/controller/system/SysMenuController.java
  29. 0 0
      sdjk-admin/src/main/java/com/miaxis/system/controller/system/SysNoticeController.java
  30. 0 0
      sdjk-admin/src/main/java/com/miaxis/system/controller/system/SysPostController.java
  31. 0 0
      sdjk-admin/src/main/java/com/miaxis/system/controller/system/SysProfileController.java
  32. 0 0
      sdjk-admin/src/main/java/com/miaxis/system/controller/system/SysRoleController.java
  33. 0 0
      sdjk-admin/src/main/java/com/miaxis/system/controller/system/SysUserController.java
  34. 0 0
      sdjk-admin/src/main/java/com/miaxis/system/controller/tool/SwaggerController.java
  35. 0 0
      sdjk-admin/src/main/resources/META-INF/spring-devtools.properties
  36. 4 4
      sdjk-admin/src/main/resources/application-dev.yml
  37. 1 1
      sdjk-admin/src/main/resources/application-prod.yml
  38. 2 2
      sdjk-admin/src/main/resources/application-prodtest.yml
  39. 1 1
      sdjk-admin/src/main/resources/application.yml
  40. 0 0
      sdjk-admin/src/main/resources/banner.txt
  41. 0 0
      sdjk-admin/src/main/resources/i18n/messages.properties
  42. 1 1
      sdjk-admin/src/main/resources/logback.xml
  43. 0 0
      sdjk-admin/src/main/resources/mybatis/mybatis-config.xml
  44. 0 0
      sdjk-admin/src/main/resources/wechatpay/apiclient_cert.p12
  45. 0 0
      sdjk-admin/src/main/resources/wechatpay/apiclient_cert.pem
  46. 0 0
      sdjk-admin/src/main/resources/wechatpay/apiclient_key.pem
  47. 2 2
      sdjk-admin/src/test/java/com/miaxis/test/NormalTest.java
  48. 2 2
      sdjk-common/pom.xml
  49. 0 0
      sdjk-common/src/main/java/com/miaxis/common/annotation/DataScope.java
  50. 0 0
      sdjk-common/src/main/java/com/miaxis/common/annotation/DataSource.java
  51. 0 0
      sdjk-common/src/main/java/com/miaxis/common/annotation/Excel.java
  52. 0 0
      sdjk-common/src/main/java/com/miaxis/common/annotation/Excels.java
  53. 0 0
      sdjk-common/src/main/java/com/miaxis/common/annotation/Log.java
  54. 0 0
      sdjk-common/src/main/java/com/miaxis/common/annotation/RepeatSubmit.java
  55. 0 0
      sdjk-common/src/main/java/com/miaxis/common/config/BeanConfig.java
  56. 0 0
      sdjk-common/src/main/java/com/miaxis/common/config/FeignConfig.java
  57. 0 0
      sdjk-common/src/main/java/com/miaxis/common/config/MiaxisConfig.java
  58. 0 0
      sdjk-common/src/main/java/com/miaxis/common/config/WxVerifierConfig.java
  59. 0 0
      sdjk-common/src/main/java/com/miaxis/common/config/WxpayConfig.java
  60. 0 0
      sdjk-common/src/main/java/com/miaxis/common/constant/Constants.java
  61. 0 0
      sdjk-common/src/main/java/com/miaxis/common/constant/GenConstants.java
  62. 0 0
      sdjk-common/src/main/java/com/miaxis/common/constant/ScheduleConstants.java
  63. 0 0
      sdjk-common/src/main/java/com/miaxis/common/constant/SmsTemplateConstants.java
  64. 0 0
      sdjk-common/src/main/java/com/miaxis/common/constant/UserConstants.java
  65. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/controller/BaseController.java
  66. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/BaseBusinessEntity.java
  67. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/BaseEntity.java
  68. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/DyUserInfo.java
  69. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/DyUserInfoResult.java
  70. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/Response.java
  71. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/ResponseEnum.java
  72. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/TreeEntity.java
  73. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/TreeSelect.java
  74. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/WxUserInfo.java
  75. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/entity/SysDept.java
  76. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/entity/SysDictData.java
  77. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/entity/SysDictType.java
  78. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/entity/SysMenu.java
  79. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/entity/SysRole.java
  80. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/entity/SysUser.java
  81. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/entity/UserInfo.java
  82. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/model/AppleResult.java
  83. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/model/DyResult.java
  84. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/model/DyToken.java
  85. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/model/LoginBody.java
  86. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/model/LoginBodyMobleCode.java
  87. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/model/LoginBodyNoCode.java
  88. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/model/LoginUser.java
  89. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/model/WxResult.java
  90. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/domain/vo/AgentVO.java
  91. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/page/PageBean.java
  92. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/page/PageBuilder.java
  93. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/page/ResponsePageInfo.java
  94. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/redis/RedisCache.java
  95. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/text/CharsetKit.java
  96. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/text/Convert.java
  97. 0 0
      sdjk-common/src/main/java/com/miaxis/common/core/text/StrFormatter.java
  98. 0 0
      sdjk-common/src/main/java/com/miaxis/common/enums/BusinessStatusEnum.java
  99. 0 0
      sdjk-common/src/main/java/com/miaxis/common/enums/BusinessTypeEnum.java
  100. 0 0
      sdjk-common/src/main/java/com/miaxis/common/enums/DataSourceTypeEnum.java

+ 14 - 14
pom.xml

@@ -5,10 +5,10 @@
 	<modelVersion>4.0.0</modelVersion>
 
     <groupId>com.miaxis</groupId>
-    <artifactId>jkt</artifactId>
+    <artifactId>sdjk</artifactId>
     <version>1.0.1</version>
 
-    <name>jkt</name>
+    <name>sdjk</name>
     <description>管理系统</description>
 
     <properties>
@@ -187,35 +187,35 @@
             <!--&lt;!&ndash; 定时任务&ndash;&gt;-->
             <!--<dependency>-->
                 <!--<groupId>com.miaxis</groupId>-->
-                <!--<artifactId>jkt-quartz</artifactId>-->
+                <!--<artifactId>sdjk-quartz</artifactId>-->
                 <!--<version>${miaxis.version}</version>-->
             <!--</dependency>-->
 	<!---->
             <!-- 代码生成-->
             <dependency>
                 <groupId>com.miaxis</groupId>
-                <artifactId>jkt-generator</artifactId>
+                <artifactId>sdjk-generator</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
 			<!---->
             <!-- 核心模块-->
             <dependency>
                 <groupId>com.miaxis</groupId>
-                <artifactId>jkt-framework</artifactId>
+                <artifactId>sdjk-framework</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
 
             <!-- 系统模块-->
             <dependency>
                 <groupId>com.miaxis</groupId>
-                <artifactId>jkt-system</artifactId>
+                <artifactId>sdjk-system</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
 
             <!-- 通用工具-->
             <dependency>
                 <groupId>com.miaxis</groupId>
-                <artifactId>jkt-common</artifactId>
+                <artifactId>sdjk-common</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
 
@@ -237,13 +237,13 @@
     </dependencyManagement>
 
     <modules>
-        <module>jkt-admin</module>
-        <module>jkt-framework</module>
-        <module>jkt-system</module>
-        <!--<module>jkt-quartz</module>-->
-        <module>jkt-generator</module>
-        <module>jkt-common</module>
-        <module>jkt-service</module>
+        <module>sdjk-admin</module>
+        <module>sdjk-framework</module>
+        <module>sdjk-system</module>
+        <!--<module>sdjk-quartz</module>-->
+        <module>sdjk-generator</module>
+        <module>sdjk-common</module>
+        <module>sdjk-service</module>
     </modules>
     <packaging>pom</packaging>
 

+ 5 - 5
jkt-admin/pom.xml → sdjk-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>jkt</artifactId>
+        <artifactId>sdjk</artifactId>
         <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
-    <artifactId>jkt-admin</artifactId>
+    <artifactId>sdjk-admin</artifactId>
 
     <description>
         web服务入口
@@ -41,7 +41,7 @@
         <!-- 核心模块-->
         <dependency>
             <groupId>com.miaxis</groupId>
-            <artifactId>jkt-framework</artifactId>
+            <artifactId>sdjk-framework</artifactId>
         </dependency>
 
         <dependency>
@@ -53,7 +53,7 @@
         <!-- app端-->
         <dependency>
             <groupId>com.miaxis</groupId>
-            <artifactId>jkt-service</artifactId>
+            <artifactId>sdjk-service</artifactId>
             <version>1.0.1</version>
         </dependency>
         <!-- 定时任务-->
@@ -65,7 +65,7 @@
         <!-- 代码生成-->
         <dependency>
             <groupId>com.miaxis</groupId>
-            <artifactId>jkt-generator</artifactId>
+            <artifactId>sdjk-generator</artifactId>
             <version>1.0.1</version>
         </dependency>
 

+ 2 - 2
jkt-admin/src/main/java/com/miaxis/JktApplication.java → sdjk-admin/src/main/java/com/miaxis/SdjkApplication.java

@@ -16,12 +16,12 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableScheduling//开启定时任务注解
 @EnableCaching
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
-public class JktApplication
+public class SdjkApplication
 {
     public static void main(String[] args)
     {
         // System.setProperty("spring.devtools.restart.enabled", "false");
-        SpringApplication.run(JktApplication.class, args);
+        SpringApplication.run(SdjkApplication.class, args);
         System.out.println(" 速达驾考启动!   ლ(´ڡ`ლ)゙  ");
     }
 }

+ 2 - 2
jkt-admin/src/main/java/com/miaxis/JktServletInitializer.java → sdjk-admin/src/main/java/com/miaxis/SdjkServletInitializer.java

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

+ 0 - 0
jkt-admin/src/main/java/com/miaxis/app/controller/ad/AdInfoController.java → sdjk-admin/src/main/java/com/miaxis/app/controller/ad/AdInfoController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/app/controller/question/QuestionCollectionController.java → sdjk-admin/src/main/java/com/miaxis/app/controller/question/QuestionCollectionController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/app/controller/question/QuestionInfoController.java → sdjk-admin/src/main/java/com/miaxis/app/controller/question/QuestionInfoController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/app/controller/question/QuestionVersionController.java → sdjk-admin/src/main/java/com/miaxis/app/controller/question/QuestionVersionController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/app/controller/question/QuestionWrongController.java → sdjk-admin/src/main/java/com/miaxis/app/controller/question/QuestionWrongController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/app/controller/score/ScoreInfoController.java → sdjk-admin/src/main/java/com/miaxis/app/controller/score/ScoreInfoController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/app/controller/user/UserInfoController.java → sdjk-admin/src/main/java/com/miaxis/app/controller/user/UserInfoController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/app/controller/vip/AppVipCodeController.java → sdjk-admin/src/main/java/com/miaxis/app/controller/vip/AppVipCodeController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/app/controller/wx/WxController.java → sdjk-admin/src/main/java/com/miaxis/app/controller/wx/WxController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/app/controller/wx/WxNotifyController.java → sdjk-admin/src/main/java/com/miaxis/app/controller/wx/WxNotifyController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/pc/controller/vip/VipCodeController.java → sdjk-admin/src/main/java/com/miaxis/pc/controller/vip/VipCodeController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/pc/controller/wx/PcWxController.java → sdjk-admin/src/main/java/com/miaxis/pc/controller/wx/PcWxController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/system/controller/common/CaptchaController.java → sdjk-admin/src/main/java/com/miaxis/system/controller/common/CaptchaController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/system/controller/common/CommonController.java → sdjk-admin/src/main/java/com/miaxis/system/controller/common/CommonController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/system/controller/monitor/ServerController.java → sdjk-admin/src/main/java/com/miaxis/system/controller/monitor/ServerController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/system/controller/monitor/SysLogininforController.java → sdjk-admin/src/main/java/com/miaxis/system/controller/monitor/SysLogininforController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/system/controller/monitor/SysOperlogController.java → sdjk-admin/src/main/java/com/miaxis/system/controller/monitor/SysOperlogController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/system/controller/monitor/SysUserOnlineController.java → sdjk-admin/src/main/java/com/miaxis/system/controller/monitor/SysUserOnlineController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/system/controller/system/SysConfigController.java → sdjk-admin/src/main/java/com/miaxis/system/controller/system/SysConfigController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/system/controller/system/SysDeptController.java → sdjk-admin/src/main/java/com/miaxis/system/controller/system/SysDeptController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/system/controller/system/SysDictDataController.java → sdjk-admin/src/main/java/com/miaxis/system/controller/system/SysDictDataController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/system/controller/system/SysDictTypeController.java → sdjk-admin/src/main/java/com/miaxis/system/controller/system/SysDictTypeController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/system/controller/system/SysLoginController.java → sdjk-admin/src/main/java/com/miaxis/system/controller/system/SysLoginController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/system/controller/system/SysMenuController.java → sdjk-admin/src/main/java/com/miaxis/system/controller/system/SysMenuController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/system/controller/system/SysNoticeController.java → sdjk-admin/src/main/java/com/miaxis/system/controller/system/SysNoticeController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/system/controller/system/SysPostController.java → sdjk-admin/src/main/java/com/miaxis/system/controller/system/SysPostController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/system/controller/system/SysProfileController.java → sdjk-admin/src/main/java/com/miaxis/system/controller/system/SysProfileController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/system/controller/system/SysRoleController.java → sdjk-admin/src/main/java/com/miaxis/system/controller/system/SysRoleController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/system/controller/system/SysUserController.java → sdjk-admin/src/main/java/com/miaxis/system/controller/system/SysUserController.java


+ 0 - 0
jkt-admin/src/main/java/com/miaxis/system/controller/tool/SwaggerController.java → sdjk-admin/src/main/java/com/miaxis/system/controller/tool/SwaggerController.java


+ 0 - 0
jkt-admin/src/main/resources/META-INF/spring-devtools.properties → sdjk-admin/src/main/resources/META-INF/spring-devtools.properties


+ 4 - 4
jkt-admin/src/main/resources/application-dev.yml → sdjk-admin/src/main/resources/application-dev.yml

@@ -6,8 +6,8 @@ spring:
         druid:
             # 主库数据源
             master:
-                #url: jdbc:mysql://192.168.8.213:3306/jkt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                url: jdbc:mysql://1.15.26.233:3307/jkt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                #url: jdbc:mysql://192.168.8.213:3306/sdjk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                url: jdbc:mysql://1.15.26.233:3307/sdjk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
                 username: root
                 password: miaxis110
             # 从库数据源
@@ -98,8 +98,8 @@ wxpay:
     merchantId: 1611324484
     serialNumber: 26C02FEDDE8C9F0F69A71CA37226F58CCBB164DE
     v3key: 7hM14893GvG3JK05575jk1l6P4tF042B
-    notifyUrl: http://1.15.26.233:8080/jkt-admin/open-api/wx/notify/wxpay
-    notifyUrlRefund: http://1.15.26.233:8080/jkt-admin/open-api/wx/notify/refund
+    notifyUrl: http://1.15.26.233:8080/sdjk-admin/open-api/wx/notify/wxpay
+    notifyUrlRefund: http://1.15.26.233:8080/sdjk-admin/open-api/wx/notify/refund
 
 
 

+ 1 - 1
jkt-admin/src/main/resources/application-prod.yml → sdjk-admin/src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://172.17.0.6:3306/jkt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                url: jdbc:mysql://172.17.0.6:3306/sdjk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
                 username: root
                 password: Miaxis@2020
             # 从库数据源

+ 2 - 2
jkt-admin/src/main/resources/application-prodtest.yml → sdjk-admin/src/main/resources/application-prodtest.yml

@@ -6,8 +6,8 @@ spring:
         druid:
             # 主库数据源
             master:
-                # url: jdbc:mysql://172.17.0.6:3306/jkt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-                url: jdbc:mysql://sh-cdb-2y9n2832.sql.tencentcdb.com:60123/jkt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                # url: jdbc:mysql://172.17.0.6:3306/sdjk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                url: jdbc:mysql://sh-cdb-2y9n2832.sql.tencentcdb.com:60123/sdjk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
                 username: root
                 password: Miaxis@2020
             # 从库数据源

+ 1 - 1
jkt-admin/src/main/resources/application.yml → sdjk-admin/src/main/resources/application.yml

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

+ 0 - 0
jkt-admin/src/main/resources/banner.txt → sdjk-admin/src/main/resources/banner.txt


+ 0 - 0
jkt-admin/src/main/resources/i18n/messages.properties → sdjk-admin/src/main/resources/i18n/messages.properties


+ 1 - 1
jkt-admin/src/main/resources/logback.xml → sdjk-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/jkt"/>
+    <property name="log.path" value="/data/logs/sdjk"/>
     <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"/>

+ 0 - 0
jkt-admin/src/main/resources/mybatis/mybatis-config.xml → sdjk-admin/src/main/resources/mybatis/mybatis-config.xml


+ 0 - 0
jkt-admin/src/main/resources/wechatpay/apiclient_cert.p12 → sdjk-admin/src/main/resources/wechatpay/apiclient_cert.p12


+ 0 - 0
jkt-admin/src/main/resources/wechatpay/apiclient_cert.pem → sdjk-admin/src/main/resources/wechatpay/apiclient_cert.pem


+ 0 - 0
jkt-admin/src/main/resources/wechatpay/apiclient_key.pem → sdjk-admin/src/main/resources/wechatpay/apiclient_key.pem


+ 2 - 2
jkt-admin/src/test/java/com/miaxis/test/NormalTest.java → sdjk-admin/src/test/java/com/miaxis/test/NormalTest.java

@@ -1,6 +1,6 @@
 package com.miaxis.test;
 
-import com.miaxis.JktApplication;
+import com.miaxis.SdjkApplication;
 import com.miaxis.score.domain.ScoreInfo;
 import com.miaxis.score.dto.ScoreInfoDTO;
 import com.miaxis.score.service.IScoreInfoService;
@@ -11,7 +11,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 //@ActiveProfiles("prod")
-@SpringBootTest(classes = JktApplication.class)
+@SpringBootTest(classes = SdjkApplication.class)
 @RunWith(SpringRunner.class)
 public class NormalTest {
 

+ 2 - 2
jkt-common/pom.xml → sdjk-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>jkt</artifactId>
+        <artifactId>sdjk</artifactId>
         <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>jkt-common</artifactId>
+    <artifactId>sdjk-common</artifactId>
 
     <description>
         common通用工具

+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/annotation/DataScope.java → sdjk-common/src/main/java/com/miaxis/common/annotation/DataScope.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/annotation/DataSource.java → sdjk-common/src/main/java/com/miaxis/common/annotation/DataSource.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/annotation/Excel.java → sdjk-common/src/main/java/com/miaxis/common/annotation/Excel.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/annotation/Excels.java → sdjk-common/src/main/java/com/miaxis/common/annotation/Excels.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/annotation/Log.java → sdjk-common/src/main/java/com/miaxis/common/annotation/Log.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/annotation/RepeatSubmit.java → sdjk-common/src/main/java/com/miaxis/common/annotation/RepeatSubmit.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/config/BeanConfig.java → sdjk-common/src/main/java/com/miaxis/common/config/BeanConfig.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/config/FeignConfig.java → sdjk-common/src/main/java/com/miaxis/common/config/FeignConfig.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/config/MiaxisConfig.java → sdjk-common/src/main/java/com/miaxis/common/config/MiaxisConfig.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/config/WxVerifierConfig.java → sdjk-common/src/main/java/com/miaxis/common/config/WxVerifierConfig.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/config/WxpayConfig.java → sdjk-common/src/main/java/com/miaxis/common/config/WxpayConfig.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/constant/Constants.java → sdjk-common/src/main/java/com/miaxis/common/constant/Constants.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/constant/GenConstants.java → sdjk-common/src/main/java/com/miaxis/common/constant/GenConstants.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/constant/ScheduleConstants.java → sdjk-common/src/main/java/com/miaxis/common/constant/ScheduleConstants.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/constant/SmsTemplateConstants.java → sdjk-common/src/main/java/com/miaxis/common/constant/SmsTemplateConstants.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/constant/UserConstants.java → sdjk-common/src/main/java/com/miaxis/common/constant/UserConstants.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/controller/BaseController.java → sdjk-common/src/main/java/com/miaxis/common/core/controller/BaseController.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/BaseBusinessEntity.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/BaseBusinessEntity.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/BaseEntity.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/BaseEntity.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/DyUserInfo.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/DyUserInfo.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/DyUserInfoResult.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/DyUserInfoResult.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/Response.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/Response.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/ResponseEnum.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/ResponseEnum.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/TreeEntity.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/TreeEntity.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/TreeSelect.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/TreeSelect.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/WxUserInfo.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/WxUserInfo.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/entity/SysDept.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/entity/SysDept.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/entity/SysDictData.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/entity/SysDictData.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/entity/SysDictType.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/entity/SysDictType.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/entity/SysMenu.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/entity/SysMenu.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/entity/SysRole.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/entity/SysRole.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/entity/SysUser.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/entity/SysUser.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/entity/UserInfo.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/entity/UserInfo.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/model/AppleResult.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/model/AppleResult.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/model/DyResult.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/model/DyResult.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/model/DyToken.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/model/DyToken.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/model/LoginBody.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/model/LoginBody.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/model/LoginBodyMobleCode.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/model/LoginBodyMobleCode.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/model/LoginBodyNoCode.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/model/LoginBodyNoCode.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/model/LoginUser.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/model/LoginUser.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/model/WxResult.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/model/WxResult.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/domain/vo/AgentVO.java → sdjk-common/src/main/java/com/miaxis/common/core/domain/vo/AgentVO.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/page/PageBean.java → sdjk-common/src/main/java/com/miaxis/common/core/page/PageBean.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/page/PageBuilder.java → sdjk-common/src/main/java/com/miaxis/common/core/page/PageBuilder.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/page/ResponsePageInfo.java → sdjk-common/src/main/java/com/miaxis/common/core/page/ResponsePageInfo.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/redis/RedisCache.java → sdjk-common/src/main/java/com/miaxis/common/core/redis/RedisCache.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/text/CharsetKit.java → sdjk-common/src/main/java/com/miaxis/common/core/text/CharsetKit.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/text/Convert.java → sdjk-common/src/main/java/com/miaxis/common/core/text/Convert.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/core/text/StrFormatter.java → sdjk-common/src/main/java/com/miaxis/common/core/text/StrFormatter.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/enums/BusinessStatusEnum.java → sdjk-common/src/main/java/com/miaxis/common/enums/BusinessStatusEnum.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/enums/BusinessTypeEnum.java → sdjk-common/src/main/java/com/miaxis/common/enums/BusinessTypeEnum.java


+ 0 - 0
jkt-common/src/main/java/com/miaxis/common/enums/DataSourceTypeEnum.java → sdjk-common/src/main/java/com/miaxis/common/enums/DataSourceTypeEnum.java


Some files were not shown because too many files changed in this diff