Ver código fonte

Restore original runtime configuration

zhangkan 3 semanas atrás
pai
commit
bf65dbf507

+ 11 - 13
src/main/java/com/muzhi/duohui/service/impl/AccessTokenServiceImpl.java

@@ -7,7 +7,6 @@ import com.dingtalk.api.request.OapiGettokenRequest;
 import com.dingtalk.api.response.OapiGettokenResponse;
 import com.muzhi.duohui.service.AccessTokenService;
 import com.taobao.api.ApiException;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -22,11 +21,13 @@ import java.util.Date;
 @Service
 public class AccessTokenServiceImpl implements AccessTokenService {
 
-    @Value("${dingtalk.app-key}")
-    private String appKey;
-
-    @Value("${dingtalk.app-secret}")
-    private String dingtalkAppSecret;
+    /**钉钉应用*/
+    //APPKEY
+    private static String APPKEY = "";
+    //APPSECRET
+    private static String APPSECRET = "";
+    //AgenthId:
+    //corpId:
 
     public static String DingtalkAccessToken = null;
 
@@ -35,8 +36,8 @@ public class AccessTokenServiceImpl implements AccessTokenService {
     public String getAccessToken() {
         DefaultDingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/gettoken");
         OapiGettokenRequest request = new OapiGettokenRequest();
-        request.setAppkey(appKey);
-        request.setAppsecret(dingtalkAppSecret);
+        request.setAppkey(APPKEY);
+        request.setAppsecret(APPSECRET);
         request.setHttpMethod("GET");
         try {
             OapiGettokenResponse response = client.execute(request);
@@ -50,11 +51,8 @@ public class AccessTokenServiceImpl implements AccessTokenService {
     public static final Long   EXPIRES_IN = 1 * 3600 * 1000L;
     public static final String TOKEN_APPID = "_appId";
 
-    @Value("${teambition.app-id}")
-    private String appId;
-
-    @Value("${teambition.app-secret}")
-    private String appSecret;
+    public static String appId = "69e0b2f69e4ec316761107fc";
+    public static String appSecret = "7ezO3tXcCzXc2C9R5LotUs1pxozlOqsU";
     //获取access_token的方法(夺汇TB应用)
     @Override
     public String getAppToken() {

+ 1 - 6
src/main/resources/application.properties

@@ -3,11 +3,6 @@ server.servlet.context-path=/api/duohui
 
 server.tomcat.uri-encoding=UTF-8
 
-dingtalk.app-key=${DINGTALK_APP_KEY:}
-dingtalk.app-secret=${DINGTALK_APP_SECRET:}
-teambition.app-id=${TEAMBITION_APP_ID:}
-teambition.app-secret=${TEAMBITION_APP_SECRET:}
-
 #?????????
 ribbon:
     ReadTimeoutMillis: 5000
@@ -23,7 +18,7 @@ ribbon:
 #spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #spring.datasource.url=jdbc:mysql://localhost:3306/dingtalk?serverTimezone=GMT%2B8
 #spring.datasource.username=root
-#spring.datasource.password=${DB_PASSWORD}
+#spring.datasource.password=123456
 
 #定时同步
 

+ 4 - 4
src/test/java/com/muzhi/duohui/APITest/Test1.java

@@ -53,7 +53,7 @@ public class Test1 {
             com.aliyun.dingtalkyida_2_0.models.CreateOrUpdateFormDataHeaders createOrUpdateFormDataHeaders = new com.aliyun.dingtalkyida_2_0.models.CreateOrUpdateFormDataHeaders();
             createOrUpdateFormDataHeaders.xAcsDingtalkAccessToken = accessTokenService.getAccessToken();
             com.aliyun.dingtalkyida_2_0.models.CreateOrUpdateFormDataRequest createOrUpdateFormDataRequest = new com.aliyun.dingtalkyida_2_0.models.CreateOrUpdateFormDataRequest()
-                    .setSystemToken(System.getenv("DINGTALK_SYSTEM_TOKEN"))
+                    .setSystemToken("JB966E91RQZUKPPFFNOKBB86G3GH38VSN42AMGV")
                     .setFormUuid("FORM-BD31E2C07C7448DD931F686A5D881E96DQV8")
                     .setUserId("yida_pub_account")
                     .setSearchCondition("[{\"componentName\":\"TextField\",\"type\":\"TEXT\",\"value\":\"BC2000029\",\"key\":\"textField_maw7b9k0\",\"operator\":\"eq\"}]")
@@ -83,7 +83,7 @@ public class Test1 {
             com.aliyun.dingtalkyida_2_0.models.GetFormDataByIDHeaders getFormDataByIDHeaders = new com.aliyun.dingtalkyida_2_0.models.GetFormDataByIDHeaders();
             getFormDataByIDHeaders.xAcsDingtalkAccessToken = accessTokenService.getAccessToken();
             com.aliyun.dingtalkyida_2_0.models.GetFormDataByIDRequest getFormDataByIDRequest = new com.aliyun.dingtalkyida_2_0.models.GetFormDataByIDRequest()
-                    .setSystemToken(System.getenv("DINGTALK_SYSTEM_TOKEN"))
+                    .setSystemToken("JB966E91RQZUKPPFFNOKBB86G3GH38VSN42AMGV")
                     .setUserId("yida_pub_account")
                     .setAppType("APP_FJSLK9BJ20K1NL3G2PUW");
 
@@ -112,7 +112,7 @@ public class Test1 {
             com.aliyun.dingtalkyida_2_0.models.UpdateSubTableHeaders updateSubTableHeaders = new com.aliyun.dingtalkyida_2_0.models.UpdateSubTableHeaders();
             updateSubTableHeaders.xAcsDingtalkAccessToken = accessTokenService.getAccessToken();
             com.aliyun.dingtalkyida_2_0.models.UpdateSubTableRequest updateSubTableRequest = new com.aliyun.dingtalkyida_2_0.models.UpdateSubTableRequest()
-                    .setSystemToken(System.getenv("DINGTALK_SYSTEM_TOKEN"))
+                    .setSystemToken("JB966E91RQZUKPPFFNOKBB86G3GH38VSN42AMGV")
                     .setFormInstanceId("FINST-R8E66381FS30I83TKR2W4DO14O8V35TY6QBHM5NH")
                     .setUserId("yida_pub_account")
                     .setTableFieldIds("tableField_lqesy4t4")
@@ -159,7 +159,7 @@ public class Test1 {
                 com.aliyun.dingtalkyida_1_0.models.SearchFormDatasHeaders searchFormDatasHeaders = new com.aliyun.dingtalkyida_1_0.models.SearchFormDatasHeaders();
                 searchFormDatasHeaders.xAcsDingtalkAccessToken = accessTokenService.getAccessToken();
                 com.aliyun.dingtalkyida_1_0.models.SearchFormDatasRequest searchFormDatasRequest = new com.aliyun.dingtalkyida_1_0.models.SearchFormDatasRequest()
-                        .setSystemToken(System.getenv("DINGTALK_SEARCH_SYSTEM_TOKEN"))
+                        .setSystemToken("1W9669D1HQZUJCB5D3Q8S5T6XUXZ2EL3V42AMYQ1")
 
                         .setSearchFieldJson(mapAllStr)