Merge branch 'master' of http://39.108.133.138:3000/1901010746/202012G03

 Conflicts:

	.idea/vcs.xml

	.idea/workspace.xml

	sso-login/target/classes/com/sso/login/controller/ViewController.class

	sso-main/src/main/resources/templates/index.html

	sso-main/target/classes/templates/index.html

.idea/.gitignore

@@ -0,0 +1,2 @@
+# Default ignored files
+/workspace.xml

.idea/202012G03.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="TemplatesService">
+    <option name="TEMPLATE_CONFIGURATION" value="Chameleon" />
+    <option name="TEMPLATE_FOLDERS">
+      <list>
+        <option value="$MODULE_DIR$/sso-vip/src/main/resources/templates" />
+      </list>
+    </option>
+  </component>
+</module>

.idea/encodings.xml

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/sso-cart/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/sso-login/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/sso-main/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/sso-vip/src/main/java" charset="UTF-8" />

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,15 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="HtmlUnknownAttribute" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="myValues">
+        <value>
+          <list size="1">
+            <item index="0" class="java.lang.String" itemvalue="th:text" />
+          </list>
+        </value>
+      </option>
+      <option name="myCustomValuesEnabled" value="true" />
+    </inspection_tool>
+  </profile>
+</component>

.idea/misc.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>

.idea/workspace.xml

@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="c5a24e7a-e8cf-45f7-8d0b-25810e3d773a" name="默认更改列表" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sso-login/src/main/java/com/sso/login/controller/LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/sso-login/src/main/java/com/sso/login/controller/LoginController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sso-login/src/main/java/com/sso/login/controller/ViewController.java" beforeDir="false" afterPath="$PROJECT_DIR$/sso-login/src/main/java/com/sso/login/controller/ViewController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sso-login/target/classes/com/sso/login/controller/LoginController.class" beforeDir="false" afterPath="$PROJECT_DIR$/sso-login/target/classes/com/sso/login/controller/LoginController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sso-main/src/main/java/com/sso/main/controller/ViewController.java" beforeDir="false" afterPath="$PROJECT_DIR$/sso-main/src/main/java/com/sso/main/controller/ViewController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sso-main/src/main/resources/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/sso-main/src/main/resources/templates/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sso-main/target/classes/com/sso/main/controller/ViewController.class" beforeDir="false" afterPath="$PROJECT_DIR$/sso-main/target/classes/com/sso/main/controller/ViewController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sso-main/target/classes/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/sso-main/target/classes/templates/index.html" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="HTML File" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="ProjectId" id="1lzQTfAXKnwTcVbccaZ8sG4KP4p" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="DefaultHtmlFileTemplate" value="HTML File" />
-    <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
-    <property name="RequestMappingsPanelOrder0" value="0" />
-    <property name="RequestMappingsPanelOrder1" value="1" />
-    <property name="RequestMappingsPanelWidth0" value="75" />
-    <property name="RequestMappingsPanelWidth1" value="75" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="jdk.selected.JAVA_MODULE" value="1.8" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/sso-login/src/main/java/com/sso/login/controller" />
-    <property name="node.js.detected.package.eslint" value="true" />
-    <property name="node.js.detected.package.tslint" value="true" />
-    <property name="node.js.path.for.package.eslint" value="project" />
-    <property name="node.js.path.for.package.tslint" value="project" />
-    <property name="node.js.selected.package.eslint" value="(autodetect)" />
-    <property name="node.js.selected.package.tslint" value="(autodetect)" />
-    <property name="project.structure.last.edited" value="模块" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.2" />
-    <property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.annotationProcessors" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="E:\Idea\sso-web\sso-login\src\main\java\com\sso\login\controller" />
-      <recent name="E:\Idea\sso-web\sso-login\src\main\java\com\sso\login\utils" />
-      <recent name="E:\Idea\sso-web\sso-vip\src\main\resources\templates" />
-      <recent name="E:\Idea\sso-web\sso-vip\src\main\resources" />
-      <recent name="E:\Idea\sso-web\sso-main\src\main\resources" />
-    </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="E:\Idea\sso-web\sso-login\src\main\resources\templates" />
-      <recent name="E:\Idea\sso-web\sso-login\src\main\resources\static" />
-      <recent name="E:\Idea\sso-web\sso-login\webapp" />
-    </key>
-  </component>
-  <component name="RunManager" selected="Spring Boot.VipApp">
-    <configuration name="LoginApp" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
-      <module name="sso-login" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="com.sso.login.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.sso.login.LoginApp" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="MainApp" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
-      <module name="sso-main" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="com.sso.main.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.sso.main.MainApp" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="VipApp" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
-      <module name="sso-vip" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="com.sso.vip.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.sso.vip.VipApp" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <list>
-      <item itemvalue="Spring Boot.LoginApp" />
-      <item itemvalue="Spring Boot.MainApp" />
-      <item itemvalue="Spring Boot.VipApp" />
-    </list>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Spring Boot.VipApp" />
-        <item itemvalue="Spring Boot.LoginApp" />
-        <item itemvalue="Spring Boot.MainApp" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="c5a24e7a-e8cf-45f7-8d0b-25810e3d773a" name="默认更改列表" comment="" />
-      <created>1608597448224</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1608597448224</updated>
-      <workItem from="1608597450909" duration="10657000" />
-      <workItem from="1608614660628" duration="4822000" />
-      <workItem from="1608631578360" duration="4551000" />
-      <workItem from="1608684196974" duration="240000" />
-      <workItem from="1609115341694" duration="4316000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="WindowStateProjectService">
-    <state x="828" y="186" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1608598947800">
-      <screen x="0" y="0" width="1920" height="1050" />
-    </state>
-    <state x="828" y="186" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1050@0.0.1920.1050" timestamp="1608598947800" />
-    <state x="1103" y="314" key="#com.intellij.ide.util.TreeClassChooserDialog" timestamp="1608598935558">
-      <screen x="0" y="0" width="1920" height="1050" />
-    </state>
-    <state x="1103" y="314" key="#com.intellij.ide.util.TreeClassChooserDialog/0.0.1920.1050@0.0.1920.1050" timestamp="1608598935558" />
-    <state x="1189" y="441" key="#com.intellij.javaee.module.view.web.EditWebRootDialog" timestamp="1608599443382">
-      <screen x="0" y="0" width="1920" height="1050" />
-    </state>
-    <state x="1189" y="441" key="#com.intellij.javaee.module.view.web.EditWebRootDialog/0.0.1920.1050@0.0.1920.1050" timestamp="1608599443382" />
-    <state x="1170" y="277" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1608603344267">
-      <screen x="0" y="0" width="1920" height="1050" />
-    </state>
-    <state x="1170" y="277" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1920.1050@0.0.1920.1050" timestamp="1608603344267" />
-    <state x="1032" y="189" key="#项目结构" timestamp="1608616244825">
-      <screen x="0" y="0" width="1920" height="1050" />
-    </state>
-    <state x="1032" y="189" key="#项目结构/0.0.1920.1050@0.0.1920.1050" timestamp="1608616244825" />
-    <state x="1154" y="286" key="FileChooserDialogImpl" timestamp="1608599626317">
-      <screen x="0" y="0" width="1920" height="1050" />
-    </state>
-    <state x="1154" y="286" key="FileChooserDialogImpl/0.0.1920.1050@0.0.1920.1050" timestamp="1608599626317" />
-    <state width="1877" height="281" key="GridCell.Tab.0.bottom" timestamp="1609119665246">
-      <screen x="0" y="0" width="1920" height="1050" />
-    </state>
-    <state width="1877" height="281" key="GridCell.Tab.0.bottom/0.0.1920.1050@0.0.1920.1050" timestamp="1609119665246" />
-    <state width="1877" height="281" key="GridCell.Tab.0.center" timestamp="1609119665246">
-      <screen x="0" y="0" width="1920" height="1050" />
-    </state>
-    <state width="1877" height="281" key="GridCell.Tab.0.center/0.0.1920.1050@0.0.1920.1050" timestamp="1609119665246" />
-    <state width="1877" height="281" key="GridCell.Tab.0.left" timestamp="1609119665246">
-      <screen x="0" y="0" width="1920" height="1050" />
-    </state>
-    <state width="1877" height="281" key="GridCell.Tab.0.left/0.0.1920.1050@0.0.1920.1050" timestamp="1609119665246" />
-    <state width="1877" height="281" key="GridCell.Tab.0.right" timestamp="1609119665246">
-      <screen x="0" y="0" width="1920" height="1050" />
-    </state>
-    <state width="1877" height="281" key="GridCell.Tab.0.right/0.0.1920.1050@0.0.1920.1050" timestamp="1609119665246" />
-    <state width="1877" height="281" key="GridCell.Tab.1.bottom" timestamp="1609119665246">
-      <screen x="0" y="0" width="1920" height="1050" />
-    </state>
-    <state width="1877" height="281" key="GridCell.Tab.1.bottom/0.0.1920.1050@0.0.1920.1050" timestamp="1609119665246" />
-    <state width="1877" height="281" key="GridCell.Tab.1.center" timestamp="1609119665246">
-      <screen x="0" y="0" width="1920" height="1050" />
-    </state>
-    <state width="1877" height="281" key="GridCell.Tab.1.center/0.0.1920.1050@0.0.1920.1050" timestamp="1609119665246" />
-    <state width="1877" height="281" key="GridCell.Tab.1.left" timestamp="1609119665246">
-      <screen x="0" y="0" width="1920" height="1050" />
-    </state>
-    <state width="1877" height="281" key="GridCell.Tab.1.left/0.0.1920.1050@0.0.1920.1050" timestamp="1609119665246" />
-    <state width="1877" height="281" key="GridCell.Tab.1.right" timestamp="1609119665246">
-      <screen x="0" y="0" width="1920" height="1050" />
-    </state>
-    <state width="1877" height="281" key="GridCell.Tab.1.right/0.0.1920.1050@0.0.1920.1050" timestamp="1609119665246" />
-    <state x="880" y="103" key="SettingsEditor" timestamp="1608599446226">
-      <screen x="0" y="0" width="1920" height="1050" />
-    </state>
-    <state x="880" y="103" key="SettingsEditor/0.0.1920.1050@0.0.1920.1050" timestamp="1608599446226" />
-    <state x="552" y="260" key="Vcs.Push.Dialog.v2" timestamp="1608684413460">
-      <screen x="0" y="0" width="1920" height="1050" />
-    </state>
-    <state x="552" y="260" key="Vcs.Push.Dialog.v2/0.0.1920.1050@0.0.1920.1050" timestamp="1608684413460" />
-    <state x="634" y="326" key="git4idea.merge.GitPullDialog" timestamp="1608684216939">
-      <screen x="0" y="0" width="1920" height="1050" />
-    </state>
-    <state x="634" y="326" key="git4idea.merge.GitPullDialog/0.0.1920.1050@0.0.1920.1050" timestamp="1608684216939" />
-    <state x="325" y="204" key="new project wizard" timestamp="1608684342660">
-      <screen x="0" y="0" width="1920" height="1050" />
-    </state>
-    <state x="325" y="204" key="new project wizard/0.0.1920.1050@0.0.1920.1050" timestamp="1608684342660" />
-  </component>
-</project>

sso-login/src/main/resources/templates/login.html

@@ -1,16 +1,141 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.w3.org/1999/xhtml">
-<head>
-    <meta charset="UTF-8">
-    <title>welcome login</title>
-</head>
-<body>
-    <h1>欢迎进入登录界面</h1>
-    <p style="color: red;" th:text="${session.msg}"></p>
-    <form action="/login" method="post">
-        用户名：<input type="text" value="" name="username"><br>
-        密码：<input type="password" value="" name="password"><br>
-        <button type="submit">登录</button>
-    </form>
-</body>
-</html>
+<head>  
+    <meta charset="UTF-8">  
+    <title>Login</title>  
+    <link rel="stylesheet" type="text/css" href="Login.css"/>  
+
+<style type="text/css">
+
+html{   
+    width: 100%;   
+    height: 100%;   
+    overflow: hidden;   
+    font-style: sans-serif;   
+} 
+
+body{   
+    width: 100%;   
+    height: 100%;   
+    font-family: 'Open Sans',sans-serif;   
+    margin: 0;   
+    background-color: #2b2727;   
+} 
+
+#login{   
+    position: absolute;   
+    top: 50%;   
+    left:50%;   
+    margin: -150px 0 0 -250px;
+    width: 500px; 
+    height: 380px;
+    background-color: #504b4b;  
+}   
+
+#login h1{   
+    color: #fff;   
+    text-shadow:0 0 10px;   
+    letter-spacing: 1px;   
+    text-align: center;   
+} 
+
+
+h1{   
+    font-size: 2em;   
+    margin: 0.67em 0;   
+}  
+
+
+input{   
+    width: 278px;   
+    height: 18px;   
+    margin-bottom: 10px;   
+    outline: none;   
+    padding: 10px;   
+    font-size: 13px;   
+    color: #fff;   
+    text-shadow:1px 1px 1px;   
+    border-top: 1px solid #312E3D;   
+    border-left: 1px solid #312E3D;   
+    border-right: 1px solid #312E3D;   
+    border-bottom: 1px solid #56536A;   
+    border-radius: 4px;   
+    background-color: #2D2D3F;   
+}   
+.but{
+    width: 300px;   
+    min-height: 20px;   
+    display: block;   
+    background-color: #e9982f;   
+    border: 1px solid #e9982f;   
+    color: rgb(0, 0, 0);   
+    padding: 9px 14px;   
+    font-size: 20px;   
+    line-height: normal;   
+    border-radius: 5px;   
+    margin: 0;   
+    font-weight: bold;
+}  
+
+.smile{
+
+margin:320px auto;
+
+width: 80px;
+
+height: 80px;
+
+font-size: 80px;
+
+animation: action 6s linear infinite;
+
+color:white;
+
+}
+
+@keyframes action {
+
+from {
+
+transform: rotate(0deg) translate(300px,80px) rotate(0deg);
+
+}
+
+to {
+
+transform: rotate(360deg) translate(300px,80px) rotate(-360deg);
+
+}
+
+}
+
+
+
+
+</style>
+</head> 
+
+<body> 
+
+
+    <div id="login">  
+        <h1>Login</h1>
+        <form method="post" action="/login">
+            <input style="margin:20px 20px 20px 100px;" type="text" value="" name="username" placeholder="用户名"></input>
+            <input style="margin:20px 20px 20px 100px;" type="password" name="password" value="" placeholder="密码"></input>
+            <p style="color: rgb(247, 240, 240);text-align: center" th:text="${session.msg}"></p>
+            <button style="margin:20px 20px 20px 100px;" class="but" type="submit">登录</button>  
+        </form>  
+    </div>
+
+    <div class="smile">☺</div>
+<script type="text/javascript">
+for (var i=0;i<5;i++) {
+setTimeout(()=>{
+console.log(i)
+},1000*i)
+}
+</script>
+
+</body>  
+</html>  

sso-login/sso-login.iml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4" />

sso-login/target/classes/templates/login.html

@@ -1,16 +1,141 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.w3.org/1999/xhtml">
-<head>
-    <meta charset="UTF-8">
-    <title>welcome login</title>
-</head>
-<body>
-    <h1>欢迎进入登录界面</h1>
-    <p style="color: red;" th:text="${session.msg}"></p>
-    <form action="/login" method="post">
-        用户名：<input type="text" value="" name="username"><br>
-        密码：<input type="password" value="" name="password"><br>
-        <button type="submit">登录</button>
-    </form>
-</body>
-</html>
+<head>  
+    <meta charset="UTF-8">  
+    <title>Login</title>  
+    <link rel="stylesheet" type="text/css" href="Login.css"/>  
+
+<style type="text/css">
+
+html{   
+    width: 100%;   
+    height: 100%;   
+    overflow: hidden;   
+    font-style: sans-serif;   
+} 
+
+body{   
+    width: 100%;   
+    height: 100%;   
+    font-family: 'Open Sans',sans-serif;   
+    margin: 0;   
+    background-color: #2b2727;   
+} 
+
+#login{   
+    position: absolute;   
+    top: 50%;   
+    left:50%;   
+    margin: -150px 0 0 -250px;
+    width: 500px; 
+    height: 380px;
+    background-color: #504b4b;  
+}   
+
+#login h1{   
+    color: #fff;   
+    text-shadow:0 0 10px;   
+    letter-spacing: 1px;   
+    text-align: center;   
+} 
+
+
+h1{   
+    font-size: 2em;   
+    margin: 0.67em 0;   
+}  
+
+
+input{   
+    width: 278px;   
+    height: 18px;   
+    margin-bottom: 10px;   
+    outline: none;   
+    padding: 10px;   
+    font-size: 13px;   
+    color: #fff;   
+    text-shadow:1px 1px 1px;   
+    border-top: 1px solid #312E3D;   
+    border-left: 1px solid #312E3D;   
+    border-right: 1px solid #312E3D;   
+    border-bottom: 1px solid #56536A;   
+    border-radius: 4px;   
+    background-color: #2D2D3F;   
+}   
+.but{
+    width: 300px;   
+    min-height: 20px;   
+    display: block;   
+    background-color: #e9982f;   
+    border: 1px solid #e9982f;   
+    color: rgb(0, 0, 0);   
+    padding: 9px 14px;   
+    font-size: 20px;   
+    line-height: normal;   
+    border-radius: 5px;   
+    margin: 0;   
+    font-weight: bold;
+}  
+
+.smile{
+
+margin:320px auto;
+
+width: 80px;
+
+height: 80px;
+
+font-size: 80px;
+
+animation: action 6s linear infinite;
+
+color:white;
+
+}
+
+@keyframes action {
+
+from {
+
+transform: rotate(0deg) translate(300px,80px) rotate(0deg);
+
+}
+
+to {
+
+transform: rotate(360deg) translate(300px,80px) rotate(-360deg);
+
+}
+
+}
+
+
+
+
+</style>
+</head> 
+
+<body> 
+
+
+    <div id="login">  
+        <h1>Login</h1>
+        <form method="post" action="/login">
+            <input style="margin:20px 20px 20px 100px;" type="text" value="" name="username" placeholder="用户名"></input>
+            <input style="margin:20px 20px 20px 100px;" type="password" name="password" value="" placeholder="密码"></input>
+            <p style="color: rgb(247, 240, 240);text-align: center" th:text="${session.msg}"></p>
+            <button style="margin:20px 20px 20px 100px;" class="but" type="submit">登录</button>  
+        </form>  
+    </div>
+
+    <div class="smile">☺</div>
+<script type="text/javascript">
+for (var i=0;i<5;i++) {
+setTimeout(()=>{
+console.log(i)
+},1000*i)
+}
+</script>
+
+</body>  
+</html>  

sso-main/src/main/java/com/sso/main/controller/ViewController.java

@@ -5,6 +5,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.web.servlet.i18n.CookieLocaleResolver;
 import org.thymeleaf.util.StringUtils;
 
 import javax.servlet.http.Cookie;
@@ -38,23 +39,6 @@ public class ViewController {
         return "index";
     }
 
-    @RequestMapping("/delete")
-    public String deleteLogin(@CookieValue(required = false,value = "TOKEN")Cookie cookie,HttpServletResponse response){
-        if (cookie!=null){
-            String token=cookie.getValue();
-            if(!StringUtils.isEmpty(token)){
-                Cookie cookie1=new Cookie("TOKEN",null);
-                cookie1.setDomain("codeshop.com");
-                cookie1.setMaxAge(0);
-                cookie1.setPath("/");
-                response.addCookie(cookie1);
-
-
-            }
-        }
-        return "index";
-    }
-
 
 }