Browse Source

骄阳调整

yumeng 5 years ago
parent
commit
fdd37c261e

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java

@@ -122,7 +122,7 @@ public class SysBaseApiImpl implements ISysBaseApi {
 	}
 	}
 
 
 	@Override
 	@Override
-	@Cacheable(cacheNames=CacheConstant.SYS_USERS_CACHE, key="#username")
+	// @Cacheable(cacheNames=CacheConstant.SYS_USERS_CACHE, key="#username")
 	public LoginUser getUserByName(String username) {
 	public LoginUser getUserByName(String username) {
 		if(oConvertUtils.isEmpty(username)) {
 		if(oConvertUtils.isEmpty(username)) {
 			return null;
 			return null;

+ 3 - 3
jeecg-boot-module-system/src/main/resources/application-prod.yml

@@ -1,5 +1,5 @@
 server:
 server:
-  port: 8804
+  port: 8805
   ip: 39.97.120.42
   ip: 39.97.120.42
   servlet:
   servlet:
     context-path: /jeecg-boot
     context-path: /jeecg-boot
@@ -67,7 +67,7 @@ spring:
   autoconfigure:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
   datasource:
-    url: jdbc:mysql://172.30.0.4:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:mysql://139.186.27.96:3306/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: hcst
     username: hcst
     password: test@20190531
     password: test@20190531
     driver-class-name: com.mysql.jdbc.Driver
     driver-class-name: com.mysql.jdbc.Driver
@@ -106,7 +106,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
       datasource:
         master:
         master:
-          url: jdbc:mysql://172.30.0.4:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://139.186.27.96:3306/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: hcst
           username: hcst
           password: test@20190531
           password: test@20190531
           driver-class-name: com.mysql.jdbc.Driver
           driver-class-name: com.mysql.jdbc.Driver

+ 1 - 1
jeecg-boot-module-system/src/main/resources/application-prod2.yml

@@ -59,7 +59,7 @@ spring:
   autoconfigure:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
   datasource:
-    url: jdbc:mysql://172.30.0.4:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:mysql://139.186.27.96:3306/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: hcst
     username: hcst
     password: test@20190531
     password: test@20190531
     driver-class-name: com.mysql.jdbc.Driver
     driver-class-name: com.mysql.jdbc.Driver

+ 2 - 2
jeecg-boot-module-system/src/main/resources/application-test.yml

@@ -97,9 +97,9 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
       datasource:
         master:
         master:
-          url: jdbc:mysql://139.186.31.213:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true
+          url: jdbc:mysql://139.186.27.96:3306/jiaoyang?characterEncoding=UTF-8&useUnicode=true
           username: hcst
           username: hcst
-          password: hcst2020
+          password: test@20190531
           driver-class-name: com.mysql.jdbc.Driver
           driver-class-name: com.mysql.jdbc.Driver
   #redis 配置
   #redis 配置
   redis:
   redis:

+ 1 - 1
jeecg-boot-module-system/src/main/resources/application-wps.yml

@@ -56,7 +56,7 @@ spring:
   autoconfigure:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
   datasource:
-    url: jdbc:mysql://139.186.27.96:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:mysql://139.186.27.96:3306/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
 #    url: jdbc:mysql://39.106.184.70:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
 #    url: jdbc:mysql://39.106.184.70:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: hcst
     username: hcst
     password: test@20190531
     password: test@20190531

+ 2 - 7
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -8,6 +8,7 @@ import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.message.handle.impl.EmailSendMsgHandle;
 import cn.com.ctop.common.module.message.handle.impl.EmailSendMsgHandle;
 import cn.com.ctop.common.module.service.*;
 import cn.com.ctop.common.module.service.*;
+import cn.com.ctop.common.module.utils.CorpWexinUtils;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouHistoryReportTaskService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouHistoryReportTaskService;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
@@ -55,13 +56,7 @@ public class SampleTest {
 
 
     @Test
     @Test
     public void loadBytedanceCreativeData() {
     public void loadBytedanceCreativeData() {
-        QueryWrapper<CtopOauthToken> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("media_id", 2);
-        List<CtopOauthToken> list = oauthTokenService.list(queryWrapper);
-        for (CtopOauthToken token : list) {
-            kuaiShouHistoryReportTaskService.createTask(token.getAccountId(), token.getAccessToken(), "2020-09-20", "2020-09-20", "daily");
-
-        }
+        CorpWexinUtils.sendMessageByWeChatId("ZhaoWang","测试企业微信发送消息");
     }
     }
 
 
     @Test
     @Test

+ 4 - 4
module-common/src/main/java/cn/com/ctop/common/module/utils/CorpWexinUtils.java

@@ -20,11 +20,11 @@ public class CorpWexinUtils {
 
 
     public static void initService() {
     public static void initService() {
         val configStorage = new WxCpDefaultConfigImpl();
         val configStorage = new WxCpDefaultConfigImpl();
-        configStorage.setCorpId("ww24b8a47826f5875f");
+        configStorage.setCorpId("wwef2e51064c0ac897");
         configStorage.setAgentId(1000002);
         configStorage.setAgentId(1000002);
-        configStorage.setCorpSecret("MJIlySADGPlgvADnkFQPUpfZD4yV-4WN6066OgNnb0s");
-        configStorage.setToken("hcst2019");
-        configStorage.setAesKey("hcst2019");
+        configStorage.setCorpSecret("ieoVDAIurCOMdLrvktyQNCqWvTPqdphmXSFdk57NZ1k");
+/*        configStorage.setToken("hcst2019");
+        configStorage.setAesKey("hcst2019");*/
         wxCpService = new WxCpServiceImpl();
         wxCpService = new WxCpServiceImpl();
         wxCpService.setWxCpConfigStorage(configStorage);
         wxCpService.setWxCpConfigStorage(configStorage);
     }
     }