From 6ac99e9deca5039a06ca9a1f6ad1afae54ee384d Mon Sep 17 00:00:00 2001
From: tianea <tianxyy80@gmail.com>
Date: Thu, 25 Aug 2022 22:32:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E8=B5=9B=E7=B3=BB=E7=BB=9F=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=20=E7=94=A8=E6=88=B7=E7=99=BB=E9=99=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=20=E5=AD=A6=E6=A0=A1=E5=BC=80=E9=80=9A=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=8E=A5=E5=8F=A3=20=E6=99=BA=E4=BA=91=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E5=BC=80=E9=80=9A=E5=AD=A6=E6=A0=A1=E7=8F=AD=E7=BA=A7?=
 =?UTF-8?q?=E3=80=81=E5=AD=A6=E7=94=9F=E3=80=81=E8=80=81=E5=B8=88=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/api/user.js                       |   7 +
 backend/src/router/index.js                   |   7 +
 backend/src/store/modules/user.js             |   1 -
 backend/src/utils/request.js                  |   2 +-
 backend/src/views/login/index.vue             |  12 +-
 front/src/api/member.js                       |   7 +
 front/src/components/index.vue                |   3 -
 front/src/router/index.js                     |   6 +
 .../platform/common/core/api/ZhiYunApi.java   |  60 +++++++
 tz/competition/competition-service/Dockerfile |   2 +-
 .../com/tz/platform/entity/Competition.java   |   1 +
 .../tz/platform/entity/CompetitionGroup.java  |   2 +-
 .../tz/platform/entity/CompetitionMember.java |   2 +-
 .../tz/platform/entity/CompetitionTask.java   |   2 +-
 .../tz/platform/entity/CompetitionTeam.java   |   2 +-
 .../com/tz/platform/entity/ExamAnswer.java    |   2 +-
 .../com/tz/platform/entity/ExamPaper.java     |   2 +-
 .../com/tz/platform/entity/ExamQuestion.java  |   1 +
 .../com/tz/platform/entity/MarketNote.java    |   2 +
 .../com/tz/platform/entity/MemberLog.java     |   2 +-
 .../java/com/tz/platform/entity/Ranking.java  |   2 +-
 .../com/tz/platform/entity/ReportInfo.java    |   2 +
 .../java/com/tz/platform/entity/Stock.java    |   2 +
 .../com/tz/platform/entity/TenPosition.java   |   2 +-
 .../com/tz/platform/juejin/JueJinApi.java     |   6 +-
 .../src/main/resources/bootstrap.yml          |   4 +-
 .../classes/META-INF/build-info.properties    |   2 +-
 tz/docker-compose.yml                         |  48 +++---
 tz/exam/exam-service/Dockerfile               |   2 +-
 .../java/com/tz/platform/entity/Course.java   |   2 +-
 .../com/tz/platform/entity/CourseCat.java     |   2 +-
 .../com/tz/platform/entity/CourseTag.java     |   6 +-
 .../java/com/tz/platform/entity/Question.java |   2 +-
 .../src/main/resources/bootstrap.yml          |   4 +-
 tz/gateway/Dockerfile                         |   2 +-
 tz/gateway/src/main/resources/bootstrap.yml   |   4 +-
 .../classes/META-INF/build-info.properties    |   2 +-
 tz/gateway/target/classes/bootstrap.yml       |   4 +-
 .../target/maven-archiver/pom.properties      |   2 +-
 tz/gateway/target/tianze-gateway.jar.original | Bin 13135 -> 13136 bytes
 .../com/tz/platform/feign/IFeignGrade.java    |  20 +++
 .../com/tz/platform/feign/IFeignSchool.java   |  18 ++
 .../tz/platform/feign/IFeignStudentLevel.java |   4 +
 .../com/tz/platform/feign/vo/GradeVo.java     |  15 ++
 .../com/tz/platform/feign/vo/SchoolVo.java    |  17 ++
 .../tz/platform/feign/vo/StudentLevelVo.java  |   1 +
 .../java/com/tz/platform/entity/Grade.java    |   3 +
 .../java/com/tz/platform/entity/Menu.java     |   6 +-
 .../java/com/tz/platform/entity/Province.java |   5 +-
 .../java/com/tz/platform/entity/School.java   |   1 +
 .../com/tz/platform/entity/StudentLevel.java  |   3 +-
 .../com/tz/platform/repository/GradeDao.java  |   1 +
 .../com/tz/platform/repository/SchoolDao.java |   1 +
 .../platform/repository/StudentLevelDao.java  |   1 +
 .../platform/system/api/SystemController.java |  15 +-
 .../system/feign/FeigGradeController.java     |  45 +++++
 .../system/feign/FeignSchoolController.java   |  32 ++++
 .../feign/FeignStudentLevelController.java    |   5 +
 .../feign/biz/FeignStudentLevelBiz.java       |   5 +
 .../tz/platform/system/pc/biz/GradeBiz.java   |   1 +
 .../tz/platform/system/pc/biz/SchoolBiz.java  |  44 +++++
 .../tz/platform/system/pc/dto/SchoolDTO.java  |   1 +
 .../platform/system/pc/vo/StudentLevelVO.java |   1 +
 .../src/main/resources/bootstrap.yml          |   4 +-
 tz/upload/upload-service/Dockerfile           |   2 +-
 .../src/main/resources/bootstrap.yml          |   4 +-
 tz/user/user-service/Dockerfile               |   2 +-
 tz/user/user-service/pom.xml                  |   5 +
 .../tz/platform/UserServiceApplication.java   |   2 +
 .../config/MyResourceServerConfigurer.java    |  21 +++
 .../MyauthorizationServerConfigurer.java      |  44 +++++
 .../tz/platform/config/WebSecurityConfig.java |  32 ++++
 .../java/com/tz/platform/entity/LoginLog.java |   6 +-
 .../java/com/tz/platform/entity/User.java     |   6 +-
 .../tz/platform/user/api/OauthController.java |  42 +++++
 .../user/api/UserLoginController.java         |   7 +
 .../user/api/biz/ApiUserLoginBiz.java         |  22 +++
 .../tz/platform/user/api/dto/OauthDTO.java    |  11 ++
 .../com/tz/platform/zhiyun/ZhiyunJob.java     |  84 ++++++++++
 .../platform/zhiyun/biz/ZhiyunAccountBiz.java | 155 ++++++++++++++++++
 .../src/main/resources/bootstrap.yml          |   4 +-
 81 files changed, 832 insertions(+), 91 deletions(-)
 create mode 100644 tz/common/common-core/src/main/java/com/tz/platform/common/core/api/ZhiYunApi.java
 create mode 100644 tz/system/system-feign/src/main/java/com/tz/platform/feign/IFeignGrade.java
 create mode 100644 tz/system/system-feign/src/main/java/com/tz/platform/feign/IFeignSchool.java
 create mode 100644 tz/system/system-feign/src/main/java/com/tz/platform/feign/vo/GradeVo.java
 create mode 100644 tz/system/system-feign/src/main/java/com/tz/platform/feign/vo/SchoolVo.java
 create mode 100644 tz/system/system-service/src/main/java/com/tz/platform/system/feign/FeigGradeController.java
 create mode 100644 tz/system/system-service/src/main/java/com/tz/platform/system/feign/FeignSchoolController.java
 create mode 100644 tz/user/user-service/src/main/java/com/tz/platform/config/MyResourceServerConfigurer.java
 create mode 100644 tz/user/user-service/src/main/java/com/tz/platform/config/MyauthorizationServerConfigurer.java
 create mode 100644 tz/user/user-service/src/main/java/com/tz/platform/config/WebSecurityConfig.java
 create mode 100644 tz/user/user-service/src/main/java/com/tz/platform/user/api/OauthController.java
 create mode 100644 tz/user/user-service/src/main/java/com/tz/platform/user/api/dto/OauthDTO.java
 create mode 100644 tz/user/user-service/src/main/java/com/tz/platform/zhiyun/ZhiyunJob.java
 create mode 100644 tz/user/user-service/src/main/java/com/tz/platform/zhiyun/biz/ZhiyunAccountBiz.java

diff --git a/backend/src/api/user.js b/backend/src/api/user.js
index dfd1fd6..ca2cc95 100644
--- a/backend/src/api/user.js
+++ b/backend/src/api/user.js
@@ -8,6 +8,13 @@ export function login(data) {
   })
 }
 
+export function info(){
+  return request({
+      url: baseUrl+ "login/info",
+      method: "get"
+  })
+}
+
 export function getInfo(token) {
   return request({
     url: '/auth/user/info',
diff --git a/backend/src/router/index.js b/backend/src/router/index.js
index 8d9e582..5483d20 100644
--- a/backend/src/router/index.js
+++ b/backend/src/router/index.js
@@ -6,6 +6,8 @@ Vue.use(Router)
 /* Layout */
 import Layout from '@/layout'
 
+import Auth from '@/components/oauth'
+
 /**
  * Note: sub-menu only appear when route children.length >= 1
  * Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
@@ -42,6 +44,11 @@ export const constantRoutes = [
     component: () => import('@/views/404'),
     hidden: true
   },
+  {
+    path: '/index',
+    component: Auth,
+    hidden: true
+  },
   {
     path: '/',
     component: Layout,
diff --git a/backend/src/store/modules/user.js b/backend/src/store/modules/user.js
index 0c2dec2..657eaaf 100644
--- a/backend/src/store/modules/user.js
+++ b/backend/src/store/modules/user.js
@@ -33,7 +33,6 @@ const actions = {
     const { username, password } = userInfo
     return new Promise((resolve, reject) => {
       login({ username: username.trim(), password: password }).then(response => {
-        console.log("login5")
         const { data } = response
         commit('SET_TOKEN', data.token)
         setToken(data.token)
diff --git a/backend/src/utils/request.js b/backend/src/utils/request.js
index 7b8bf5c..7648832 100644
--- a/backend/src/utils/request.js
+++ b/backend/src/utils/request.js
@@ -41,7 +41,7 @@ service.interceptors.response.use(
    * You can also judge the status by HTTP Status Code
    */
   response => {
-    console.log(response)
+    
     const res = response.data
     // if the custom code is not 200, it is judged as an error.
     if (res.code !== 200) {
diff --git a/backend/src/views/login/index.vue b/backend/src/views/login/index.vue
index 36df62e..df56d64 100644
--- a/backend/src/views/login/index.vue
+++ b/backend/src/views/login/index.vue
@@ -54,9 +54,15 @@
 
 <script>
 import { validUsername } from '@/utils/validate'
-
+import * as  authApi from "@/utils/auth.js"
 export default {
   name: 'Login',
+  created(){
+        if(this.$route.query.token){
+            authApi.setToken(this.$route.query.token)
+            location.href="/"                  
+        }
+  },
   data() {
     const validateUsername = (rule, value, callback) => {
       if (!validUsername(value)) {
@@ -110,7 +116,7 @@ export default {
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true
-          console.log("login1")
+        
           this.$store.dispatch('user/login', this.loginForm).then(() => {
             this.$router.push({ path: this.redirect || '/' })
             this.loading = false
@@ -118,7 +124,7 @@ export default {
             this.loading = false
           })
         } else {
-           console.log("login3")
+           
           return false
         }
       })
diff --git a/front/src/api/member.js b/front/src/api/member.js
index 5761bc8..90ae8f6 100644
--- a/front/src/api/member.js
+++ b/front/src/api/member.js
@@ -11,6 +11,13 @@ export function login(data){
     })
 }
 
+export function info(){
+    return request({
+        url: baseUrl+ "login/info",
+        method: "get"
+    })
+}
+
 export function getMemberInfo(compId,stageId){
     return request({
         url: authUrl+"/get",
diff --git a/front/src/components/index.vue b/front/src/components/index.vue
index f31aeb2..677e543 100644
--- a/front/src/components/index.vue
+++ b/front/src/components/index.vue
@@ -191,9 +191,6 @@ export default {
   mounted(){
      this.listGoing()
      this.listDone()    
-  },
-  created(){
-    
   },
   methods:{
     goCompetition(id){
diff --git a/front/src/router/index.js b/front/src/router/index.js
index 8d5aa1d..511fc9f 100644
--- a/front/src/router/index.js
+++ b/front/src/router/index.js
@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import Router from 'vue-router'
 import Index from '@/components/index'
+import Oauth from '@/components/oauth'
 import CompetitionIndex from '@/views/competition/index'
 import Login from '@/views/login/index'
 import Exam from '@/views/system/exam'
@@ -21,6 +22,11 @@ let router = new Router({
       name: '首页',
       component: Index
     },
+    {
+      path: '/index',
+      name: '登陆中...',
+      component: Oauth
+    },
     {
       path: '/competition/',
       name: '竞赛首页',
diff --git a/tz/common/common-core/src/main/java/com/tz/platform/common/core/api/ZhiYunApi.java b/tz/common/common-core/src/main/java/com/tz/platform/common/core/api/ZhiYunApi.java
new file mode 100644
index 0000000..0228dd5
--- /dev/null
+++ b/tz/common/common-core/src/main/java/com/tz/platform/common/core/api/ZhiYunApi.java
@@ -0,0 +1,60 @@
+package com.tz.platform.common.core.api;
+
+import com.tz.platform.common.core.tools.HttpUtil;
+
+import java.util.Map;
+
+public class ZhiYunApi {
+    String baseUrl = "http://139.159.242.249:8890";
+    Map<String,String> headers = null;
+    public ZhiYunApi(){
+
+    }
+
+
+    public String findAllGrade(Integer schoolId){
+        String content = HttpUtil.get(baseUrl+"/api/classes/findAllBySchoolId?schoolId="+schoolId,headers);
+        return  content;
+    }
+
+    public String findAllSchool(){
+        String content = HttpUtil.get(baseUrl+"/api/school/findAll",headers);
+        return content;
+    }
+
+    public String findAllStudent(Integer schoolId){
+        String content = HttpUtil.get(baseUrl+"/api/student/findAllBySchoolId?schoolId="+schoolId,headers);
+        return content;
+    }
+
+    public String findTeacherBySchoolId(Integer schoolId){
+        String content = HttpUtil.get(baseUrl+"/api/teacher/findAllBySchoolId?schoolId="+schoolId,headers);
+        return content;
+    }
+
+    public String findClassesBySchoolId(Integer schoolId){
+        String content = HttpUtil.get(baseUrl+"/api/classes/findAllBySchoolId?schoolId="+schoolId,headers);
+        return content;
+    }
+
+    public String findAllCource(){
+        String content = HttpUtil.get(baseUrl+"/api/course/findAll",headers);
+        return  content;
+    }
+
+
+    public String findCourceBySchool(Integer schoolId){
+        String content = HttpUtil.get(baseUrl+"/api/course/findAllBySchoolId?schoolId="+schoolId,headers);
+        return content;
+    }
+
+    public String findAllQuestion(){
+        String content = HttpUtil.get(baseUrl+"/api/question/findAll",headers);
+        return  content;
+    }
+
+    public String findQuestionByCourseId(Integer courseId,Integer pageIndex,Integer pageSize){
+        String content = HttpUtil.get(baseUrl+"/api/question/findByCourseId?courseId="+courseId+"&pageSize="+pageSize+"&pageIndex="+pageIndex,headers);
+        return  content;
+    }
+}
diff --git a/tz/competition/competition-service/Dockerfile b/tz/competition/competition-service/Dockerfile
index fd5b59f..2579052 100644
--- a/tz/competition/competition-service/Dockerfile
+++ b/tz/competition/competition-service/Dockerfile
@@ -2,7 +2,7 @@ FROM daocloud.io/library/java:8-jre-alpine
 MAINTAINER tianze
 ARG JAVA_OPTS="-Xmn256M -Xmx2048M"
 ENV JAVA_OPTS=$JAVA_OPTS
-ARG RUN_ARGS="--spring.profiles.active=pro --spring.cloud.nacos.server-addr=172.19.255.105:8848"
+ARG RUN_ARGS="--spring.profiles.active=sale --spring.cloud.nacos.server-addr=172.19.255.105:8848"
 ENV RUN_ARGS=$RUN_ARGS
 ADD target/tianze-competition.jar /competition-service.jar
 ENTRYPOINT ["sh","-c","java $JAVA_OPTS -jar /competition-service.jar $RUN_ARGS"]
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/Competition.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/Competition.java
index 2cbf099..8fd50bc 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/Competition.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/Competition.java
@@ -15,6 +15,7 @@ import java.util.List;
 @Entity
 @TypeDef(name = "json", typeClass = JsonStringType.class)
 @Data
+@Table(name = "competition_sale")
 public class Competition {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionGroup.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionGroup.java
index ba6c81a..8f123bf 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionGroup.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionGroup.java
@@ -9,7 +9,7 @@ import java.util.List;
 
 @Data
 @Entity
-@Table(indexes = {@Index(columnList = "competitionId")})
+@Table(name = "competition_group_sale",indexes = {@Index(columnList = "competitionId")})
 public class CompetitionGroup {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionMember.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionMember.java
index f856c20..04de000 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionMember.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionMember.java
@@ -7,7 +7,7 @@ import java.util.Date;
 
 @Entity
 @Data
-@Table(indexes={@Index(columnList = "competitionId,stageId,teamId"),@Index(columnList = "userId"),@Index(columnList = "studentNo"),@Index(columnList = "name"),@Index(columnList = "school"),@Index(columnList = "accountId")})
+@Table(name="competition_member_sale",indexes={@Index(columnList = "competitionId,stageId,teamId"),@Index(columnList = "userId"),@Index(columnList = "studentNo"),@Index(columnList = "name"),@Index(columnList = "school"),@Index(columnList = "accountId")})
 public class CompetitionMember {
 
     @Id
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionTask.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionTask.java
index f5a05c7..e635e02 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionTask.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionTask.java
@@ -12,7 +12,7 @@ import java.util.List;
 
 @Data
 @Entity
-@Table(indexes = {@Index(columnList = "competitionId")})
+@Table(name="competition_task_sale",indexes = {@Index(columnList = "competitionId")})
 @TypeDef(name = "json", typeClass = JsonStringType.class)
 public class CompetitionTask {
     @Id
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionTeam.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionTeam.java
index d2722a3..3740997 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionTeam.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionTeam.java
@@ -6,7 +6,7 @@ import javax.persistence.*;
 
 @Data
 @Entity
-@Table(indexes = {@Index(columnList = "teamName"),@Index(columnList = "skey")})
+@Table(name="competition_team_sale",indexes = {@Index(columnList = "teamName"),@Index(columnList = "skey")})
 public class CompetitionTeam {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamAnswer.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamAnswer.java
index 779f69d..230aec1 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamAnswer.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamAnswer.java
@@ -12,7 +12,7 @@ import java.util.List;
 @Data
 @Entity
 @TypeDef(name = "json", typeClass = JsonStringType.class)
-@Table(indexes = {@Index(columnList = "userId,competitionId,stageId")})
+@Table(name = "exam_answer_sale",indexes = {@Index(columnList = "userId,competitionId,stageId")})
 public class ExamAnswer {
     /**
      * 大赛ID_阶段ID_分组ID_用户ID_问题ID
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamPaper.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamPaper.java
index 8779faa..7ac3c21 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamPaper.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamPaper.java
@@ -11,7 +11,7 @@ import java.util.List;
 
 @Data
 @Entity
-@Table(indexes={ @Index(columnList = "userNo,compId,stageId")})
+@Table(name = "exam_paper_sale",indexes={ @Index(columnList = "userNo,compId,stageId")})
 @TypeDef(name = "json", typeClass = JsonStringType.class)
 public class ExamPaper {
     @Id
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamQuestion.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamQuestion.java
index cd6bd8c..2f9e2a0 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamQuestion.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamQuestion.java
@@ -12,6 +12,7 @@ import java.util.List;
 
 @Data
 @Entity
+@Table(name = "exam_question_sale")
 @TypeDef(name = "json", typeClass = JsonStringType.class)
 public class ExamQuestion {
     @Id
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/MarketNote.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/MarketNote.java
index 53cb96e..b253c21 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/MarketNote.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/MarketNote.java
@@ -5,10 +5,12 @@ import lombok.Data;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Table;
 import java.util.Date;
 
 @Data
 @Entity
+@Table(name = "market_note_sale")
 public class MarketNote {
     @Id
     private String id;
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/MemberLog.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/MemberLog.java
index b7d8985..3d1aeb4 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/MemberLog.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/MemberLog.java
@@ -10,7 +10,7 @@ import java.util.Date;
 
 @Entity
 @Data
-@Table(indexes = {@Index(columnList = "shortDate")})
+@Table(name = "member_log_sale",indexes = {@Index(columnList = "shortDate")})
 public class MemberLog {
     @Id
     private String id;
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/Ranking.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/Ranking.java
index 68d6cd5..2af2796 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/Ranking.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/Ranking.java
@@ -8,7 +8,7 @@ import java.util.Date;
 
 @Data
 @Entity
-@Table(indexes = {@Index(columnList = "compId,stageId,updateTime"),@Index(columnList = "userNo"),@Index(columnList = "accountId")})
+@Table(name = "ranking_sale",indexes = {@Index(columnList = "compId,stageId,updateTime"),@Index(columnList = "userNo"),@Index(columnList = "accountId")})
 public class Ranking {
     @Id
     private String id;
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ReportInfo.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ReportInfo.java
index 5884cd0..a16a9ee 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ReportInfo.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ReportInfo.java
@@ -5,10 +5,12 @@ import lombok.Data;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Table;
 import java.util.Date;
 
 @Data
 @Entity
+@Table(name = "report_info_sale")
 public class ReportInfo {
     @Id
     private String accountId;
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/Stock.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/Stock.java
index a92bb61..6c0b8f8 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/Stock.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/Stock.java
@@ -4,9 +4,11 @@ import lombok.Data;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Table;
 
 @Data
 @Entity
+@Table(name = "stock_sale")
 public class Stock {
     @Id
     private String symbol;
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/TenPosition.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/TenPosition.java
index 68c5a72..18ac470 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/TenPosition.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/TenPosition.java
@@ -9,7 +9,7 @@ import javax.persistence.Table;
 
 @Data
 @Entity
-@Table(indexes = {@Index(columnList = "accountId")})
+@Table(name = "ten_position_sale",indexes = {@Index(columnList = "accountId")})
 public class TenPosition {
     @Id
     private String id;
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/juejin/JueJinApi.java b/tz/competition/competition-service/src/main/java/com/tz/platform/juejin/JueJinApi.java
index 038e7da..f332a35 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/juejin/JueJinApi.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/juejin/JueJinApi.java
@@ -242,8 +242,8 @@ public class JueJinApi {
         String start = "2022-04-01";
         String end = "2022-05-05";
 
-//        AccountInfo info = api.createAccount("测试账号",1000000L,1);
-//        System.out.println(info.getAccount_id());
+        AccountInfo info = api.createAccount("测试账号",1000000L,1);
+        System.out.println(info.getAccount_id());
 //        api.deleteAccount("4811913f-9dba-11ec-89b3-00163e0e6ad0");
 //        api.getCashInfo("d91c3a8f-cba8-11ec-a483-00163e0e6ad0");
 //        api.test();
@@ -253,7 +253,7 @@ public class JueJinApi {
 //         String content =   api.createReport2(accountId,"report"+System.currentTimeMillis());
 //        api.getTenPosition("9d7f4856-cc11-11ec-9cd0-00163e0e6ad0");
 //         api.getCashInfo("cbee8129-cae7-11ec-a4f7-00163e0e6ad0");
-         api.cashInOut("481c4bbd-cc20-11ec-b818-00163e0e6ad0");
+//         api.cashInOut("481c4bbd-cc20-11ec-b818-00163e0e6ad0");
 //         String content = api.getReport("57509895");
 //         System.out.println(content);
 //         String reportDetail = api.reportSumary("55122910");
diff --git a/tz/competition/competition-service/src/main/resources/bootstrap.yml b/tz/competition/competition-service/src/main/resources/bootstrap.yml
index 771e322..a083e6e 100644
--- a/tz/competition/competition-service/src/main/resources/bootstrap.yml
+++ b/tz/competition/competition-service/src/main/resources/bootstrap.yml
@@ -1,5 +1,5 @@
 server:
-  port: 50012
+  port: 60012
   error:
     whitelabel:
       enabled: false
@@ -11,7 +11,7 @@ spring:
   application:
     name: tz-competition-service
   profiles:
-    active: dev
+    active: sale
   cloud:
     nacos:
       server-addr: 127.0.0.1:8848
diff --git a/tz/competition/target/classes/META-INF/build-info.properties b/tz/competition/target/classes/META-INF/build-info.properties
index 83383e5..58ec06d 100644
--- a/tz/competition/target/classes/META-INF/build-info.properties
+++ b/tz/competition/target/classes/META-INF/build-info.properties
@@ -1,5 +1,5 @@
 build.artifact=competition
 build.group=com.tz
 build.name=competition
-build.time=2022-06-16T05\:40\:57.634Z
+build.time=2022-08-25T14\:09\:03.001Z
 build.version=1.0-SNAPSHOT
diff --git a/tz/docker-compose.yml b/tz/docker-compose.yml
index 1876964..1a4a798 100644
--- a/tz/docker-compose.yml
+++ b/tz/docker-compose.yml
@@ -5,9 +5,9 @@ services:
       context: ./upload/upload-service
       args:
         JAVA_OPTS: '-Xmn256M -Xmx1024M'
-        RUN_ARGS: '--spring.profiles.active=pro --spring.cloud.nacos.server-addr=172.19.255.105:8848'
-    image: alient/tianze:upload
-    container_name: upload
+        RUN_ARGS: '--spring.profiles.active=sale --spring.cloud.nacos.server-addr=172.19.255.105:8848'
+    image: alient/tianze:upload-sale
+    container_name: upload-sale
     restart: always
     volumes:
       - /tmp/logs/upload:/root/tianze/logs/upload
@@ -15,15 +15,15 @@ services:
     networks:
       - tianze
     ports:
-      - "50015:50015"
+      - "60015:60015"
   tianze-user:
     build:
       context: ./user/user-service
       args:
         JAVA_OPTS: '-Xmn256M -Xmx1024M'
-        RUN_ARGS: '--spring.profiles.active=pro --spring.cloud.nacos.server-addr=172.19.255.105:8848'
-    image: alient/tianze:user
-    container_name: user
+        RUN_ARGS: '--spring.profiles.active=sale --spring.cloud.nacos.server-addr=172.19.255.105:8848'
+    image: alient/tianze:user-sale
+    container_name: user-sale
     restart: always
     volumes:
       - /tmp/logs/user:/root/tianze/logs/user
@@ -31,67 +31,67 @@ services:
     networks:
       - tianze
     ports:
-      - "50011:50011"
+      - "60011:60011"
   tianze-system:
     build:
       context: ./system/system-service
       args:
         JAVA_OPTS: '-Xmn256M -Xmx1024M'
-        RUN_ARGS: '--spring.profiles.active=pro --spring.cloud.nacos.server-addr=172.19.255.105:8848'
-    image: alient/tianze:system
-    container_name: system
+        RUN_ARGS: '--spring.profiles.active=sale --spring.cloud.nacos.server-addr=172.19.255.105:8848'
+    image: alient/tianze:system-sale
+    container_name: system-sale
     restart: always
     volumes:
       - /tmp/logs/system:/root/tianze/logs/system
     networks:
       - tianze
     ports:
-      - "50014:50014"
+      - "60014:60014"
   tianze-gateway:
     build:
       context: ./gateway
       args:
         JAVA_OPTS: '-Xmn256M -Xmx1024M'
-        RUN_ARGS: '--spring.profiles.active=pro --spring.cloud.nacos.server-addr=172.19.255.105:8848'
-    image: alient/tianze:gateway
-    container_name: gateway
+        RUN_ARGS: '--spring.profiles.active=sale --spring.cloud.nacos.server-addr=172.19.255.105:8848'
+    image: alient/tianze:gateway-sale
+    container_name: gateway-sale
     restart: always
     volumes:
       - /tmp/logs/gateway:/root/tianze/logs/gateway
     networks:
       - tianze
     ports:
-      - "50010:50010"
+      - "60010:60010"
   tianze-exam:
     build:
       context: ./exam/exam-service
       args:
         JAVA_OPTS: '-Xmn256M -Xmx1024M'
-        RUN_ARGS: '--spring.profiles.active=pro --spring.cloud.nacos.server-addr=172.19.255.105:8848'
-    image: alient/tianze:exam
-    container_name: exam
+        RUN_ARGS: '--spring.profiles.active=sale --spring.cloud.nacos.server-addr=172.19.255.105:8848'
+    image: alient/tianze:exam-sale
+    container_name: exam-sale
     restart: always
     volumes:
       - /tmp/logs/exam:/root/tianze/logs/exam
     networks:
       - tianze
     ports:
-      - "50013:50013"
+      - "60013:60013"
   tianze-competition:
     build:
       context: ./competition/competition-service
       args:
         JAVA_OPTS: '-Xmn256M -Xmx2048M'
-        RUN_ARGS: '--spring.profiles.active=pro --spring.cloud.nacos.server-addr=172.19.255.105:8848'
-    image: alient/tianze:competition
-    container_name: competition
+        RUN_ARGS: '--spring.profiles.active=sale --spring.cloud.nacos.server-addr=172.19.255.105:8848'
+    image: alient/tianze:competition-sale
+    container_name: competition-sale
     restart: always
     volumes:
       - /tmp/logs/competition:/root/tianze/logs/competition
     networks:
       - tianze
     ports:
-      - "50012:50012"
+      - "60012:60012"
 networks:
   tianze:
     driver: bridge
\ No newline at end of file
diff --git a/tz/exam/exam-service/Dockerfile b/tz/exam/exam-service/Dockerfile
index 6604924..b06f750 100644
--- a/tz/exam/exam-service/Dockerfile
+++ b/tz/exam/exam-service/Dockerfile
@@ -2,7 +2,7 @@ FROM daocloud.io/library/java:8-jre-alpine
 MAINTAINER tianze
 ARG JAVA_OPTS="-Xmx128M"
 ENV JAVA_OPTS=$JAVA_OPTS
-ARG RUN_ARGS="--spring.profiles.active=pro --spring.cloud.nacos.server-addr=172.19.255.105:8848"
+ARG RUN_ARGS="--spring.profiles.active=sale --spring.cloud.nacos.server-addr=172.19.255.105:8848"
 ENV RUN_ARGS=$RUN_ARGS
 ADD target/tianze-exam.jar /exam-service.jar
 ENTRYPOINT ["sh","-c","java $JAVA_OPTS -jar /exam-service.jar $RUN_ARGS"]
diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/entity/Course.java b/tz/exam/exam-service/src/main/java/com/tz/platform/entity/Course.java
index b89df69..bdebd5d 100644
--- a/tz/exam/exam-service/src/main/java/com/tz/platform/entity/Course.java
+++ b/tz/exam/exam-service/src/main/java/com/tz/platform/entity/Course.java
@@ -8,7 +8,7 @@ import java.util.Date;
 
 @Entity
 @Data
-@Table(indexes = {@Index(columnList = "name")})
+@Table(name = "course_sale",indexes = {@Index(columnList = "name")})
 public class Course  implements Serializable {
     @Id
     @GeneratedValue(strategy= GenerationType.IDENTITY)
diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/entity/CourseCat.java b/tz/exam/exam-service/src/main/java/com/tz/platform/entity/CourseCat.java
index 433185b..6016e5c 100644
--- a/tz/exam/exam-service/src/main/java/com/tz/platform/entity/CourseCat.java
+++ b/tz/exam/exam-service/src/main/java/com/tz/platform/entity/CourseCat.java
@@ -6,7 +6,7 @@ import javax.persistence.*;
 
 @Entity
 @Data
-@Table(indexes = {@Index(columnList = "name")})
+@Table(name = "couse_cat_sale",indexes = {@Index(columnList = "name")})
 public class CourseCat {
     @Id
     @GeneratedValue(strategy= GenerationType.IDENTITY)
diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/entity/CourseTag.java b/tz/exam/exam-service/src/main/java/com/tz/platform/entity/CourseTag.java
index 27ccab6..7cb7ccc 100644
--- a/tz/exam/exam-service/src/main/java/com/tz/platform/entity/CourseTag.java
+++ b/tz/exam/exam-service/src/main/java/com/tz/platform/entity/CourseTag.java
@@ -2,13 +2,11 @@ package com.tz.platform.entity;
 
 import lombok.Data;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
 
 @Entity
 @Data
+@Table(name = "course_sale")
 public class CourseTag {
     @Id
     @GeneratedValue(strategy= GenerationType.IDENTITY)
diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/entity/Question.java b/tz/exam/exam-service/src/main/java/com/tz/platform/entity/Question.java
index 70ce31b..0b963bd 100644
--- a/tz/exam/exam-service/src/main/java/com/tz/platform/entity/Question.java
+++ b/tz/exam/exam-service/src/main/java/com/tz/platform/entity/Question.java
@@ -13,7 +13,7 @@ import java.util.Date;
 import java.util.List;
 
 @Entity
-@Table(name = "question",indexes = {@Index(columnList = "stem"),@Index(columnList = "type"),@Index(columnList = "courseId,questionType,levelId"),@Index(columnList = "userNo")})
+@Table(name = "question_sale",indexes = {@Index(columnList = "stem"),@Index(columnList = "type"),@Index(columnList = "courseId,questionType,levelId"),@Index(columnList = "userNo")})
 @Data
 @TypeDef(name = "json", typeClass = JsonStringType.class)
 public class Question {
diff --git a/tz/exam/exam-service/src/main/resources/bootstrap.yml b/tz/exam/exam-service/src/main/resources/bootstrap.yml
index 96a5d66..10d7984 100644
--- a/tz/exam/exam-service/src/main/resources/bootstrap.yml
+++ b/tz/exam/exam-service/src/main/resources/bootstrap.yml
@@ -1,10 +1,10 @@
 server:
-  port: 50013
+  port: 60013
 spring:
   application:
     name: tz-exam-service
   profiles:
-    active: dev
+    active: sale
   cloud:
     nacos:
       server-addr: 127.0.0.1:8848
diff --git a/tz/gateway/Dockerfile b/tz/gateway/Dockerfile
index c4dc76d..889ccae 100644
--- a/tz/gateway/Dockerfile
+++ b/tz/gateway/Dockerfile
@@ -2,7 +2,7 @@ FROM daocloud.io/library/java:8-jre-alpine
 MAINTAINER tianze
 ARG JAVA_OPTS="-Xmn256M -Xmx1024M"
 ENV JAVA_OPTS=$JAVA_OPTS
-ARG RUN_ARGS="--spring.profiles.active=pro --spring.cloud.nacos.server-addr=172.19.255.105:8848"
+ARG RUN_ARGS="--spring.profiles.active=sale --spring.cloud.nacos.server-addr=172.19.255.105:8848"
 ENV RUN_ARGS=$RUN_ARGS
 ADD target/tianze-gateway.jar /gateway-service.jar
 ENTRYPOINT ["sh","-c","java $JAVA_OPTS -jar /gateway-service.jar $RUN_ARGS"]
diff --git a/tz/gateway/src/main/resources/bootstrap.yml b/tz/gateway/src/main/resources/bootstrap.yml
index 71dbc38..4b0dea6 100644
--- a/tz/gateway/src/main/resources/bootstrap.yml
+++ b/tz/gateway/src/main/resources/bootstrap.yml
@@ -12,6 +12,6 @@ spring:
         file-extension: yaml
         namespace: ${spring.profiles.active}
   profiles:
-    active: dev
+    active: sale
 server:
-  port: 50010
\ No newline at end of file
+  port: 60010
\ No newline at end of file
diff --git a/tz/gateway/target/classes/META-INF/build-info.properties b/tz/gateway/target/classes/META-INF/build-info.properties
index 2f5991a..3b9adde 100644
--- a/tz/gateway/target/classes/META-INF/build-info.properties
+++ b/tz/gateway/target/classes/META-INF/build-info.properties
@@ -1,5 +1,5 @@
 build.artifact=gateway
 build.group=com.tz
 build.name=gateway
-build.time=2022-06-16T05\:40\:57.634Z
+build.time=2022-08-25T14\:09\:03.001Z
 build.version=1.0-SNAPSHOT
diff --git a/tz/gateway/target/classes/bootstrap.yml b/tz/gateway/target/classes/bootstrap.yml
index 71dbc38..4b0dea6 100644
--- a/tz/gateway/target/classes/bootstrap.yml
+++ b/tz/gateway/target/classes/bootstrap.yml
@@ -12,6 +12,6 @@ spring:
         file-extension: yaml
         namespace: ${spring.profiles.active}
   profiles:
-    active: dev
+    active: sale
 server:
-  port: 50010
\ No newline at end of file
+  port: 60010
\ No newline at end of file
diff --git a/tz/gateway/target/maven-archiver/pom.properties b/tz/gateway/target/maven-archiver/pom.properties
index fa598aa..c85e352 100644
--- a/tz/gateway/target/maven-archiver/pom.properties
+++ b/tz/gateway/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Jun 16 13:41:15 CST 2022
+#Thu Aug 25 22:09:13 CST 2022
 version=1.0-SNAPSHOT
 groupId=com.tz
 artifactId=gateway
diff --git a/tz/gateway/target/tianze-gateway.jar.original b/tz/gateway/target/tianze-gateway.jar.original
index ffd2a94d30f19e965208a553f27f6f7388e29df7..daf06c7a7bcd3bb43898def1b668884a34a90cb6 100644
GIT binary patch
delta 6483
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

delta 6500
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

diff --git a/tz/system/system-feign/src/main/java/com/tz/platform/feign/IFeignGrade.java b/tz/system/system-feign/src/main/java/com/tz/platform/feign/IFeignGrade.java
new file mode 100644
index 0000000..9cb6222
--- /dev/null
+++ b/tz/system/system-feign/src/main/java/com/tz/platform/feign/IFeignGrade.java
@@ -0,0 +1,20 @@
+package com.tz.platform.feign;
+
+import com.tz.platform.feign.vo.GradeVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.List;
+
+@FeignClient(value = "tz-system-service")
+public interface IFeignGrade {
+    @RequestMapping(value = "/feign/system/grade/getByOuterId")
+    GradeVo getByOuterId(@RequestBody Integer outerId);
+
+    @RequestMapping(value = "/feign/system/grade/save")
+    GradeVo saveGrade(@RequestBody GradeVo vo);
+
+    @RequestMapping(value = "/feign/system/grade/saveAll")
+    void saveAllGrade(@RequestBody List<GradeVo> gradeVoList);
+}
diff --git a/tz/system/system-feign/src/main/java/com/tz/platform/feign/IFeignSchool.java b/tz/system/system-feign/src/main/java/com/tz/platform/feign/IFeignSchool.java
new file mode 100644
index 0000000..6b12e63
--- /dev/null
+++ b/tz/system/system-feign/src/main/java/com/tz/platform/feign/IFeignSchool.java
@@ -0,0 +1,18 @@
+package com.tz.platform.feign;
+
+import com.tz.platform.feign.vo.SchoolVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.List;
+
+
+@FeignClient(value = "tz-system-service")
+public interface IFeignSchool {
+    @RequestMapping(value = "/feign/system/school/getByOuterId")
+    SchoolVo getByOuterId(@RequestBody Integer outerId);
+
+    @RequestMapping(value = "/feign/system/school/list")
+    List<SchoolVo> list();
+}
diff --git a/tz/system/system-feign/src/main/java/com/tz/platform/feign/IFeignStudentLevel.java b/tz/system/system-feign/src/main/java/com/tz/platform/feign/IFeignStudentLevel.java
index 922db59..f6d9f7e 100644
--- a/tz/system/system-feign/src/main/java/com/tz/platform/feign/IFeignStudentLevel.java
+++ b/tz/system/system-feign/src/main/java/com/tz/platform/feign/IFeignStudentLevel.java
@@ -2,6 +2,7 @@ package com.tz.platform.feign;
 
 import com.tz.platform.feign.vo.StudentLevelVo;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.util.List;
@@ -10,4 +11,7 @@ import java.util.List;
 public interface IFeignStudentLevel {
     @RequestMapping(value = "/feign/system/level/list")
     List<StudentLevelVo> list();
+
+    @RequestMapping(value = "/feign/system/level/getByOuterId")
+    StudentLevelVo getByOuterId(@RequestBody Integer outerId);
 }
diff --git a/tz/system/system-feign/src/main/java/com/tz/platform/feign/vo/GradeVo.java b/tz/system/system-feign/src/main/java/com/tz/platform/feign/vo/GradeVo.java
new file mode 100644
index 0000000..798a4f3
--- /dev/null
+++ b/tz/system/system-feign/src/main/java/com/tz/platform/feign/vo/GradeVo.java
@@ -0,0 +1,15 @@
+package com.tz.platform.feign.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class GradeVo {
+    private String classNo;
+    private String name;
+    private Date createTime;
+    private Long userNo;
+    private Integer schoolId;
+    private Integer outerId;
+}
diff --git a/tz/system/system-feign/src/main/java/com/tz/platform/feign/vo/SchoolVo.java b/tz/system/system-feign/src/main/java/com/tz/platform/feign/vo/SchoolVo.java
new file mode 100644
index 0000000..73d681a
--- /dev/null
+++ b/tz/system/system-feign/src/main/java/com/tz/platform/feign/vo/SchoolVo.java
@@ -0,0 +1,17 @@
+package com.tz.platform.feign.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SchoolVo {
+    private Integer id;
+    private String name;
+    private Integer provinceId;
+    private String province;
+    private Integer levelId;
+    private String level;
+    private Date createTime;
+    private Integer outerId;
+}
diff --git a/tz/system/system-feign/src/main/java/com/tz/platform/feign/vo/StudentLevelVo.java b/tz/system/system-feign/src/main/java/com/tz/platform/feign/vo/StudentLevelVo.java
index 53f2ed1..b286e12 100644
--- a/tz/system/system-feign/src/main/java/com/tz/platform/feign/vo/StudentLevelVo.java
+++ b/tz/system/system-feign/src/main/java/com/tz/platform/feign/vo/StudentLevelVo.java
@@ -8,4 +8,5 @@ import java.io.Serializable;
 public class StudentLevelVo implements Serializable {
     private Integer id;
     private String name;
+    private Integer outerId;
 }
diff --git a/tz/system/system-service/src/main/java/com/tz/platform/entity/Grade.java b/tz/system/system-service/src/main/java/com/tz/platform/entity/Grade.java
index f785a84..4b15333 100644
--- a/tz/system/system-service/src/main/java/com/tz/platform/entity/Grade.java
+++ b/tz/system/system-service/src/main/java/com/tz/platform/entity/Grade.java
@@ -4,10 +4,12 @@ import lombok.Data;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Table;
 import java.util.Date;
 
 @Entity
 @Data
+@Table(name = "grade_sale")
 public class Grade {
     @Id
     private String classNo;
@@ -15,4 +17,5 @@ public class Grade {
     private Date createTime;
     private Long userNo;
     private Integer schoolId;
+    private Integer outerId;
 }
\ No newline at end of file
diff --git a/tz/system/system-service/src/main/java/com/tz/platform/entity/Menu.java b/tz/system/system-service/src/main/java/com/tz/platform/entity/Menu.java
index 8d431d6..19e2cc7 100644
--- a/tz/system/system-service/src/main/java/com/tz/platform/entity/Menu.java
+++ b/tz/system/system-service/src/main/java/com/tz/platform/entity/Menu.java
@@ -2,13 +2,11 @@ package com.tz.platform.entity;
 
 import lombok.Data;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
 
 @Entity
 @Data
+@Table(name = "menu_sale")
 public class Menu {
     @Id
     @GeneratedValue(strategy= GenerationType.IDENTITY)
diff --git a/tz/system/system-service/src/main/java/com/tz/platform/entity/Province.java b/tz/system/system-service/src/main/java/com/tz/platform/entity/Province.java
index 90b9bab..c0fe5d7 100644
--- a/tz/system/system-service/src/main/java/com/tz/platform/entity/Province.java
+++ b/tz/system/system-service/src/main/java/com/tz/platform/entity/Province.java
@@ -2,10 +2,7 @@ package com.tz.platform.entity;
 
 import lombok.Data;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
 
 @Entity
 @Data
diff --git a/tz/system/system-service/src/main/java/com/tz/platform/entity/School.java b/tz/system/system-service/src/main/java/com/tz/platform/entity/School.java
index d122410..59a7a73 100644
--- a/tz/system/system-service/src/main/java/com/tz/platform/entity/School.java
+++ b/tz/system/system-service/src/main/java/com/tz/platform/entity/School.java
@@ -20,4 +20,5 @@ public class School {
     private Integer levelId;
     private String level;
     private Date createTime;
+    private Integer outerId;
 }
diff --git a/tz/system/system-service/src/main/java/com/tz/platform/entity/StudentLevel.java b/tz/system/system-service/src/main/java/com/tz/platform/entity/StudentLevel.java
index 5f17a87..de1ad68 100644
--- a/tz/system/system-service/src/main/java/com/tz/platform/entity/StudentLevel.java
+++ b/tz/system/system-service/src/main/java/com/tz/platform/entity/StudentLevel.java
@@ -14,7 +14,6 @@ public class StudentLevel {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Integer id;
-
     private String name;
-
+    private Integer outerId;
 }
diff --git a/tz/system/system-service/src/main/java/com/tz/platform/repository/GradeDao.java b/tz/system/system-service/src/main/java/com/tz/platform/repository/GradeDao.java
index 93b6faa..60caac6 100644
--- a/tz/system/system-service/src/main/java/com/tz/platform/repository/GradeDao.java
+++ b/tz/system/system-service/src/main/java/com/tz/platform/repository/GradeDao.java
@@ -10,4 +10,5 @@ import java.util.List;
 public interface GradeDao extends JpaRepository<Grade,String> {
     Grade getByClassNo(String classNo);
     List<Grade> findByName(String name);
+    Grade getByOuterId(Integer outerId);
 }
diff --git a/tz/system/system-service/src/main/java/com/tz/platform/repository/SchoolDao.java b/tz/system/system-service/src/main/java/com/tz/platform/repository/SchoolDao.java
index 4f57897..3389055 100644
--- a/tz/system/system-service/src/main/java/com/tz/platform/repository/SchoolDao.java
+++ b/tz/system/system-service/src/main/java/com/tz/platform/repository/SchoolDao.java
@@ -13,4 +13,5 @@ public interface SchoolDao extends JpaRepository<School,Integer> {
     School getById(Integer id);
     List<School> findByName(String name);
     Page<School> findById(Integer id, Pageable pageable);
+    School getByOuterId(Integer outerId);
 }
diff --git a/tz/system/system-service/src/main/java/com/tz/platform/repository/StudentLevelDao.java b/tz/system/system-service/src/main/java/com/tz/platform/repository/StudentLevelDao.java
index e284569..933f9b2 100644
--- a/tz/system/system-service/src/main/java/com/tz/platform/repository/StudentLevelDao.java
+++ b/tz/system/system-service/src/main/java/com/tz/platform/repository/StudentLevelDao.java
@@ -6,4 +6,5 @@ import org.springframework.stereotype.Repository;
 
 @Repository
 public interface StudentLevelDao extends JpaRepository<StudentLevel,Integer> {
+    StudentLevel getByOuterId(Integer outerId);
 }
diff --git a/tz/system/system-service/src/main/java/com/tz/platform/system/api/SystemController.java b/tz/system/system-service/src/main/java/com/tz/platform/system/api/SystemController.java
index d37309a..9f9f21e 100644
--- a/tz/system/system-service/src/main/java/com/tz/platform/system/api/SystemController.java
+++ b/tz/system/system-service/src/main/java/com/tz/platform/system/api/SystemController.java
@@ -1,14 +1,16 @@
 package com.tz.platform.system.api;
 
+import com.tz.platform.common.core.api.ZhiYunApi;
 import com.tz.platform.common.core.base.Result;
 import com.tz.platform.system.pc.biz.PCProvinceBiz;
 import com.tz.platform.system.pc.biz.PCStudentLevelBiz;
+import com.tz.platform.system.pc.biz.SchoolBiz;
 import com.tz.platform.system.pc.dto.ListStudentLevelDTO;
 import com.tz.platform.system.pc.dto.ProvinceDTO;
+import com.tz.platform.system.pc.dto.SchoolDTO;
+import com.tz.platform.system.pc.vo.SchoolVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/api/system")
@@ -20,6 +22,9 @@ public class SystemController {
     @Autowired
     private PCStudentLevelBiz pcStudentLevelBiz;
 
+    @Autowired
+    private SchoolBiz schoolBiz;
+
 
     @GetMapping(value = "province")
     public Result<ProvinceDTO> provinceList(){
@@ -33,4 +38,8 @@ public class SystemController {
         return  pcStudentLevelBiz.list();
     }
 
+    @RequestMapping(value="school",method = RequestMethod.GET)
+    public Result<SchoolDTO> addSchool(@RequestParam("id") Integer id,@RequestParam("name") String name,@RequestParam("level") Integer level,@RequestParam("province") String province){
+        return schoolBiz.save(id,name,level);
+    }
 }
diff --git a/tz/system/system-service/src/main/java/com/tz/platform/system/feign/FeigGradeController.java b/tz/system/system-service/src/main/java/com/tz/platform/system/feign/FeigGradeController.java
new file mode 100644
index 0000000..de42e32
--- /dev/null
+++ b/tz/system/system-service/src/main/java/com/tz/platform/system/feign/FeigGradeController.java
@@ -0,0 +1,45 @@
+package com.tz.platform.system.feign;
+
+import cn.hutool.core.lang.UUID;
+import com.tz.platform.common.core.tools.BeanUtils;
+import com.tz.platform.entity.Grade;
+import com.tz.platform.feign.IFeignGrade;
+import com.tz.platform.feign.vo.GradeVo;
+import com.tz.platform.repository.GradeDao;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+public class FeigGradeController implements IFeignGrade {
+
+    @Autowired
+    private GradeDao gradeDao;
+
+    @Override
+    public GradeVo getByOuterId(Integer outerId) {
+        Grade grade = gradeDao.getByOuterId(outerId);
+        return BeanUtils.copyProperties(grade,GradeVo.class);
+    }
+
+    @Override
+    public GradeVo saveGrade(GradeVo vo) {
+        Grade grade = BeanUtils.copyProperties(vo,Grade.class);
+        grade =  gradeDao.save(grade);
+        return BeanUtils.copyProperties(grade,GradeVo.class);
+    }
+
+    @Override
+    public void saveAllGrade(List<GradeVo> gradeVoList) {
+        List<Grade> gradeList = BeanUtils.copyProperties(gradeVoList,Grade.class);
+        gradeList.forEach(grade -> {
+            if(StringUtils.isEmpty(grade.getClassNo())){
+                grade.setClassNo(UUID.fastUUID().toString(true));
+            }
+        });
+        gradeDao.saveAll(gradeList);
+    }
+
+}
diff --git a/tz/system/system-service/src/main/java/com/tz/platform/system/feign/FeignSchoolController.java b/tz/system/system-service/src/main/java/com/tz/platform/system/feign/FeignSchoolController.java
new file mode 100644
index 0000000..5bd837a
--- /dev/null
+++ b/tz/system/system-service/src/main/java/com/tz/platform/system/feign/FeignSchoolController.java
@@ -0,0 +1,32 @@
+package com.tz.platform.system.feign;
+
+import com.tz.platform.common.core.tools.BeanUtils;
+import com.tz.platform.entity.School;
+import com.tz.platform.feign.IFeignSchool;
+import com.tz.platform.feign.vo.SchoolVo;
+import com.tz.platform.repository.SchoolDao;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+@RestController
+public class FeignSchoolController implements IFeignSchool {
+
+    @Autowired
+    private SchoolDao schoolDao ;
+    @Override
+    public SchoolVo getByOuterId(Integer outerId) {
+        School school = schoolDao.getByOuterId(outerId);
+        SchoolVo schoolVo = BeanUtils.copyProperties(school,SchoolVo.class);
+        return schoolVo;
+    }
+
+    @Override
+    public List<SchoolVo> list() {
+        List<School> schoolList = schoolDao.findAll();
+        List<SchoolVo> vo = BeanUtils.copyProperties(schoolList,SchoolVo.class);
+        return vo;
+    }
+}
diff --git a/tz/system/system-service/src/main/java/com/tz/platform/system/feign/FeignStudentLevelController.java b/tz/system/system-service/src/main/java/com/tz/platform/system/feign/FeignStudentLevelController.java
index b112992..44a1fa4 100644
--- a/tz/system/system-service/src/main/java/com/tz/platform/system/feign/FeignStudentLevelController.java
+++ b/tz/system/system-service/src/main/java/com/tz/platform/system/feign/FeignStudentLevelController.java
@@ -18,4 +18,9 @@ public class FeignStudentLevelController implements IFeignStudentLevel {
     public List<StudentLevelVo> list() {
         return feignStudentLevelBiz.list();
     }
+
+    @Override
+    public StudentLevelVo getByOuterId(Integer outerId) {
+        return feignStudentLevelBiz.getByOuterId(outerId);
+    }
 }
diff --git a/tz/system/system-service/src/main/java/com/tz/platform/system/feign/biz/FeignStudentLevelBiz.java b/tz/system/system-service/src/main/java/com/tz/platform/system/feign/biz/FeignStudentLevelBiz.java
index b2ed4a4..1306652 100644
--- a/tz/system/system-service/src/main/java/com/tz/platform/system/feign/biz/FeignStudentLevelBiz.java
+++ b/tz/system/system-service/src/main/java/com/tz/platform/system/feign/biz/FeignStudentLevelBiz.java
@@ -19,4 +19,9 @@ public class FeignStudentLevelBiz {
         List<StudentLevelVo> rs = BeanUtils.copyProperties(studentLevels,StudentLevelVo.class);
         return rs;
     }
+    public StudentLevelVo getByOuterId(Integer outerId){
+        StudentLevel studentLevel = studentLevelDao.getByOuterId(outerId);
+        StudentLevelVo vo =  BeanUtils.copyProperties(studentLevel,StudentLevelVo.class);
+        return vo;
+    }
 }
diff --git a/tz/system/system-service/src/main/java/com/tz/platform/system/pc/biz/GradeBiz.java b/tz/system/system-service/src/main/java/com/tz/platform/system/pc/biz/GradeBiz.java
index 2340bf2..0256e40 100644
--- a/tz/system/system-service/src/main/java/com/tz/platform/system/pc/biz/GradeBiz.java
+++ b/tz/system/system-service/src/main/java/com/tz/platform/system/pc/biz/GradeBiz.java
@@ -54,6 +54,7 @@ public class GradeBiz {
             grade.setCreateTime(new Date());
             grade.setUserNo(vo.getUserNo());
             grade.setSchoolId(userVo.getSchoolId());
+            grade.setOuterId(0);
         }
         if(grade == null){
             return  Result.error("班级名称不能为空");
diff --git a/tz/system/system-service/src/main/java/com/tz/platform/system/pc/biz/SchoolBiz.java b/tz/system/system-service/src/main/java/com/tz/platform/system/pc/biz/SchoolBiz.java
index 6899d33..68e01f4 100644
--- a/tz/system/system-service/src/main/java/com/tz/platform/system/pc/biz/SchoolBiz.java
+++ b/tz/system/system-service/src/main/java/com/tz/platform/system/pc/biz/SchoolBiz.java
@@ -1,12 +1,15 @@
 package com.tz.platform.system.pc.biz;
 
+import com.tz.platform.common.core.api.ZhiYunApi;
 import com.tz.platform.common.core.base.Result;
 import com.tz.platform.common.core.enmus.UserTypeEnum;
 import com.tz.platform.common.core.tools.BeanUtils;
 import com.tz.platform.entity.Grade;
 import com.tz.platform.entity.School;
+import com.tz.platform.feign.IFeignStudentLevel;
 import com.tz.platform.feign.user.IFeignUser;
 import com.tz.platform.feign.user.vo.UserVo;
+import com.tz.platform.feign.vo.StudentLevelVo;
 import com.tz.platform.repository.SchoolDao;
 import com.tz.platform.system.pc.dto.ListGradeDTO;
 import com.tz.platform.system.pc.dto.ListSchoolDTO;
@@ -28,6 +31,11 @@ public class SchoolBiz {
     @Autowired
     private IFeignUser feignUser;
 
+    private ZhiYunApi zhiYunApi = new ZhiYunApi();
+
+    @Autowired
+    private IFeignStudentLevel feignStudentLevel;
+
     public Result<SchoolDTO> save(SchoolVO vo){
 
         UserVo user = feignUser.getByUserNo(vo.getUserNo());
@@ -63,6 +71,42 @@ public class SchoolBiz {
         return Result.success(dto);
     }
 
+    public Result<SchoolDTO> save(Integer outerId,String name,Integer level){
+        StudentLevelVo studentLevelVo =null;
+        if(level == null){
+            return Result.error("学生成次不能为空");
+        }
+        try {
+            studentLevelVo = feignStudentLevel.getByOuterId(level);
+        }catch (Exception ex){
+            return Result.error("学生成次未做对应");
+        }
+        if(studentLevelVo == null){
+            return Result.error("学生成次未做对应");
+        }
+
+        if(StringUtils.isEmpty(name)){
+            return Result.error("学校名称不能为空");
+        }
+
+        School school = schoolDao.getByOuterId(outerId);
+        if(school==null){
+            school = new School();
+            school.setCreateTime(new Date());
+            school.setProvince("");
+            school.setProvinceId(0);
+
+        }
+        school.setLevel(studentLevelVo.getName());
+        school.setLevelId(studentLevelVo.getId());
+        school.setName(name);
+        school.setOuterId(outerId);
+        school =schoolDao.save(school);
+        SchoolDTO dto = BeanUtils.copyProperties(school,SchoolDTO.class);
+
+      return  Result.success(dto);
+    }
+
     public Result<ListSchoolDTO> list(SchoolVO vo){
         UserVo userVo = feignUser.getByUserNo(vo.getUserNo());
         Integer pageNo = vo.getPageNo();
diff --git a/tz/system/system-service/src/main/java/com/tz/platform/system/pc/dto/SchoolDTO.java b/tz/system/system-service/src/main/java/com/tz/platform/system/pc/dto/SchoolDTO.java
index 1386c03..7e50a13 100644
--- a/tz/system/system-service/src/main/java/com/tz/platform/system/pc/dto/SchoolDTO.java
+++ b/tz/system/system-service/src/main/java/com/tz/platform/system/pc/dto/SchoolDTO.java
@@ -12,4 +12,5 @@ public class SchoolDTO implements Serializable {
     private String province;
     private Integer levelId;
     private String level;
+    private Integer outerId;
 }
diff --git a/tz/system/system-service/src/main/java/com/tz/platform/system/pc/vo/StudentLevelVO.java b/tz/system/system-service/src/main/java/com/tz/platform/system/pc/vo/StudentLevelVO.java
index 010efa5..b73370b 100644
--- a/tz/system/system-service/src/main/java/com/tz/platform/system/pc/vo/StudentLevelVO.java
+++ b/tz/system/system-service/src/main/java/com/tz/platform/system/pc/vo/StudentLevelVO.java
@@ -6,4 +6,5 @@ import lombok.Data;
 public class StudentLevelVO {
     private Integer id;
     private String name;
+    private Integer outerId;
 }
diff --git a/tz/system/system-service/src/main/resources/bootstrap.yml b/tz/system/system-service/src/main/resources/bootstrap.yml
index 9097e9f..5122db0 100644
--- a/tz/system/system-service/src/main/resources/bootstrap.yml
+++ b/tz/system/system-service/src/main/resources/bootstrap.yml
@@ -1,10 +1,10 @@
 server:
-  port: 50014
+  port: 60014
 spring:
   application:
     name: tz-system-service
   profiles:
-    active: dev
+    active: sale
   cloud:
     nacos:
       server-addr: 127.0.0.1:8848
diff --git a/tz/upload/upload-service/Dockerfile b/tz/upload/upload-service/Dockerfile
index 5bf25ea..a7e9ba5 100644
--- a/tz/upload/upload-service/Dockerfile
+++ b/tz/upload/upload-service/Dockerfile
@@ -2,7 +2,7 @@ FROM daocloud.io/library/java:8-jre-alpine
 MAINTAINER tianze
 ARG JAVA_OPTS="-Xmx128M"
 ENV JAVA_OPTS=$JAVA_OPTS
-ARG RUN_ARGS="--spring.profiles.active=pro --spring.cloud.nacos.server-addr=172.19.255.105:8848"
+ARG RUN_ARGS="--spring.profiles.active=sale --spring.cloud.nacos.server-addr=172.19.255.105:8848"
 ENV RUN_ARGS=$RUN_ARGS
 ADD target/tianze-upload.jar /upload-service.jar
 ENTRYPOINT ["sh","-c","java $JAVA_OPTS -jar /upload-service.jar $RUN_ARGS"]
diff --git a/tz/upload/upload-service/src/main/resources/bootstrap.yml b/tz/upload/upload-service/src/main/resources/bootstrap.yml
index b4f334a..67f42da 100644
--- a/tz/upload/upload-service/src/main/resources/bootstrap.yml
+++ b/tz/upload/upload-service/src/main/resources/bootstrap.yml
@@ -1,10 +1,10 @@
 server:
-  port: 50015
+  port: 60015
 spring:
   application:
     name: tz-upload-service
   profiles:
-    active: dev
+    active: sale
   cloud:
     nacos:
       server-addr: 127.0.0.1:8848
diff --git a/tz/user/user-service/Dockerfile b/tz/user/user-service/Dockerfile
index 57b4667..313a517 100644
--- a/tz/user/user-service/Dockerfile
+++ b/tz/user/user-service/Dockerfile
@@ -2,7 +2,7 @@ FROM daocloud.io/library/java:8-jre-alpine
 MAINTAINER tianze
 ARG JAVA_OPTS="-Xmx128M"
 ENV JAVA_OPTS=$JAVA_OPTS
-ARG RUN_ARGS="--spring.profiles.active=pro --spring.cloud.nacos.server-addr=172.19.255.105:8848"
+ARG RUN_ARGS="--spring.profiles.active=sale --spring.cloud.nacos.server-addr=172.19.255.105:8848"
 ENV RUN_ARGS=$RUN_ARGS
 ADD target/tianze-user.jar /user-service.jar
 ENTRYPOINT ["sh","-c","java $JAVA_OPTS -jar /user-service.jar $RUN_ARGS"]
diff --git a/tz/user/user-service/pom.xml b/tz/user/user-service/pom.xml
index 7541bda..926ecb2 100644
--- a/tz/user/user-service/pom.xml
+++ b/tz/user/user-service/pom.xml
@@ -39,6 +39,11 @@
             <artifactId>xlsx-streamer</artifactId>
             <version>2.1.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.security.oauth</groupId>
+            <artifactId>spring-security-oauth2</artifactId>
+            <version>2.3.5.RELEASE</version>
+        </dependency>
 
     </dependencies>
 
diff --git a/tz/user/user-service/src/main/java/com/tz/platform/UserServiceApplication.java b/tz/user/user-service/src/main/java/com/tz/platform/UserServiceApplication.java
index 01910d6..76191af 100644
--- a/tz/user/user-service/src/main/java/com/tz/platform/UserServiceApplication.java
+++ b/tz/user/user-service/src/main/java/com/tz/platform/UserServiceApplication.java
@@ -4,11 +4,13 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients(basePackages = "com.tz.platform.feign")
+@EnableScheduling
 public class UserServiceApplication {
     public static void main(String[] args) {
         SpringApplication.run(UserServiceApplication.class,args);
diff --git a/tz/user/user-service/src/main/java/com/tz/platform/config/MyResourceServerConfigurer.java b/tz/user/user-service/src/main/java/com/tz/platform/config/MyResourceServerConfigurer.java
new file mode 100644
index 0000000..b58740a
--- /dev/null
+++ b/tz/user/user-service/src/main/java/com/tz/platform/config/MyResourceServerConfigurer.java
@@ -0,0 +1,21 @@
+package com.tz.platform.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
+import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter;
+import org.springframework.security.oauth2.config.annotation.web.configurers.ResourceServerSecurityConfigurer;
+
+@Configuration
+@EnableResourceServer
+public class MyResourceServerConfigurer extends ResourceServerConfigurerAdapter {
+    @Override
+    public void configure(ResourceServerSecurityConfigurer resources) throws  Exception {
+        super.configure(resources);
+    }
+    @Override
+    public void configure(HttpSecurity http) throws Exception{
+        http.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and().authorizeRequests().antMatchers("/api/auth/**").authenticated();
+    }
+}
diff --git a/tz/user/user-service/src/main/java/com/tz/platform/config/MyauthorizationServerConfigurer.java b/tz/user/user-service/src/main/java/com/tz/platform/config/MyauthorizationServerConfigurer.java
new file mode 100644
index 0000000..103621a
--- /dev/null
+++ b/tz/user/user-service/src/main/java/com/tz/platform/config/MyauthorizationServerConfigurer.java
@@ -0,0 +1,44 @@
+package com.tz.platform.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer;
+import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter;
+import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer;
+import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer;
+import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer;
+
+@Configuration
+@EnableAuthorizationServer
+public class MyauthorizationServerConfigurer extends AuthorizationServerConfigurerAdapter {
+
+    @Autowired
+    private AuthenticationManager authenticationManager;
+    @Override
+    public void configure(AuthorizationServerSecurityConfigurer security) throws  Exception{
+        security.allowFormAuthenticationForClients();
+    }
+
+    @Override
+    public void configure(ClientDetailsServiceConfigurer clients) throws  Exception{
+        clients.inMemory()
+                .withClient("zhiyun")
+                .authorizedGrantTypes("client_credentials")
+                .scopes("all")
+                .secret("zhiyun2022");
+    }
+
+
+//    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+//
+//    }
+
+    @Override
+    public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception {
+        endpoints.authenticationManager(authenticationManager);
+        super.configure(endpoints);
+    }
+}
diff --git a/tz/user/user-service/src/main/java/com/tz/platform/config/WebSecurityConfig.java b/tz/user/user-service/src/main/java/com/tz/platform/config/WebSecurityConfig.java
new file mode 100644
index 0000000..09fce34
--- /dev/null
+++ b/tz/user/user-service/src/main/java/com/tz/platform/config/WebSecurityConfig.java
@@ -0,0 +1,32 @@
+package com.tz.platform.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+@Configuration
+@EnableWebSecurity
+public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
+    @Bean
+    public PasswordEncoder passwordEncoder(){
+        return new PasswordEncoder() {
+            @Override
+            public String encode(CharSequence charSequence) {
+                return charSequence.toString();
+            }
+
+            @Override
+            public boolean matches(CharSequence charSequence, String s) {
+                return s.equals(charSequence.toString());
+            }
+        };
+    }
+    @Override
+    @Bean
+    public AuthenticationManager authenticationManager() throws Exception{
+        return super.authenticationManager();
+    }
+}
diff --git a/tz/user/user-service/src/main/java/com/tz/platform/entity/LoginLog.java b/tz/user/user-service/src/main/java/com/tz/platform/entity/LoginLog.java
index 8a16784..ee12d17 100644
--- a/tz/user/user-service/src/main/java/com/tz/platform/entity/LoginLog.java
+++ b/tz/user/user-service/src/main/java/com/tz/platform/entity/LoginLog.java
@@ -2,14 +2,12 @@ package com.tz.platform.entity;
 
 import lombok.Data;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
 import java.util.Date;
 
 @Data
 @Entity
+@Table(name = "login_log_sale")
 public class LoginLog {
     @Id
     private Long id;
diff --git a/tz/user/user-service/src/main/java/com/tz/platform/entity/User.java b/tz/user/user-service/src/main/java/com/tz/platform/entity/User.java
index 7f25906..d08ac11 100644
--- a/tz/user/user-service/src/main/java/com/tz/platform/entity/User.java
+++ b/tz/user/user-service/src/main/java/com/tz/platform/entity/User.java
@@ -8,7 +8,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 @Entity
-@Table(name = "user",indexes = {@Index(columnList = "studentNo"),@Index(columnList = "school"),@Index(columnList = "username"),@Index(columnList = "name")})
+@Table(name = "user_sale",indexes = {@Index(columnList = "studentNo"),@Index(columnList = "school"),@Index(columnList = "username"),@Index(columnList = "name")})
 @Data
 public class User implements Serializable {
 
@@ -57,6 +57,10 @@ public class User implements Serializable {
 
     private String avatar;
 
+    private Integer classId;
+
+    private Integer outerId;
+
 
     private static final long serialVersionUID = 1L;
 
diff --git a/tz/user/user-service/src/main/java/com/tz/platform/user/api/OauthController.java b/tz/user/user-service/src/main/java/com/tz/platform/user/api/OauthController.java
new file mode 100644
index 0000000..2624e79
--- /dev/null
+++ b/tz/user/user-service/src/main/java/com/tz/platform/user/api/OauthController.java
@@ -0,0 +1,42 @@
+package com.tz.platform.user.api;
+
+import com.tz.platform.common.core.base.Result;
+import com.tz.platform.common.core.enmus.UserTypeEnum;
+import com.tz.platform.common.core.tools.JWTUtil;
+import com.tz.platform.entity.User;
+import com.tz.platform.repository.UserDao;
+import com.tz.platform.user.api.biz.ApiUserLoginBiz;
+import com.tz.platform.user.api.dto.OauthDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(value = "/api/auth")
+public class OauthController {
+
+    @Autowired
+    private ApiUserLoginBiz userLoginBiz;
+
+    @Autowired
+    private UserDao userDao;
+
+
+    @PostMapping("login")
+    public Result<OauthDTO> login(String uname, Integer uid){
+        OauthDTO oauthDTO = new OauthDTO();
+        User user =  userDao.getByUsername(uname);
+        if(user == null){
+            return  Result.error("用户不存在");
+        }
+        String token =JWTUtil.create(user.getId(),user.getUserType(), JWTUtil.DATE);
+        oauthDTO.setToken(token);
+        String baseUrl = "https://zqtzdss.sztzjy.com/index?token=";
+        if(user.getUserType() > UserTypeEnum.USER.getCode()){
+            baseUrl = "http://zqtzdst.sztzjy.com/#/login?token=";
+        }
+        oauthDTO.setUrl(baseUrl+token);
+        return Result.success(oauthDTO);
+    }
+}
diff --git a/tz/user/user-service/src/main/java/com/tz/platform/user/api/UserLoginController.java b/tz/user/user-service/src/main/java/com/tz/platform/user/api/UserLoginController.java
index 33c3368..22b35ae 100644
--- a/tz/user/user-service/src/main/java/com/tz/platform/user/api/UserLoginController.java
+++ b/tz/user/user-service/src/main/java/com/tz/platform/user/api/UserLoginController.java
@@ -24,6 +24,13 @@ public class UserLoginController extends BaseController {
         return apiUserLoginBiz.loginPassword(userLoginPasswordBO);
     }
 
+    @GetMapping(path = "info")
+    public Result<UserLoginDTO> info(){
+        Long userId =  getUserNo();
+        String ip = getRemoteIp();
+        return apiUserLoginBiz.loginByToken(userId,ip);
+    }
+
     @GetMapping(path = "out")
     public Result<String> loginOut(){
         return apiUserLoginBiz.loginOut(getUserNo());
diff --git a/tz/user/user-service/src/main/java/com/tz/platform/user/api/biz/ApiUserLoginBiz.java b/tz/user/user-service/src/main/java/com/tz/platform/user/api/biz/ApiUserLoginBiz.java
index 3562e14..f1e3613 100644
--- a/tz/user/user-service/src/main/java/com/tz/platform/user/api/biz/ApiUserLoginBiz.java
+++ b/tz/user/user-service/src/main/java/com/tz/platform/user/api/biz/ApiUserLoginBiz.java
@@ -98,6 +98,28 @@ public class ApiUserLoginBiz {
         return Result.success(dto);
     }
 
+    public Result<UserLoginDTO> loginByToken(Long userId,String ip){
+        User user =  userDao.getById(userId);
+        // 登录日志
+        LoginLog loginLog =  loginLog(LoginStatusEnum.SUCCESS, ip,user.getUsername(),"web",user.getId());
+        UserLoginDTO dto = new UserLoginDTO();
+        dto.setUserNo(user.getId());
+        dto.setUsername(user.getUsername());
+        dto.setName(user.getName());
+        dto.setSchool(user.getSchool());
+        dto.setLevelId(user.getLevelId());
+        dto.setEmail(user.getEmail());
+        dto.setClassName(user.getClassName());
+        dto.setMobile(user.getMobile());
+        dto.setIp(loginLog.getIp());
+        dto.setComplete(user.getComplete());
+        dto.setLocation(loginLog.getLocation());
+        dto.setLastLoginTime(loginLog.getLastTime());
+        dto.setToken(JWTUtil.create(user.getId(),user.getUserType(), JWTUtil.DATE));
+        dto.setClassName(user.getClassName());
+        return Result.success(dto);
+    }
+
     private LoginLog loginLog(LoginStatusEnum loginStatusEnum, String ip,String username,String clientType,Long userNo){
         LoginLog loginLog = loginLogDao.getById(userNo);
         String lastTime =  "";
diff --git a/tz/user/user-service/src/main/java/com/tz/platform/user/api/dto/OauthDTO.java b/tz/user/user-service/src/main/java/com/tz/platform/user/api/dto/OauthDTO.java
new file mode 100644
index 0000000..1949d26
--- /dev/null
+++ b/tz/user/user-service/src/main/java/com/tz/platform/user/api/dto/OauthDTO.java
@@ -0,0 +1,11 @@
+package com.tz.platform.user.api.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class OauthDTO implements Serializable {
+    private String url;
+    private String token;
+}
diff --git a/tz/user/user-service/src/main/java/com/tz/platform/zhiyun/ZhiyunJob.java b/tz/user/user-service/src/main/java/com/tz/platform/zhiyun/ZhiyunJob.java
new file mode 100644
index 0000000..33e3420
--- /dev/null
+++ b/tz/user/user-service/src/main/java/com/tz/platform/zhiyun/ZhiyunJob.java
@@ -0,0 +1,84 @@
+package com.tz.platform.zhiyun;
+
+import com.tz.platform.zhiyun.biz.ZhiyunAccountBiz;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisCallback;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Objects;
+
+@Component
+@Slf4j
+public class ZhiyunJob {
+
+    @Autowired
+    private ZhiyunAccountBiz zhiyunAccountBiz;
+
+    @Resource
+    private RedisTemplate redisTemplate;
+
+    /**
+     * 过期时间 毫秒
+     */
+    private long ms = 3600000;
+
+
+    /**
+     * 每分钟执行一次
+     */
+    @Scheduled(cron = "*/60 * * * * ?")
+    public void synStudent(){
+
+        String jobName = "zhiyunSynJob";
+        boolean lr = lock(jobName,ms);
+        if(lr){
+            try {
+                zhiyunAccountBiz.synGrade();
+                zhiyunAccountBiz.synAccountJob();
+            }catch (Exception ex){
+                log.error("大赛状态更新任务失败: {}",ex.getMessage());
+            }finally {
+                unLock(jobName);
+            }
+        }
+    }
+
+    /**
+     * 获取一个redis分布锁
+     *
+     * @param lockKey        锁住的key
+     * @param lockExpireMils 锁住的时长。如果超时未解锁，视为加锁线程死亡，其他线程可夺取锁
+     * @return
+     */
+    public boolean lock(String lockKey, long lockExpireMils) {
+        return (Boolean) redisTemplate.execute((RedisCallback) connection -> {
+            long nowTime = System.currentTimeMillis();
+            Boolean acquire = connection.setNX(lockKey.getBytes(), String.valueOf(nowTime + lockExpireMils + 1).getBytes());
+            if (acquire) {
+                return Boolean.TRUE;
+            } else {
+                byte[] value = connection.get(lockKey.getBytes());
+                if (Objects.nonNull(value) && value.length > 0) {
+                    long oldTime = Long.parseLong(new String(value));
+                    if (oldTime < nowTime) {
+                        //connection.getSet：返回这个key的旧值并设置新值。
+                        byte[] oldValue = connection.getSet(lockKey.getBytes(), String.valueOf(nowTime + lockExpireMils + 1).getBytes());
+                        //当key不存时会返回空，表示key不存在或者已在管道中使用
+                        return oldValue == null ? false : Long.parseLong(new String(oldValue)) < nowTime;
+                    }
+                }
+            }
+            return Boolean.FALSE;
+        });
+    }
+    public  void unLock(String key){
+        redisTemplate.execute((RedisCallback) redisConnection -> {
+            redisConnection.del(key.getBytes());
+            return true;
+        });
+    }
+}
diff --git a/tz/user/user-service/src/main/java/com/tz/platform/zhiyun/biz/ZhiyunAccountBiz.java b/tz/user/user-service/src/main/java/com/tz/platform/zhiyun/biz/ZhiyunAccountBiz.java
new file mode 100644
index 0000000..64c0014
--- /dev/null
+++ b/tz/user/user-service/src/main/java/com/tz/platform/zhiyun/biz/ZhiyunAccountBiz.java
@@ -0,0 +1,155 @@
+package com.tz.platform.zhiyun.biz;
+
+import cn.hutool.crypto.digest.DigestUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.tz.platform.common.core.api.ZhiYunApi;
+import com.tz.platform.common.core.config.SystemUtil;
+import com.tz.platform.common.core.enmus.UserTypeEnum;
+import com.tz.platform.common.core.tools.StrUtil;
+import com.tz.platform.entity.User;
+import com.tz.platform.feign.IFeignGrade;
+import com.tz.platform.feign.IFeignSchool;
+import com.tz.platform.feign.vo.GradeVo;
+import com.tz.platform.feign.vo.SchoolVo;
+import com.tz.platform.repository.UserDao;
+import org.apache.commons.collections4.list.GrowthList;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Component
+public class ZhiyunAccountBiz {
+    private ZhiYunApi zhiYunApi =new ZhiYunApi();
+
+    @Autowired
+    private IFeignSchool feignSchool ;
+
+    @Autowired
+    private IFeignGrade feignGrade ;
+
+    @Autowired
+    private UserDao userDao;
+
+    public void synAccountJob(){
+        List<SchoolVo>  schoolVoList = feignSchool.list();
+        schoolVoList.forEach(schoolVo -> {
+            String studentContent = zhiYunApi.findAllStudent(schoolVo.getOuterId());
+            dealStudent(studentContent,schoolVo);
+            String teacherCountent = zhiYunApi.findTeacherBySchoolId(schoolVo.getOuterId());
+            dealTeacher(teacherCountent,schoolVo);
+        });
+    }
+
+    public void synGrade(){
+        List<SchoolVo>  schoolVoList = feignSchool.list();
+        schoolVoList.forEach(schoolVo -> {
+            String gradeContent = zhiYunApi.findAllGrade(schoolVo.getOuterId());
+            dealGrade(gradeContent,schoolVo);
+        });
+    }
+
+    public void synQuestion(){
+        List<SchoolVo>  schoolVoList = feignSchool.list();
+        schoolVoList.forEach(schoolVo -> {
+
+        });
+    }
+
+
+    private void dealGrade(String content,SchoolVo school){
+        JSONObject jsonObject = JSONUtil.parseObj(content);
+        Integer code = jsonObject.getInt("code");
+        if(code == 200 ){
+            JSONArray jsonArray = jsonObject.getJSONArray("data");
+            List<GradeVo> gradeVoList = new ArrayList<>();
+            jsonArray.forEach(jo->{
+                JSONObject studentOb = (JSONObject)jo;
+                Integer outerId = studentOb.getInt("id");
+                String name = studentOb.getStr("name");
+                GradeVo vo = feignGrade.getByOuterId(outerId);
+                if(vo == null){
+                    vo = new GradeVo();
+                    vo.setCreateTime(new Date());
+                }
+                vo.setName(name);
+                vo.setOuterId(outerId);
+                vo.setUserNo(0L);
+                vo.setSchoolId(school.getId());
+                gradeVoList.add(vo);
+            });
+            feignGrade.saveAllGrade(gradeVoList);
+        }
+    }
+
+    private void dealStudent(String content,SchoolVo school){
+        JSONObject jsonObject = JSONUtil.parseObj(content);
+        Integer code = jsonObject.getInt("code");
+        if(code == 200 ){
+            JSONArray jsonArray = jsonObject.getJSONArray("data");
+            List<User> userList = new ArrayList<>();
+            jsonArray.forEach(jo->{
+                JSONObject studentOb = (JSONObject)jo;
+                Integer classId = studentOb.getInt("classId");
+                String studentNo = studentOb.getStr("studentNo");
+                String name = studentOb.getStr("name");
+                User user = dealUser(studentNo,name,classId,school,UserTypeEnum.USER.getCode());
+                userList.add(user);
+            });
+            userDao.saveAll(userList);
+        }
+
+    }
+
+    private User dealUser(String studentNo,String name,int classId,SchoolVo school,Integer userType){
+        User user =userDao.getByUsername(studentNo);
+        if(user == null){
+            user = new User();
+            user.setMobileSalt(StrUtil.get32UUID());
+            user.setMobilePsw(DigestUtil.sha1Hex(user.getMobileSalt() + SystemUtil.INIT_PASSWORD));
+        }
+        user.setSchoolId(school.getId());
+        user.setOuterId(0);
+        user.setSchool(school.getName());
+
+
+        //需要设置值
+        user.setClassName("");
+        user.setClassId(0);
+        GradeVo gradeVo = feignGrade.getByOuterId(classId);
+        if(gradeVo !=null){
+            user.setClassName(gradeVo.getName());
+            user.setClassId(gradeVo.getOuterId());
+        }
+        user.setLevelId(school.getLevelId());
+        user.setName(name);
+        user.setUsername(studentNo);
+        user.setStatusId(1);
+        user.setUserType(userType);
+        user.setStudentNo(studentNo);
+        return  user;
+    }
+
+    private void dealTeacher(String content,SchoolVo school){
+        JSONObject jsonObject = JSONUtil.parseObj(content);
+        Integer code = jsonObject.getInt("code");
+        if(code == 200 ){
+            JSONArray jsonArray = jsonObject.getJSONArray("data");
+            List<User> userList = new ArrayList<>();
+            jsonArray.forEach(jo->{
+                JSONObject studentOb = (JSONObject)jo;
+                String studentNo = studentOb.getStr("teacherNo");
+                String name = studentOb.getStr("name");
+                User user = dealUser(studentNo,name,0,school,UserTypeEnum.TEACHER.getCode());
+                userList.add(user);
+            });
+            userDao.saveAll(userList);
+        }
+    }
+
+
+}
diff --git a/tz/user/user-service/src/main/resources/bootstrap.yml b/tz/user/user-service/src/main/resources/bootstrap.yml
index bf0ae4c..65d1eeb 100644
--- a/tz/user/user-service/src/main/resources/bootstrap.yml
+++ b/tz/user/user-service/src/main/resources/bootstrap.yml
@@ -1,10 +1,10 @@
 server:
-  port: 50011
+  port: 60011
 spring:
   application:
     name: tz-user-service
   profiles:
-    active: dev
+    active: sale
   cloud:
     nacos:
       server-addr: 127.0.0.1:8848