v3.5.0.GA

docker/docker-mysql/sql/init.sql

@@ -2,6 +2,6 @@ create database if not exists  `maxkey` /*!40100 DEFAULT CHARACTER SET utf8mb4 C
 
 use maxkey ;
 
-source /docker-entrypoint-initdb.d/v3.3.3.ga/maxkey_v3.3.3.GA.sql   ;
-source /docker-entrypoint-initdb.d/v3.3.3.ga/maxkey_v3.3.3.GA_data.sql   ;
+source /docker-entrypoint-initdb.d/v3.5.0.ga/maxkey_v3.5.0.GA.sql   ;
+source /docker-entrypoint-initdb.d/v3.5.0.ga/maxkey_v3.5.0.GA_data.sql   ;
  
\ No newline at end of file

docker/docker-mysql/sql/v2.9.0.ga/init_v2.9.0.ga.sql

- source /docker-entrypoint-initdb.d/maxkey_v2.9.0.GA.sql   ;
- source /docker-entrypoint-initdb.d/maxkey_v2.9.0.GA_data.sql   ;
- 
\ No newline at end of file

docker/docker-mysql/sql/v3.0.0.ga/init_v3.0.0.ga.sql

- source /docker-entrypoint-initdb.d/maxkey_v3.0.0.GA.sql   ;
- source /docker-entrypoint-initdb.d/maxkey_v3.0.0.GA_data.sql   ;
- 
\ No newline at end of file

docker/docker-mysql/sql/v3.1.0.ga/init.sql

-create database if not exists  `maxkey` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci */ /*!80016 DEFAULT ENCRYPTION='N' */ ;
-
-use maxkey ;
-
-source /docker-entrypoint-initdb.d/v3.1.0.ga/maxkey_v3.1.0.GA.sql   ;
-source /docker-entrypoint-initdb.d/v3.1.0.ga/maxkey_v3.1.0.GA_data.sql   ;
- 
\ No newline at end of file

sql/maxkey_v3.5.0.RC.sql → docker/docker-mysql/sql/v3.5.0.ga/maxkey_v3.5.0.GA.sql

@@ -1196,4 +1196,4 @@ CREATE TABLE `mxk_userinfo_adjunct` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2022-05-01  9:26:23
+-- Dump completed on 2022-05-05 21:46:26

docker/docker-nginx/Dockerfile

+#MaxKey nginx Proxy Docker Build
+
+FROM nginx
+
+COPY ./nginx.conf /etc/nginx/conf.d/default.conf
+
+
+#CMD ["nginx", "-g", "daemon off;"]
+

docker/docker-nginx/nginx.conf

+#MaxKey nginx Proxy Server
+
+server {
+    listen       80;
+
+    server_name  localhost;
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+        try_files $uri $uri/ /index.html;
+    }
+	
+	#服务器集群路径
+	#认证后端
+	location /sign/ {
+		proxy_pass http://192.168.0.104:9527/sign/;
+	}
+	
+	#认证前端
+	location /maxkey/ {
+		proxy_pass http://192.168.0.104:8527/maxkey/;
+	}
+	
+	#管理后端
+	location /maxkey-mgt-api/ {
+		proxy_pass http://192.168.0.104:9526/maxkey-mgt-api/;
+	}
+	
+	#管理前端
+	location /maxkey-mgt/ {
+		proxy_pass http://192.168.0.104:8526/maxkey-mgt/;
+	}
+
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+}
\ No newline at end of file

maxkey-web-frontend/maxkey-web-app/Dockerfile

+#MaxKey Frontend Docker Build
+
+FROM node:16.14.2
+
+LABEL authors="MaxKey <maxkeysupport@163.com>"
+
+WORKDIR /usr/src/app
+
+COPY package.json package.json
+
+RUN npm config set registry https://registry.npm.taobao.org \
+    && npm i
+
+COPY ./src  ./src
+RUN npm install -g @angular/cli
+
+RUN ng build --prod --base-href /maxkey/
+
+FROM nginx
+
+COPY ./nginx.conf /etc/nginx/conf.d/default.conf
+
+#RUN rm -rf /usr/share/nginx/html/*
+
+COPY  dist /usr/share/nginx/html/maxkey
+
+#CMD ["nginx", "-g", "daemon off;"]
+

maxkey-web-frontend/maxkey-web-app/angular.json

@@ -20,6 +20,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            "baseHref": "/maxkey/",
             "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",

maxkey-web-frontend/maxkey-web-app/nginx.conf

+#MaxKey Frontend Server
+server {
+    listen       8527;
+
+    server_name  localhost;
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+        try_files $uri $uri/ /index.html;
+    }
+
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+}
\ No newline at end of file

maxkey-web-frontend/maxkey-web-app/package.json

@@ -23,7 +23,7 @@
   "scripts": {
     "ng-high-memory": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng",
     "ng": "ng",
-    "start": "ng s -o",
+    "start": "ng s -o  --serve-path=/maxkey/ --port=8527",
     "hmr": "ng s -o --hmr",
     "build": "npm run ng-high-memory build",
     "analyze": "npm run ng-high-memory build -- --source-map",

maxkey-web-frontend/maxkey-web-mgt-app/Dockerfile

+#MaxKey Mgt Frontend Docker Build
+
 FROM node:16.14.2
 
 LABEL authors="MaxKey <maxkeysupport@163.com>"
@@ -12,15 +14,15 @@ RUN npm config set registry https://registry.npm.taobao.org \
 COPY ./src  ./src
 RUN npm install -g @angular/cli
 
-RUN ng build --prod
+RUN ng build --prod --base-href /maxkey-mgt/
 
 FROM nginx
 
-COPY ./nginx.conf /etc/nginx/conf.d/
+COPY ./nginx.conf /etc/nginx/conf.d/default.conf
 
-RUN rm -rf /usr/share/nginx/html/*
+#RUN rm -rf /usr/share/nginx/html/*
 
-COPY  dist /usr/share/nginx/html
+COPY  dist /usr/share/nginx/html/maxkey-mgt
 
 #CMD ["nginx", "-g", "daemon off;"]
 

maxkey-web-frontend/maxkey-web-mgt-app/angular.json

@@ -20,6 +20,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            "baseHref": "/maxkey-mgt/",
             "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",

maxkey-web-frontend/maxkey-web-mgt-app/nginx.conf

-#MaxKey mgmt server
+#MaxKey Mgt Frontend Server
 server {
-    listen       9524;
+    listen       8526;
 
     server_name  localhost;
 

maxkey-web-frontend/maxkey-web-mgt-app/package.json

@@ -23,7 +23,7 @@
   "scripts": {
     "ng-high-memory": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng",
     "ng": "ng",
-    "start": "ng s -o",
+    "start": "ng s -o  --serve-path=/maxkey-mgt/ --port=8526",
     "hmr": "ng s -o --hmr",
     "build": "npm run ng-high-memory build",
     "analyze": "npm run ng-high-memory build -- --source-map",

maxkey-webs/maxkey-web-maxkey/config/build_docker.gradle

@@ -30,8 +30,8 @@ jib {
 	}
 	container {
 		mainClass 	= "org.maxkey.MaxKeyApplication"
-		jvmFlags 	= ['-Dfile.encoding=utf-8', '-Dserver.port=443','-Duser.timezone=Asia/Shanghai']
-		ports 		= ['443']
+		jvmFlags 	= ['-Dfile.encoding=utf-8', '-Dserver.port=9527','-Duser.timezone=Asia/Shanghai']
+		ports 		= ['9527']
 	}
 }
 
@@ -57,6 +57,4 @@ dependencies {
    	implementation project(":maxkey-protocols:maxkey-protocol-saml-2.0")
 	implementation project(":maxkey-protocols:maxkey-protocol-jwt")
 	
-	implementation project(":maxkey-webs:maxkey-web-resources")
-	
 }

maxkey-webs/maxkey-web-mgt/config/build_docker.gradle

@@ -31,8 +31,8 @@ jib {
 	}
 	container {
 		mainClass 	= "org.maxkey.MaxKeyMgtApplication"
-		jvmFlags 	= ['-Dfile.encoding=utf-8', '-Dserver.port=9527','-Duser.timezone=Asia/Shanghai']
-		ports	 	= ['9527']
+		jvmFlags 	= ['-Dfile.encoding=utf-8', '-Dserver.port=9526','-Duser.timezone=Asia/Shanghai']
+		ports	 	= ['9526']
 	}
 }
 
@@ -62,6 +62,5 @@ dependencies {
    	implementation project(":maxkey-synchronizers:maxkey-synchronizer-workweixin")
    	implementation project(":maxkey-synchronizers:maxkey-synchronizer-dingtalk")
    	
-   	implementation project(":maxkey-webs:maxkey-web-resources")
    	
 }
\ No newline at end of file