Skip to content

Q
QLNS_N01
Commit e7b14bbb authored by đinh thị đầm's avatar đinh thị đầm
Browse files
Options

commit

parent 72500a6f
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 35 deletions
src/main/resources/application.properties
View file @ e7b14bbb
......@@ -3,27 +3,23 @@
# DATABASE CONNECTION
# ===============================
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
<<<<<<< HEAD
spring.datasource.url=jdbc:mysql://localhost:3306/quantrivanphong
spring.datasource.username=root
spring.datasource.password=ahihi123
=======
spring.datasource.url=jdbc:mysql://localhost:3308/quantrivanphong
spring.datasource.username=root
spring.datasource.password= 123456
>>>>>>> f6b6b75d93f4b7ab7e92c4c2398ddcf0c0f812b4
# ===============================
# JPA / HIBERNATE
# ===============================
spring.jpa.show-sql=true
spring.jpa.hibernate.ddl-auto=update
<<<<<<< HEAD
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL57Dialect
=======
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
#spring.jpa.properties.hibernate.default_schema=qlns_itsol
>>>>>>> f6b6b75d93f4b7ab7e92c4c2398ddcf0c0f812b4
## Fix Postgres JPA Error:
......
src/main/resources/public/index.html
View file @ e7b14bbb
<!DOCTYPE HTML>
<html>
<head>
<title>Business_Blog a Blogging Category Flat Bootstrap Responsive Website Template | World :: w3layouts</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="keywords" content="Business_Blog Responsive web template, Bootstrap Web Templates, Flat Web Templates, Android Compatible web template,
Smartphone Compatible web template, free webdesigns for Nokia, Samsung, LG, SonyErricsson, Motorola web design"/>
<script type="applijewelleryion/x-javascript">
addEventListener("load", function() { setTimeout(hideURLbar, 0); }, false); function hideURLbar(){ window.scrollTo(0,1); }
</script>
<link href="css/bootstrap.css" rel='stylesheet' type='text/css'/>
<!-- Custom Theme files -->
<link href="https://fonts.googleapis.com/css?family=Roboto+Condensed:400,700" rel='stylesheet' type='text/css'>
<link href="https://fonts.googleapis.com/css?family=Open+Sans" type='text/css'>
<link href="css/style.css" rel='stylesheet' type='text/css'/>
<!--Khai báo các thư viện-->
<script src="js/jquery-3.2.1.min.js"></script>
<script src="js/bootstrap.min.js"></script>
<script src="js/angular.js"></script>
<script src="js/angular-ui-router.min.js"></script>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">
<!--End khai báo thư viện-->
<!--Khai báo các file js-->
<script src="pages/employee/js/app.js"></script>
<!--End khai báo các file js-->
<!-- khai báo các controllers -->
<script src="pages/employee/js/employeeController.js"></script>
<!--End khai báo controllers-->
</head>
<body ng-app="myApp">
<!--start-main-->
<div ui-view></div>
......
src/main/resources/public/pages/employee/html/welcome.html
View file @ e7b14bbb
......@@ -88,9 +88,6 @@
<td>{{emp.phoneNumber}}</td>
<td>{{emp.education}}</td>
<td>{{emp.homeTown}}</td>
<td><a href="#" ng-click="update(emp);">Update</a>
<td><a href="#" confirmed-click="delete(employee);" ng-confirm-click=" Do you want to delete this user?">Delete</a></td>
</tr>
......
src/main/resources/public/pages/employee/js/employeeController.js
View file @ e7b14bbb
......@@ -23,11 +23,11 @@ angular.module("myApp",[]).controller("employeeController", function($scope, $ht
console.log($scope.emp);
$http({
method : 'POST',
url : "http://localhost:8081/list_employee/",
url : "http://localhost:8080/list_employee/",
data: $scope.emp
}).then(function successCallback(response) {
console.log(response);
$window.location.href ='http://localhost:8081/#/tintuc';
$window.location.href ='http://localhost:8080/#/tintuc';
}, function errorCallback(response) {
console.log(response)
});
......@@ -40,14 +40,14 @@ angular.module("myApp",[]).controller("employeeController", function($scope, $ht
$scope.deleteEmployee = function (employee) {
$http({
method : 'DELETE',
url : 'http://localhost:8081/deleteEmployee/' + employee.id
url : 'http://localhost:8080/deleteEmployee/' + employee.id
}).then(_success, _error);
}
$http({
method : 'GET',
url : "http://localhost:8081/list_employee/",
url : "http://localhost:8080/list_employee/",
}).then(function successCallback(response) {
console.log(response)
$scope.employess=response.data;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment