Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lcj-btp-java-app
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
郭智朋
lcj-btp-java-app
Commits
6d2de307
Commit
6d2de307
authored
Feb 09, 2025
by
guozhipeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
正常部署
parent
921247f4
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
137 additions
and
3 deletions
+137
-3
.cdsrc.json
.cdsrc.json
+3
-0
Makefile_20250208193834.mta
Makefile_20250208193834.mta
+55
-0
Login.controller.js
app/main/webapp/controller/Login.controller.js
+43
-0
Menu.controller.js
app/main/webapp/controller/master/Menu.controller.js
+1
-0
QualityGoldSample.controller.js
...troller/qualityInspection/QualityGoldSample.controller.js
+1
-0
QualityInspection01.controller.js
...oller/qualityInspection/QualityInspection01.controller.js
+1
-0
RoleType.controller.js
app/main/webapp/controller/staff/RoleType.controller.js
+1
-0
xs-app.json
app/router/xs-app.json
+16
-0
package.json
db/package.json
+1
-0
mta.yaml
mta.yaml
+4
-1
pom.xml
srv/pom.xml
+5
-0
HttpFilter.java
...java/customer/lianchuangjie/common/filter/HttpFilter.java
+1
-0
HttpInterceptor.java
...customer/lianchuangjie/common/filter/HttpInterceptor.java
+3
-1
OperateAuthFilter.java.txt
...er/lianchuangjie/common/filter/OperateAuthFilter.java.txt
+1
-0
xs-security.json
xs-security.json
+1
-1
No files found.
.cdsrc.json
View file @
6d2de307
{
{
"sql"
:
{
"native_hana_associations"
:
false
},
"build"
:
{
"build"
:
{
"target"
:
"."
"target"
:
"."
},
},
...
...
Makefile_20250208193834.mta
0 → 100644
View file @
6d2de307
# Generated with Cloud MTA Build Tool version 1.2.33
version=0.0.1
MBT=C:/Users/admin/AppData/Roaming/npm/node_modules/mbt/unpacked_bin/mbt.exe
ifndef p
$(error platform flag is expected. e.g. use make -f makefile.mta p=cf)
endif
target_provided=true
ifndef t
t="$(CURDIR)"
target_provided=false
endif
ifndef strict
strict=true
endif
ifndef mtar
mtar="*"
endif
modules := $(shell $(MBT) provide modules -d=dev)
modules := $(subst ],,$(subst [,,$(modules)))
# List of all the recipes to be executed during the build process
.PHONY: all pre_validate pre_build validate $(modules) post_build meta mtar cleanup
# Default target compile all
all: pre_validate pre_build validate $(modules) post_build meta mtar cleanup
# Validate mta.yaml
pre_validate:
@$(MBT) validate -r=${strict} -x="paths"
pre_build: pre_validate
@$(MBT) project build -p=pre
# Execute module build
define build_rule
$(1): validate
@$(MBT) module build -m=$(1) -p=${p} -t=${t}
endef
$(foreach mod,$(modules),$(eval $(call build_rule,$(mod))))# Create META-INF folder with MANIFEST.MF & mtad.yaml
meta: $(modules) post_build
@$(MBT) gen meta -p=${p} -t=${t}
post_build: $(modules)
@$(MBT) project build -p=post -t=${t}
# Validate mta.yaml
validate: pre_build
@$(MBT) validate -r=${strict}
# Pack as MTAR artifact
mtar: $(modules) meta
@$(MBT) gen mtar --mtar=${mtar} --target_provided=${target_provided} -t=${t}
cleanup: mtar
# Remove tmp folder
@$(MBT) clean -t=${t}
\ No newline at end of file
app/main/webapp/controller/Login.controller.js
View file @
6d2de307
...
@@ -123,6 +123,39 @@ sap.ui.define([
...
@@ -123,6 +123,39 @@ sap.ui.define([
// return !!(sap.ui.Device.os.android || sap.ui.Device.os.ios || sap.ui.Device.os.windows.phone || sap.ui.Device.os.blackberry);
// return !!(sap.ui.Device.os.android || sap.ui.Device.os.ios || sap.ui.Device.os.windows.phone || sap.ui.Device.os.blackberry);
return
!!
(
sap
.
ui
.
Device
.
os
.
android
||
sap
.
ui
.
Device
.
os
.
ios
||
sap
.
ui
.
Device
.
os
.
blackberry
);
return
!!
(
sap
.
ui
.
Device
.
os
.
android
||
sap
.
ui
.
Device
.
os
.
ios
||
sap
.
ui
.
Device
.
os
.
blackberry
);
},
},
/**
* 获取token
* @param completeCallback
*/
getCsrfToken
(
completeCallback
)
{
let
that
=
this
jQuery
.
ajax
({
method
:
"GET"
,
url
:
this
.
baseUrl
+
"odata/v4/orderService/OrderHeader"
,
headers
:
{
'x-csrf-token'
:
'fetch'
},
contentType
:
'application/json'
,
dataType
:
'json'
,
crossDomain
:
true
,
async
:
true
,
success
:
function
(
response
)
{
//console.log('success', response)
},
error
:
function
(
jqXHR
,
textStatus
,
errorThrown
)
{
//console.log('error', jqXHR, textStatus, errorThrown)
},
complete
:
function
(
xhr
,
status
){
// 在 complete 回调中获取响应头中的 x-csrf-token
var
csrfToken
=
xhr
.
getResponseHeader
(
'x-csrf-token'
);
that
.
getStorage
().
put
(
"csrfToken"
,
csrfToken
);
//console.log('获取到的 CSRF Token: ', csrfToken);
if
(
completeCallback
&&
typeof
completeCallback
===
'function'
)
{
completeCallback
(
csrfToken
);
}
}
})
},
// 登录
// 登录
onLogin
:
function
(
oEvent
)
{
onLogin
:
function
(
oEvent
)
{
// this.getRouter().navTo("menu", {}, true);
// this.getRouter().navTo("menu", {}, true);
...
@@ -138,11 +171,20 @@ sap.ui.define([
...
@@ -138,11 +171,20 @@ sap.ui.define([
return
;
return
;
}
}
console
.
log
(
"onLoginUrl="
,
that
.
baseUrl
+
"login/login"
);
console
.
log
(
"onLoginUrl="
,
that
.
baseUrl
+
"login/login"
);
that
.
getCsrfToken
(
csrfToken
=>
{
console
.
log
(
'【获取到的 CSRF Token】 '
,
csrfToken
);
var
csrfTokenStorage
=
that
.
getStorage
().
get
(
"csrfToken"
)
console
.
log
(
'【获取到的 CSRF Token】 '
,
csrfToken
);
console
.
log
(
'【获取到的 CSRF csrfTokenStorage】 '
,
csrfTokenStorage
);
let
busyDialog
=
new
sap
.
m
.
BusyDialog
();
let
busyDialog
=
new
sap
.
m
.
BusyDialog
();
busyDialog
.
open
();
busyDialog
.
open
();
jQuery
.
ajax
({
jQuery
.
ajax
({
method
:
"POST"
,
method
:
"POST"
,
headers
:
{
'x-csrf-token'
:
that
.
getStorage
().
get
(
"csrfToken"
),
'Content-Type'
:
'application/json'
},
data
:
JSON
.
stringify
(
param
),
data
:
JSON
.
stringify
(
param
),
url
:
that
.
baseUrl
+
"login/login"
,
url
:
that
.
baseUrl
+
"login/login"
,
contentType
:
'application/json'
,
contentType
:
'application/json'
,
...
@@ -198,6 +240,7 @@ sap.ui.define([
...
@@ -198,6 +240,7 @@ sap.ui.define([
}
}
}
}
});
});
})
},
},
onSelectDialogPress
:
function
(
oEvent
)
{
onSelectDialogPress
:
function
(
oEvent
)
{
var
oView
=
this
.
getView
();
var
oView
=
this
.
getView
();
...
...
app/main/webapp/controller/master/Menu.controller.js
View file @
6d2de307
...
@@ -364,6 +364,7 @@ sap.ui.define(
...
@@ -364,6 +364,7 @@ sap.ui.define(
contentType
:
'application/json'
,
contentType
:
'application/json'
,
dataType
:
'json'
,
dataType
:
'json'
,
headers
:
{
headers
:
{
'x-csrf-token'
:
that
.
getStorage
().
get
(
"csrfToken"
),
language
:
that
.
language
language
:
that
.
language
},
},
success
:
function
(
res
)
{
success
:
function
(
res
)
{
...
...
app/main/webapp/controller/qualityInspection/QualityGoldSample.controller.js
View file @
6d2de307
...
@@ -388,6 +388,7 @@ sap.ui.define(
...
@@ -388,6 +388,7 @@ sap.ui.define(
contentType
:
'application/json'
,
contentType
:
'application/json'
,
dataType
:
'json'
,
dataType
:
'json'
,
headers
:
{
headers
:
{
'x-csrf-token'
:
that
.
getStorage
().
get
(
"csrfToken"
),
language
:
that
.
language
language
:
that
.
language
},
},
success
:
function
(
data
)
{
success
:
function
(
data
)
{
...
...
app/main/webapp/controller/qualityInspection/QualityInspection01.controller.js
View file @
6d2de307
...
@@ -631,6 +631,7 @@ sap.ui.define(
...
@@ -631,6 +631,7 @@ sap.ui.define(
contentType
:
'application/json'
,
contentType
:
'application/json'
,
dataType
:
'json'
,
dataType
:
'json'
,
headers
:
{
headers
:
{
'x-csrf-token'
:
that
.
getStorage
().
get
(
"csrfToken"
),
language
:
that
.
language
language
:
that
.
language
},
},
success
:
function
(
data
)
{
success
:
function
(
data
)
{
...
...
app/main/webapp/controller/staff/RoleType.controller.js
View file @
6d2de307
...
@@ -331,6 +331,7 @@ sap.ui.define(
...
@@ -331,6 +331,7 @@ sap.ui.define(
contentType
:
'application/json'
,
contentType
:
'application/json'
,
dataType
:
'json'
,
dataType
:
'json'
,
headers
:
{
headers
:
{
'x-csrf-token'
:
that
.
getStorage
().
get
(
"csrfToken"
),
language
:
that
.
language
language
:
that
.
language
},
},
success
:
function
(
res
)
{
success
:
function
(
res
)
{
...
...
app/router/xs-app.json
View file @
6d2de307
{
{
"welcomeFile"
:
"/main/webapp/index.html"
,
"welcomeFile"
:
"/main/webapp/index.html"
,
"routes"
:
[
"routes"
:
[
{
"source"
:
"^/index.html(#.*)?$"
,
"target"
:
"/main/webapp/index.html$1"
,
"localDir"
:
"."
,
"cacheControl"
:
"no-cache, no-store, must-revalidate"
},
{
{
"source"
:
"^/odata/(.*)"
,
"source"
:
"^/odata/(.*)"
,
"target"
:
"/odata/$1"
,
"target"
:
"/odata/$1"
,
"destination"
:
"srv-api"
"destination"
:
"srv-api"
},
},
{
"source"
:
"^/logs/(.*)"
,
"target"
:
"/logs/$1"
,
"destination"
:
"srv-api"
},
{
"source"
:
"^([^.]*)$"
,
"target"
:
"$1"
,
"destination"
:
"srv-api"
},
{
{
"source"
:
"^/main/(.*)"
,
"source"
:
"^/main/(.*)"
,
"target"
:
"/$1"
,
"target"
:
"/$1"
,
...
...
db/package.json
View file @
6d2de307
{
{
"name"
:
"deploy"
,
"name"
:
"deploy"
,
"dependencies"
:
{
"dependencies"
:
{
"hdb"
:
"^0"
,
"@sap/hdi-deploy"
:
"^4"
"@sap/hdi-deploy"
:
"^4"
},
},
"engines"
:
{
"engines"
:
{
...
...
mta.yaml
View file @
6d2de307
...
@@ -19,7 +19,7 @@ modules:
...
@@ -19,7 +19,7 @@ modules:
readiness-health-check-type
:
http
readiness-health-check-type
:
http
readiness-health-check-http-endpoint
:
/actuator/health/readiness
readiness-health-check-http-endpoint
:
/actuator/health/readiness
routes
:
routes
:
-
route
:
lianchuangjie-tes-srv.unibetter-ic.com
-
route
:
lianchuangjie-tes
t
-srv.unibetter-ic.com
properties
:
properties
:
SPRING_PROFILES_ACTIVE
:
cloud,sandbox
SPRING_PROFILES_ACTIVE
:
cloud,sandbox
JBP_CONFIG_COMPONENTS
:
"
jres:
['com.sap.xs.java.buildpack.jre.SAPMachineJRE']"
JBP_CONFIG_COMPONENTS
:
"
jres:
['com.sap.xs.java.buildpack.jre.SAPMachineJRE']"
...
@@ -56,6 +56,9 @@ modules:
...
@@ -56,6 +56,9 @@ modules:
type
:
html5
type
:
html5
path
:
app/main
path
:
app/main
build-parameters
:
build-parameters
:
builder
:
custom
commands
:
-
npm run build
supported-platforms
:
supported-platforms
:
[]
[]
build-result
:
.
build-result
:
.
...
...
srv/pom.xml
View file @
6d2de307
...
@@ -323,6 +323,11 @@
...
@@ -323,6 +323,11 @@
<groupId>
com.sap.cds
</groupId>
<groupId>
com.sap.cds
</groupId>
<artifactId>
cds-starter-cloudfoundry
</artifactId>
<artifactId>
cds-starter-cloudfoundry
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-actuator
</artifactId>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
srv/src/main/java/customer/lianchuangjie/common/filter/HttpFilter.java
View file @
6d2de307
...
@@ -25,6 +25,7 @@ public class HttpFilter implements Filter {
...
@@ -25,6 +25,7 @@ public class HttpFilter implements Filter {
@Override
@Override
public
void
doFilter
(
ServletRequest
servletRequest
,
ServletResponse
servletResponse
,
FilterChain
filterChain
)
public
void
doFilter
(
ServletRequest
servletRequest
,
ServletResponse
servletResponse
,
FilterChain
filterChain
)
throws
IOException
,
ServletException
{
throws
IOException
,
ServletException
{
log
.
info
(
"[HttpFilter]doFilter"
);
HttpServletRequest
request
=
(
HttpServletRequest
)
servletRequest
;
HttpServletRequest
request
=
(
HttpServletRequest
)
servletRequest
;
ThreadLocalManagerUtil
.
HeaderInfo
headerInfo
=
new
ThreadLocalManagerUtil
.
HeaderInfo
();
ThreadLocalManagerUtil
.
HeaderInfo
headerInfo
=
new
ThreadLocalManagerUtil
.
HeaderInfo
();
headerInfo
.
setLanguage
(
request
.
getHeader
(
SystemConstants
.
LANGUAGE
));
headerInfo
.
setLanguage
(
request
.
getHeader
(
SystemConstants
.
LANGUAGE
));
...
...
srv/src/main/java/customer/lianchuangjie/common/filter/HttpInterceptor.java
View file @
6d2de307
...
@@ -5,6 +5,7 @@ import customer.lianchuangjie.common.util.StringUtil;
...
@@ -5,6 +5,7 @@ import customer.lianchuangjie.common.util.StringUtil;
import
customer.lianchuangjie.common.util.ThreadLocalManagerUtil
;
import
customer.lianchuangjie.common.util.ThreadLocalManagerUtil
;
import
jakarta.servlet.http.HttpServletRequest
;
import
jakarta.servlet.http.HttpServletRequest
;
import
jakarta.servlet.http.HttpServletResponse
;
import
jakarta.servlet.http.HttpServletResponse
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.web.servlet.HandlerInterceptor
;
import
org.springframework.web.servlet.HandlerInterceptor
;
import
org.springframework.web.servlet.ModelAndView
;
import
org.springframework.web.servlet.ModelAndView
;
...
@@ -13,11 +14,12 @@ import org.springframework.web.servlet.ModelAndView;
...
@@ -13,11 +14,12 @@ import org.springframework.web.servlet.ModelAndView;
* @Description 需要注册到 webmvc中
* @Description 需要注册到 webmvc中
* @CreateTime 2022/12/8 17:59
* @CreateTime 2022/12/8 17:59
**/
**/
@Slf4j
public
class
HttpInterceptor
implements
HandlerInterceptor
{
public
class
HttpInterceptor
implements
HandlerInterceptor
{
@Override
@Override
public
boolean
preHandle
(
jakarta
.
servlet
.
http
.
HttpServletRequest
request
,
public
boolean
preHandle
(
jakarta
.
servlet
.
http
.
HttpServletRequest
request
,
jakarta
.
servlet
.
http
.
HttpServletResponse
response
,
java
.
lang
.
Object
handler
)
throws
java
.
lang
.
Exception
{
jakarta
.
servlet
.
http
.
HttpServletResponse
response
,
java
.
lang
.
Object
handler
)
throws
java
.
lang
.
Exception
{
log
.
info
(
"[HttpInterceptor]preHandle"
);
//成功登录后,获取请求头中appKey,通过其从内存中获取userLoginId 存入ThreadLocal中
//成功登录后,获取请求头中appKey,通过其从内存中获取userLoginId 存入ThreadLocal中
if
(!
"/login/login"
.
equals
(
request
.
getRequestURI
())
&&
StringUtil
.
isNotEmpty
(
request
.
getHeader
(
"appKey"
))
if
(!
"/login/login"
.
equals
(
request
.
getRequestURI
())
&&
StringUtil
.
isNotEmpty
(
request
.
getHeader
(
"appKey"
))
&&
CommonConstant
.
userAuthenticationMap
.
containsKey
(
request
.
getHeader
(
"appKey"
)))
{
&&
CommonConstant
.
userAuthenticationMap
.
containsKey
(
request
.
getHeader
(
"appKey"
)))
{
...
...
srv/src/main/java/customer/lianchuangjie/common/filter/OperateAuthFilter.java
→
srv/src/main/java/customer/lianchuangjie/common/filter/OperateAuthFilter.java
.txt
View file @
6d2de307
...
@@ -56,6 +56,7 @@ public class OperateAuthFilter implements Filter {
...
@@ -56,6 +56,7 @@ public class OperateAuthFilter implements Filter {
@Override
@Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
log.info("[OperateAuthFilter]doFilter");
HttpServletRequest request = (HttpServletRequest) servletRequest;
HttpServletRequest request = (HttpServletRequest) servletRequest;
HttpServletResponse response = (HttpServletResponse) servletResponse;
HttpServletResponse response = (HttpServletResponse) servletResponse;
String appKey = request.getHeader("appKey"); //用户appKey
String appKey = request.getHeader("appKey"); //用户appKey
...
...
xs-security.json
View file @
6d2de307
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
],
],
"role-collections"
:
[
"role-collections"
:
[
{
{
"name"
:
"
l
ianchuangjie_Administrators"
,
"name"
:
"
L
ianchuangjie_Administrators"
,
"description"
:
"Lianchuangjie Administrators"
,
"description"
:
"Lianchuangjie Administrators"
,
"role-template-references"
:
[
"role-template-references"
:
[
"$XSAPPNAME.Administrators"
"$XSAPPNAME.Administrators"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment