Merge branch 'master' of http://118.31.7.2:3000/tianzeOrg/resource_center

src/main/java/com/sztzjy/resource_center/controller/new_module/admin/AdminDataController.java

@@ -223,7 +223,7 @@ public class AdminDataController {
                 }
             }
             // 更新对象
-            adminDataMapper.updateByPrimaryKeyWithBLOBs(adminDataWithBLOBs);
+            adminDataMapper.updateByPrimaryKeySelective(adminDataWithBLOBs);
         } catch (Exception e) {
             e.printStackTrace();
             return new ResultEntity<>(HttpStatus.INTERNAL_SERVER_ERROR, "编辑失败请联系管理员！");

src/main/java/com/sztzjy/resource_center/controller/new_module/stu/StuJupyterController.java

@@ -17,6 +17,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPut;
+import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
@@ -317,8 +318,6 @@ public class StuJupyterController {
         }
 
 
-
-
         try (CloseableHttpClient client = HttpClients.createDefault()) {
             String notebookContent = "{"
                     + "\"cells\": ["
@@ -354,19 +353,12 @@ public class StuJupyterController {
                     + "}";
 
 
-
-
-
-
             // 在根目录下创建新的笔记本
             HttpPut createNotebookRequest = new HttpPut(JUPYTER_URL + "/api/contents/"+name+".ipynb");
-
-
-
             createNotebookRequest.addHeader("Authorization", "token " + adminJupyterTokenList.get(0).getToken());
-            createNotebookRequest.addHeader("Content-Type", "application/json");
-            createNotebookRequest.setEntity(new StringEntity("{\"type\": \"notebook\", \"content\": " + notebookContent + "}"));
-
+            createNotebookRequest.addHeader("Content-Type", "application/json charset=UTF-8");
+            //createNotebookRequest.setEntity(new StringEntity("{\"type\": \"notebook\", \"content\": " + notebookContent + "}"));
+            createNotebookRequest.setEntity(new StringEntity("{\"type\": \"notebook\", \"content\": " + notebookContent + "}", ContentType.APPLICATION_JSON.withCharset("UTF-8")));
             try (CloseableHttpResponse createNotebookResponse = client.execute(createNotebookRequest)) {
                 int statusCode = createNotebookResponse.getStatusLine().getStatusCode();
                 if (statusCode == 201) {

src/main/resources/application-pro.yml

@@ -3,17 +3,16 @@ spring:
   datasource:
     druid:
       db-type: mysql
-      url: jdbc:mysql://${DB_HOST:120.78.220.29}:${DB_PORT:3307}/${DB_NAME:resource_center}?useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
+      url: jdbc:mysql://${DB_HOST:120.79.54.255}:${DB_PORT:3306}/${DB_NAME:resource_center}?useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
       username: ${DB_USER:root}
-      password: ${DB_PWD:sztzjy2017}
+      password: ${DB_PWD:Sztzjy506}
       driver-class-name: com.mysql.cj.jdbc.Driver
 
 
 # 文件存储
 file:
   type: local
-  path: /usr/local/tianzeProject/resource_center/uploadFile
-
+  path: /usr/local/tianzeProject/resourceCenter/uploadFile
 
 timer:
   enable: false
@@ -25,4 +24,7 @@ swagger:
   description: 天择外汇模拟交易WebAPI接口文档
   contactName: 深圳天择教育科技有限公司
   contactAddress: www.sztzjy.com
-  version: @project.version@
+  version: @project.version@
+
+tch:
+  serverAddress: http://120.79.54.255:9998