修复无法查询归属地的bug

tyunh · Jul 15, 2020 · bd9cb3b · bd9cb3b
1 parent 4b72952
commit bd9cb3b
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 11 deletions.
diff --git a/docs/sql/zuihou_defaults.sql b/docs/sql/zuihou_defaults.sql
@@ -232,8 +232,8 @@ CREATE TABLE `d_global_user` (
 -- Records of d_global_user
 -- ----------------------------
 BEGIN;
-INSERT INTO `d_global_user` VALUES (1, 'admin', 'admin', '10086', '超级管理员', '244387066@qq.com', '1fdbcfb7a0a8c138c7eedbd205639853', b'1', '2019-08-29 16:50:35', 1, '2019-08-29 16:50:35', 1);
-INSERT INTO `d_global_user` VALUES (2, 'admin', 'demoAdmin', '10086', '超级管理员[演示]', '244387066@qq.com', 'd9d17d88918aa72834289edaf38f42e2', b'1', '2019-10-30 10:29:21', 1, '2019-10-30 10:29:23', 1);
+INSERT INTO `d_global_user` VALUES (1, 'admin', 'admin', '10086', '超级管理员', '306479353@qq.com', '1fdbcfb7a0a8c138c7eedbd205639853', b'1', '2019-08-29 16:50:35', 1, '2019-08-29 16:50:35', 1);
+INSERT INTO `d_global_user` VALUES (2, 'admin', 'demoAdmin', '10086', '超级管理员[演示]', '306479353@qq.com', 'd9d17d88918aa72834289edaf38f42e2', b'1', '2019-10-30 10:29:21', 1, '2019-10-30 10:29:23', 1);
 COMMIT;
 
 -- ----------------------------

diff --git a/pom.xml b/pom.xml
@@ -49,7 +49,7 @@
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
- <docker.image.prefix></docker.image.prefix>
+ <docker.image.prefix>zuihou</docker.image.prefix>
  <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
  <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
  <maven-javadoc-plugin.version>3.0.0</maven-javadoc-plugin.version>

diff --git a/zuihou-authority-server/Dockerfile b/zuihou-authority-server/Dockerfile
@@ -1,5 +1,5 @@
 FROM openjdk:8-jre
-MAINTAINER zuihou 244387066@qq.com
+MAINTAINER zuihou 306479353@qq.com
 
 RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
  && echo "Asia/Shanghai" > /etc/timezone

diff --git a/zuihou-authority-server/src/main/resources/application-docker.yml b/zuihou-authority-server/src/main/resources/application-docker.yml
@@ -0,0 +1,45 @@
+zuihou:
+ nginx:
+ ip: tangyh.top
+ port: 10000
+ redis:
+ ip: 127.0.0.1
+ port: 16379
+ password: SbtyMveYNfLzTks7H0apCmyStPzWJqjy
+ database: 0
+ rabbitmq:
+ enabled: false
+ ip: 127.0.0.1
+ port: 5672
+ username: zuihou
+ password: zuihou
+ mysql:
+ ip: 127.0.0.1
+ port: 3306
+ driverClassName: com.mysql.cj.jdbc.Driver
+ database: zuihou_defaults
+ username: root
+ password: root
+ database:
+ isNotWrite: true
+ swagger:
+ # 正式环境用nginx代理，为了保持和cloud版本一致的URL，特意调整
+ docket:
+ general:
+ base-path: /api/oauth
+ oauth:
+ base-path: /api/oauth
+ auth:
+ base-path: /api/authority
+ common:
+ base-path: /api/authority
+ core:
+ base-path: /api/authority
+ tenant:
+ base-path: /api/authority
+ sms:
+ base-path: /api/msgs
+ msgs:
+ base-path: /api/msgs
+ file:
+ base-path: /api/file
diff --git a/zuihou-authority-server/src/main/resources/application.yml b/zuihou-authority-server/src/main/resources/application.yml
@@ -69,12 +69,15 @@ zuihou:
  license: Powered By zuihou
  licenseUrl: https://github.com/zuihou
  termsOfServiceUrl: https://github.com/zuihou
- version: 2.2
- apiKeys:
- - name: 令牌
- keyname: token
- passAs: header
+ version: 2.4
  global-operation-parameters:
+ - name: token
+ description: 用户身份token
+ modelRef: String
+ parameterType: header
+ required: true
+ # 默认值只是方便本地开发时，少填参数，生产环境请禁用swagger或者禁用默认参数
+ defaultValue: "Bearer test"
  - name: Authorization
  description: 客户端信息
  modelRef: String
@@ -105,7 +108,7 @@ zuihou:
  base-package: com.github.zuihou.authority.controller.core
  tenant:
  title: 租户模块
- base-package: com.github.zuihou.authority.controller.defaults
+ base-package: com.github.zuihou.tenant.controller
  sms:
  title: 短信模块
  base-package: com.github.zuihou.sms.controller

diff --git a/zuihou-jobs/zuihou-jobs-server/Dockerfile b/zuihou-jobs/zuihou-jobs-server/Dockerfile
@@ -1,5 +1,5 @@
 FROM openjdk:8-jre
-MAINTAINER zuihou 244387066@qq.com
+MAINTAINER zuihou 306479353@qq.com
 
 RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
  && echo "Asia/Shanghai" > /etc/timezone