3 Ревизии

Автор SHA1 Съобщение Дата
  alizalang c73a9e2769 created user database преди 6 години
  alizalang c786983a60 saved преди 6 години
  alizalang e032299e24 created spring boot file version преди 6 години
променени са 30 файла, в които са добавени 577 реда и са изтрити 334 реда
  1. BIN
      .DS_Store
  2. BIN
      ZipTeamOrange/.DS_Store
  3. 25
    0
      ZipTeamOrange/.gitignore
  4. 2
    2
      ZipTeamOrange/.idea/misc.xml
  5. BIN
      ZipTeamOrange/.mvn/wrapper/maven-wrapper.jar
  6. 1
    0
      ZipTeamOrange/.mvn/wrapper/maven-wrapper.properties
  7. 225
    0
      ZipTeamOrange/mvnw
  8. 143
    0
      ZipTeamOrange/mvnw.cmd
  9. 54
    61
      ZipTeamOrange/pom.xml
  10. BIN
      ZipTeamOrange/src/.DS_Store
  11. BIN
      ZipTeamOrange/src/main/.DS_Store
  12. BIN
      ZipTeamOrange/src/main/java/.DS_Store
  13. BIN
      ZipTeamOrange/src/main/java/ZipTeamOrange/.DS_Store
  14. 12
    0
      ZipTeamOrange/src/main/java/ZipTeamOrange/ZipTeamOrangeApplication.java
  15. 60
    0
      ZipTeamOrange/src/main/java/ZipTeamOrange/user/User.java
  16. 26
    0
      ZipTeamOrange/src/main/java/ZipTeamOrange/user/UserController.java
  17. 10
    0
      ZipTeamOrange/src/main/java/ZipTeamOrange/user/UserRepository.java
  18. 0
    57
      ZipTeamOrange/src/main/java/com/zipteam/Chat.java
  19. 0
    22
      ZipTeamOrange/src/main/java/com/zipteam/ChatController.java
  20. 0
    10
      ZipTeamOrange/src/main/java/com/zipteam/ChatRepository.java
  21. 0
    6
      ZipTeamOrange/src/main/java/com/zipteam/Controller.java
  22. 0
    4
      ZipTeamOrange/src/main/java/com/zipteam/Main.java
  23. 0
    39
      ZipTeamOrange/src/main/java/com/zipteam/Message.java
  24. 0
    22
      ZipTeamOrange/src/main/java/com/zipteam/MessageController.java
  25. 0
    9
      ZipTeamOrange/src/main/java/com/zipteam/MessageRepository.java
  26. 0
    72
      ZipTeamOrange/src/main/java/com/zipteam/User.java
  27. 0
    20
      ZipTeamOrange/src/main/java/com/zipteam/UserController.java
  28. 0
    10
      ZipTeamOrange/src/main/java/com/zipteam/UserRepository.java
  29. 3
    0
      ZipTeamOrange/src/main/resources/application.properties
  30. 16
    0
      ZipTeamOrange/src/test/java/ZipTeamOrange/ZipTeamOrangeApplicationTests.java

BIN
.DS_Store Целия файл


BIN
ZipTeamOrange/.DS_Store Целия файл


+ 25
- 0
ZipTeamOrange/.gitignore Целия файл

@@ -0,0 +1,25 @@
1
+/target/
2
+!.mvn/wrapper/maven-wrapper.jar
3
+
4
+### STS ###
5
+.apt_generated
6
+.classpath
7
+.factorypath
8
+.project
9
+.settings
10
+.springBeans
11
+.sts4-cache
12
+
13
+### IntelliJ IDEA ###
14
+.idea
15
+*.iws
16
+*.iml
17
+*.ipr
18
+
19
+### NetBeans ###
20
+/nbproject/private/
21
+/build/
22
+/nbbuild/
23
+/dist/
24
+/nbdist/
25
+/.nb-gradle/

+ 2
- 2
ZipTeamOrange/.idea/misc.xml Целия файл

@@ -8,7 +8,7 @@
8 8
       </list>
9 9
     </option>
10 10
   </component>
11
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="10" project-jdk-type="JavaSDK">
12
-    <output url="file://$PROJECT_DIR$/out" />
11
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" project-jdk-name="10" project-jdk-type="JavaSDK">
12
+    <output url="file://$PROJECT_DIR$/classes" />
13 13
   </component>
14 14
 </project>

BIN
ZipTeamOrange/.mvn/wrapper/maven-wrapper.jar Целия файл


+ 1
- 0
ZipTeamOrange/.mvn/wrapper/maven-wrapper.properties Целия файл

@@ -0,0 +1 @@
1
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip

+ 225
- 0
ZipTeamOrange/mvnw Целия файл

@@ -0,0 +1,225 @@
1
+#!/bin/sh
2
+# ----------------------------------------------------------------------------
3
+# Licensed to the Apache Software Foundation (ASF) under one
4
+# or more contributor license agreements.  See the NOTICE file
5
+# distributed with this work for additional information
6
+# regarding copyright ownership.  The ASF licenses this file
7
+# to you under the Apache License, Version 2.0 (the
8
+# "License"); you may not use this file except in compliance
9
+# with the License.  You may obtain a copy of the License at
10
+#
11
+#    http://www.apache.org/licenses/LICENSE-2.0
12
+#
13
+# Unless required by applicable law or agreed to in writing,
14
+# software distributed under the License is distributed on an
15
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16
+# KIND, either express or implied.  See the License for the
17
+# specific language governing permissions and limitations
18
+# under the License.
19
+# ----------------------------------------------------------------------------
20
+
21
+# ----------------------------------------------------------------------------
22
+# Maven2 Start Up Batch script
23
+#
24
+# Required ENV vars:
25
+# ------------------
26
+#   JAVA_HOME - location of a JDK home dir
27
+#
28
+# Optional ENV vars
29
+# -----------------
30
+#   M2_HOME - location of maven2's installed home dir
31
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
32
+#     e.g. to debug Maven itself, use
33
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
34
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
35
+# ----------------------------------------------------------------------------
36
+
37
+if [ -z "$MAVEN_SKIP_RC" ] ; then
38
+
39
+  if [ -f /etc/mavenrc ] ; then
40
+    . /etc/mavenrc
41
+  fi
42
+
43
+  if [ -f "$HOME/.mavenrc" ] ; then
44
+    . "$HOME/.mavenrc"
45
+  fi
46
+
47
+fi
48
+
49
+# OS specific support.  $var _must_ be set to either true or false.
50
+cygwin=false;
51
+darwin=false;
52
+mingw=false
53
+case "`uname`" in
54
+  CYGWIN*) cygwin=true ;;
55
+  MINGW*) mingw=true;;
56
+  Darwin*) darwin=true
57
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
58
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
59
+    if [ -z "$JAVA_HOME" ]; then
60
+      if [ -x "/usr/libexec/java_home" ]; then
61
+        export JAVA_HOME="`/usr/libexec/java_home`"
62
+      else
63
+        export JAVA_HOME="/Library/Java/Home"
64
+      fi
65
+    fi
66
+    ;;
67
+esac
68
+
69
+if [ -z "$JAVA_HOME" ] ; then
70
+  if [ -r /etc/gentoo-release ] ; then
71
+    JAVA_HOME=`java-config --jre-home`
72
+  fi
73
+fi
74
+
75
+if [ -z "$M2_HOME" ] ; then
76
+  ## resolve links - $0 may be a link to maven's home
77
+  PRG="$0"
78
+
79
+  # need this for relative symlinks
80
+  while [ -h "$PRG" ] ; do
81
+    ls=`ls -ld "$PRG"`
82
+    link=`expr "$ls" : '.*-> \(.*\)$'`
83
+    if expr "$link" : '/.*' > /dev/null; then
84
+      PRG="$link"
85
+    else
86
+      PRG="`dirname "$PRG"`/$link"
87
+    fi
88
+  done
89
+
90
+  saveddir=`pwd`
91
+
92
+  M2_HOME=`dirname "$PRG"`/..
93
+
94
+  # make it fully qualified
95
+  M2_HOME=`cd "$M2_HOME" && pwd`
96
+
97
+  cd "$saveddir"
98
+  # echo Using m2 at $M2_HOME
99
+fi
100
+
101
+# For Cygwin, ensure paths are in UNIX format before anything is touched
102
+if $cygwin ; then
103
+  [ -n "$M2_HOME" ] &&
104
+    M2_HOME=`cygpath --unix "$M2_HOME"`
105
+  [ -n "$JAVA_HOME" ] &&
106
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
107
+  [ -n "$CLASSPATH" ] &&
108
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
109
+fi
110
+
111
+# For Migwn, ensure paths are in UNIX format before anything is touched
112
+if $mingw ; then
113
+  [ -n "$M2_HOME" ] &&
114
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
115
+  [ -n "$JAVA_HOME" ] &&
116
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
117
+  # TODO classpath?
118
+fi
119
+
120
+if [ -z "$JAVA_HOME" ]; then
121
+  javaExecutable="`which javac`"
122
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
123
+    # readlink(1) is not available as standard on Solaris 10.
124
+    readLink=`which readlink`
125
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
126
+      if $darwin ; then
127
+        javaHome="`dirname \"$javaExecutable\"`"
128
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
129
+      else
130
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
131
+      fi
132
+      javaHome="`dirname \"$javaExecutable\"`"
133
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
134
+      JAVA_HOME="$javaHome"
135
+      export JAVA_HOME
136
+    fi
137
+  fi
138
+fi
139
+
140
+if [ -z "$JAVACMD" ] ; then
141
+  if [ -n "$JAVA_HOME"  ] ; then
142
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
143
+      # IBM's JDK on AIX uses strange locations for the executables
144
+      JAVACMD="$JAVA_HOME/jre/sh/java"
145
+    else
146
+      JAVACMD="$JAVA_HOME/bin/java"
147
+    fi
148
+  else
149
+    JAVACMD="`which java`"
150
+  fi
151
+fi
152
+
153
+if [ ! -x "$JAVACMD" ] ; then
154
+  echo "Error: JAVA_HOME is not defined correctly." >&2
155
+  echo "  We cannot execute $JAVACMD" >&2
156
+  exit 1
157
+fi
158
+
159
+if [ -z "$JAVA_HOME" ] ; then
160
+  echo "Warning: JAVA_HOME environment variable is not set."
161
+fi
162
+
163
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
164
+
165
+# traverses directory structure from process work directory to filesystem root
166
+# first directory with .mvn subdirectory is considered project base directory
167
+find_maven_basedir() {
168
+
169
+  if [ -z "$1" ]
170
+  then
171
+    echo "Path not specified to find_maven_basedir"
172
+    return 1
173
+  fi
174
+
175
+  basedir="$1"
176
+  wdir="$1"
177
+  while [ "$wdir" != '/' ] ; do
178
+    if [ -d "$wdir"/.mvn ] ; then
179
+      basedir=$wdir
180
+      break
181
+    fi
182
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
183
+    if [ -d "${wdir}" ]; then
184
+      wdir=`cd "$wdir/.."; pwd`
185
+    fi
186
+    # end of workaround
187
+  done
188
+  echo "${basedir}"
189
+}
190
+
191
+# concatenates all lines of a file
192
+concat_lines() {
193
+  if [ -f "$1" ]; then
194
+    echo "$(tr -s '\n' ' ' < "$1")"
195
+  fi
196
+}
197
+
198
+BASE_DIR=`find_maven_basedir "$(pwd)"`
199
+if [ -z "$BASE_DIR" ]; then
200
+  exit 1;
201
+fi
202
+
203
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
204
+echo $MAVEN_PROJECTBASEDIR
205
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
206
+
207
+# For Cygwin, switch paths to Windows format before running java
208
+if $cygwin; then
209
+  [ -n "$M2_HOME" ] &&
210
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
211
+  [ -n "$JAVA_HOME" ] &&
212
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
213
+  [ -n "$CLASSPATH" ] &&
214
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
215
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
216
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
217
+fi
218
+
219
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
220
+
221
+exec "$JAVACMD" \
222
+  $MAVEN_OPTS \
223
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
224
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
225
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

+ 143
- 0
ZipTeamOrange/mvnw.cmd Целия файл

@@ -0,0 +1,143 @@
1
+@REM ----------------------------------------------------------------------------
2
+@REM Licensed to the Apache Software Foundation (ASF) under one
3
+@REM or more contributor license agreements.  See the NOTICE file
4
+@REM distributed with this work for additional information
5
+@REM regarding copyright ownership.  The ASF licenses this file
6
+@REM to you under the Apache License, Version 2.0 (the
7
+@REM "License"); you may not use this file except in compliance
8
+@REM with the License.  You may obtain a copy of the License at
9
+@REM
10
+@REM    http://www.apache.org/licenses/LICENSE-2.0
11
+@REM
12
+@REM Unless required by applicable law or agreed to in writing,
13
+@REM software distributed under the License is distributed on an
14
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15
+@REM KIND, either express or implied.  See the License for the
16
+@REM specific language governing permissions and limitations
17
+@REM under the License.
18
+@REM ----------------------------------------------------------------------------
19
+
20
+@REM ----------------------------------------------------------------------------
21
+@REM Maven2 Start Up Batch script
22
+@REM
23
+@REM Required ENV vars:
24
+@REM JAVA_HOME - location of a JDK home dir
25
+@REM
26
+@REM Optional ENV vars
27
+@REM M2_HOME - location of maven2's installed home dir
28
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
29
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
30
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
31
+@REM     e.g. to debug Maven itself, use
32
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
33
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
34
+@REM ----------------------------------------------------------------------------
35
+
36
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
37
+@echo off
38
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
39
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
40
+
41
+@REM set %HOME% to equivalent of $HOME
42
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
43
+
44
+@REM Execute a user defined script before this one
45
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
46
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
47
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
48
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
49
+:skipRcPre
50
+
51
+@setlocal
52
+
53
+set ERROR_CODE=0
54
+
55
+@REM To isolate internal variables from possible post scripts, we use another setlocal
56
+@setlocal
57
+
58
+@REM ==== START VALIDATION ====
59
+if not "%JAVA_HOME%" == "" goto OkJHome
60
+
61
+echo.
62
+echo Error: JAVA_HOME not found in your environment. >&2
63
+echo Please set the JAVA_HOME variable in your environment to match the >&2
64
+echo location of your Java installation. >&2
65
+echo.
66
+goto error
67
+
68
+:OkJHome
69
+if exist "%JAVA_HOME%\bin\java.exe" goto init
70
+
71
+echo.
72
+echo Error: JAVA_HOME is set to an invalid directory. >&2
73
+echo JAVA_HOME = "%JAVA_HOME%" >&2
74
+echo Please set the JAVA_HOME variable in your environment to match the >&2
75
+echo location of your Java installation. >&2
76
+echo.
77
+goto error
78
+
79
+@REM ==== END VALIDATION ====
80
+
81
+:init
82
+
83
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
84
+@REM Fallback to current working directory if not found.
85
+
86
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
87
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
88
+
89
+set EXEC_DIR=%CD%
90
+set WDIR=%EXEC_DIR%
91
+:findBaseDir
92
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
93
+cd ..
94
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
95
+set WDIR=%CD%
96
+goto findBaseDir
97
+
98
+:baseDirFound
99
+set MAVEN_PROJECTBASEDIR=%WDIR%
100
+cd "%EXEC_DIR%"
101
+goto endDetectBaseDir
102
+
103
+:baseDirNotFound
104
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
105
+cd "%EXEC_DIR%"
106
+
107
+:endDetectBaseDir
108
+
109
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
110
+
111
+@setlocal EnableExtensions EnableDelayedExpansion
112
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
113
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
114
+
115
+:endReadAdditionalConfig
116
+
117
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
118
+
119
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
120
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
121
+
122
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
123
+if ERRORLEVEL 1 goto error
124
+goto end
125
+
126
+:error
127
+set ERROR_CODE=1
128
+
129
+:end
130
+@endlocal & set ERROR_CODE=%ERROR_CODE%
131
+
132
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
133
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
134
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
135
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
136
+:skipRcPost
137
+
138
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
139
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
140
+
141
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
142
+
143
+exit /B %ERROR_CODE%

+ 54
- 61
ZipTeamOrange/pom.xml Целия файл

@@ -1,71 +1,64 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2
-<project xmlns="http://maven.apache.org/POM/4.0.0"
3
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5
-    <modelVersion>4.0.0</modelVersion>
2
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4
+	<modelVersion>4.0.0</modelVersion>
6 5
 
7
-    <groupId>com ZipTeam</groupId>
8
-    <artifactId>ZipTeamOrange</artifactId>
9
-    <version>1.0-SNAPSHOT</version>
6
+	<groupId>com ZipTeam</groupId>
7
+	<artifactId>ZipTeamOrange</artifactId>
8
+	<version>0.0.1-SNAPSHOT</version>
9
+	<packaging>jar</packaging>
10 10
 
11
-    <parent>
12
-        <groupId>org.springframework.boot</groupId>
13
-        <artifactId>spring-boot-starter-parent</artifactId>
14
-        <version>2.0.3.RELEASE</version>
15
-    </parent>
11
+	<name>ZipTeamOrange</name>
12
+	<description>Demo project for Spring Boot</description>
16 13
 
17
-    <dependencies>
18
-        <dependency>
19
-            <groupId>org.springframework.boot</groupId>
20
-            <artifactId>spring-boot-starter-web</artifactId>
21
-        </dependency>
22
-        <dependency>
23
-            <groupId>org.springframework.boot</groupId>
24
-            <artifactId>spring-boot-starter-test</artifactId>
25
-            <scope>test</scope>
26
-        </dependency>
27
-        <dependency>
28
-            <groupId>junit</groupId>
29
-            <artifactId>junit</artifactId>
30
-        </dependency>
31
-        <dependency>
32
-            <groupId>org.springframework.boot</groupId>
33
-            <artifactId>spring-boot-test-autoconfigure</artifactId>
34
-        </dependency>
35
-        <dependency>
36
-            <groupId>org.springframework</groupId>
37
-            <artifactId>spring-test</artifactId>
38
-            <version>5.0.7.RELEASE</version>
39
-            <scope>compile</scope>
40
-        </dependency>
41
-        <dependency>
42
-            <groupId>org.hamcrest</groupId>
43
-            <artifactId>hamcrest-library</artifactId>
44
-        </dependency>
45
-        <dependency>
46
-            <groupId>org.springframework.boot</groupId>
47
-            <artifactId>spring-boot-starter-actuator</artifactId>
48
-        </dependency>
14
+	<parent>
15
+		<groupId>org.springframework.boot</groupId>
16
+		<artifactId>spring-boot-starter-parent</artifactId>
17
+		<version>2.0.3.RELEASE</version>
18
+		<relativePath/> <!-- lookup parent from repository -->
19
+	</parent>
49 20
 
50
-        <dependency>
51
-            <groupId>org.springframework.boot</groupId>
52
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
53
-        </dependency>
54
-    </dependencies>
21
+	<properties>
22
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
24
+		<java.version>1.8</java.version>
25
+	</properties>
55 26
 
56
-    <properties>
57
-        <java.version>1.8</java.version>
58
-    </properties>
27
+	<dependencies>
28
+		<dependency>
29
+			<groupId>org.springframework.boot</groupId>
30
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
31
+		</dependency>
32
+		<dependency>
33
+			<groupId>org.springframework.boot</groupId>
34
+			<artifactId>spring-boot-starter-web</artifactId>
35
+		</dependency>
59 36
 
60
-    <build>
61
-        <plugins>
62
-            <plugin>
63
-                <groupId>org.springframework.boot</groupId>
64
-                <artifactId>spring-boot-maven-plugin</artifactId>
65
-            </plugin>
66
-        </plugins>
67
-    </build>
37
+		<dependency>
38
+			<groupId>org.springframework.boot</groupId>
39
+			<artifactId>spring-boot-devtools</artifactId>
40
+			<scope>runtime</scope>
41
+		</dependency>
42
+		<dependency>
43
+			<groupId>mysql</groupId>
44
+			<artifactId>mysql-connector-java</artifactId>
45
+			<!--<scope>runtime</scope>-->
46
+		</dependency>
47
+		<dependency>
48
+			<groupId>org.springframework.boot</groupId>
49
+			<artifactId>spring-boot-starter-test</artifactId>
50
+			<scope>test</scope>
51
+		</dependency>
52
+	</dependencies>
68 53
 
54
+	<build>
55
+		<plugins>
56
+			<plugin>
57
+				<groupId>org.springframework.boot</groupId>
58
+				<artifactId>spring-boot-maven-plugin</artifactId>
59
+			</plugin>
60
+		</plugins>
61
+	</build>
69 62
 
70 63
 
71
-</project>
64
+</project>

BIN
ZipTeamOrange/src/.DS_Store Целия файл


BIN
ZipTeamOrange/src/main/.DS_Store Целия файл


BIN
ZipTeamOrange/src/main/java/.DS_Store Целия файл


BIN
ZipTeamOrange/src/main/java/ZipTeamOrange/.DS_Store Целия файл


+ 12
- 0
ZipTeamOrange/src/main/java/ZipTeamOrange/ZipTeamOrangeApplication.java Целия файл

@@ -0,0 +1,12 @@
1
+package ZipTeamOrange;
2
+
3
+import org.springframework.boot.SpringApplication;
4
+import org.springframework.boot.autoconfigure.SpringBootApplication;
5
+
6
+@SpringBootApplication
7
+public class ZipTeamOrangeApplication {
8
+
9
+	public static void main(String[] args) {
10
+		SpringApplication.run(ZipTeamOrangeApplication.class, args);
11
+	}
12
+}

+ 60
- 0
ZipTeamOrange/src/main/java/ZipTeamOrange/user/User.java Целия файл

@@ -0,0 +1,60 @@
1
+package ZipTeamOrange.user;
2
+
3
+import javax.persistence.Entity;
4
+import javax.persistence.GeneratedValue;
5
+import javax.persistence.GenerationType;
6
+import javax.persistence.Id;
7
+
8
+@Entity
9
+public class User {
10
+
11
+    @Id
12
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
13
+    private Long id;
14
+    private String userName;
15
+    private String email;
16
+    private String password;
17
+
18
+
19
+    public User() {
20
+    }
21
+
22
+
23
+    public User(String userName, String email, String password) {
24
+        this.userName = userName;
25
+        this.email = email;
26
+        this.password = password;
27
+    }
28
+
29
+    public Long getId() {
30
+        return id;
31
+    }
32
+
33
+    public void setId(Long id) {
34
+        this.id = id;
35
+    }
36
+
37
+    public String getUserName() {
38
+        return userName;
39
+    }
40
+
41
+    public void setUserName(String userName) {
42
+        this.userName = userName;
43
+    }
44
+
45
+    public String getEmail() {
46
+        return email;
47
+    }
48
+
49
+    public void setEmail(String email) {
50
+        this.email = email;
51
+    }
52
+
53
+    public String getPassword() {
54
+        return password;
55
+    }
56
+
57
+    public void setPassword(String password) {
58
+        this.password = password;
59
+    }
60
+}

+ 26
- 0
ZipTeamOrange/src/main/java/ZipTeamOrange/user/UserController.java Целия файл

@@ -0,0 +1,26 @@
1
+package ZipTeamOrange.user;
2
+
3
+import org.springframework.beans.factory.annotation.Autowired;
4
+import org.springframework.stereotype.Controller;
5
+import org.springframework.web.bind.annotation.GetMapping;
6
+import org.springframework.web.bind.annotation.RequestMapping;
7
+import org.springframework.web.bind.annotation.RequestParam;
8
+import org.springframework.web.bind.annotation.ResponseBody;
9
+
10
+@Controller
11
+@RequestMapping(path = "/user")
12
+public class UserController {
13
+
14
+    @Autowired
15
+    private UserRepository userRepository;
16
+
17
+    @GetMapping(path="/add")
18
+    public @ResponseBody String addNewuser(@RequestParam String username, @RequestParam String email, @RequestParam String password){
19
+        User user = new User(username, email, password);
20
+
21
+        userRepository.save(user);
22
+
23
+        return  "saved";
24
+    }
25
+
26
+}

+ 10
- 0
ZipTeamOrange/src/main/java/ZipTeamOrange/user/UserRepository.java Целия файл

@@ -0,0 +1,10 @@
1
+package ZipTeamOrange.user;
2
+
3
+import org.springframework.data.jpa.repository.JpaRepository;
4
+
5
+
6
+public interface UserRepository extends JpaRepository<User, Long>{
7
+
8
+
9
+
10
+}

+ 0
- 57
ZipTeamOrange/src/main/java/com/zipteam/Chat.java Целия файл

@@ -1,57 +0,0 @@
1
-
2
-package com.zipteam;
3
-
4
-
5
-import java.util.HashMap;
6
-import java.util.HashSet;
7
-
8
-public class Chat {
9
-    private int chatId;
10
-    private String name;
11
-    private boolean isChannel;
12
-    private boolean isPublic;
13
-    private int creatorId;
14
-    private HashSet<User> users = new HashSet<User>();
15
-    private HashMap<String, Message> messages = new HashMap<String, Message>();
16
-
17
-    public Chat(){}
18
-
19
-    public Chat(String name){
20
-        this.name = name;
21
-    }
22
-
23
-    public Chat(int chatId, String name, boolean isChannel, boolean isPublic){
24
-        this.chatId = chatId;
25
-        this.name = name;
26
-        this.isChannel = isChannel;
27
-        this.isPublic = isPublic;
28
-    }
29
-
30
-    public int getChatId() {
31
-        return chatId;
32
-    }
33
-
34
-    public String getName() {
35
-        return name;
36
-    }
37
-
38
-    public boolean isChannel() {
39
-        return isChannel;
40
-    }
41
-
42
-    public boolean isPublic() {
43
-        return isPublic;
44
-    }
45
-
46
-    public int getCreatorId() {
47
-        return creatorId;
48
-    }
49
-
50
-    public HashSet<User> getUsers() {
51
-        return users;
52
-    }
53
-
54
-    public HashMap<String, Message> getMessages() {
55
-        return messages;
56
-    }
57
-}

+ 0
- 22
ZipTeamOrange/src/main/java/com/zipteam/ChatController.java Целия файл

@@ -1,22 +0,0 @@
1
-
2
-package com.zipteam;
3
-
4
-public class ChatController extends Controller{
5
-
6
-
7
-    private Chat chat;
8
-    private String uri;
9
-
10
-    public  String get(User user) {
11
-        return user.toString();
12
-    }
13
-    public String put(User user) {
14
-        return user.toString();
15
-    }
16
-
17
-    public String post(User user) {
18
-        return user.toString();
19
-    }
20
-
21
-    public String delete(User user) { return user.toString(); }
22
-}

+ 0
- 10
ZipTeamOrange/src/main/java/com/zipteam/ChatRepository.java Целия файл

@@ -1,10 +0,0 @@
1
-package com.zipteam;
2
-
3
-import org.springframework.data.jpa.repository.JpaRepository;
4
-
5
-import java.util.List;
6
-
7
-interface ChatRespository extends JpaRepository<User, Integer> {
8
-
9
-    List<User> findByTitleContainingOrContentContaining(String text, String textAgain);
10
-}

+ 0
- 6
ZipTeamOrange/src/main/java/com/zipteam/Controller.java Целия файл

@@ -1,6 +0,0 @@
1
-package com.zipteam;
2
-
3
-public abstract class Controller {
4
-
5
-    private String url;
6
-}

+ 0
- 4
ZipTeamOrange/src/main/java/com/zipteam/Main.java Целия файл

@@ -1,4 +0,0 @@
1
-package com.zipteam;
2
-
3
-public class Main {
4
-}

+ 0
- 39
ZipTeamOrange/src/main/java/com/zipteam/Message.java Целия файл

@@ -1,39 +0,0 @@
1
-package com.zipteam;
2
-
3
-import java.util.Date;
4
-
5
-public class Message {
6
-    private int messageId;
7
-    private String text;
8
-    private Date timestamp;
9
-    private int userId;
10
-    private int chatId;
11
-
12
-    public Message(){}
13
-
14
-    public Message(String text, int userId, int chatId){
15
-        this.text = text;
16
-        this.userId=userId;
17
-        this.chatId=chatId;
18
-    }
19
-
20
-    public int getMessageId() {
21
-        return messageId;
22
-    }
23
-
24
-    public String getText() {
25
-        return text;
26
-    }
27
-
28
-    public Date getTimestamp() {
29
-        return timestamp;
30
-    }
31
-
32
-    public int getUserId() {
33
-        return userId;
34
-    }
35
-
36
-    public int getChatId() {
37
-        return chatId;
38
-    }
39
-}

+ 0
- 22
ZipTeamOrange/src/main/java/com/zipteam/MessageController.java Целия файл

@@ -1,22 +0,0 @@
1
-
2
-package com.zipteam;
3
-
4
-public class MessageController extends Controller{
5
-
6
-
7
-    private Message message;
8
-    private String uri;
9
-
10
-    public  String get(User user) {
11
-        return user.toString();
12
-    }
13
-    public String put(User user) {
14
-        return user.toString();
15
-    }
16
-
17
-    public String post(User user) {
18
-        return user.toString();
19
-    }
20
-
21
-    public String delete(User user) { return user.toString(); }
22
-}

+ 0
- 9
ZipTeamOrange/src/main/java/com/zipteam/MessageRepository.java Целия файл

@@ -1,9 +0,0 @@
1
-package com.zipteam;
2
-
3
-import org.springframework.data.jpa.repository.JpaRepository;
4
-import java.util.List;
5
-
6
-interface MessageRespository extends JpaRepository<User, Integer> {
7
-
8
-    List<User> findByTitleContainingOrContentContaining(String text, String textAgain);
9
-}

+ 0
- 72
ZipTeamOrange/src/main/java/com/zipteam/User.java Целия файл

@@ -1,72 +0,0 @@
1
-package com.zipteam;
2
-
3
-import javax.persistence.Entity;
4
-import javax.persistence.GeneratedValue;
5
-import javax.persistence.GenerationType;
6
-import javax.persistence.Id;
7
-
8
-@Entity
9
-public class User {
10
-    @Id
11
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
12
-    private int userId;
13
-
14
-    private String name;
15
-    private String email;
16
-    private String password;
17
-    private String picture;
18
-
19
-    public User(){ }
20
-
21
-    public User(String name, String email, String password){
22
-        this.name = name;
23
-        this.email = email;
24
-        this.password = password;
25
-    }
26
-
27
-//    public User(int userId, String name, String email, String password){
28
-//        this.userId = userId;
29
-//        this.name = name;
30
-//        this.email = email;
31
-//        this.password = password;
32
-//    }
33
-//
34
-//    public User(int userId, String name, String email, String password, String picture){
35
-//        this.userId = userId;
36
-//        this.name = name;
37
-//        this.email = email;
38
-//        this.password = password;
39
-//        this.picture = picture;
40
-//    }
41
-
42
-
43
-    public int getUserId() {
44
-        return userId;
45
-    }
46
-
47
-    public String getName() {
48
-        return name;
49
-    }
50
-
51
-    public String getEmail() {
52
-        return email;
53
-    }
54
-
55
-    public String getPassword() {
56
-        return password;
57
-    }
58
-
59
-    public String getPicture() {
60
-        return picture;
61
-    }
62
-
63
-    @Override
64
-    public String toString() {
65
-        return "User{" +
66
-                "id=" + userId +
67
-                ", name='" + name + '\'' +
68
-                '}';
69
-    }
70
-
71
-
72
-}

+ 0
- 20
ZipTeamOrange/src/main/java/com/zipteam/UserController.java Целия файл

@@ -1,20 +0,0 @@
1
-package com.zipteam;
2
-
3
-public class UserController extends Controller{
4
-
5
-    private User user;
6
-    private String uri;
7
-
8
-    public  String get(User user) {
9
-        return user.toString();
10
-    }
11
-    public String put(User user) {
12
-     return user.toString();
13
-    }
14
-
15
-    public String post(User user) {
16
-     return user.toString();
17
-    }
18
-
19
-    public String delete(User user) { return user.toString(); }
20
-}

+ 0
- 10
ZipTeamOrange/src/main/java/com/zipteam/UserRepository.java Целия файл

@@ -1,10 +0,0 @@
1
-package com.zipteam;
2
-
3
-import org.springframework.data.jpa.repository.JpaRepository;
4
-
5
-import java.util.List;
6
-
7
-interface UserRespository extends JpaRepository<User, Integer> {
8
-
9
-    List<User> findByTitleContainingOrContentContaining(String text, String textAgain);
10
-}

+ 3
- 0
ZipTeamOrange/src/main/resources/application.properties Целия файл

@@ -0,0 +1,3 @@
1
+spring.jpa.hibernate.ddl-auto=create-drop
2
+spring.datasource.url=jdbc:mysql://localhost:3306/ZipTeamOrange?useSSL=false
3
+spring.datasource.username=root

+ 16
- 0
ZipTeamOrange/src/test/java/ZipTeamOrange/ZipTeamOrangeApplicationTests.java Целия файл

@@ -0,0 +1,16 @@
1
+package ZipTeamOrange;
2
+
3
+import org.junit.Test;
4
+import org.junit.runner.RunWith;
5
+import org.springframework.boot.test.context.SpringBootTest;
6
+import org.springframework.test.context.junit4.SpringRunner;
7
+
8
+@RunWith(SpringRunner.class)
9
+@SpringBootTest
10
+public class ZipTeamOrangeApplicationTests {
11
+
12
+	@Test
13
+	public void contextLoads() {
14
+	}
15
+
16
+}