针对portal添加基于path的反向代理支持 #2754

zjh-neverstop · 2019-11-12T04:22:20Z

fixed 域名配置问题 #1154

zjh-neverstop · 2019-11-12T04:27:25Z

在app.js中定义了path常量和filter，同时在AppUtil服务中定义了获取path的方法

var appUtil = angular.module('app.util', ['toastr', 'ngCookies', 'pascalprecht.translate'])
    .constant("prefixLocation", "这里为反向代理path")      // 前缀路径
    .filter('prefixPath',['prefixLocation', function(prefixLocation) {   // 前缀路径过滤器
        return function(text) {
            return prefixLocation + text;
        }
    }])

同时修改了js和html中对资源的引用路径，并进行了测试，可以支持基于path的反向代理

codecov-io · 2019-11-12T04:35:09Z

Codecov Report

Merging #2754 into master will decrease coverage by 0.02%.
The diff coverage is 25%.

@@             Coverage Diff              @@
##             master    #2754      +/-   ##
============================================
- Coverage     50.48%   50.45%   -0.03%     
- Complexity     2084     2085       +1     
============================================
  Files           413      414       +1     
  Lines         12666    12668       +2     
  Branches       1294     1294              
============================================
- Hits           6394     6392       -2     
- Misses         5819     5822       +3     
- Partials        453      454       +1

Impacted Files	Coverage Δ	Complexity Δ
...lo/portal/spi/configuration/AuthConfiguration.java	`5.84% <0%> (ø)`	`1 <0> (ø)`	⬇️
...apollo/portal/controller/PrefixPathController.java	`50% <50%> (ø)`	`1 <1> (?)`
...mework/apollo/portal/component/PortalSettings.java	`65.07% <0%> (-4.77%)`	`5% <0%> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fe016be...c5d4b27. Read the comment docs.

coveralls · 2019-11-12T04:36:15Z

Coverage decreased (-0.02%) to 54.042% when pulling c5d4b27 on zjh-neverstop:master into fe016be on ctripcorp:master.

baiyun1102 · 2019-11-14T10:20:09Z

这个功能挺不错的，希望能以配置参数的方式传入

nobodyiam · 2019-11-17T02:35:49Z

这个功能点很不错，👍

看代码，现在如果要配置反向代理路径的话，是需要修改app.js然后重新打包？
是否有可能做成配置参数，不需要重新打包？这样可能使用起来会更简便

zjh-neverstop · 2019-11-18T14:25:30Z

这个功能点很不错，👍

看代码，现在如果要配置反向代理路径的话，是需要修改app.js然后重新打包？
是否有可能做成配置参数，不需要重新打包？这样可能使用起来会更简便

嗯，目前确实是需要修改app.js并重新打包，我抽空改一下

zjh-neverstop · 2019-11-19T09:36:23Z

@nobodyiam
修改了一下，现在可通过application.properties来设置prefixPath的值，比如在config目录下添加一个application.properties文件，内容如下：

prefixPath=/apollo

然后重启一下portal即可生效，不用再打包了

nobodyiam · 2019-11-25T01:08:44Z

...tal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/AuthConfiguration.java

@@ -271,7 +271,7 @@ protected void configure(HttpSecurity http) throws Exception {
      http.csrf().disable();
      http.headers().frameOptions().sameOrigin();
      http.authorizeRequests()
-          .antMatchers("/prometheus/**","/metrics/**","/openapi/**", "/vendor/**", "/styles/**", "/scripts/**", "/views/**", "/img/**", "/i18n/**").permitAll()
+          .antMatchers("/prometheus/**","/metrics/**","/openapi/**", "/vendor/**", "/styles/**", "/scripts/**", "/views/**", "/img/**", "/i18n/**", "/prefixPath").permitAll()


there is another place to change, just search i18n in this program

另外一个地方已修改

apollo-portal/src/main/resources/static/login.html

zjh-neverstop · 2019-11-25T16:19:44Z

@nobodyiam
code review中提到的两个问题已修改

nobodyiam · 2019-11-30T09:31:40Z

...-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/PrefixPathController.java

+@RestController
+public class PrefixPathController {
+
+  @Value("${prefixPath: }") private String prefixPath;


@Value("${prefixPath: }") will cause the default prefixPath to be " " instead of "".
Though it is still working(I guess the browser does some trick), I would suggest we change it as follows:

@Value("${prefixPath:}") private String prefixPath;

Basically, it works as expected. And a FAQ is added for this function.

已按照建议进行修改

WilliamThh · 2019-12-09T11:44:30Z

@nobodyiam 我拉下最新的代码，编译并且使用-DprefixPath=/apollo -Dserver.servlet.context-path=/apollo，可以访问，但是出现了以下两个问题

输入用户名密码点击登录会报以下错误：{"exception":"org.springframework.web.HttpRequestMethodNotSupportedException","message":"Request method \u0027POST\u0027 not supported","status":400,"timestamp":"2019-12-09T19:38:17.267"}

2.在控制面板点击用户再点退出，会自动跳到根路径，报404

WilliamThh · 2019-12-10T03:08:25Z

问题解决，启动时添加-Dapollo_profile=github,auth -DprefixPath=/apollo -Dserver.servlet.context-path=/apollo参数

我是用Idea编译的，-Dapollo_profile=github,auth必须添加，否则会出现#2142 Failed to configure a DataSource: 'url' attribute is not specified and no embedded datasource could be configured.这样的报错

gy09535 · 2022-03-09T02:09:16Z

问题解决，启动时添加-Dapollo_profile=github,auth -DprefixPath=/apollo -Dserver.servlet.context-path=/apollo参数

我是用Idea编译的，-Dapollo_profile=github,auth必须添加，否则会出现#2142 Failed to configure a DataSource: 'url' attribute is not specified and no embedded datasource could be configured.这样的报错

use -Dprefix.path=/apollo -Dserver.servlet.context-path=/apollo can work

ref: https://github.com/apolloconfig/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/PrefixPathController.java#L32

zjh-neverstop added 2 commits November 12, 2019 12:07

针对portal添加基于path的反向代理支持

1d787d1

针对portal添加基于path的反向代理支持，默认path为空

75a0f21

Merge branch 'master' into master

36f2250

JaredTan95 added enhancement area/ui Categorizes issue or PR as related to front end labels Nov 15, 2019

Merge branch 'master' into master

7f4b320

'反向代理path可配置化'

354b53f

Merge branch 'master' into master

6f42d16

nobodyiam mentioned this pull request Nov 25, 2019

portal里面的链接无法支持自定义contextPath #2770

Closed

nobodyiam reviewed Nov 25, 2019

View reviewed changes

apollo-portal/src/main/resources/static/login.html Outdated Show resolved Hide resolved

jinghao and others added 2 commits November 25, 2019 23:31

修改code review中提到的问题

de0068c

Merge branch 'master' into master

15fcc59

zjh-neverstop requested a review from nobodyiam November 26, 2019 03:54

zjh-neverstop and others added 3 commits November 26, 2019 18:26

Merge branch 'master' into master

540308d

Merge branch 'master' into master

dd9f35a

Merge branch 'master' into master

90ca5a2

JaredTan95 added this to the 1.6.0 milestone Nov 28, 2019

nobodyiam reviewed Nov 30, 2019

View reviewed changes

nobodyiam mentioned this pull request Nov 30, 2019

deployment must be as jar with context path：/ #2432

Closed

zjh-neverstop added 2 commits November 30, 2019 09:36

Merge branch 'master' into master

a6a7e33

Update PrefixPathController.java

3120c79

Merge branch 'master' into master

c5d4b27

nobodyiam merged commit c102e2b into apolloconfig:master Dec 1, 2019

WilliamThh mentioned this pull request Dec 6, 2019

如何使用master代码打包编译成jar并部署k8s #2824

Closed

nobodyiam mentioned this pull request Dec 7, 2019

apollo-portal 加入context-path部署 #1099

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

针对portal添加基于path的反向代理支持 #2754

针对portal添加基于path的反向代理支持 #2754

zjh-neverstop commented Nov 12, 2019 •

edited

Loading

zjh-neverstop commented Nov 12, 2019

codecov-io commented Nov 12, 2019 •

edited

Loading

coveralls commented Nov 12, 2019 •

edited

Loading

baiyun1102 commented Nov 14, 2019

nobodyiam commented Nov 17, 2019

zjh-neverstop commented Nov 18, 2019

zjh-neverstop commented Nov 19, 2019

nobodyiam Nov 25, 2019

zjh-neverstop Nov 25, 2019

zjh-neverstop commented Nov 25, 2019

nobodyiam Nov 30, 2019

nobodyiam Nov 30, 2019

zjh-neverstop Nov 30, 2019

WilliamThh commented Dec 9, 2019

WilliamThh commented Dec 10, 2019

gy09535 commented Mar 9, 2022 •

edited

Loading

针对portal添加基于path的反向代理支持 #2754

针对portal添加基于path的反向代理支持 #2754

Conversation

zjh-neverstop commented Nov 12, 2019 • edited Loading

zjh-neverstop commented Nov 12, 2019

codecov-io commented Nov 12, 2019 • edited Loading

Codecov Report

coveralls commented Nov 12, 2019 • edited Loading

baiyun1102 commented Nov 14, 2019

nobodyiam commented Nov 17, 2019

zjh-neverstop commented Nov 18, 2019

zjh-neverstop commented Nov 19, 2019

nobodyiam Nov 25, 2019

Choose a reason for hiding this comment

zjh-neverstop Nov 25, 2019

Choose a reason for hiding this comment

zjh-neverstop commented Nov 25, 2019

nobodyiam Nov 30, 2019

Choose a reason for hiding this comment

nobodyiam Nov 30, 2019

Choose a reason for hiding this comment

zjh-neverstop Nov 30, 2019

Choose a reason for hiding this comment

WilliamThh commented Dec 9, 2019

WilliamThh commented Dec 10, 2019

gy09535 commented Mar 9, 2022 • edited Loading

zjh-neverstop commented Nov 12, 2019 •

edited

Loading

codecov-io commented Nov 12, 2019 •

edited

Loading

coveralls commented Nov 12, 2019 •

edited

Loading

gy09535 commented Mar 9, 2022 •

edited

Loading