Merge pull request #61 from yanyanho/main

fix the start shell

docker-compose.yaml

@@ -18,4 +18,14 @@ services:
       - "8081:8080"
       - "4001:4001"
     volumes:
-      - ./data/ipfs:/data/ipfs
+      - ./data/ipfs:/data/ipfs
+  nginx:
+    container_name: mynginx
+    image: nginx:latest
+    ports:
+        - '80:80'
+    volumes:
+        - ./nginx.conf:/etc/nginx/nginx.conf
+#        - ./conf.d:/etc/nginx/conf.d
+#        - ./logs:/var/log/nginx
+    restart: always

nginx.conf

@@ -0,0 +1,24 @@
+
+events {
+    worker_connections  4096;  ## Default: 1024
+}
+http {
+  server {
+    listen 80;
+    listen [::]:80;
+    server_name ipfs.dapplearning.org;
+    location / {
+      proxy_pass http://localhost:8081;
+      proxy_read_timeout 60;
+      proxy_connect_timeout 60;
+      proxy_redirect off;
+
+      # Allow the use of websockets
+      proxy_http_version 1.1;
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection 'upgrade';
+      proxy_set_header Host $host;
+      proxy_cache_bypass $http_upgrade;
+    }
+  }
+ }

src/main/java/com/dl/officialsite/team/TeamController.java

@@ -36,7 +36,7 @@ public class TeamController {
      * 新增团队
      */
     @PutMapping
-    BaseResponse add(@RequestBody TeamVO team, @RequestParam String address) {
+    BaseResponse create(@RequestBody TeamVO team, @RequestParam String address) {
         teamService.add(team);
         return BaseResponse.successWithData(team);
     }

start.sh

@@ -50,9 +50,9 @@ start(){
         echo "==============================================================================================="
     else
         echo -n "Server $APP_MAIN Port $SERVER_PORT ..."
-        echo "$JAVA_CMD -agentlib:jdwp=transport=dt_socket,address=9093,server=y,suspend=n -Djdk.tls.namedGroups="secp256k1" $JAVA_OPTS -Djava.library.path=$CONF_DIR -cp $CLASSPATH $APP_MAIN >> $LOG_DIR/front.out 2>&1 &"
+        echo "$JAVA_CMD -agentlib:jdwp=transport=dt_socket,address=9093,server=y,suspend=n -Djdk.tls.namedGroups="secp256k1" $JAVA_OPTS -Djava.library.path=$CONF_DIR -Dhttps.protocols=TLSv1.2 -cp $CLASSPATH $APP_MAIN >> $LOG_DIR/front.out 2>&1 &"
 
-        nohup $JAVA_CMD -agentlib:jdwp=transport=dt_socket,address=9093,server=y,suspend=n -Djdk.tls.namedGroups="secp256k1" $JAVA_OPTS -Djava.library.path=$CONF_DIR -cp $CLASSPATH $APP_MAIN >> $LOG_DIR/front.out 2>&1 &
+        nohup $JAVA_CMD -agentlib:jdwp=transport=dt_socket,address=9093,server=y,suspend=n -Djdk.tls.namedGroups="secp256k1" $JAVA_OPTS -Djava.library.path=$CONF_DIR -Dhttps.protocols=TLSv1.2 -cp $CLASSPATH $APP_MAIN >> $LOG_DIR/front.out 2>&1 &
 
         count=1
         result=0