Procházet zdrojové kódy

Restore original runtime configuration

zhangkan před 3 týdny
rodič
revize
81e5265f02

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

@@ -12,7 +12,6 @@ import com.muzhi.chuangqi.service.AccessTokenService;
 import com.taobao.api.ApiException;
 import okhttp3.*;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -30,11 +29,13 @@ import java.util.Map;
 @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 = "dingyftn3awxy2jdpmdb";
+    //APPSECRET
+    private static String APPSECRET = "gtZtjDEE07WkfDPvOnPc_KF6Q32vkvpoaGr73uK2OA5z_BB6Afs5Fxli6nzBT7nz";
+    //AgenthId:3999410686
+    //corpId:
 
     public static String DingtalkAccessToken = null;
 
@@ -43,8 +44,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);
@@ -58,11 +59,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 = "68c7b5f1e4110b38ef834c7d";
+    public static String appSecret = "gRxU3cRNvIMaxVX8lUnPz0MXxHCm3hy7";
     //获取access_token的方法(创崎TB应用)
     @Override
     public String getAppToken() {

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

@@ -3,11 +3,6 @@ server.servlet.context-path=/chuangqi
 
 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
 
 #定时同步
 

+ 1 - 1
src/test/java/com/muzhi/chuangqi/APITest/Test1.java

@@ -392,7 +392,7 @@ public class Test1 {
 
             com.aliyun.dingtalkworkflow_1_0.Client client = createClient();
             com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceHeaders getProcessInstanceHeaders = new com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceHeaders();
-            getProcessInstanceHeaders.xAcsDingtalkAccessToken = System.getenv("DINGTALK_TEST_ACCESS_TOKEN");
+            getProcessInstanceHeaders.xAcsDingtalkAccessToken = "a42f9c8567043f30bca647a8b2891927";
             com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceRequest getProcessInstanceRequest = new com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceRequest()
                     .setProcessInstanceId("3N00zVdyT_y5xTdiJe_FMQ04211756956064");